ranked-model 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e92bbed2da4ae8cd7a3705fed451fb73a27b6eee
-  data.tar.gz: da248775ef6a763b5a6342587fd5343c06db9adb
+SHA256:
+  metadata.gz: c342543b3341c81d62ceca340fc0966a3386a6115fc2ee36f309582995f8af52
+  data.tar.gz: 25408af509201219ce0539dbfe3324c8b3806bce367d3e00b80a2f15dc6e7dc4
 SHA512:
-  metadata.gz: 638948178a3dd3c45bdc811e43ea8b5ca2cd8401ae7a74124c97e2cf09d5a68381bcce5e810db1d42b311281a07633cfb69946c0994e8f1a1675fb564501e70b
-  data.tar.gz: 3d37e0b29d0aac037f6ca3edf7258ffac9b17aefa55f46f472d0789999eddf37e5258ea30969a94d7f1543a95e63bf964d40b0d4c517354f6e64b057f1054cc0
+  metadata.gz: 139bcf7c985b68e017e03bb3718a4377ec878ec7b249ac32ad20900d1467e5026a093e82725f8e39e1d8a378a7db0959f6a37f7571d1bccae40e9b8f70244a55
+  data.tar.gz: ca739746fb067e6de9ae52bcb08f352fcdf676a02063e04f5d3b5f3b8a54d773ff57227d5dc5fca7c6d402155920b3da39c73d83d495680ff988f67248fac321

data/.gitignore

@@ -5,3 +5,4 @@ pkg/*
 
 Gemfile.lock
 *.gemfile.lock
+.ruby-version

data/.rspec

@@ -1,2 +1,3 @@
 --color
+--warnings
 --format documentation

data/.travis.yml

@@ -1,49 +1,35 @@
-sudo: false # use newer travis infrastructure
 language: ruby
 cache: bundler
+sudo: false
 before_install:
-  - gem install bundler -v 1.16.1
+  - gem update --system
+  - gem install bundler
 before_script:
   - mysql -e 'create database ranked_model_test;'
   - psql -c 'create database ranked_model_test;' -U postgres
 rvm:
-  - 1.9.3
-  - 2.1.10
-  - 2.2.10
-  - 2.3.7
   - 2.4.4
   - 2.5.1
+  - 2.6.4
   - jruby-9.1.17.0
-  - rbx-3.107
 env:
   - DB=sqlite
   - DB=mysql
   - DB=postgresql
+services:
+  - mysql
+  - postgresql
 gemfile:
-  - gemfiles/rails_4_1.gemfile
   - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_5_0.gemfile
   - gemfiles/rails_5_1.gemfile
   - gemfiles/rails_5_2.gemfile
+  - gemfiles/rails_6_0.gemfile
 matrix:
   exclude:
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails_5_1.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails_5_2.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails_5_1.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails_5_2.gemfile
     - rvm: jruby-9.1.17.0
       gemfile: gemfiles/rails_5_2.gemfile
     - rvm: 2.4.4
-      gemfile: gemfiles/rails_4_1.gemfile
-    - rvm: 2.5.1
-      gemfile: gemfiles/rails_4_1.gemfile
-    - rvm: rbx-3.107
-      gemfile: gemfiles/rails_5_2.gemfile
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: jruby-9.1.17.0
+      gemfile: gemfiles/rails_6_0.gemfile

data/Appraisals

@@ -1,81 +1,71 @@
-appraise "rails-4-1" do
+appraise "rails-4-2" do
   group :sqlite do
-    gem "sqlite3", "~> 1.3.13", platform: :ruby
     gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
   end
   group :mysql do
-    gem "mysql2", "~> 0.3.21", platform: :ruby
+    gem "mysql2", "~> 0.4.0", platform: :ruby
     gem "activerecord-jdbcmysql-adapter", "~> 1.3.24", platform: :jruby
   end
   group :postgresql do
-    gem "pg", "~> 0.18.0", platform: :ruby
+    gem "pg", "~> 0.18.4", platform: :ruby
     gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.24", platform: :jruby
   end
 
-  gem "activerecord", "~> 4.1.16"
+  gem "activerecord", "~> 4.2.0"
 end
 
-appraise "rails-4-2" do
+appraise "rails-5-0" do
   group :sqlite do
-    gem "sqlite3", "~> 1.3.13", platform: :ruby
-    gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
+    gem "activerecord-jdbcsqlite3-adapter", "~> 50.0", platform: :jruby
   end
   group :mysql do
-    gem "mysql2", "~> 0.4.10", platform: :ruby
-    gem "activerecord-jdbcmysql-adapter", "~> 1.3.24", platform: :jruby
+    gem "activerecord-jdbcmysql-adapter", "~> 50.0", platform: :jruby
   end
   group :postgresql do
-    gem "pg", "~> 0.18.0", platform: :ruby
-    gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.24", platform: :jruby
+    gem "activerecord-jdbcpostgresql-adapter", "~> 50.0", platform: :jruby
   end
 
-  gem "activerecord", "~> 4.2.10"
+  gem "activerecord", "~> 5.0.0"
 end
 
-appraise "rails-5-0" do
+appraise "rails-5-1" do
   group :sqlite do
-    gem "sqlite3", "~> 1.3.13", platform: :ruby
-    gem "activerecord-jdbcsqlite3-adapter", "~> 50.1", platform: :jruby
+    gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
   end
   group :mysql do
-    gem "mysql2", "~> 0.4.10", platform: :ruby
-    gem "activerecord-jdbcmysql-adapter", "~> 50.1", platform: :jruby
+    gem "activerecord-jdbcmysql-adapter", "~> 51.0", platform: :jruby
   end
   group :postgresql do
-    gem "pg", "~> 0.21.0", platform: :ruby
-    gem "activerecord-jdbcpostgresql-adapter", "~> 50.1", platform: :jruby
+    gem "activerecord-jdbcpostgresql-adapter", "~> 51.0", platform: :jruby
   end
 
-  gem "activerecord", "~> 5.0.7"
+  gem "activerecord", "~> 5.1.0"
 end
 
-appraise "rails-5-1" do
+appraise "rails-5-2" do
   group :sqlite do
-    gem "sqlite3", "~> 1.3.13", platform: :ruby
-    gem "activerecord-jdbcsqlite3-adapter", "~> 51.1", platform: :jruby
+    gem "activerecord-jdbcsqlite3-adapter", "~> 52.0", platform: :jruby
   end
   group :mysql do
-    gem "mysql2", "~> 0.4.10", platform: :ruby
-    gem "activerecord-jdbcmysql-adapter", "~> 51.1", platform: :jruby
+    gem "activerecord-jdbcmysql-adapter", "~> 52.0", platform: :jruby
   end
   group :postgresql do
-    gem "pg", "~> 0.21.0", platform: :ruby
-    gem "activerecord-jdbcpostgresql-adapter", "~> 51.1", platform: :jruby
+    gem "activerecord-jdbcpostgresql-adapter", "~> 52.0", platform: :jruby
   end
 
-  gem "activerecord", "~> 5.1.6"
+  gem "activerecord", "~> 5.2.0"
 end
 
-appraise "rails-5-2" do
+appraise "rails-6-0" do
   group :sqlite do
-    gem "sqlite3", "~> 1.3.13", platform: :ruby
+    gem "sqlite3", "~> 1.4", platform: :ruby
+    gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platform: :jruby
   end
   group :mysql do
-    gem "mysql2", "~> 0.4.10", platform: :ruby
+    gem "activerecord-jdbcmysql-adapter", "~> 60.0", platform: :jruby
   end
   group :postgresql do
-    gem "pg", "~> 0.21.0", platform: :ruby
+    gem "activerecord-jdbcpostgresql-adapter", "~> 60.0", platform: :jruby
   end
-
-  gem "activerecord", "~> 5.2.0"
-end
+  gem "activerecord", "~> 6.0.0"
+end

data/Gemfile

@@ -2,3 +2,15 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in ranked-model.gemspec
 gemspec
+
+group :sqlite do
+  gem "sqlite3", "~> 1.3.13", platform: :ruby
+end
+
+group :postgresql do
+  gem "pg", "~> 1.1.4", platform: :ruby
+end
+
+group :mysql do
+  gem "mysql2", "~> 0.5.0", platform: :ruby
+end

data/Readme.mkd

@@ -5,7 +5,7 @@
 Installation
 ------------
 
-ranked-model passes specs with Rails 4.1, 4.2, 5.0, 5.1 and 5.2 for MySQL, Postgres, and SQLite on Ruby 1.9.3, 2.1 through 2.5, jruby-9.1.17.0, and rbx-3.107 where Rails supports the platform. This is with the exception of Postgres before Rails 4.0 on all platforms, which is unsupported by `ranked-model`. Note that the `pg` gem has pulled support for rbx (Rubinius) from version 1 onward.
+ranked-model passes specs with Rails 4.2, 5.0, 5.1, 5.2, 6.0 for MySQL, Postgres, and SQLite on Ruby 2.4 through 2.6, and jruby-9.1.17.0 where Rails supports the platform. This is with the exception of Postgres before Rails 4.0 on all platforms, which is unsupported by `ranked-model`. Note that the `pg` gem has pulled support for rbx (Rubinius) from version 1 onward.
 
 TL;DR, if you are using Rails 4 and up you are 100% good to go. Before Rails 4, be wary of Postgres.
 
@@ -52,7 +52,7 @@ The ranking integers stored in the `row_order` column will be big and spaced apa
 implement a sorting UI, just update the resource by appending the column name with `_position` and indicating the desired position:
 
 ``` ruby
-@duck.update_attribute :row_order_position, 0  # or 1, 2, 37. :first, :last, :up and :down are also valid
+@duck.update :row_order_position => 0  # or 1, 2, 37. :first, :last, :up and :down are also valid
 ```
 
 **IMPORTANT: Note that you MUST append _position to the column name when setting a new position on an instance. This is a fake column that can take relative as well as absolute index-based values for position.**

data/gemfiles/rails_4_2.gemfile

@@ -2,21 +2,21 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.2.10"
+gem "activerecord", "~> 4.2.0"
 
 group :sqlite do
   gem "sqlite3", "~> 1.3.13", platform: :ruby
   gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
 end
 
-group :mysql do
-  gem "mysql2", "~> 0.4.10", platform: :ruby
-  gem "activerecord-jdbcmysql-adapter", "~> 1.3.24", platform: :jruby
-end
-
 group :postgresql do
-  gem "pg", "~> 0.18.0", platform: :ruby
+  gem "pg", "~> 0.18.4", platform: :ruby
   gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.24", platform: :jruby
 end
 
+group :mysql do
+  gem "mysql2", "~> 0.4.0", platform: :ruby
+  gem "activerecord-jdbcmysql-adapter", "~> 1.3.24", platform: :jruby
+end
+
 gemspec path: "../"

data/gemfiles/rails_5_0.gemfile

@@ -2,21 +2,21 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.7"
+gem "activerecord", "~> 5.0.0"
 
 group :sqlite do
   gem "sqlite3", "~> 1.3.13", platform: :ruby
-  gem "activerecord-jdbcsqlite3-adapter", "~> 50.1", platform: :jruby
+  gem "activerecord-jdbcsqlite3-adapter", "~> 50.0", platform: :jruby
 end
 
-group :mysql do
-  gem "mysql2", "~> 0.4.10", platform: :ruby
-  gem "activerecord-jdbcmysql-adapter", "~> 50.1", platform: :jruby
+group :postgresql do
+  gem "pg", "~> 1.1.4", platform: :ruby
+  gem "activerecord-jdbcpostgresql-adapter", "~> 50.0", platform: :jruby
 end
 
-group :postgresql do
-  gem "pg", "~> 0.21.0", platform: :ruby
-  gem "activerecord-jdbcpostgresql-adapter", "~> 50.1", platform: :jruby
+group :mysql do
+  gem "mysql2", "~> 0.5.0", platform: :ruby
+  gem "activerecord-jdbcmysql-adapter", "~> 50.0", platform: :jruby
 end
 
 gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -2,21 +2,21 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.1.6"
+gem "activerecord", "~> 5.1.0"
 
 group :sqlite do
   gem "sqlite3", "~> 1.3.13", platform: :ruby
-  gem "activerecord-jdbcsqlite3-adapter", "~> 51.1", platform: :jruby
+  gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
 end
 
-group :mysql do
-  gem "mysql2", "~> 0.4.10", platform: :ruby
-  gem "activerecord-jdbcmysql-adapter", "~> 51.1", platform: :jruby
+group :postgresql do
+  gem "pg", "~> 1.1.4", platform: :ruby
+  gem "activerecord-jdbcpostgresql-adapter", "~> 51.0", platform: :jruby
 end
 
-group :postgresql do
-  gem "pg", "~> 0.21.0", platform: :ruby
-  gem "activerecord-jdbcpostgresql-adapter", "~> 51.1", platform: :jruby
+group :mysql do
+  gem "mysql2", "~> 0.5.0", platform: :ruby
+  gem "activerecord-jdbcmysql-adapter", "~> 51.0", platform: :jruby
 end
 
 gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -6,14 +6,17 @@ gem "activerecord", "~> 5.2.0"
 
 group :sqlite do
   gem "sqlite3", "~> 1.3.13", platform: :ruby
+  gem "activerecord-jdbcsqlite3-adapter", "~> 52.0", platform: :jruby
 end
 
-group :mysql do
-  gem "mysql2", "~> 0.4.10", platform: :ruby
+group :postgresql do
+  gem "pg", "~> 1.1.4", platform: :ruby
+  gem "activerecord-jdbcpostgresql-adapter", "~> 52.0", platform: :jruby
 end
 
-group :postgresql do
-  gem "pg", "~> 0.21.0", platform: :ruby
+group :mysql do
+  gem "mysql2", "~> 0.5.0", platform: :ruby
+  gem "activerecord-jdbcmysql-adapter", "~> 52.0", platform: :jruby
 end
 
 gemspec path: "../"

data/gemfiles/rails_6_0.gemfile

@@ -0,0 +1,22 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 6.0.0"
+
+group :sqlite do
+  gem "sqlite3", "~> 1.4", platform: :ruby
+  gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platform: :jruby
+end
+
+group :postgresql do
+  gem "pg", "~> 1.1.4", platform: :ruby
+  gem "activerecord-jdbcpostgresql-adapter", "~> 60.0", platform: :jruby
+end
+
+group :mysql do
+  gem "mysql2", "~> 0.5.0", platform: :ruby
+  gem "activerecord-jdbcmysql-adapter", "~> 60.0", platform: :jruby
+end
+
+gemspec path: "../"

data/lib/ranked-model.rb

@@ -69,7 +69,7 @@ module RankedModel
     end
 
     def column_default ranker
-      column_defaults[ranker.name.to_s] if ActiveRecord::Base.connected?
+      column_defaults[ranker.name.to_s] if ActiveRecord::Base.connected? && table_exists?
     end
 
   end

data/lib/ranked-model/ranker.rb

@@ -175,7 +175,7 @@ module RankedModel
 
       def assure_unique_position
         if ( new_record? || rank_changed? )
-          if (rank > RankedModel::MAX_RANK_VALUE) || current_at_rank(rank)
+          if (rank > RankedModel::MAX_RANK_VALUE) || rank_taken?
             rearrange_ranks
           end
         end
@@ -211,10 +211,12 @@ module RankedModel
       def rebalance_ranks
         if rank && instance.persisted?
           origin = current_order.index { |item| item.instance.id == instance.id }
-          destination = current_order.index { |item| rank <= item.rank }
-          destination -= 1 if origin < destination
+          if origin
+            destination = current_order.index { |item| rank <= item.rank }
+            destination -= 1 if origin < destination
 
-          current_order.insert destination, current_order.delete_at(origin)
+            current_order.insert destination, current_order.delete_at(origin)
+          end
         end
 
         gaps = current_order.size + 1
@@ -290,13 +292,8 @@ module RankedModel
         end
       end
 
-      def current_at_rank _rank
-        if (ordered_instance = finder.
-                                 except( :order ).
-                                 where( ranker.column => _rank ).
-                                 first)
-          RankedModel::Ranker::Mapper.new ranker, ordered_instance
-        end
+      def rank_taken?
+        finder.except(:order).where(ranker.column => rank).exists?
       end
 
       def neighbors_at_position _pos

data/lib/ranked-model/version.rb

@@ -1,3 +1,3 @@
 module RankedModel
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/ranked-model.gemspec

@@ -9,11 +9,11 @@ Gem::Specification.new do |s|
   s.authors     = ["Matthew Beale"]
   s.email       = ["matt.beale@madhatted.com"]
   s.homepage    = "https://github.com/mixonic/ranked-model"
-  s.summary     = %q{An acts_as_sortable replacement built for Rails 3 & 4}
-  s.description = %q{ranked-model is a modern row sorting library built for Rails 3 & 4. It uses ARel aggressively and is better optimized than most other libraries.}
+  s.summary     = %q{An acts_as_sortable replacement built for Rails 4.2+}
+  s.description = %q{ranked-model is a modern row sorting library built for Rails 4.2+. It uses ARel aggressively and is better optimized than most other libraries.}
   s.license     = 'MIT'
 
-  s.add_dependency "activerecord", ">= 4.1.16"
+  s.add_dependency "activerecord", ">= 4.2"
   s.add_development_dependency "rspec", "~> 3"
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "mocha"

data/spec/duck-model/column_default_ducks_spec.rb

@@ -22,7 +22,7 @@ describe 'ColumnDefaultDuck' do
 				end
 			}.not_to raise_error
 		ensure
-			ActiveRecord::Base.establish_connection(DB_CONFIG.to_sym)
+			ActiveRecord::Base.establish_connection(ENV['DB'].to_sym)
 		end
 	end
 

data/spec/duck-model/duck_spec.rb

@@ -48,9 +48,9 @@ describe Duck do
     }
     @ducks.each { |name, duck|
       duck.reload
-      duck.update_attribute :row_position, 0
-      duck.update_attribute :size_position, 0
-      duck.update_attribute :age_position, 0
+      duck.update :row_position => 0
+      duck.update :size_position => 0
+      duck.update :age_position => 0
       duck.save!
     }
     @ducks.each {|name, duck| duck.reload }
@@ -59,8 +59,8 @@ describe Duck do
   describe "sorting by size on in_shin_pond" do
 
     before {
-      @ducks[:quacky].update_attribute :size_position, 0
-      @ducks[:wingy].update_attribute :size_position, 2
+      @ducks[:quacky].update :size_position => 0
+      @ducks[:wingy].update :size_position => 2
     }
 
     subject { Duck.in_shin_pond.rank(:size).to_a }
@@ -76,8 +76,8 @@ describe Duck do
   describe "sorting by age on Shin pond" do
 
     before {
-      @ducks[:feathers].update_attribute :age_position, 0
-      @ducks[:wingy].update_attribute :age_position, 0
+      @ducks[:feathers].update :age_position => 0
+      @ducks[:wingy].update :age_position => 0
     }
 
     subject { Duck.where(:pond => 'Shin').rank(:age).to_a }
@@ -93,10 +93,10 @@ describe Duck do
   describe "sorting by row" do
 
     before {
-      @ducks[:beaky].update_attribute :row_position, 0
-      @ducks[:webby].update_attribute :row_position, 2
-      @ducks[:waddly].update_attribute :row_position, 2
-      @ducks[:wingy].update_attribute :row_position, 6
+      @ducks[:beaky].update :row_position => 0
+      @ducks[:webby].update :row_position => 2
+      @ducks[:waddly].update :row_position => 2
+      @ducks[:wingy].update :row_position => 6
     }
 
     subject { Duck.rank(:row).to_a }
@@ -112,13 +112,13 @@ describe Duck do
   describe "mixed sorting by" do
 
     before {
-      @ducks[:quacky].update_attribute :size_position, 0
-      @ducks[:beaky].update_attribute :row_position, 0
-      @ducks[:webby].update_attribute :row_position, 2
-      @ducks[:wingy].update_attribute :size_position, 1
-      @ducks[:waddly].update_attribute :row_position, 2
-      @ducks[:wingy].update_attribute :row_position, 6
-      @ducks[:webby].update_attribute :row_position, 6
+      @ducks[:quacky].update :size_position => 0
+      @ducks[:beaky].update :row_position => 0
+      @ducks[:webby].update :row_position => 2
+      @ducks[:wingy].update :size_position => 1
+      @ducks[:waddly].update :row_position => 2
+      @ducks[:wingy].update :row_position => 6
+      @ducks[:webby].update :row_position => 6
     }
 
     describe "row" do
@@ -153,7 +153,7 @@ describe Duck do
       # puts Duck.rank(:age).collect {|duck| "#{duck.name} #{duck.age}" }
       duck = Duck.rank(:age)[2]
       expect(->{
-        duck.update_attribute :name, 'New Name'
+        duck.update :name => 'New Name'
       }).to_not change(duck.reload, :age)
       # puts Duck.rank(:age).collect {|duck| "#{duck.name} #{duck.age}" }
     end
@@ -187,7 +187,7 @@ describe Duck do
 
       before {
         @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect {|duck| duck.id }
-        @ducks[:wingy].update_attribute :row_position, 2
+        @ducks[:wingy].update :row_position => 2
       }
 
       context {
@@ -214,7 +214,7 @@ describe Duck do
 
       before {
         @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect {|duck| duck.id }
-        @ducks[:wingy].update_attribute :row_position, 0
+        @ducks[:wingy].update :row_position => 0
       }
 
       context {
@@ -254,7 +254,7 @@ describe Duck do
 
       context {
 
-        before { @ducks[:wingy].update_attribute :row_position, (@ducks.size - 2) }
+        before { @ducks[:wingy].update :row_position => (@ducks.size - 2) }
 
         subject { Duck.ranker(:row).with(Duck.new).current_at_position(@ducks.size - 2).instance }
 
@@ -264,7 +264,7 @@ describe Duck do
 
       context {
 
-        before { @ducks[:wingy].update_attribute :row_position, :down }
+        before { @ducks[:wingy].update :row_position => :down }
 
         subject { Duck.ranker(:row).with(Duck.new).current_at_position(@ducks.size - 2).instance }
 
@@ -278,7 +278,7 @@ describe Duck do
 
       before {
         @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect {|duck| duck.id }
-        @ducks[:wingy].update_attribute :row_position, (@ducks.size - 1)
+        @ducks[:wingy].update :row_position => (@ducks.size - 1)
       }
 
       context {
@@ -319,7 +319,7 @@ describe Duck do
 
       before {
         @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect {|duck| duck.id }
-        @ducks[:wingy].update_attribute :row_position, :last
+        @ducks[:wingy].update :row_position => :last
       }
 
       context {
@@ -360,7 +360,7 @@ describe Duck do
 
       before {
         @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect {|duck| duck.id }
-        @ducks[:wingy].update_attribute :row_position, 'last'
+        @ducks[:wingy].update :row_position => 'last'
       }
 
       context {
@@ -403,7 +403,7 @@ describe Duck do
 
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect { |duck| duck.id }
-          @ducks[:wingy].update_attribute :row_position, :down
+          @ducks[:wingy].update :row_position => :down
         }
 
         context {
@@ -430,7 +430,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:quacky].id).collect { |duck| duck.id }
-          @ducks[:quacky].update_attribute :row_position, :down
+          @ducks[:quacky].update :row_position => :down
         }
 
         context {
@@ -455,7 +455,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:feathers].id).collect { |duck| duck.id }
-          @ducks[:feathers].update_attribute :row_position, :down
+          @ducks[:feathers].update :row_position => :down
         }
 
         context {
@@ -484,7 +484,7 @@ describe Duck do
 
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect { |duck| duck.id }
-          @ducks[:wingy].update_attribute :row_position, 'down'
+          @ducks[:wingy].update :row_position => 'down'
         }
 
         context {
@@ -511,7 +511,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:quacky].id).collect { |duck| duck.id }
-          @ducks[:quacky].update_attribute :row_position, 'down'
+          @ducks[:quacky].update :row_position => 'down'
         }
 
         context {
@@ -536,7 +536,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:feathers].id).collect { |duck| duck.id }
-          @ducks[:feathers].update_attribute :row_position, 'down'
+          @ducks[:feathers].update :row_position => 'down'
         }
 
         context {
@@ -565,7 +565,7 @@ describe Duck do
 
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect { |duck| duck.id }
-          @ducks[:wingy].update_attribute :row_position, :up
+          @ducks[:wingy].update :row_position => :up
         }
 
         context {
@@ -592,7 +592,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:beaky].id).collect { |duck| duck.id }
-          @ducks[:beaky].update_attribute :row_position, :up
+          @ducks[:beaky].update :row_position => :up
         }
 
         context {
@@ -617,7 +617,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:waddly].id).collect { |duck| duck.id }
-          @ducks[:waddly].update_attribute :row_position, :up
+          @ducks[:waddly].update :row_position => :up
         }
 
         context {
@@ -645,7 +645,7 @@ describe Duck do
             Duck.where(id: @ducks[name].id).update_all(row: i)
             @ducks[name].reload
           end
-          @ducks[:wingy].update_attribute :row_position, :up
+          @ducks[:wingy].update :row_position => :up
         }
 
         context {
@@ -675,7 +675,7 @@ describe Duck do
 
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect { |duck| duck.id }
-          @ducks[:wingy].update_attribute :row_position, 'up'
+          @ducks[:wingy].update :row_position => 'up'
         }
 
         context {
@@ -702,7 +702,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:beaky].id).collect { |duck| duck.id }
-          @ducks[:beaky].update_attribute :row_position, 'up'
+          @ducks[:beaky].update :row_position => 'up'
         }
 
         context {
@@ -727,7 +727,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:waddly].id).collect { |duck| duck.id }
-          @ducks[:waddly].update_attribute :row_position, 'up'
+          @ducks[:waddly].update :row_position => 'up'
         }
 
         context {
@@ -779,6 +779,36 @@ describe Duck do
     }
   end
 
+  describe "when moving between ponds should work when rebalancing" do
+
+    before {
+      [:feathers, :wingy, :webby, :waddly, :beaky].each_with_index do |name, i|
+        Duck.where(id: @ducks[name].id).update_all(age: RankedModel::MIN_RANK_VALUE + i, pond: "Boyden")
+        @ducks[name].reload
+      end
+
+      Duck.find_by(id: @ducks[:quacky]).update!(age_position: 2, pond: "Boyden")
+    }
+
+    context {
+      subject { Duck.find_by(id: @ducks[:feathers]).age_rank }
+
+      it { should == 0 }
+    }
+
+    context {
+      subject { Duck.find_by(id: @ducks[:quacky]).age_rank }
+
+      it { should == 2 }
+    }
+
+    context {
+      subject { Duck.find_by(id: @ducks[:beaky]).age_rank }
+
+      it { should == 5 }
+    }
+  end
+
 end
 
 describe Duck do
@@ -812,7 +842,7 @@ describe Duck do
     }
     @ducks.each { |name, duck|
       duck.reload
-      duck.update_attribute :landing_order_position, 0
+      duck.update :landing_order_position => 0
       duck.save!
     }
     @ducks.each {|name, duck| duck.reload }
@@ -821,8 +851,8 @@ describe Duck do
   describe "sorting by landing_order" do
 
     before {
-      @ducks[:quacky].update_attribute :landing_order_position, 0
-      @ducks[:wingy].update_attribute :landing_order_position, 1
+      @ducks[:quacky].update :landing_order_position => 0
+      @ducks[:wingy].update :landing_order_position => 1
     }
 
     subject { Duck.in_lake_and_flock(0,0).rank(:landing_order).to_a }
@@ -846,10 +876,10 @@ describe Duck do
 
       @previous_ranks = @untouchable_ranks.call
 
-      @ducks[:quacky].update_attribute :landing_order_position, 0
-      @ducks[:wingy].update_attribute :landing_order_position, 1
-      @ducks[:feathers].update_attribute :landing_order_position, 0
-      @ducks[:wingy].update_attribute :landing_order_position, 1
+      @ducks[:quacky].update :landing_order_position => 0
+      @ducks[:wingy].update :landing_order_position => 1
+      @ducks[:feathers].update :landing_order_position => 0
+      @ducks[:wingy].update :landing_order_position => 1
     }
 
     subject { @untouchable_ranks.call }

data/spec/duck-model/lots_of_ducks_spec.rb

@@ -29,7 +29,7 @@ describe Duck do
 
       before {
         @last = Duck.last
-        @last.update_attribute :row_position, 137
+        @last.update :row_position => 137
       }
 
       subject { Duck.ranker(:row).with(Duck.new).current_at_position(137).instance }
@@ -42,7 +42,7 @@ describe Duck do
 
       before {
         @last = Duck.last
-        @last.update_attribute :row_position, 2
+        @last.update :row_position => 2
       }
 
       subject { Duck.ranker(:row).with(Duck.new).current_at_position(2).instance }
@@ -55,7 +55,7 @@ describe Duck do
 
       before {
         @last = Duck.last
-        @last.update_attribute :row_position, :last
+        @last.update :row_position => :last
       }
 
       subject { Duck.rank(:row).last }
@@ -68,7 +68,7 @@ describe Duck do
 
       before {
         @last = Duck.last
-        @last.update_attribute :row_position, :first
+        @last.update :row_position => :first
       }
 
       subject { Duck.rank(:row).first }
@@ -87,8 +87,8 @@ describe Duck do
         @first = Duck.first
         @second = Duck.offset(1).first
         @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_in([@first.id, @second.id])).collect {|d| d.id }
-        @first.update_attribute :row, RankedModel::MAX_RANK_VALUE
-        @second.update_attribute :row, RankedModel::MAX_RANK_VALUE
+        @first.update :row => RankedModel::MAX_RANK_VALUE
+        @second.update :row => RankedModel::MAX_RANK_VALUE
       }
 
       context {
@@ -105,13 +105,13 @@ describe Duck do
 
       before {
         Duck.first(50).each_with_index do |d, index|
-          d.update_attributes :age => index % 10, :pond => "Pond #{index / 10}"
+          d.update :age => index % 10, :pond => "Pond #{index / 10}"
         end
         @duck_11 = Duck.where(:pond => 'Pond 1').rank(:age).first
         @duck_12 = Duck.where(:pond => 'Pond 1').rank(:age).second
         @ordered = Duck.where(:pond => 'Pond 1').rank(:age).where(Duck.arel_table[:id].not_in([@duck_11.id, @duck_12.id])).collect {|d| d.id }
-        @duck_11.update_attribute :age, RankedModel::MAX_RANK_VALUE
-        @duck_12.update_attribute :age, RankedModel::MAX_RANK_VALUE
+        @duck_11.update :age => RankedModel::MAX_RANK_VALUE
+        @duck_12.update :age => RankedModel::MAX_RANK_VALUE
       }
 
       context {
@@ -133,8 +133,8 @@ describe Duck do
         @first = Duck.first
         @second = Duck.offset(1).first
         @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_in([@first.id, @second.id])).collect {|d| d.id }
-        @first.update_attribute :row, RankedModel::MIN_RANK_VALUE
-        @second.update_attribute :row, RankedModel::MIN_RANK_VALUE
+        @first.update :row => RankedModel::MIN_RANK_VALUE
+        @second.update :row => RankedModel::MIN_RANK_VALUE
       }
 
       context {
@@ -163,11 +163,11 @@ describe Duck do
           where(Duck.arel_table[:id].not_in([@first.id, @second.id, @third.id, @fourth.id, @fifth.id])).
           where(Duck.arel_table[:row].gteq(RankedModel::MAX_RANK_VALUE / 2)).
           collect {|d| d.id }
-        @first.update_attribute :row, RankedModel::MIN_RANK_VALUE
-        @second.update_attribute :row, RankedModel::MAX_RANK_VALUE
-        @third.update_attribute :row, (RankedModel::MAX_RANK_VALUE / 2)
+        @first.update :row => RankedModel::MIN_RANK_VALUE
+        @second.update :row => RankedModel::MAX_RANK_VALUE
+        @third.update :row => (RankedModel::MAX_RANK_VALUE / 2)
         Duck.where(id: @fifth.id).update_all row: @third.row
-        @fourth.update_attribute :row, @third.row
+        @fourth.update :row => @third.row
       }
 
       context {

data/spec/ego-model/ego_spec.rb

@@ -10,7 +10,7 @@ describe Ego do
     }
     @egos.each { |name, ego|
       ego.reload
-      ego.update_attribute :size_position, 0
+      ego.update :size_position => 0
       ego.save!
     }
     @egos.each {|name, ego| ego.reload }
@@ -19,8 +19,8 @@ describe Ego do
   describe "sorting on size alternative primary key" do
 
     before {
-      @egos[:nick].update_attribute :size_position, 0
-      @egos[:sally].update_attribute :size_position, 2
+      @egos[:nick].update :size_position => 0
+      @egos[:sally].update :size_position => 2
     }
 
     subject { Ego.rank(:size).to_a }

data/spec/number-model/number_spec.rb

@@ -14,8 +14,8 @@ describe Number do
       @first = Number.first
       @second = Number.offset(1).first
       @ordered = Number.rank(:order).where(Number.arel_table[:id].not_in([@first.id, @second.id])).collect {|d| d.id }
-      @first.update_attribute :order, RankedModel::MAX_RANK_VALUE
-      @second.update_attribute :order, RankedModel::MAX_RANK_VALUE
+      @first.update :order => RankedModel::MAX_RANK_VALUE
+      @second.update :order => RankedModel::MAX_RANK_VALUE
     }
 
     context {

data/spec/player-model/records_already_exist_spec.rb

@@ -16,7 +16,7 @@ describe Player do
 
   describe "setting the position of a record that already exists" do
     it "sets the rank without error" do
-      expect{@players[:bob].update_attributes! :score_position => 1}.to_not raise_error
+      expect{@players[:bob].update! :score_position => 1}.to_not raise_error
     end
   end
 end

data/spec/sti-model/element_spec.rb

@@ -12,7 +12,7 @@ describe Element do
     }
     @elements.each { |name, element|
       element.reload
-      element.update_attribute :combination_order_position, 0
+      element.update :combination_order_position => 0
     }
     @elements.each {|name, element| element.reload }
   }
@@ -20,9 +20,9 @@ describe Element do
   describe "rebalancing on an STI class should not affect the other class" do
 
     before {
-      @elements[:helium].update_attribute :combination_order_position, :first
-      @elements[:xenon].update_attribute :combination_order_position, :first
-      @elements[:argon].update_attribute :combination_order_position, :last
+      @elements[:helium].update :combination_order_position => :first
+      @elements[:xenon].update :combination_order_position => :first
+      @elements[:argon].update :combination_order_position => :last
 
       TransitionMetal.ranker(:combination_order).with(@elements[:chromium]).instance_eval { rebalance_ranks }
     }
@@ -40,16 +40,16 @@ describe Element do
   describe "setting positions on STI classes" do
 
     before {
-      @elements[:helium].update_attribute :combination_order_position, :first
-      @elements[:xenon].update_attribute :combination_order_position, :first
-      @elements[:argon].update_attribute :combination_order_position, :first
-
-      @elements[:chromium].update_attribute :combination_order_position, 1
-      @elements[:manganese].update_attribute :combination_order_position, 1
-      @elements[:manganese].update_attribute :combination_order_position, 0
-      @elements[:chromium].update_attribute :combination_order_position, 0
-      @elements[:manganese].update_attribute :combination_order_position, 0
-      @elements[:chromium].update_attribute :combination_order_position, 0
+      @elements[:helium].update :combination_order_position => :first
+      @elements[:xenon].update :combination_order_position => :first
+      @elements[:argon].update :combination_order_position => :first
+
+      @elements[:chromium].update :combination_order_position => 1
+      @elements[:manganese].update :combination_order_position => 1
+      @elements[:manganese].update :combination_order_position => 0
+      @elements[:chromium].update :combination_order_position => 0
+      @elements[:manganese].update :combination_order_position => 0
+      @elements[:chromium].update :combination_order_position => 0
     }
 
     describe "NobleGas" do
@@ -81,16 +81,16 @@ describe Element do
   describe "setting positions on STI classes" do
 
     before {
-      @elements[:helium].update_attribute :combination_order_position, :first
-      @elements[:xenon].update_attribute :combination_order_position, :first
-      @elements[:argon].update_attribute :combination_order_position, :first
-
-      @elements[:chromium].update_attribute :combination_order_position, 1
-      @elements[:manganese].update_attribute :combination_order_position, 1
-      @elements[:manganese].update_attribute :combination_order_position, 0
-      @elements[:chromium].update_attribute :combination_order_position, 0
-      @elements[:manganese].update_attribute :combination_order_position, 0
-      @elements[:chromium].update_attribute :combination_order_position, 0
+      @elements[:helium].update :combination_order_position => :first
+      @elements[:xenon].update :combination_order_position => :first
+      @elements[:argon].update :combination_order_position => :first
+
+      @elements[:chromium].update :combination_order_position => 1
+      @elements[:manganese].update :combination_order_position => 1
+      @elements[:manganese].update :combination_order_position => 0
+      @elements[:chromium].update :combination_order_position => 0
+      @elements[:manganese].update :combination_order_position => 0
+      @elements[:chromium].update :combination_order_position => 0
     }
 
     describe "NobleGas" do

data/spec/sti-model/vehicle_spec.rb

@@ -12,7 +12,7 @@ describe Vehicle do
     }
     @vehicles.each { |name, vehicle|
       vehicle.reload
-      vehicle.update_attribute :parking_order_position, 0
+      vehicle.update :parking_order_position => 0
     }
     @vehicles.each {|name, vehicle| vehicle.reload }
   }
@@ -20,8 +20,8 @@ describe Vehicle do
   describe "ranking by STI parent" do
 
     before {
-      @vehicles[:volvo].update_attribute :parking_order_position, :first
-      @vehicles[:ford].update_attribute :parking_order_position, :first
+      @vehicles[:volvo].update :parking_order_position => :first
+      @vehicles[:ford].update :parking_order_position => :first
     }
 
     describe "Vehicle" do
@@ -72,4 +72,4 @@ describe Vehicle do
 
   end
 
-end
+end

data/spec/support/active_record.rb

@@ -1,13 +1,13 @@
 require 'active_record'
 require 'logger'
 
-ROOT = File.join(File.dirname(__FILE__), '..')
-
-DB_CONFIG = ENV["DB"] || "sqlite"
+unless ENV['DB']
+  ENV['DB'] = 'sqlite'
+end
 
 ActiveRecord::Base.logger = Logger.new('tmp/ar_debug.log')
 ActiveRecord::Base.configurations = YAML::load(IO.read('spec/support/database.yml'))
-ActiveRecord::Base.establish_connection(DB_CONFIG.to_sym)
+ActiveRecord::Base.establish_connection(ENV['DB'].to_sym)
 
 ActiveRecord::Schema.define :version => 0 do
   create_table :ducks, :force => true do |t|
@@ -148,7 +148,7 @@ class MotorBike < Vehicle
 end
 
 class Ego < ActiveRecord::Base
-  primary_key = :alternative_to_id
+  self.primary_key = :alternative_to_id
   include RankedModel
   ranks :size
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ranked-model
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Matthew Beale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-23 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ranked-model is a modern row sorting library built for Rails 3 & 4. It
+description: ranked-model is a modern row sorting library built for Rails 4.2+. It
   uses ARel aggressively and is better optimized than most other libraries.
 email:
 - matt.beale@madhatted.com
@@ -138,11 +138,11 @@ files:
 - LICENSE
 - Rakefile
 - Readme.mkd
-- gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
 - lib/ranked-model.rb
 - lib/ranked-model/railtie.rb
 - lib/ranked-model/ranker.rb
@@ -183,11 +183,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: An acts_as_sortable replacement built for Rails 3 & 4
+summary: An acts_as_sortable replacement built for Rails 4.2+
 test_files:
 - spec/duck-model/column_default_ducks_spec.rb
 - spec/duck-model/duck_spec.rb

data/gemfiles/rails_4_1.gemfile

@@ -1,22 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.1.16"
-
-group :sqlite do
-  gem "sqlite3", "~> 1.3.13", platform: :ruby
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
-end
-
-group :mysql do
-  gem "mysql2", "~> 0.3.21", platform: :ruby
-  gem "activerecord-jdbcmysql-adapter", "~> 1.3.24", platform: :jruby
-end
-
-group :postgresql do
-  gem "pg", "~> 0.18.0", platform: :ruby
-  gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.24", platform: :jruby
-end
-
-gemspec path: "../"