ranked-model 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bc1cd219c463a32552a7f583dbb9f52c95a356b
-  data.tar.gz: '0362078c1c550eb8da5e22fa2aa9c69864597f44'
+  metadata.gz: 5cfad22b2acf05bc3deda080d1bb11b96ade3c9d
+  data.tar.gz: cd2d02de24cf6465ee4211818beb6696ec41e616
 SHA512:
-  metadata.gz: e347568a8c34e9ce8ced2ba819fc8e9f3b297c4dadefff56c8eb0c43cafa12e872e508f4140ded18aea30b7aaed704979b7d2c42030c56f244ce930a150d1125
-  data.tar.gz: 3ebd264cd22bea1038055c36cf460c3e352b3cc4383bfdb3112134808341ee8b9d180782f21b48341003f15b3dbe199d704dfa0fea3cc5bacb396caf377cf8b1
+  metadata.gz: fd1dbb2069c730aeda634d15cc4cd5a5fa0be8def4cca8db3b6bb320e40ef97f29f88bac16f2ba12720a1287cbb06ae3188e7862f5586599757fc2c56f6d3e6e
+  data.tar.gz: b5f0896c2a4979b3f8d157bc20f3ee1bc7846ea6ef2ffb3432b50d5696e0852f803026bea3d0177c8db22b949c3d8c89022582b4c79da84c8ff8fc4a2611d3a6

data/.travis.yml

@@ -14,25 +14,34 @@ rvm:
   - 2.4.4
   - 2.5.1
   - jruby-9.1.17.0
-  - rbx-3.100
+  - rbx-3.107
 env:
   - DB=sqlite
   - DB=mysql
   - DB=postgresql
 gemfile:
-  - gemfiles/rails_3_2.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
 matrix:
   exclude:
-    - rvm: 2.4.4
-      gemfile: gemfiles/rails_3_2.gemfile
+    - 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_3_2.gemfile
     - rvm: 2.5.1
       gemfile: gemfiles/rails_4_1.gemfile
-    - env: DB=postgresql
-      gemfile: gemfiles/rails_3_2.gemfile
-

data/Appraisals

@@ -1,4 +1,4 @@
-appraise "rails-3-2" do
+appraise "rails-4-1" do
   group :sqlite do
     gem "sqlite3", platform: :ruby
     gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
@@ -12,16 +12,16 @@ appraise "rails-3-2" do
     gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.24", platform: :jruby
   end
 
-  gem "activerecord", "~> 3.2.22.2"
+  gem "activerecord", "~> 4.1.16"
 end
 
-appraise "rails-4-1" do
+appraise "rails-4-2" do
   group :sqlite do
     gem "sqlite3", 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.10", platform: :ruby
     gem "activerecord-jdbcmysql-adapter", "~> 1.3.24", platform: :jruby
   end
   group :postgresql do
@@ -29,43 +29,53 @@ appraise "rails-4-1" do
     gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.24", platform: :jruby
   end
 
-  gem "activerecord", "~> 4.1.16"
+  gem "activerecord", "~> 4.2.10"
 end
 
-appraise "rails-4-2" do
+appraise "rails-5-0" do
   group :sqlite do
     gem "sqlite3", platform: :ruby
-    gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
+    gem "activerecord-jdbcsqlite3-adapter", "~> 50.1", 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.1", platform: :jruby
   end
   group :postgresql do
-    gem "pg", "~> 0.18.0", platform: :ruby
-    gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.24", platform: :jruby
+    gem "pg", "~> 0.21.0", platform: :ruby
+    gem "activerecord-jdbcpostgresql-adapter", "~> 50.1", platform: :jruby
   end
 
-  gem "activerecord", "~> 4.2.10"
+  gem "activerecord", "~> 5.0.7"
 end
 
-# appraise "rails-5-0" do
-#   group :mysql do
-#     gem "mysql2", "~> 0.4.10", platform: :ruby
-#   end
-#   gem "activerecord", "~> 5.0.6"
-# end
+appraise "rails-5-1" do
+  group :sqlite do
+    gem "sqlite3", platform: :ruby
+    gem "activerecord-jdbcsqlite3-adapter", "~> 51.1", platform: :jruby
+  end
+  group :mysql do
+    gem "mysql2", "~> 0.4.10", platform: :ruby
+    gem "activerecord-jdbcmysql-adapter", "~> 51.1", platform: :jruby
+  end
+  group :postgresql do
+    gem "pg", "~> 0.21.0", platform: :ruby
+    gem "activerecord-jdbcpostgresql-adapter", "~> 51.1", platform: :jruby
+  end
+
+  gem "activerecord", "~> 5.1.6"
+end
 
-# appraise "rails-5-1" do
-#   group :mysql do
-#     gem "mysql2", "~> 0.4.10", platform: :ruby
-#   end
-#   gem "activerecord", "~> 5.1.4"
-# end
+appraise "rails-5-2" do
+  group :sqlite do
+    gem "sqlite3", platform: :ruby
+  end
+  group :mysql do
+    gem "mysql2", "~> 0.4.10", platform: :ruby
+  end
+  group :postgresql do
+    gem "pg", "~> 0.21.0", platform: :ruby
+  end
 
-# appraise "rails-5-2" do
-#   group :mysql do
-#     gem "mysql2", "~> 0.4.10", platform: :ruby
-#   end
-#   gem "activerecord", "~> 5.2.0.rc1"
-# end
+  gem "activerecord", "~> 5.2.0"
+end

data/Gemfile

@@ -2,6 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in ranked-model.gemspec
 gemspec
-
-gem 'rubysl', '~> 2.0', platform: :rbx
-gem 'rubinius-developer_tools', platform: :rbx

data/Readme.mkd

@@ -1,11 +1,11 @@
-**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.
+**ranked-model** is a modern row sorting library built for Rails 3, 4 and 5.  It uses ARel aggressively and is better optimized than most other libraries.
 
 [![Build Status](https://travis-ci.org/mixonic/ranked-model.png)](https://travis-ci.org/mixonic/ranked-model)
 
 Installation
 ------------
 
-ranked-model passes specs with Rails 3.1, 3.2, 4.0, and 4.1-beta for MySQL, Postgres, and SQLite on Ruby 1.9.2, 1.9.3, 2.0, 2.1, jruby-19mode, and rubinius where Rails supports the platform. This is with the exception of Postgres before Rails 4.0 on all platforms, which is unsupported (I'd gladly accept a PR to fix this).
+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.
 
 TL;DR, if you are using Rails 4 and up you are 100% good to go. Before Rails 4, be wary of Postgres.
 
@@ -55,6 +55,8 @@ implement a sorting UI, just update the resource by appending the column name wi
 @duck.update_attribute :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.**
+
 Position numbers begin at zero.  A position number greater than the number of records acts the
 same as :last. :up and :down move the record up/down the ladder by one step.
 
@@ -80,16 +82,19 @@ class Duck < ActiveRecord::Base
 
   include RankedModel
 
-  ranks :row_order,           # Name this ranker, used with rank()
-    :column => :sort_order    # Override the default column, which defaults to the name
-  
+  ranks :row_order,                  # Name this ranker, used with rank()
+    :column => :sort_order           # Override the default column, which defaults to the name
+
   belongs_to :pond
   ranks :swimming_order,
-    :with_same => :pond_id    # Ducks belong_to Ponds, make the ranker scoped to one pond
-  
+    :with_same => :pond_id           # Ducks belong_to Ponds, make the ranker scoped to one pond
+
+  ranks :row_order,
+    :with_same => [:pond_id, :breed] # Lets rank them by breed
+
   scope :walking, where(:walking => true )
   ranks :walking_order,
-    :scope => :walking        # Narrow this ranker to a scope
+    :scope => :walking               # Narrow this ranker to a scope
 
 end
 ```
@@ -178,10 +183,12 @@ Fork, clone, write a test, write some code, commit, push, send a pull request.
 The specs can be run with sqlite, postgres, and mysql:
 
 ```
-DB=postgresql bundle exec rake
+bundle
+appraisal install
+DB=postgresql bundle exec appraisal rake
 ```
 
-Is no DB is specified, the tests run against sqlite.
+If no DB is specified (`sqlite`, `mysql`, or `postgresql`), the tests run against sqlite.
 
 RankedModel is mostly the handiwork of Matthew Beale:
 
@@ -203,3 +210,4 @@ A hearty thanks to these contributors:
 * [jguyon](https://github.com/jguyon)
 * [pehrlich](https://github.com/pehrlich)
 * [petergoldstein](https://github.com/petergoldstein)
+* [brendon](https://github.com/brendon)

data/gemfiles/rails_3_2.gemfile

@@ -2,9 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rubysl", "~> 2.0", platform: :rbx
-gem "rubinius-developer_tools", platform: :rbx
-gem "activerecord", "~> 3.2.22.2"
+gem "activerecord", "~> 3.2.22.5"
 
 group :sqlite do
   gem "sqlite3", platform: :ruby

data/gemfiles/rails_4_1.gemfile

@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rubysl", "~> 2.0", platform: :rbx
-gem "rubinius-developer_tools", platform: :rbx
 gem "activerecord", "~> 4.1.16"
 
 group :sqlite do

data/gemfiles/rails_4_2.gemfile

@@ -2,8 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rubysl", "~> 2.0", platform: :rbx
-gem "rubinius-developer_tools", platform: :rbx
 gem "activerecord", "~> 4.2.10"
 
 group :sqlite do

data/gemfiles/rails_5_0.gemfile

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

data/gemfiles/rails_5_1.gemfile

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

data/gemfiles/rails_5_2.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.2.0"
+
+group :sqlite do
+  gem "sqlite3", platform: :ruby
+end
+
+group :mysql do
+  gem "mysql2", "~> 0.4.10", platform: :ruby
+end
+
+group :postgresql do
+  gem "pg", "~> 0.21.0", platform: :ruby
+end
+
+gemspec path: "../"

data/lib/ranked-model.rb

@@ -40,7 +40,7 @@ module RankedModel
       end
     end
 
-  private
+    private
 
     def ranks *args
       self.rankers ||= []

data/lib/ranked-model/ranker.rb

@@ -66,7 +66,7 @@ module RankedModel
         #
         instance_class.
           where(instance_class.primary_key => instance.id).
-          update_all([%Q{#{ranker.column} = ?}, value])
+          update_all(ranker.column => value)
       end
 
       def position
@@ -89,6 +89,10 @@ module RankedModel
 
     private
 
+      def reset_cache
+        @finder, @current_order, @current_first, @current_last = nil
+      end
+
       def instance_class
         ranker.class_name.nil? ? instance.class : ranker.class_name.constantize
       end
@@ -114,31 +118,31 @@ module RankedModel
         case position
           when :first, 'first'
             if current_first && current_first.rank
-              rank_at( ( ( RankedModel::MIN_RANK_VALUE - current_first.rank ).to_f / 2 ).ceil + current_first.rank)
+              rank_at_average current_first.rank, RankedModel::MIN_RANK_VALUE
             else
               position_at :middle
             end
           when :last, 'last'
             if current_last && current_last.rank
-              rank_at( ( ( RankedModel::MAX_RANK_VALUE - current_last.rank ).to_f / 2 ).ceil + current_last.rank )
+              rank_at_average current_last.rank, RankedModel::MAX_RANK_VALUE
             else
               position_at :middle
             end
           when :middle, 'middle'
-            rank_at( ( ( RankedModel::MAX_RANK_VALUE - RankedModel::MIN_RANK_VALUE ).to_f / 2 ).ceil + RankedModel::MIN_RANK_VALUE )
+            rank_at_average RankedModel::MIN_RANK_VALUE, RankedModel::MAX_RANK_VALUE
           when :down, 'down'
             neighbors = find_next_two(rank)
             if neighbors[:lower]
               min = neighbors[:lower].rank
               max = neighbors[:upper] ? neighbors[:upper].rank : RankedModel::MAX_RANK_VALUE
-              rank_at( ( ( max - min ).to_f / 2 ).ceil + min )
+              rank_at_average min, max
             end
           when :up, 'up'
             neighbors = find_previous_two(rank)
             if neighbors[:upper]
               max = neighbors[:upper].rank
               min = neighbors[:lower] ? neighbors[:lower].rank : RankedModel::MIN_RANK_VALUE
-              rank_at( ( ( max - min ).to_f / 2 ).ceil + min )
+              rank_at_average min, max
             end
           when String
             position_at position.to_i
@@ -148,7 +152,7 @@ module RankedModel
             neighbors = neighbors_at_position(position)
             min = ((neighbors[:lower] && neighbors[:lower].has_rank?) ? neighbors[:lower].rank : RankedModel::MIN_RANK_VALUE)
             max = ((neighbors[:upper] && neighbors[:upper].has_rank?) ? neighbors[:upper].rank : RankedModel::MAX_RANK_VALUE)
-            rank_at( ( ( max - min ).to_f / 2 ).ceil + min )
+            rank_at_average min, max
           when NilClass
             if !rank
               position_at :last
@@ -156,12 +160,17 @@ module RankedModel
         end
       end
 
+      def rank_at_average(min, max)
+        if (max - min).between?(-1, 1) # No room at the inn...
+          rebalance_ranks
+          position_at position
+        else
+          rank_at( ( ( max - min ).to_f / 2 ).ceil + min )
+        end
+      end
+
       def assure_unique_position
         if ( new_record? || rank_changed? )
-          unless rank
-            rank_at( RankedModel::MAX_RANK_VALUE )
-          end
-
           if (rank > RankedModel::MAX_RANK_VALUE) || current_at_rank(rank)
             rearrange_ranks
           end
@@ -170,22 +179,25 @@ module RankedModel
 
       def rearrange_ranks
         _scope = finder
-        unless instance.id.nil?
-          # Never update ourself, shift others around us.
-          _scope = _scope.where( instance_class.arel_table[instance_class.primary_key].not_eq(instance.id) )
-        end
+        escaped_column = ActiveRecord::Base.connection.quote_column_name ranker.column
+        # If there is room at the bottom of the list and we're added to the very top of the list...
         if current_first.rank && current_first.rank > RankedModel::MIN_RANK_VALUE && rank == RankedModel::MAX_RANK_VALUE
+          # ...then move everyone else down 1 to make room for us at the end
           _scope.
             where( instance_class.arel_table[ranker.column].lteq(rank) ).
-            update_all( %Q{#{ranker.column} = #{ranker.column} - 1} )
+            update_all( "#{escaped_column} = #{escaped_column} - 1" )
+        # If there is room at the top of the list and we're added below the last value in the list...
         elsif current_last.rank && current_last.rank < (RankedModel::MAX_RANK_VALUE - 1) && rank < current_last.rank
+          # ...then move everyone else at or above our desired rank up 1 to make room for us
           _scope.
             where( instance_class.arel_table[ranker.column].gteq(rank) ).
-            update_all( %Q{#{ranker.column} = #{ranker.column} + 1} )
+            update_all( "#{escaped_column} = #{escaped_column} + 1" )
+        # If there is room at the bottom of the list and we're added above the lowest value in the list...
         elsif current_first.rank && current_first.rank > RankedModel::MIN_RANK_VALUE && rank > current_first.rank
+          # ...then move everyone else below us down 1 and change our rank down 1 to avoid the collission
           _scope.
             where( instance_class.arel_table[ranker.column].lt(rank) ).
-            update_all( %Q{#{ranker.column} = #{ranker.column} - 1} )
+            update_all( "#{escaped_column} = #{escaped_column} - 1" )
           rank_at( rank - 1 )
         else
           rebalance_ranks
@@ -193,67 +205,64 @@ module RankedModel
       end
 
       def rebalance_ranks
-        total = current_order.size + 2
-        has_set_self = false
-        total.times do |index|
-          next if index == 0 || index == total
-          rank_value = ((((RankedModel::MAX_RANK_VALUE - RankedModel::MIN_RANK_VALUE).to_f / total) * index ).ceil + RankedModel::MIN_RANK_VALUE)
-          index = index - 1
-          if has_set_self
-            index = index - 1
+        if rank
+          origin = current_order.index { |item| item.instance.id == instance.id }
+          destination = current_order.index { |item| rank <= item.rank }
+          destination -= 1 if origin < destination
+
+          current_order.insert destination, current_order.delete_at(origin)
+        end
+
+        gaps = current_order.size + 1
+        range = (RankedModel::MAX_RANK_VALUE - RankedModel::MIN_RANK_VALUE).to_f
+        gap_size = (range / gaps).ceil
+
+        current_order.each.with_index(1) do |item, position|
+          new_rank = (gap_size * position) + RankedModel::MIN_RANK_VALUE
+
+          if item.instance.id == instance.id
+            rank_at new_rank
           else
-            if !current_order[index] ||
-               ( !current_order[index].rank.nil? &&
-                 current_order[index].rank >= rank )
-              rank_at rank_value
-              has_set_self = true
-              next
-            end
+            item.update_rank! new_rank
           end
-          current_order[index].update_rank! rank_value
         end
+
+        reset_cache
       end
 
       def finder(order = :asc)
         @finder ||= {}
         @finder[order] ||= begin
           _finder = instance_class
-          columns = [instance_class.arel_table[instance_class.primary_key], instance_class.arel_table[ranker.column]]
+          columns = [instance_class.primary_key.to_sym, ranker.column]
+
           if ranker.scope
             _finder = _finder.send ranker.scope
           end
+
           case ranker.with_same
-            when Symbol
-              columns << instance_class.arel_table[ranker.with_same]
-              _finder = _finder.where \
-                instance_class.arel_table[ranker.with_same].eq(instance.attributes["#{ranker.with_same}"])
-            when Array
-              ranker.with_same.each {|c| columns.push instance_class.arel_table[c] }
-              _finder = _finder.where(
-                ranker.with_same[1..-1].inject(
-                  instance_class.arel_table[ranker.with_same.first].eq(
-                    instance.attributes["#{ranker.with_same.first}"]
-                  )
-                ) {|scoper, attr|
-                  scoper.and(
-                    instance_class.arel_table[attr].eq(
-                      instance.attributes["#{attr}"]
-                    )
-                  )
-                }
-              )
-          end
-          if !new_record?
+          when Symbol
+            columns << ranker.with_same
             _finder = _finder.where \
-              instance_class.arel_table[instance_class.primary_key].not_eq(instance.id)
+              ranker.with_same => instance.attributes[ranker.with_same.to_s]
+          when Array
+            ranker.with_same.each do |column|
+              columns << column
+              _finder = _finder.where column => instance.attributes[column.to_s]
+            end
           end
-          _finder.order(instance_class.arel_table[ranker.column].send(order)).select(columns)
+
+          unless new_record?
+            _finder = _finder.where.not instance_class.primary_key.to_sym => instance.id
+          end
+
+          _finder.order(ranker.column.to_sym => order).select(columns)
         end
       end
 
       def current_order
         @current_order ||= begin
-          finder.collect { |ordered_instance|
+          finder.unscope(where: instance_class.primary_key.to_sym).collect { |ordered_instance|
             RankedModel::Ranker::Mapper.new ranker, ordered_instance
           }
         end

data/lib/ranked-model/version.rb

@@ -1,3 +1,3 @@
 module RankedModel
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/ranked-model.gemspec

@@ -13,14 +13,14 @@ Gem::Specification.new do |s|
   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.license     = 'MIT'
 
-  s.add_dependency "activerecord", ">= 3.1.12"
-  s.add_development_dependency "rspec", "~> 2.13.0"
-  s.add_development_dependency "sqlite3", "~> 1.3.7"
-  s.add_development_dependency "genspec", "~> 0.2.8"
-  s.add_development_dependency "mocha", "~> 0.14.0"
-  s.add_development_dependency "database_cleaner", "~> 1.2.0"
+  s.add_dependency "activerecord", ">= 4.1.16"
+  s.add_development_dependency "rspec", "~> 3"
+  s.add_development_dependency "rspec-its"
+  s.add_development_dependency "mocha"
+  s.add_development_dependency "database_cleaner", "~> 1.7.0"
   s.add_development_dependency "rake", "~> 10.1.0"
   s.add_development_dependency "appraisal"
+  s.add_development_dependency "pry"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/duck-model/duck_spec.rb

@@ -8,14 +8,14 @@ describe Duck do
 
   subject { @duck }
 
-  it { subject.respond_to?(:row_position).should be_true }
-  it { subject.respond_to?(:row_position=).should be_true }
-  it { subject.respond_to?(:size_position).should be_true }
-  it { subject.respond_to?(:size_position=).should be_true }
-  it { subject.respond_to?(:age_position).should be_true }
-  it { subject.respond_to?(:age_position=).should be_true }
-  it { subject.respond_to?(:landing_order_position).should be_true }
-  it { subject.respond_to?(:landing_order_position=).should be_true }
+  it { expect(subject).to respond_to(:row_position) }
+  it { expect(subject).to respond_to(:row_position=) }
+  it { expect(subject).to respond_to(:size_position) }
+  it { expect(subject).to respond_to(:size_position=) }
+  it { expect(subject).to respond_to(:age_position) }
+  it { expect(subject).to respond_to(:age_position=) }
+  it { expect(subject).to respond_to(:landing_order_position) }
+  it { expect(subject).to respond_to(:landing_order_position=) }
 
 end
 
@@ -148,9 +148,9 @@ describe Duck do
     it "doesn't change ranking" do
       # puts Duck.rank(:age).collect {|duck| "#{duck.name} #{duck.age}" }
       duck = Duck.rank(:age)[2]
-      ->{
+      expect(->{
         duck.update_attribute :name, 'New Name'
-      }.should_not change(duck.reload, :age)
+      }).to_not change(duck.reload, :age)
       # puts Duck.rank(:age).collect {|duck| "#{duck.name} #{duck.age}" }
     end
 
@@ -161,7 +161,7 @@ describe Duck do
     it "marks record as changed" do
       duck = Duck.rank(:age)[2]
       duck.age_position = 1
-      duck.changed?.should be_true
+      expect(duck.changed?).to be true
     end
 
   end
@@ -172,7 +172,7 @@ describe Duck do
 
     it "doesnt set empty string" do
       subject.age_position = ''
-      subject.age_position.should be_nil
+      expect(subject.age_position).to be_nil
     end
 
   end
@@ -198,9 +198,9 @@ describe Duck do
 
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
-        it { subject[0..1].should == @ordered[0..1] }
+        it { expect(subject[0..1]).to eq(@ordered[0..1]) }
 
-        it { subject[3..subject.length].should == @ordered[2..@ordered.length] }
+        it { expect(subject[3..subject.length]).to eq(@ordered[2..@ordered.length]) }
 
       }
 
@@ -233,7 +233,38 @@ describe Duck do
 
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
-        it { subject[1..subject.length].should == @ordered }
+        it { expect(subject[1..subject.length]).to eq(@ordered) }
+
+      }
+
+    end
+
+    describe "second to last" do
+
+      before {
+        [:quacky, :feathers, :wingy, :webby, :waddly, :beaky].each_with_index do |name, i|
+           Duck.where(id: @ducks[name].id).update_all(row: RankedModel::MAX_RANK_VALUE - i)
+           @ducks[name].reload
+         end
+      }
+
+      context {
+
+        before { @ducks[:wingy].update_attribute :row_position, (@ducks.size - 2) }
+
+        subject { Duck.ranker(:row).with(Duck.new).current_at_position(@ducks.size - 2).instance }
+
+        its(:id) { should == @ducks[:wingy].id }
+
+      }
+
+      context {
+
+        before { @ducks[:wingy].update_attribute :row_position, :down }
+
+        subject { Duck.ranker(:row).with(Duck.new).current_at_position(@ducks.size - 2).instance }
+
+        its(:id) { should == @ducks[:wingy].id }
 
       }
 
@@ -274,7 +305,7 @@ describe Duck do
 
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
-        it { subject[0..-2].should == @ordered }
+        it { expect(subject[0..-2]).to eq(@ordered) }
 
       }
 
@@ -315,7 +346,7 @@ describe Duck do
 
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
-        it { subject[0..-2].should == @ordered }
+        it { expect(subject[0..-2]).to eq(@ordered) }
 
       }
 
@@ -356,7 +387,7 @@ describe Duck do
 
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
-        it { subject[0..-2].should == @ordered }
+        it { expect(subject[0..-2]).to eq(@ordered) }
 
       }
 
@@ -383,9 +414,9 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..3].should == @ordered[0..3] }
+          it { expect(subject[0..3]).to eq(@ordered[0..3]) }
 
-          it { subject[5..subject.length].should == @ordered[4..@ordered.length] }
+          it { expect(subject[5..subject.length]).to eq(@ordered[4..@ordered.length]) }
 
         }
 
@@ -410,7 +441,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..-2].should eq(@ordered) }
+          it { expect(subject[0..-2]).to eq(@ordered) }
 
         }
 
@@ -435,7 +466,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..-2].should eq(@ordered) }
+          it { expect(subject[0..-2]).to eq(@ordered) }
 
         }
 
@@ -464,9 +495,9 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..3].should == @ordered[0..3] }
+          it { expect(subject[0..3]).to eq(@ordered[0..3]) }
 
-          it { subject[5..subject.length].should == @ordered[4..@ordered.length] }
+          it { expect(subject[5..subject.length]).to eq(@ordered[4..@ordered.length]) }
 
         }
 
@@ -491,7 +522,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..-2].should eq(@ordered) }
+          it { expect(subject[0..-2]).to eq(@ordered) }
 
         }
 
@@ -516,7 +547,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..-2].should eq(@ordered) }
+          it { expect(subject[0..-2]).to eq(@ordered) }
 
         }
 
@@ -545,9 +576,9 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..1].should == @ordered[0..1] }
+          it { expect(subject[0..1]).to eq(@ordered[0..1]) }
 
-          it { subject[3..subject.length].should == @ordered[2..@ordered.length] }
+          it { expect(subject[3..subject.length]).to eq(@ordered[2..@ordered.length]) }
 
         }
 
@@ -572,7 +603,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[1..subject.length].should eq(@ordered) }
+          it { expect(subject[1..subject.length]).to eq(@ordered) }
 
         }
 
@@ -597,7 +628,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[1..subject.length].should eq(@ordered) }
+          it { expect(subject[1..subject.length]).to eq(@ordered) }
 
         }
 
@@ -655,9 +686,9 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..1].should == @ordered[0..1] }
+          it { expect(subject[0..1]).to eq(@ordered[0..1]) }
 
-          it { subject[3..subject.length].should == @ordered[2..@ordered.length] }
+          it { expect(subject[3..subject.length]).to eq(@ordered[2..@ordered.length]) }
 
         }
 
@@ -682,7 +713,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[1..subject.length].should eq(@ordered) }
+          it { expect(subject[1..subject.length]).to eq(@ordered) }
 
         }
 
@@ -707,7 +738,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[1..subject.length].should eq(@ordered) }
+          it { expect(subject[1..subject.length]).to eq(@ordered) }
 
         }
 
@@ -792,7 +823,7 @@ describe Duck do
 
     subject { @untouchable_ranks.call }
 
-    it { should == @previous_ranks }
+    it { is_expected.to eq(@previous_ranks) }
 
   end
 

data/spec/duck-model/lots_of_ducks_spec.rb

@@ -9,6 +9,20 @@ describe Duck do
     end
   }
 
+  describe "a large number of records" do
+    before { @ducks = Duck.all }
+
+    describe "the last two ducks' rows' difference" do
+      subject { @ducks[-1].row - @ducks[-2].row }
+      it { is_expected.not_to be_between(-1, 1) }
+    end
+
+    describe "the second to last two ducks' rows' difference" do
+      subject { @ducks[-2].row - @ducks[-3].row }
+      it { is_expected.not_to be_between(-1, 1) }
+    end
+  end
+
   describe "setting and fetching by position" do
 
     describe '137' do
@@ -81,7 +95,7 @@ describe Duck do
 
         subject { Duck.rank(:row).collect {|d| d.id } }
 
-        it { should == (@ordered[0..-2] + [@ordered[-1], @first.id, @second.id]) }
+        it { is_expected.to eq(@ordered[0..-2] + [@ordered[-1], @first.id, @second.id]) }
 
       }
 
@@ -103,12 +117,12 @@ describe Duck do
       context {
         subject { Duck.where(:pond => 'Pond 1').rank(:age).collect {|d| d.id } }
 
-        it { should == (@ordered[0..-2] + [@ordered[-1], @duck_11.id, @duck_12.id]) }
+        it { is_expected.to eq(@ordered[0..-2] + [@ordered[-1], @duck_11.id, @duck_12.id]) }
       }
 
       context {
         subject { Duck.first.age }
-        it { should == 0}
+        it { is_expected.to eq(0)}
       }
       
     end
@@ -127,7 +141,7 @@ describe Duck do
 
         subject { Duck.rank(:row).collect {|d| d.id } }
 
-        it { should == ([@second.id, @first.id] + @ordered) }
+        it { is_expected.to eq([@second.id, @first.id] + @ordered) }
 
       }
 
@@ -136,21 +150,23 @@ describe Duck do
     describe "with no more gaps" do
 
       before {
-        @first = Duck.first
-        @second = Duck.where(:row => RankedModel::MAX_RANK_VALUE).first || Duck.offset(1).first
-        @third = Duck.offset(2).first
-        @fourth = Duck.offset(4).first
+        @first = Duck.rank(:row).first
+        @second = Duck.rank(:row).offset(1).first
+        @third = Duck.rank(:row).offset(2).first
+        @fourth = Duck.rank(:row).offset(4).first
+        @fifth = Duck.rank(:row).offset(5).first
         @lower = Duck.rank(:row).
-          where(Duck.arel_table[:id].not_in([@first.id, @second.id, @third.id, @fourth.id])).
+          where(Duck.arel_table[:id].not_in([@first.id, @second.id, @third.id, @fourth.id, @fifth.id])).
           where(Duck.arel_table[:row].lt(RankedModel::MAX_RANK_VALUE / 2)).
           collect {|d| d.id }
         @upper = Duck.rank(:row).
-          where(Duck.arel_table[:id].not_in([@first.id, @second.id, @third.id, @fourth.id])).
+          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)
+        Duck.where(id: @fifth.id).update_all row: @third.row
         @fourth.update_attribute :row, @third.row
       }
 
@@ -158,7 +174,7 @@ describe Duck do
 
         subject { Duck.rank(:row).collect {|d| d.id } }
 
-        it { should == ([@first.id] + @lower + [@fourth.id, @third.id] + @upper + [@second.id]) }
+        it { is_expected.to eq([@first.id] + @lower + [@fourth.id, @third.id, @fifth.id] + @upper + [@second.id]) }
 
       }
 

data/spec/number-model/number_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Number do
+
+  before {
+    200.times do |i|
+      Number.create :value => i
+    end
+  }
+
+  describe "a rearrangement with keyword column name" do
+
+    before {
+      @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
+    }
+
+    context {
+
+      subject { Number.rank(:order).collect {|d| d.id } }
+
+      it { should == (@ordered[0..-2] + [@ordered[-1], @first.id, @second.id]) }
+
+    }
+
+  end
+
+end

data/spec/ranked-model/version_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe RankedModel do
 
-  it { should define_constant(:VERSION) }
+  it { is_expected.to define_constant(:VERSION) }
 
 end

data/spec/spec_helper.rb

@@ -1,13 +1,18 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'rspec/its'
 
 require 'ranked-model'
+require 'pry'
 
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each {|f| require f}
 
 # After the DB connection is setup
 require 'database_cleaner'
 
+# Uncomment this to see Active Record logging for tests
+# ActiveRecord::Base.logger = Logger.new(STDOUT)
+
 RSpec.configure do |config|
   config.mock_with :mocha
 

data/spec/sti-model/vehicle_spec.rb

@@ -43,7 +43,7 @@ describe Vehicle do
     describe "Vehicle" do
 
       it "should have one ranker object" do
-        Vehicle.rankers.count.should == 1
+        expect(Vehicle.rankers.count).to eq(1)
       end
 
       subject { Vehicle.rankers.first }
@@ -57,7 +57,7 @@ describe Vehicle do
     describe "MotorBike" do
 
       it "should have one ranker object" do
-        MotorBike.rankers.count.should == 1
+        expect(MotorBike.rankers.count).to eq(1)
       end
 
       subject { MotorBike.rankers.first }

data/spec/support/active_record.rb

@@ -56,6 +56,11 @@ ActiveRecord::Schema.define :version => 0 do
     t.string :city
     t.integer :score
   end
+
+  create_table :numbers, :force => true do |t|
+    t.float :value
+    t.integer :order
+  end
 end
 
 class Duck < ActiveRecord::Base
@@ -145,3 +150,8 @@ end
 class Player < ActiveRecord::Base
   # don't add rank yet, do it in the specs
 end
+
+class Number < ActiveRecord::Base
+  include RankedModel
+  ranks :order
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ranked-model
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Matthew Beale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2018-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,100 +16,100 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.12
+        version: 4.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.12
+        version: 4.1.16
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: genspec
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -141,6 +141,9 @@ files:
 - gemfiles/rails_3_2.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
 - lib/ranked-model.rb
 - lib/ranked-model/railtie.rb
 - lib/ranked-model/ranker.rb
@@ -151,6 +154,7 @@ files:
 - spec/duck-model/lots_of_ducks_spec.rb
 - spec/duck-model/wrong_ducks_spec.rb
 - spec/ego-model/ego_spec.rb
+- spec/number-model/number_spec.rb
 - spec/player-model/records_already_exist_spec.rb
 - spec/ranked-model/ranker_spec.rb
 - spec/ranked-model/version_spec.rb
@@ -180,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: An acts_as_sortable replacement built for Rails 3 & 4
@@ -189,6 +193,7 @@ test_files:
 - spec/duck-model/lots_of_ducks_spec.rb
 - spec/duck-model/wrong_ducks_spec.rb
 - spec/ego-model/ego_spec.rb
+- spec/number-model/number_spec.rb
 - spec/player-model/records_already_exist_spec.rb
 - spec/ranked-model/ranker_spec.rb
 - spec/ranked-model/version_spec.rb