From 54654e0b586c6687b3df8f7aae029121819b2290 Mon Sep 17 00:00:00 2001 From: Hassan Date: Fri, 14 Sep 2018 16:24:07 +0200 Subject: [PATCH] Update database Cleaner with rails 5 and replace Fixnum with Integer --- .travis.yml | 7 ++ gemfiles/40.gemfile | 2 +- gemfiles/40.gemfile.lock | 85 +++++++++-------- gemfiles/41.gemfile | 2 +- gemfiles/41.gemfile.lock | 137 ++++++++++++++------------- gemfiles/42.gemfile | 2 +- gemfiles/42.gemfile.lock | 178 ++++++++++++++++++------------------ gemfiles/50.gemfile | 2 +- gemfiles/50.gemfile.lock | 124 ++++++++++++------------- lib/active_sorting/model.rb | 4 +- 10 files changed, 274 insertions(+), 269 deletions(-) diff --git a/.travis.yml b/.travis.yml index 651e65d..4875d32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ rvm: - 2.1.8 - 2.0.0 - rbx-2 +- 2.5.1 before_install: - gem install bundler -v '~> 1.11' gemfile: @@ -20,5 +21,11 @@ matrix: gemfile: gemfiles/50.gemfile - rvm: rbx-2 gemfile: gemfiles/50.gemfile + - rvm: 2.5.1 + gemfile: gemfiles/40.gemfile + - rvm: 2.5.1 + gemfile: gemfiles/41.gemfile + - rvm: 2.5.1 + gemfile: gemfiles/42.gemfile cache: - bundler diff --git a/gemfiles/40.gemfile b/gemfiles/40.gemfile index c6d0a1f..f844fec 100644 --- a/gemfiles/40.gemfile +++ b/gemfiles/40.gemfile @@ -4,4 +4,4 @@ source "https://rubygems.org" gem "rails", "~> 4.0.0" -gemspec :path => "../" +gemspec path: "../" diff --git a/gemfiles/40.gemfile.lock b/gemfiles/40.gemfile.lock index b4f128d..d66b088 100644 --- a/gemfiles/40.gemfile.lock +++ b/gemfiles/40.gemfile.lock @@ -1,7 +1,7 @@ PATH - remote: ../ + remote: .. specs: - activesorting (0.7.1) + activesorting (0.8.4) activerecord (>= 4.0.0) railties (>= 4.0.0) @@ -32,32 +32,31 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - appraisal (2.1.0) + appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (4.0.2) builder (3.1.4) - concurrent-ruby (1.0.1) - coveralls (0.8.13) - json (~> 1.8) - simplecov (~> 0.11.0) + concurrent-ruby (1.0.5) + coveralls (0.8.22) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) term-ansicolor (~> 1.3) - thor (~> 0.19.1) - tins (~> 1.6.0) - database_cleaner (1.5.1) - diff-lcs (1.2.5) - docile (1.1.5) + thor (~> 0.19.4) + tins (~> 1.6) + database_cleaner (1.7.0) + diff-lcs (1.3) + docile (1.3.1) erubis (2.7.0) - i18n (0.7.0) - json (1.8.3) - mail (2.6.4) - mime-types (>= 1.16, < 4) - mime-types (3.0) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0221) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (2.1.0) + mail (2.7.1) + mini_mime (>= 0.1.1) + mini_mime (1.0.1) minitest (4.7.5) - multi_json (1.11.2) + multi_json (1.13.1) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) @@ -75,38 +74,38 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.5.0) - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) - simplecov (0.11.2) - docile (~> 1.1.0) - json (~> 1.8) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sprockets (3.5.2) + simplecov-html (0.10.2) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.11) - term-ansicolor (1.3.2) + sqlite3 (1.3.13) + term-ansicolor (1.6.0) tins (~> 1.0) - thor (0.19.1) - thread_safe (0.3.5) - tins (1.6.0) - tzinfo (0.3.48) + thor (0.19.4) + thread_safe (0.3.6) + tins (1.17.0) + tzinfo (0.3.54) PLATFORMS ruby @@ -123,4 +122,4 @@ DEPENDENCIES sqlite3 BUNDLED WITH - 1.11.2 + 1.16.5 diff --git a/gemfiles/41.gemfile b/gemfiles/41.gemfile index f95005c..f4a887f 100644 --- a/gemfiles/41.gemfile +++ b/gemfiles/41.gemfile @@ -4,4 +4,4 @@ source "https://rubygems.org" gem "rails", "~> 4.1.0" -gemspec :path => "../" +gemspec path: "../" diff --git a/gemfiles/41.gemfile.lock b/gemfiles/41.gemfile.lock index 25762bd..279bbfd 100644 --- a/gemfiles/41.gemfile.lock +++ b/gemfiles/41.gemfile.lock @@ -1,115 +1,114 @@ PATH - remote: ../ + remote: .. specs: - activesorting (0.7.1) + activesorting (0.8.4) activerecord (>= 4.0.0) railties (>= 4.0.0) GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.15) - actionpack (= 4.1.15) - actionview (= 4.1.15) + actionmailer (4.1.16) + actionpack (= 4.1.16) + actionview (= 4.1.16) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.15) - actionview (= 4.1.15) - activesupport (= 4.1.15) + actionpack (4.1.16) + actionview (= 4.1.16) + activesupport (= 4.1.16) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.15) - activesupport (= 4.1.15) + actionview (4.1.16) + activesupport (= 4.1.16) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.15) - activesupport (= 4.1.15) + activemodel (4.1.16) + activesupport (= 4.1.16) builder (~> 3.1) - activerecord (4.1.15) - activemodel (= 4.1.15) - activesupport (= 4.1.15) + activerecord (4.1.16) + activemodel (= 4.1.16) + activesupport (= 4.1.16) arel (~> 5.0.0) - activesupport (4.1.15) + activesupport (4.1.16) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - appraisal (2.1.0) + appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (5.0.1.20140414130214) - builder (3.2.2) - concurrent-ruby (1.0.1) - coveralls (0.8.13) - json (~> 1.8) - simplecov (~> 0.11.0) + builder (3.2.3) + concurrent-ruby (1.0.5) + coveralls (0.8.22) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) term-ansicolor (~> 1.3) - thor (~> 0.19.1) - tins (~> 1.6.0) - database_cleaner (1.5.1) - diff-lcs (1.2.5) - docile (1.1.5) + thor (~> 0.19.4) + tins (~> 1.6) + database_cleaner (1.7.0) + diff-lcs (1.3) + docile (1.3.1) erubis (2.7.0) - i18n (0.7.0) - json (1.8.3) - mail (2.6.4) - mime-types (>= 1.16, < 4) - mime-types (3.0) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0221) - minitest (5.8.4) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (1.8.6) + mail (2.7.1) + mini_mime (>= 0.1.1) + mini_mime (1.0.1) + minitest (5.11.3) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) - rails (4.1.15) - actionmailer (= 4.1.15) - actionpack (= 4.1.15) - actionview (= 4.1.15) - activemodel (= 4.1.15) - activerecord (= 4.1.15) - activesupport (= 4.1.15) + rails (4.1.16) + actionmailer (= 4.1.16) + actionpack (= 4.1.16) + actionview (= 4.1.16) + activemodel (= 4.1.16) + activerecord (= 4.1.16) + activesupport (= 4.1.16) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.15) + railties (= 4.1.16) sprockets-rails (~> 2.0) - railties (4.1.15) - actionpack (= 4.1.15) - activesupport (= 4.1.15) + railties (4.1.16) + actionpack (= 4.1.16) + activesupport (= 4.1.16) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.5.0) - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) - simplecov (0.11.2) - docile (~> 1.1.0) - json (~> 1.8) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sprockets (3.5.2) + simplecov-html (0.10.2) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.11) - term-ansicolor (1.3.2) + sqlite3 (1.3.13) + term-ansicolor (1.6.0) tins (~> 1.0) - thor (0.19.1) - thread_safe (0.3.5) - tins (1.6.0) - tzinfo (1.2.2) + thor (0.19.4) + thread_safe (0.3.6) + tins (1.17.0) + tzinfo (1.2.5) thread_safe (~> 0.1) PLATFORMS @@ -127,4 +126,4 @@ DEPENDENCIES sqlite3 BUNDLED WITH - 1.11.2 + 1.16.5 diff --git a/gemfiles/42.gemfile b/gemfiles/42.gemfile index cd8b45b..6977eb0 100644 --- a/gemfiles/42.gemfile +++ b/gemfiles/42.gemfile @@ -4,4 +4,4 @@ source "https://rubygems.org" gem "rails", "~> 4.2.0" -gemspec :path => "../" +gemspec path: "../" diff --git a/gemfiles/42.gemfile.lock b/gemfiles/42.gemfile.lock index b2f42ef..cfc184b 100644 --- a/gemfiles/42.gemfile.lock +++ b/gemfiles/42.gemfile.lock @@ -1,140 +1,140 @@ PATH - remote: ../ + remote: .. specs: - activesorting (0.7.1) + activesorting (0.8.4) activerecord (>= 4.0.0) railties (>= 4.0.0) GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.6) - actionview (= 4.2.6) - activesupport (= 4.2.6) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.6) - activesupport (= 4.2.6) + actionview (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.6) - activesupport (= 4.2.6) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.6) - activesupport (= 4.2.6) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.6) - activemodel (= 4.2.6) - activesupport (= 4.2.6) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) - activesupport (4.2.6) + activesupport (4.2.10) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - appraisal (2.1.0) + appraisal (2.2.0) bundler rake thor (>= 0.14.0) - arel (6.0.3) - builder (3.2.2) - concurrent-ruby (1.0.1) - coveralls (0.8.13) - json (~> 1.8) - simplecov (~> 0.11.0) + arel (6.0.4) + builder (3.2.3) + concurrent-ruby (1.0.5) + coveralls (0.8.22) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) term-ansicolor (~> 1.3) - thor (~> 0.19.1) - tins (~> 1.6.0) - database_cleaner (1.5.1) - diff-lcs (1.2.5) - docile (1.1.5) + thor (~> 0.19.4) + tins (~> 1.6) + crass (1.0.4) + database_cleaner (1.7.0) + diff-lcs (1.3) + docile (1.3.1) erubis (2.7.0) - globalid (0.3.6) - activesupport (>= 4.1.0) - i18n (0.7.0) - json (1.8.3) - loofah (2.0.3) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (2.1.0) + loofah (2.2.2) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) - mime-types (3.0) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0221) - mini_portile2 (2.0.0) - minitest (5.8.4) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - rack (1.6.4) + mail (2.7.1) + mini_mime (>= 0.1.1) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + rack (1.6.10) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.6) - actionmailer (= 4.2.6) - actionpack (= 4.2.6) - actionview (= 4.2.6) - activejob (= 4.2.6) - activemodel (= 4.2.6) - activerecord (= 4.2.6) - activesupport (= 4.2.6) + rails (4.2.10) + actionmailer (= 4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + activemodel (= 4.2.10) + activerecord (= 4.2.10) + activesupport (= 4.2.10) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.6) + railties (= 4.2.10) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (4.2.6) - actionpack (= 4.2.6) - activesupport (= 4.2.6) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.5.0) - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) - simplecov (0.11.2) - docile (~> 1.1.0) - json (~> 1.8) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sprockets (3.5.2) + simplecov-html (0.10.2) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.4) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.11) - term-ansicolor (1.3.2) + sqlite3 (1.3.13) + term-ansicolor (1.6.0) tins (~> 1.0) - thor (0.19.1) - thread_safe (0.3.5) - tins (1.6.0) - tzinfo (1.2.2) + thor (0.19.4) + thread_safe (0.3.6) + tins (1.17.0) + tzinfo (1.2.5) thread_safe (~> 0.1) PLATFORMS @@ -152,4 +152,4 @@ DEPENDENCIES sqlite3 BUNDLED WITH - 1.11.2 + 1.16.5 diff --git a/gemfiles/50.gemfile b/gemfiles/50.gemfile index c849d73..59140d4 100644 --- a/gemfiles/50.gemfile +++ b/gemfiles/50.gemfile @@ -4,4 +4,4 @@ source "https://rubygems.org" gem "rails", "5.0.0.beta3" -gemspec :path => "../" +gemspec path: "../" diff --git a/gemfiles/50.gemfile.lock b/gemfiles/50.gemfile.lock index b1bf016..5f3eed0 100644 --- a/gemfiles/50.gemfile.lock +++ b/gemfiles/50.gemfile.lock @@ -1,7 +1,7 @@ PATH - remote: ../ + remote: .. specs: - activesorting (0.7.1) + activesorting (0.8.4) activerecord (>= 4.0.0) railties (>= 4.0.0) @@ -45,42 +45,42 @@ GEM i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - appraisal (2.1.0) + appraisal (2.2.0) bundler rake thor (>= 0.14.0) - arel (7.0.0) - builder (3.2.2) - concurrent-ruby (1.0.1) - coveralls (0.8.13) - json (~> 1.8) - simplecov (~> 0.11.0) + arel (7.1.4) + builder (3.2.3) + concurrent-ruby (1.0.5) + coveralls (0.8.22) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) term-ansicolor (~> 1.3) - thor (~> 0.19.1) - tins (~> 1.6.0) - database_cleaner (1.5.1) - diff-lcs (1.2.5) - docile (1.1.5) + thor (~> 0.19.4) + tins (~> 1.6) + crass (1.0.4) + database_cleaner (1.7.0) + diff-lcs (1.3) + docile (1.3.1) erubis (2.7.0) - globalid (0.3.6) - activesupport (>= 4.1.0) - i18n (0.7.0) - json (1.8.3) - loofah (2.0.3) + globalid (0.4.1) + activesupport (>= 4.2.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + json (2.1.0) + loofah (2.2.2) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) - method_source (0.8.2) - mime-types (3.0) - mime-types-data (~> 3.2015) - mime-types-data (3.2016.0221) - mini_portile2 (2.0.0) - minitest (5.8.4) + mail (2.7.1) + mini_mime (>= 0.1.1) + method_source (0.9.0) + mini_mime (1.0.1) + mini_portile2 (2.3.0) + minitest (5.11.3) nio4r (1.2.1) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - rack (2.0.0.alpha) - json + nokogiri (1.8.5) + mini_portile2 (~> 2.3.0) + rack (2.0.5) rack-test (0.6.3) rack (>= 1.0) rails (5.0.0.beta3) @@ -97,12 +97,12 @@ GEM sprockets-rails (>= 2.0.0) rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + rails-dom-testing (1.0.9) + activesupport (>= 4.2.0, < 5.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) railties (5.0.0.beta3) actionpack (= 5.0.0.beta3) activesupport (= 5.0.0.beta3) @@ -110,42 +110,42 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.5.0) - rspec (3.4.0) - rspec-core (~> 3.4.0) - rspec-expectations (~> 3.4.0) - rspec-mocks (~> 3.4.0) - rspec-core (3.4.4) - rspec-support (~> 3.4.0) - rspec-expectations (3.4.0) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-mocks (3.4.1) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.4.0) - rspec-support (3.4.1) - simplecov (0.11.2) - docile (~> 1.1.0) - json (~> 1.8) + rspec-support (~> 3.8.0) + rspec-support (3.8.0) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sprockets (3.5.2) + simplecov-html (0.10.2) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.4) + sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.11) - term-ansicolor (1.3.2) + sqlite3 (1.3.13) + term-ansicolor (1.6.0) tins (~> 1.0) - thor (0.19.1) - thread_safe (0.3.5) - tins (1.6.0) - tzinfo (1.2.2) + thor (0.19.4) + thread_safe (0.3.6) + tins (1.17.0) + tzinfo (1.2.5) thread_safe (~> 0.1) - websocket-driver (0.6.3) + websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.3) PLATFORMS ruby @@ -162,4 +162,4 @@ DEPENDENCIES sqlite3 BUNDLED WITH - 1.11.2 + 1.16.5 diff --git a/lib/active_sorting/model.rb b/lib/active_sorting/model.rb index 43b383b..d8e58a9 100644 --- a/lib/active_sorting/model.rb +++ b/lib/active_sorting/model.rb @@ -75,8 +75,8 @@ def active_sorting_check_options # unless field_type == :integer # raise ArgumentError, "Sortable field should be of type Integer, #{field_type} where given" # end - unless active_sorting_step.is_a?(Fixnum) - raise ArgumentError, "Sortable step should be of type Fixnum, #{active_sorting_step.class.name} where given" + unless active_sorting_step.is_a?(Integer) + raise ArgumentError, "Sortable step should be of type Integer, #{active_sorting_step.class.name} where given" end unless active_sorting_scope.respond_to?(:each) raise ArgumentError, "Sortable step should be of type Enumerable, #{active_sorting_scope.class.name} where given"