ruby 2.6.2

jmcapra · Apr 12, 2019 · 68474b0 · 68474b0
1 parent 3ba9b54
commit 68474b0
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 52 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.3.4
+2.6.2
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '2.3.4'
+ruby '2.6.2'
 
 gem 'rails', '5.1.6.2'
 
@@ -19,7 +19,7 @@ gem "passenger", '~> 6.0.1'
 
 gem "mysql2", '0.4.10'
 gem "bcrypt", '3.1.12'
-gem 'haml', '~> 5.0.1'
+gem 'haml', '~> 5.0.4'
 gem 'sass', '~> 3.4.24'
 gem 'rack-attack', '~> 5.0.1'
 gem 'rest-client', '~> 2.0.2'
@@ -121,8 +121,8 @@ group :development do
   gem 'listen', '~> 3.1.5'
   gem 'annotate', '~> 2.7.1'
   gem 'zeus', '~> 0.15.13', require: false
-  gem 'better_errors', '~> 2.1.1'
-  gem 'web-console', '~> 3.5.1'
+  gem 'better_errors', '~> 2.5.1'
+  gem 'web-console', '~> 3.7.0'
   gem 'awesome_print', '~> 1.7.0'
   gem 'binding_of_caller'
 end
@@ -161,7 +161,7 @@ gem 'js-routes', '~> 1.3.3'
 gem 'color', '~> 1.8'
 
 gem 'uuidtools', '~> 2.1.5'
-gem 'transit-ruby', '~> 0.8.1'
+gem 'transit-ruby', '~> 0.8.602'
 
 # Markdown parser
 gem 'redcarpet', '~> 3.4.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -75,15 +75,16 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
     airbrake (6.1.2)
       airbrake-ruby (~> 2.2, >= 2.2.5)
     airbrake-ruby (2.2.6)
     annotate (2.7.1)
       activerecord (>= 3.2, < 6.0)
       rake (>= 10.4, < 12.0)
     arel (8.0.0)
-    ast (2.3.0)
+    ast (2.4.0)
     awesome_print (1.7.0)
     aws-sdk (2.9.25)
       aws-sdk-resources (= 2.9.25)
@@ -94,18 +95,18 @@ GEM
       aws-sdk-core (= 2.9.25)
     aws-sigv4 (1.0.0)
     bcrypt (3.1.12)
-    better_errors (2.1.1)
+    better_errors (2.5.1)
       coderay (>= 1.0.0)
-      erubis (>= 2.6.6)
+      erubi (>= 1.0.0)
       rack (>= 0.9.0)
-    bindex (0.5.0)
+    bindex (0.6.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     biz (1.7.0)
       clavius (~> 1.0)
       tzinfo
     builder (3.2.3)
-    byebug (9.0.6)
+    byebug (11.0.1)
     callsite (0.0.11)
     camertron-eprun (1.1.1)
     capybara (2.18.0)
@@ -123,7 +124,7 @@ GEM
     climate_control (0.2.0)
     cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
-    coderay (1.1.1)
+    coderay (1.1.2)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0)
@@ -180,8 +181,8 @@ GEM
     dalli (2.7.6)
     database_cleaner (1.6.1)
     debug_inspector (0.0.3)
-    delayed_job (4.1.3)
-      activesupport (>= 3.0, < 5.2)
+    delayed_job (4.1.5)
+      activesupport (>= 3.0, < 5.3)
     delayed_job_active_record (4.1.2)
       activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
@@ -205,7 +206,6 @@ GEM
       launchy (~> 2.1)
       mail (~> 2.6)
     erubi (1.8.0)
-    erubis (2.7.0)
     execjs (2.7.0)
     factory_girl (4.8.0)
       activesupport (>= 3.0.0)
@@ -243,7 +243,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    haml (5.0.1)
+    haml (5.0.4)
       temple (>= 0.8.0)
       tilt
     hashdiff (0.3.8)
@@ -296,7 +296,7 @@ GEM
       callsite (~> 0.0, >= 0.0.11)
       rack-contrib (>= 1.1, < 3)
       railties (>= 3.0.0, < 5.2.0)
-    method_source (0.8.2)
+    method_source (0.9.2)
     middleware (0.1.0)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
@@ -328,7 +328,7 @@ GEM
     netrc (0.11.0)
     newrelic_rpm (4.2.0.334)
     nio4r (2.3.1)
-    nokogiri (1.10.1)
+    nokogiri (1.10.2)
       mini_portile2 (~> 2.4.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -361,9 +361,9 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
-    parallel (1.11.2)
-    parser (2.4.0.0)
-      ast (~> 2.2)
+    parallel (1.17.0)
+    parser (2.6.2.0)
+      ast (~> 2.4.0)
     passenger (6.0.1)
       rack
       rake (>= 0.8.1)
@@ -375,23 +375,22 @@ GEM
     paypal-sdk-permissions (1.96.4)
       paypal-sdk-core (~> 0.3.0)
     possibly (1.0.1)
-    powerpack (0.1.1)
+    powerpack (0.1.2)
     premailer (1.10.4)
       addressable
       css_parser (>= 1.4.10)
       htmlentities (>= 4.0.0)
-    pry (0.10.4)
+    pry (0.12.2)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.2)
-      byebug (~> 9.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (2.0.5)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
-    rack (2.0.6)
+    rack (2.0.7)
     rack-attack (5.0.1)
       rack
     rack-contrib (1.2.0)
@@ -493,7 +492,7 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
     rubyzip (1.2.2)
     safe_yaml (1.0.5)
@@ -516,7 +515,6 @@ GEM
     sitemap_generator (5.3.1)
       builder (~> 3.0)
     sixarm_ruby_unaccent (1.1.1)
-    slop (3.6.0)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -529,7 +527,7 @@ GEM
     stripe (4.9.0)
       faraday (~> 0.13)
       net-http-persistent (~> 3.0)
-    temple (0.8.0)
+    temple (0.8.1)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
@@ -542,10 +540,10 @@ GEM
       riddle (>= 2.0.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.9)
     timecop (0.8.1)
-    transit-ruby (0.8.599)
-      addressable (~> 2.3.6)
+    transit-ruby (0.8.602)
+      addressable (~> 2.3)
       msgpack (~> 1.1.0)
       oj (~> 2.18)
     trollop (2.1.2)
@@ -563,12 +561,12 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
-    unicode-display_width (1.2.1)
+    unicode-display_width (1.5.0)
     unicode_utils (1.4.0)
     uuidtools (2.1.5)
     warden (1.2.8)
       rack (>= 2.0.6)
-    web-console (3.5.1)
+    web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
@@ -602,7 +600,7 @@ DEPENDENCIES
   awesome_print (~> 1.7.0)
   aws-sdk (~> 2.9.25)
   bcrypt (= 3.1.12)
-  better_errors (~> 2.1.1)
+  better_errors (~> 2.5.1)
   binding_of_caller
   biz
   capybara (~> 2.18.0)
@@ -630,7 +628,7 @@ DEPENDENCIES
   ffi (>= 1.9.25)
   flying-sphinx (~> 1.2.0)
   guard-rspec (~> 4.7.3)
-  haml (~> 5.0.1)
+  haml (~> 5.0.4)
   hiredis (~> 0.6.1)
   i18n-js (~> 3.0.0)
   intercom
@@ -684,20 +682,20 @@ DEPENDENCIES
   therubyracer (~> 0.12.3)
   thinking-sphinx (~> 3.3.0)
   timecop (~> 0.8.1)
-  transit-ruby (~> 0.8.1)
+  transit-ruby (~> 0.8.602)
   truncate_html (~> 0.9.3)
   ts-delayed-delta!
   twitter_cldr
   tzinfo-data (~> 1.2017, >= 1.2017.2)
   uglifier (~> 3.2.0)
   uuidtools (~> 2.1.5)
-  web-console (~> 3.5.1)
+  web-console (~> 3.7.0)
   web_translate_it (~> 2.4.1)
   will_paginate (~> 3.1.5)
   zeus (~> 0.15.13)
 
 RUBY VERSION
-   ruby 2.3.4p301
+   ruby 2.6.2p47
 
 BUNDLED WITH
-   1.16.1
+   1.17.2
diff --git a/app/controllers/community_memberships_controller.rb b/app/controllers/community_memberships_controller.rb
@@ -11,12 +11,12 @@ class CommunityMembershipsController < ApplicationController
 
   before_action :ensure_membership_found
   before_action :ensure_membership_is_not_accepted
-  before_action only: [:pending_consent, :give_consent] {
+  before_action only: [:pending_consent, :give_consent] do
     ensure_membership_status("pending_consent")
-  }
-  before_action only: [:confirmation_pending] {
+  end
+  before_action only: [:confirmation_pending] do
     ensure_membership_status("pending_email_confirmation")
-  }
+  end
 
   Form = EntityUtils.define_builder(
     [:invitation_code, :string],

diff --git a/app/utils/entity_utils.rb b/app/utils/entity_utils.rb
@@ -63,8 +63,8 @@ def model_to_hash(model)
       end
     },
     fixnum: -> (_, v, _) {
-      unless (v.nil? || v.is_a?(Fixnum))
-        {code: :fixnum, msg: "Value must be a Fixnum. Was: #{v} (#{v.class.name})." }
+      unless (v.nil? || v.is_a?(Integer))
+        {code: :fixnum, msg: "Value must be a Integer. Was: #{v} (#{v.class.name})." }
       end
     },
     symbol: -> (_, v, _) {

diff --git a/spec/services/plan_service/api/plans_spec.rb b/spec/services/plan_service/api/plans_spec.rb
@@ -29,7 +29,7 @@
             res = plans_api.get_current(community_id: 123)
 
             expect(res.success).to eq(true)
-            expect(res.data[:id]).to be_a(Fixnum)
+            expect(res.data[:id]).to be_a(Integer)
             expect(res.data.except(:id)).to include(
                                               community_id: 123,
                                               status: :trial,
@@ -59,7 +59,7 @@
             res = plans_api.get_current(community_id: 123)
 
             expect(res.success).to eq(true)
-            expect(res.data[:id]).to be_a(Fixnum)
+            expect(res.data[:id]).to be_a(Integer)
             expect(res.data.except(:id)).to include(
                                               community_id: 123,
                                               status: :active,
@@ -86,7 +86,7 @@
             res = plans_api.get_current(community_id: 123)
 
             expect(res.success).to eq(true)
-            expect(res.data[:id]).to be_a(Fixnum)
+            expect(res.data[:id]).to be_a(Integer)
             expect(res.data.except(:id)).to include(
                                               community_id: 123,
                                               status: :active,