If a rank value is the max value, treat it as 'last' and shit everybo…

…dy out of the way
muthhus · Jun 15, 2011 · 0977966 · 0977966
1 parent beb8070
commit 0977966
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 4 deletions.
diff --git a/lib/ranked-model/ranker.rb b/lib/ranked-model/ranker.rb
@@ -128,16 +128,21 @@ def assure_unique_position
       end
 
       def rearrange_ranks
-        if current_last.rank < (RankedModel::MAX_RANK_VALUE - 1) && rank < current_last.rank
+        if current_first.rank > RankedModel::MIN_RANK_VALUE && rank == RankedModel::MAX_RANK_VALUE
+          instance.class.
+            where( instance.class.arel_table[:id].not_eq(instance.id) ).
+            where( instance.class.arel_table[ranker.column].lteq(rank) ).
+            update_all( "#{ranker.column} = #{ranker.column} - 1" )
+        elsif current_last.rank < (RankedModel::MAX_RANK_VALUE - 1) && rank < current_last.rank
           instance.class.
             where( instance.class.arel_table[:id].not_eq(instance.id) ).
             where( instance.class.arel_table[ranker.column].gteq(rank) ).
             update_all( "#{ranker.column} = #{ranker.column} + 1" )
-        elsif current_first.rank > RankedModel::MIN_RANK_VALUE && rank > current_first.rank 
+        elsif current_first.rank > RankedModel::MIN_RANK_VALUE + 1 && rank > current_first.rank 
           instance.class.
             where( instance.class.arel_table[:id].not_eq(instance.id) ).
             where( instance.class.arel_table[ranker.column].lt(rank) ).
-            update_all( "#{ranker.column} = #{ranker.column} - 1" )
+            update_all( "#{ranker.column} = #{ranker.column} - 2" )
           rank_at( rank - 1 )
         else
           rebalance_ranks

diff --git a/spec/duck-model/lots_of_ducks_spec.rb b/spec/duck-model/lots_of_ducks_spec.rb
@@ -37,6 +37,32 @@
 
     end
 
+    describe 'last' do
+
+      before {
+        @last = Duck.last
+        @last.update_attribute :row_position, :last
+      }
+
+      subject { Duck.rank(:row).last }
+
+      its(:id) { should == @last.id }
+
+    end
+
+    describe 'first' do
+
+      before {
+        @last = Duck.last
+        @last.update_attribute :row_position, :first
+      }
+
+      subject { Duck.rank(:row).first }
+
+      its(:id) { should == @last.id }
+
+    end
+
   end
 
   describe "a rearrangement" do
@@ -55,7 +81,7 @@
 
         subject { Duck.rank(:row).collect {|d| d.id } }
 
-        it { should == (@ordered[0..-2] + [@first.id, @second.id, @ordered[-1]]) }
+        it { should == (@ordered[0..-2] + [@ordered[-1], @first.id, @second.id]) }
 
       }