From 69cb2cbc5c89650d3b53aec2e2947e913210faa8 Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Thu, 31 Jan 2019 17:11:34 -0600 Subject: [PATCH] Rails 5.0 builds --- Gemfile | 15 +++-- Gemfile.lock | 163 ++++++++++++++++++++++++--------------------------- 2 files changed, 85 insertions(+), 93 deletions(-) diff --git a/Gemfile b/Gemfile index 65b26f6b..b53407da 100755 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' ruby '2.4.5' gem 'rake' -gem 'rails', '~> 4.2.8' +gem 'rails', '= 5.0.0' gem 'rails_12factor' # https://stripe.com/docs/api gem 'stripe' @@ -69,7 +69,7 @@ gem 'httparty' # User authentication # https://github.com/plataformatec/devise -gem 'devise', '~> 3.5.0' +gem 'devise', '~> 4.4' gem 'devise-async' # https://github.com/airbrake/airbrake @@ -90,7 +90,7 @@ gem 'table_print' gem 'bunny', '>= 2.6.3' -gem 'rails-i18n', '~> 4.0' # For 3.x +gem 'rails-i18n' gem 'i18n-js' gem 'countries' @@ -136,10 +136,15 @@ gem 'dry-validation' # used only for config validation gem 'foreman' -gem 'grape', '~> 1.1.0' +gem 'grape' gem 'grape-entity' gem 'grape-swagger' gem 'grape-swagger-entity' gem 'grape_url_validator' gem 'grape_logging' -gem 'grape_devise', path: 'gems/grape_devise' +gem 'grape_devise' +#gem 'grape_devise', git: 'https://github.com/ericschultz/grape_devise.git' + +#gem 'protected_attributes' + +gem 'rack-ssl' diff --git a/Gemfile.lock b/Gemfile.lock index a63ce2f5..7b153a83 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,23 +8,6 @@ GIT multi_json (~> 1.0) stripe (>= 1.31.0, <= 1.58.0) -GIT - remote: https://github.com/ruby-grape/grape-entity.git - revision: 0e04aa561373b510c2486282979085eaef2ae663 - ref: 0e04aa561373b510c2486282979085eaef2ae663 - specs: - qx (0.1.1) - activerecord (>= 3.0) - colorize (~> 0.8) - -PATH - remote: gems/grape_devise - specs: - grape_devise (0.1.1) - devise (>= 2.2.8, < 5) - grape (> 0.7) - rails (> 3.2, < 6) - PATH remote: gems/ruby-param-validation specs: @@ -42,39 +25,42 @@ GEM remote: https://rubygems.org/ specs: action_mailer_matchers (1.0.0) - actionmailer (4.2.11) - actionpack (= 4.2.11) - actionview (= 4.2.11) - activejob (= 4.2.11) + actioncable (5.0.0) + actionpack (= 5.0.0) + nio4r (~> 1.2) + websocket-driver (~> 0.6.1) + actionmailer (5.0.0) + actionpack (= 5.0.0) + actionview (= 5.0.0) + activejob (= 5.0.0) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.11) - actionview (= 4.2.11) - activesupport (= 4.2.11) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + actionpack (5.0.0) + actionview (= 5.0.0) + activesupport (= 5.0.0) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.11) - activesupport (= 4.2.11) + actionview (5.0.0) + activesupport (= 5.0.0) builder (~> 3.1) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.11) - activesupport (= 4.2.11) - globalid (>= 0.3.0) - activemodel (4.2.11) - activesupport (= 4.2.11) - builder (~> 3.1) - activerecord (4.2.11) - activemodel (= 4.2.11) - activesupport (= 4.2.11) - arel (~> 6.0) - activesupport (4.2.11) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.0.2) + activejob (5.0.0) + activesupport (= 5.0.0) + globalid (>= 0.3.6) + activemodel (5.0.0) + activesupport (= 5.0.0) + activerecord (5.0.0) + activemodel (= 5.0.0) + activesupport (= 5.0.0) + arel (~> 7.0) + activesupport (5.0.0) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) @@ -84,7 +70,7 @@ GEM tdigest (= 0.1.1) amq-protocol (2.3.0) andand (1.3.3) - arel (6.0.4) + arel (7.1.4) ast (2.4.0) aws-eventstream (1.0.1) aws-partitions (1.110.0) @@ -166,15 +152,15 @@ GEM delayed_job (>= 3.0, < 5) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (3.5.10) + devise (4.5.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0, < 6.0) responders - thread_safe (~> 0.1) warden (~> 1.2.3) - devise-async (0.10.2) - devise (>= 3.2, < 4.0) + devise-async (1.0.0) + activejob (>= 5.0) + devise (>= 4.0) diff-lcs (1.3) docile (1.3.1) domain_name (0.5.20180417) @@ -311,6 +297,7 @@ GEM kdtree require_all netrc (0.11.0) + nio4r (1.2.1) nokogiri (1.10.1) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) @@ -318,9 +305,9 @@ GEM parser (2.6.0.0) ast (~> 2.4.0) pg (0.21.0) - polyglot (0.3.5) - power_assert (1.1.1) - pry (0.11.3) + power_assert (1.1.3) + powerpack (0.1.2) + pry (0.12.0) coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (3.0.3) @@ -330,7 +317,7 @@ GEM puma (>= 2.7, < 4) rabl (0.14.0) activesupport (>= 2.3.14) - rack (1.6.11) + rack (2.0.6) rack-accept (0.4.5) rack (>= 0.4) rack-attack (5.4.2) @@ -340,37 +327,35 @@ GEM rack-test (0.6.3) rack (>= 1.0) rack-timeout (0.5.1) - rails (4.2.11) - actionmailer (= 4.2.11) - actionpack (= 4.2.11) - actionview (= 4.2.11) - activejob (= 4.2.11) - activemodel (= 4.2.11) - activerecord (= 4.2.11) - activesupport (= 4.2.11) + rails (5.0.0) + actioncable (= 5.0.0) + actionmailer (= 5.0.0) + actionpack (= 5.0.0) + actionview (= 5.0.0) + activejob (= 5.0.0) + activemodel (= 5.0.0) + activerecord (= 5.0.0) + activesupport (= 5.0.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.11) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) + railties (= 5.0.0) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - rails-i18n (4.0.9) - i18n (~> 0.7) - railties (~> 4.0) + rails-i18n (5.1.3) + i18n (>= 0.7, < 2) + railties (>= 5.0, < 6) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging - rails_serve_static_assets (0.0.4) - rails_stdout_logging (0.0.3) - railties (3.2.22.5) - actionpack (= 3.2.22.5) - activesupport (= 3.2.22.5) - rack-ssl (~> 1.3.2) + rails_serve_static_assets (0.0.5) + rails_stdout_logging (0.0.5) + railties (5.0.0) + actionpack (= 5.0.0) + activesupport (= 5.0.0) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) @@ -486,12 +471,15 @@ GEM coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) - warden (1.2.7) - rack (>= 1.0) + warden (1.2.8) + rack (>= 2.0.6) webmock (3.4.2) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) xml-simple (1.1.5) yard (0.9.18) @@ -516,7 +504,7 @@ DEPENDENCIES database_cleaner debase delayed_job_active_record - devise (~> 3.5.0) + devise (~> 4.4) devise-async dotenv-rails dry-validation @@ -526,11 +514,10 @@ DEPENDENCIES foreman fullcontact geocoder - grape (~> 1.1.0) + grape grape-entity grape-swagger grape-swagger-entity - grape_devise! grape_logging grape_url_validator hamster @@ -544,7 +531,7 @@ DEPENDENCIES nearest_time_zone parallel param_validation! - pg + pg (~> 0.11) pry puma puma_worker_killer @@ -553,8 +540,8 @@ DEPENDENCIES rack-attack rack-ssl rack-timeout - rails (~> 4.2.8) - rails-i18n (~> 4.0) + rails (= 5.0.0) + rails-i18n rails_12factor rake roadie-rails @@ -577,7 +564,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 2.3.7p456 + ruby 2.4.5p335 BUNDLED WITH 1.17.3