ranked-model 0.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcff2571a186c754b8b163ed3d80709dcaaf81c8
-  data.tar.gz: c51f12aea789f0b771cac3d84d0fee6d3524607e
+  metadata.gz: 116f5fc0aeafe231cddba562c5135e868ba06604
+  data.tar.gz: c720ee45d4532e3c96fb2d829788a2c43cdd7f8f
 SHA512:
-  metadata.gz: 7b91a45c679724c3625e587a8118441f53de967e2c614e00bcd76f8103bc4007d2e1149dc159222c4c4839b7ffa86ab3f03f9e8d42e7863d3840bf7dad40a1d5
-  data.tar.gz: 46e6dca0c5f42e0b11a7e32b8f152675a336e15061657676ae32c80cfee4c8fffda441740bc66729c4f0daff19851be18ccdcd9c84e0b40eb8c2c551b522fef6
+  metadata.gz: 00ca1355412ab2cc161edc2831bc685862f4996b33903a7bf5a65077e2a638e2f385d665db6e20bdfe50f59d93c8517cdf68c8e694a325680c4a2314e4adb677
+  data.tar.gz: 72dbeebd7402e29238fb7219c0037f04ba588dba79e06ecbabf6ee9962cee67131b0b96246945639271b7585c63ebf6edb09274c7ba779ca864a336ba576af72

data/.gitignore

@@ -1,5 +1,6 @@
 pkg/*
 *.gem
 .bundle
+*.un~
 
 Gemfile.lock

data/.travis.yml

@@ -1,18 +1,82 @@
 language: ruby
+before_script:
+  - mysql -e 'create database ranked_model_test;'
+  - psql -c 'create database ranked_model_test;' -U postgres
 rvm:
   - "1.9.2"
   - "1.9.3"
   - "2.0.0"
+  - "2.1.0"
+  - "jruby-19mode"
+  - "rbx"
 env:
-  - "ACTIVERECORD_VERSION=4.0.0"
-  - "ACTIVERECORD_VERSION=3.2.13"
+  - "ACTIVERECORD_VERSION=4.1.0.beta1"
+  - "ACTIVERECORD_VERSION=4.1.0.beta1 DB=mysql_travis"
+  - "ACTIVERECORD_VERSION=4.1.0.beta1 DB=postgresql_travis"
+  - "ACTIVERECORD_VERSION=4.0.2"
+  - "ACTIVERECORD_VERSION=4.0.2 DB=mysql_travis"
+  - "ACTIVERECORD_VERSION=4.0.2 DB=postgresql_travis"
+  - "ACTIVERECORD_VERSION=3.2.16"
+  - "ACTIVERECORD_VERSION=3.2.16 DB=mysql_travis"
+  - "ACTIVERECORD_VERSION=3.2.16 DB=postgresql_travis"
   - "ACTIVERECORD_VERSION=3.1.12"
+  - "ACTIVERECORD_VERSION=3.1.12 DB=mysql_travis"
+  - "ACTIVERECORD_VERSION=3.1.12 DB=postgresql_travis"
   - "ACTIVERECORD_VERSION=master"
+  - "ACTIVERECORD_VERSION=master DB=mysql_travis"
+  - "ACTIVERECORD_VERSION=master DB=postgresql_travis"
 matrix:
   exclude:
-    - env: "ACTIVERECORD_VERSION=4.0.0"
+    - env: "ACTIVERECORD_VERSION=4.1.0.beta1"
       rvm: "1.9.2"
+    - env: "ACTIVERECORD_VERSION=4.1.0.beta1 DB=mysql_travis"
+      rvm: "1.9.2"
+    - env: "ACTIVERECORD_VERSION=4.1.0.beta1 DB=postgresql_travis"
+      rvm: "1.9.2"
+    - env: "ACTIVERECORD_VERSION=4.1.0.beta1"
+      rvm: "1.9.3"
+    - env: "ACTIVERECORD_VERSION=4.1.0.beta1 DB=mysql_travis"
+      rvm: "1.9.3"
+    - env: "ACTIVERECORD_VERSION=4.1.0.beta1 DB=postgresql_travis"
+      rvm: "1.9.3"
+    - env: "ACTIVERECORD_VERSION=4.1.0.beta1"
+      rvm: "jruby-19mode"
+    - env: "ACTIVERECORD_VERSION=4.1.0.beta1 DB=mysql_travis"
+      rvm: "jruby-19mode"
+    - env: "ACTIVERECORD_VERSION=4.1.0.beta1 DB=postgresql_travis"
+      rvm: "jruby-19mode"
     - env: "ACTIVERECORD_VERSION=master"
+      rvm: "jruby-19mode"
+    - env: "ACTIVERECORD_VERSION=master DB=mysql_travis"
+      rvm: "jruby-19mode"
+    - env: "ACTIVERECORD_VERSION=master DB=postgresql_travis"
+      rvm: "jruby-19mode"
+    - env: "ACTIVERECORD_VERSION=4.0.2"
+      rvm: "1.9.2"
+    - env: "ACTIVERECORD_VERSION=4.0.2 DB=mysql_travis"
       rvm: "1.9.2"
+    - env: "ACTIVERECORD_VERSION=4.0.2 DB=postgresql_travis"
+      rvm: "1.9.2"
+    - env: "ACTIVERECORD_VERSION=master"
+      rvm: "1.9.2"
+    - env: "ACTIVERECORD_VERSION=master DB=mysql_travis"
+      rvm: "1.9.2"
+    - env: "ACTIVERECORD_VERSION=master DB=postgresql_travis"
+      rvm: "1.9.2"
+    - env: "ACTIVERECORD_VERSION=master"
+      rvm: "1.9.3"
+    - env: "ACTIVERECORD_VERSION=master DB=mysql_travis"
+      rvm: "1.9.3"
+    - env: "ACTIVERECORD_VERSION=master DB=postgresql_travis"
+      rvm: "1.9.3"
   allow_failures:
+    # Master may or may not pass
     - env: "ACTIVERECORD_VERSION=master"
+    - env: "ACTIVERECORD_VERSION=master DB=mysql_travis"
+    - env: "ACTIVERECORD_VERSION=master DB=postgresql_travis"
+    # Rails 3.1 is incompatible with database cleaner 1.2
+    - env: "ACTIVERECORD_VERSION=3.1.12 DB=mysql_travis"
+    - env: "ACTIVERECORD_VERSION=3.1.12 DB=postgresql_travis"
+    # Postgres is not supported before Rails 4.0.
+    - env: "ACTIVERECORD_VERSION=3.1.12 DB=postgresql_travis"
+    - env: "ACTIVERECORD_VERSION=3.2.16 DB=postgresql_travis"

data/Gemfile

@@ -13,3 +13,20 @@ when "default"
 else
   gem "activerecord", "~> #{ar_version}"
 end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end
+
+# SQLite
+gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0", platforms: :jruby
+gem "sqlite3", platforms: :ruby
+
+# Postgres
+gem "activerecord-jdbcpostgresql-adapter", platforms: :jruby
+gem "pg", platforms: :ruby
+
+# MySQL
+gem "activerecord-jdbcmysql-adapter", platforms: :jruby
+gem "mysql", platforms: :ruby

data/Readme.mkd

@@ -5,6 +5,10 @@
 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).
+
+TL;DR, if you are using Rails 4 and up you are 100% good to go. Before Rails 4, be wary of Postgres.
+
 To install ranked-model, just add it to your `Gemfile`:
 
 ``` ruby
@@ -45,14 +49,14 @@ Duck.rank(:row_order).all
 ```
 
 The ranking integers stored in the `row_order` column will be big and spaced apart.  When you
-implement a sorting UI, just update the resource with the position instead:
+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 and :last are also valid
+@duck.update_attribute :row_order_position, 0  # or 1, 2, 37. :first, :last, :up and :down are also valid
 ```
 
 Position numbers begin at zero.  A position number greater than the number of records acts the
-same as :last.
+same as :last. :up and :down move the record up/down the ladder by one step.
 
 So using a normal json controller where `@duck.attributes = params[:duck]; @duck.save`, JS can
 look pretty elegant:
@@ -117,10 +121,17 @@ Contributing
 
 Fork, clone, write a test, write some code, commit, push, send a pull request.  Github FTW!
 
+The specs can be run with sqlite, postgres, and mysql:
+
+```
+DB=postgres bundle exec rake
+```
+
+Is no DB is specified, the tests run against sqlite.
+
 RankedModel is mostly the handiwork of Matthew Beale:
 
 * [madhatted.com](http://madhatted.com) is where I blog. Also [@mixonic](http://twitter.com/mixonic).
-* [Spinto](http://www.spintoapp.com) is a product I'm bootstrapping.
 
 A hearty thanks to these contributors:
 
@@ -129,3 +140,12 @@ A hearty thanks to these contributors:
 * [AndrewRadev](https://github.com/AndrewRadev)
 * [adheerajkumar](https://github.com/adheerajkumar)
 * [mikeycgto](https://github.com/mikeycgto)
+* [robotex82](https://github.com/robotex82)
+* [rociiu](https://github.com/rociiu)
+* [codepodu](https://github.com/codepodu)
+* [kakra](https://github.com/kakra)
+* [metalon](https://github.com/metalon)
+* [jamesalmond](https://github.com/jamesalmond)
+* [jguyon](https://github.com/jguyon)
+* [pehrlich](https://github.com/pehrlich)
+* [petergoldstein](https://github.com/petergoldstein)

data/lib/ranked-model.rb

@@ -46,7 +46,14 @@ module RankedModel
       self.rankers ||= []
       ranker = RankedModel::Ranker.new(*args)
       self.rankers << ranker
-      attr_accessor "#{ranker.name}_position"
+      attr_reader "#{ranker.name}_position"
+      define_method "#{ranker.name}_position=" do |position|
+        if position.present?
+          send "#{ranker.column}_will_change!"
+          instance_variable_set "@#{ranker.name}_position", position
+        end
+      end
+
       public "#{ranker.name}_position", "#{ranker.name}_position="
     end
 

data/lib/ranked-model/ranker.rb

@@ -64,7 +64,9 @@ module RankedModel
       def update_rank! value
         # Bypass callbacks
         #
-        instance_class.where(instance_class.primary_key => instance.id).update_all ["#{ranker.column} = ?", value]
+        instance_class.
+          where(instance_class.primary_key => instance.id).
+          update_all([%Q{#{ranker.column} = ?}, value])
       end
 
       def position
@@ -81,6 +83,10 @@ module RankedModel
         end
       end
 
+      def has_rank?
+        !rank.nil?
+      end
+
     private
 
       def instance_class
@@ -120,14 +126,28 @@ module RankedModel
             end
           when :middle, 'middle'
             rank_at( ( ( RankedModel::MAX_RANK_VALUE - RankedModel::MIN_RANK_VALUE ).to_f / 2 ).ceil + RankedModel::MIN_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 )
+            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 )
+            end
           when String
             position_at position.to_i
           when 0
             position_at :first
           when Integer
             neighbors = neighbors_at_position(position)
-            min = (neighbors[:lower] ? neighbors[:lower].rank : RankedModel::MIN_RANK_VALUE)
-            max = (neighbors[:upper] ? neighbors[:upper].rank : RankedModel::MAX_RANK_VALUE)
+            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 )
           when NilClass
             if !rank
@@ -157,15 +177,15 @@ module RankedModel
         if current_first.rank && current_first.rank > RankedModel::MIN_RANK_VALUE && rank == RankedModel::MAX_RANK_VALUE
           _scope.
             where( instance_class.arel_table[ranker.column].lteq(rank) ).
-            update_all( "#{ranker.column} = #{ranker.column} - 1" )
+            update_all( %Q{#{ranker.column} = #{ranker.column} - 1} )
         elsif current_last.rank && current_last.rank < (RankedModel::MAX_RANK_VALUE - 1) && rank < current_last.rank
           _scope.
             where( instance_class.arel_table[ranker.column].gteq(rank) ).
-            update_all( "#{ranker.column} = #{ranker.column} + 1" )
+            update_all( %Q{#{ranker.column} = #{ranker.column} + 1} )
         elsif current_first.rank && current_first.rank > RankedModel::MIN_RANK_VALUE && rank > current_first.rank
           _scope.
             where( instance_class.arel_table[ranker.column].lt(rank) ).
-            update_all( "#{ranker.column} = #{ranker.column} - 1" )
+            update_all( %Q{#{ranker.column} = #{ranker.column} - 1} )
           rank_at( rank - 1 )
         else
           rebalance_ranks
@@ -194,7 +214,7 @@ module RankedModel
         end
       end
 
-      def finder
+      def finder(order = :asc)
         @finder ||= begin
           _finder = instance_class
           columns = [instance_class.arel_table[instance_class.primary_key], instance_class.arel_table[ranker.column]]
@@ -226,7 +246,7 @@ module RankedModel
             _finder = _finder.where \
               instance_class.arel_table[instance_class.primary_key].not_eq(instance.id)
           end
-          _finder.order(instance_class.arel_table[ranker.column].asc).select(columns)
+          _finder.order(instance_class.arel_table[ranker.column].send(order)).select(columns)
         end
       end
 
@@ -286,6 +306,30 @@ module RankedModel
         end
       end
 
+      def find_next_two _rank
+        ordered_instances = finder.where(instance_class.arel_table[ranker.column].gt _rank).limit(2)
+        if ordered_instances[1]
+          { :lower => RankedModel::Ranker::Mapper.new( ranker, ordered_instances[0] ),
+            :upper => RankedModel::Ranker::Mapper.new( ranker, ordered_instances[1] ) }
+        elsif ordered_instances[0]
+          { :lower => RankedModel::Ranker::Mapper.new( ranker, ordered_instances[0] ) }
+        else
+          {}
+        end
+      end
+
+      def find_previous_two _rank
+        ordered_instances = finder(:desc).where(instance_class.arel_table[ranker.column].lt _rank).limit(2)
+        if ordered_instances[1]
+          { :upper => RankedModel::Ranker::Mapper.new( ranker, ordered_instances[0] ),
+            :lower => RankedModel::Ranker::Mapper.new( ranker, ordered_instances[1] ) }
+        elsif ordered_instances[0]
+          { :upper => RankedModel::Ranker::Mapper.new( ranker, ordered_instances[0] ) }
+        else
+          {}
+        end
+      end
+
     end
 
   end

data/lib/ranked-model/version.rb

@@ -1,3 +1,3 @@
 module RankedModel
-  VERSION = "0.3"
+  VERSION = "0.4.0"
 end

data/ranked-model.gemspec

@@ -11,13 +11,14 @@ Gem::Specification.new do |s|
   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.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.0.1"
+  s.add_development_dependency "database_cleaner", "~> 1.2.0"
   s.add_development_dependency "rake", "~> 10.1.0"
 
   s.files         = `git ls-files`.split("\n")

data/spec/duck-model/duck_spec.rb

@@ -62,9 +62,9 @@ describe Duck do
     subject { Duck.in_shin_pond.rank(:size).to_a }
 
     its(:size) { should == 3 }
-    
+
     its(:first) { should == @ducks[:quacky] }
-    
+
     its(:last) { should == @ducks[:wingy] }
 
   end
@@ -79,9 +79,9 @@ describe Duck do
     subject { Duck.where(:pond => 'Shin').rank(:age).to_a }
 
     its(:size) { should == 3 }
-    
+
     its(:first) { should == @ducks[:wingy] }
-    
+
     its(:last) { should == @ducks[:quacky] }
 
   end
@@ -98,9 +98,9 @@ describe Duck do
     subject { Duck.rank(:row).to_a }
 
     its(:size) { should == 6 }
-    
+
     its(:first) { should == @ducks[:beaky] }
-    
+
     its(:last) { should == @ducks[:wingy] }
 
   end
@@ -117,26 +117,26 @@ describe Duck do
       @ducks[:webby].update_attribute :row_position, 6
     }
 
-    describe "row" do 
+    describe "row" do
 
       subject { Duck.rank(:row).to_a }
 
       its(:size) { should == 6 }
-      
+
       its(:first) { should == @ducks[:beaky] }
-      
+
       its(:last) { should == @ducks[:webby] }
 
     end
 
-    describe "row" do 
+    describe "row" do
 
       subject { Duck.in_shin_pond.rank(:size).to_a }
 
       its(:size) { should == 3 }
-      
+
       its(:first) { should == @ducks[:quacky] }
-      
+
       its(:last) { should == @ducks[:feathers] }
 
     end
@@ -156,6 +156,27 @@ describe Duck do
 
   end
 
+  describe "changing a related attribute" do
+
+    it "marks record as changed" do
+      duck = Duck.rank(:age)[2]
+      duck.age_position = 1
+      duck.changed?.should be_true
+    end
+
+  end
+
+  describe "setting only truly values" do
+
+    subject { Duck.rank(:age).first }
+
+    it "doesnt set empty string" do
+      subject.age_position = ''
+      subject.age_position.should be_nil
+    end
+
+  end
+
   describe "setting and fetching by positioning" do
 
     describe "in the middle" do
@@ -178,7 +199,7 @@ describe Duck do
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
         it { subject[0..1].should == @ordered[0..1] }
-        
+
         it { subject[3..subject.length].should == @ordered[2..@ordered.length] }
 
       }
@@ -213,7 +234,7 @@ describe Duck do
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
         it { subject[1..subject.length].should == @ordered }
-        
+
       }
 
     end
@@ -254,7 +275,7 @@ describe Duck do
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
         it { subject[0..-2].should == @ordered }
-        
+
       }
 
     end
@@ -295,11 +316,11 @@ describe Duck do
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
         it { subject[0..-2].should == @ordered }
-        
+
       }
 
     end
-    
+
     describe "at the end with string" do
 
       before {
@@ -336,11 +357,335 @@ describe Duck do
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
         it { subject[0..-2].should == @ordered }
-        
+
       }
 
     end
 
+    describe "down with symbol" do
+
+      context "when in the middle" 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
+        }
+
+        context {
+
+          subject { Duck.ranker(:row).with(Duck.new).current_at_position(4).instance }
+
+          its(:id) { should == @ducks[:wingy].id }
+
+        }
+
+        context {
+
+          subject { Duck.rank(:row).collect { |duck| duck.id } }
+
+          it { subject[0..3].should == @ordered[0..3] }
+
+          it { subject[5..subject.length].should == @ordered[4..@ordered.length] }
+
+        }
+
+      end
+
+      context "when last" 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
+        }
+
+        context {
+
+          subject { Duck.ranker(:row).with(Duck.new).current_at_position(@ducks.size - 1).instance }
+
+          its(:id) { should == @ducks[:quacky].id }
+
+        }
+
+        context {
+
+          subject { Duck.rank(:row).collect { |duck| duck.id } }
+
+          it { subject[0..-2].should eq(@ordered) }
+
+        }
+
+      end
+
+      context "when second last" 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
+        }
+
+        context {
+
+          subject { Duck.ranker(:row).with(Duck.new).current_at_position(@ducks.size - 1).instance }
+
+          its(:id) { should == @ducks[:feathers].id }
+
+        }
+
+        context {
+
+          subject { Duck.rank(:row).collect { |duck| duck.id } }
+
+          it { subject[0..-2].should eq(@ordered) }
+
+        }
+
+      end
+
+    end
+
+    describe "down with string" do
+
+      context "when in the middle" 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'
+        }
+
+        context {
+
+          subject { Duck.ranker(:row).with(Duck.new).current_at_position(4).instance }
+
+          its(:id) { should == @ducks[:wingy].id }
+
+        }
+
+        context {
+
+          subject { Duck.rank(:row).collect { |duck| duck.id } }
+
+          it { subject[0..3].should == @ordered[0..3] }
+
+          it { subject[5..subject.length].should == @ordered[4..@ordered.length] }
+
+        }
+
+      end
+
+      context "when last" 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'
+        }
+
+        context {
+
+          subject { Duck.ranker(:row).with(Duck.new).current_at_position(@ducks.size - 1).instance }
+
+          its(:id) { should == @ducks[:quacky].id }
+
+        }
+
+        context {
+
+          subject { Duck.rank(:row).collect { |duck| duck.id } }
+
+          it { subject[0..-2].should eq(@ordered) }
+
+        }
+
+      end
+
+      context "when second last" 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'
+        }
+
+        context {
+
+          subject { Duck.ranker(:row).with(Duck.new).current_at_position(@ducks.size - 1).instance }
+
+          its(:id) { should == @ducks[:feathers].id }
+
+        }
+
+        context {
+
+          subject { Duck.rank(:row).collect { |duck| duck.id } }
+
+          it { subject[0..-2].should eq(@ordered) }
+
+        }
+
+      end
+
+    end
+
+    describe "up with symbol" do
+
+      context "when in the middle" 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
+        }
+
+        context {
+
+          subject { Duck.ranker(:row).with(Duck.new).current_at_position(2).instance }
+
+          its(:id) { should == @ducks[:wingy].id }
+
+        }
+
+        context {
+
+          subject { Duck.rank(:row).collect { |duck| duck.id } }
+
+          it { subject[0..1].should == @ordered[0..1] }
+
+          it { subject[3..subject.length].should == @ordered[2..@ordered.length] }
+
+        }
+
+      end
+
+      context "when first" 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
+        }
+
+        context {
+
+          subject { Duck.ranker(:row).with(Duck.new).current_at_position(0).instance }
+
+          its(:id) { should == @ducks[:beaky].id }
+
+        }
+
+        context {
+
+          subject { Duck.rank(:row).collect { |duck| duck.id } }
+
+          it { subject[1..subject.length].should eq(@ordered) }
+
+        }
+
+      end
+
+      context "when second" 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
+        }
+
+        context {
+
+          subject { Duck.ranker(:row).with(Duck.new).current_at_position(0).instance }
+
+          its(:id) { should == @ducks[:waddly].id }
+
+        }
+
+        context {
+
+          subject { Duck.rank(:row).collect { |duck| duck.id } }
+
+          it { subject[1..subject.length].should eq(@ordered) }
+
+        }
+
+      end
+
+    end
+
+    describe "up with string" do
+
+      context "when in the middle" 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'
+        }
+
+        context {
+
+          subject { Duck.ranker(:row).with(Duck.new).current_at_position(2).instance }
+
+          its(:id) { should == @ducks[:wingy].id }
+
+        }
+
+        context {
+
+          subject { Duck.rank(:row).collect { |duck| duck.id } }
+
+          it { subject[0..1].should == @ordered[0..1] }
+
+          it { subject[3..subject.length].should == @ordered[2..@ordered.length] }
+
+        }
+
+      end
+
+      context "when first" 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'
+        }
+
+        context {
+
+          subject { Duck.ranker(:row).with(Duck.new).current_at_position(0).instance }
+
+          its(:id) { should == @ducks[:beaky].id }
+
+        }
+
+        context {
+
+          subject { Duck.rank(:row).collect { |duck| duck.id } }
+
+          it { subject[1..subject.length].should eq(@ordered) }
+
+        }
+
+      end
+
+      context "when second" 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'
+        }
+
+        context {
+
+          subject { Duck.ranker(:row).with(Duck.new).current_at_position(0).instance }
+
+          its(:id) { should == @ducks[:waddly].id }
+
+        }
+
+        context {
+
+          subject { Duck.rank(:row).collect { |duck| duck.id } }
+
+          it { subject[1..subject.length].should eq(@ordered) }
+
+        }
+
+      end
+
+    end
+
   end
 
 end
@@ -392,9 +737,9 @@ describe Duck do
     subject { Duck.in_lake_and_flock(0,0).rank(:landing_order).to_a }
 
     its(:size) { should == 3 }
-    
+
     its(:first) { should == @ducks[:quacky] }
-    
+
     its(:last) { should == @ducks[:feathers] }
 
   end

data/spec/player-model/records_already_exist_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Player do
+
+  before {
+    @players = {}
+    @players[:dave] = Player.create!(:name => "Dave", :city => "Detroit")
+    @players[:bob] = Player.create!(:name => "Bob", :city => "Portland")
+    @players[:nigel] = Player.create!(:name => "Nigel", :city => "New York")
+    Player.class_eval do
+      include RankedModel
+      ranks :score
+    end
+
+  }
+
+  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
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,11 +1,13 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'database_cleaner'
 
-require 'ranked-model' # and any other gems you need
+require 'ranked-model'
 
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each {|f| require f}
 
+# After the DB connection is setup
+require 'database_cleaner'
+
 RSpec.configure do |config|
   config.mock_with :mocha
 

data/spec/support/active_record.rb

@@ -1,12 +1,13 @@
 require 'active_record'
-require 'sqlite3'
 require 'logger'
 
 ROOT = File.join(File.dirname(__FILE__), '..')
 
+DB_CONFIG = "test" + (ENV['DB'] ? "_#{ENV['DB'].downcase}" : '')
+
 ActiveRecord::Base.logger = Logger.new('tmp/ar_debug.log')
 ActiveRecord::Base.configurations = YAML::load(IO.read('spec/support/database.yml'))
-ActiveRecord::Base.establish_connection('development')
+ActiveRecord::Base.establish_connection(DB_CONFIG)
 
 ActiveRecord::Schema.define :version => 0 do
   create_table :ducks, :force => true do |t|
@@ -49,6 +50,12 @@ ActiveRecord::Schema.define :version => 0 do
     t.string :name
     t.integer :size
   end
+
+  create_table :players, :force => true do |t|
+    t.string :name
+    t.string :city
+    t.integer :score
+  end
 end
 
 class Duck < ActiveRecord::Base
@@ -129,3 +136,7 @@ class Ego < ActiveRecord::Base
   include RankedModel
   ranks :size
 end
+
+class Player < ActiveRecord::Base
+  # don't add rank yet, do it in the specs
+end

data/spec/support/database.yml

@@ -1,5 +1,30 @@
-development:
+test:
   adapter: sqlite3
   database: tmp/data.sqlite3
   pool: 5
   timeout: 5000
+
+test_mysql:
+  adapter: mysql
+  database: ranked_model_test
+  pool: 5
+  timeout: 5000
+
+test_postgresql:
+  adapter: postgresql
+  database: ranked_model_test
+  pool: 5
+  timeout: 5000
+
+test_mysql_travis:
+  adapter: mysql
+  database: ranked_model_test
+  pool: 5
+  timeout: 5000
+  username: travis
+
+test_postgresql_travis:
+  adapter: postgresql
+  database: ranked_model_test
+  pool: 5
+  timeout: 5000

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ranked-model
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.4.0
 platform: ruby
 authors:
 - Matthew Beale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ files:
 - spec/duck-model/lots_of_ducks_spec.rb
 - spec/duck-model/wrong_ducks_spec.rb
 - spec/ego-model/ego_spec.rb
+- spec/player-model/records_already_exist_spec.rb
 - spec/ranked-model/ranker_spec.rb
 - spec/ranked-model/version_spec.rb
 - spec/spec_helper.rb
@@ -142,7 +143,8 @@ files:
 - spec/support/database.yml
 - tmp/.gitignore
 homepage: https://github.com/mixonic/ranked-model
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -169,6 +171,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/player-model/records_already_exist_spec.rb
 - spec/ranked-model/ranker_spec.rb
 - spec/ranked-model/version_spec.rb
 - spec/spec_helper.rb