ranked-model 0.0.3 → 0.0.4

data/Readme.mkd

@@ -34,7 +34,7 @@ This simple example assumes an integer column called `row_order`.  To order Duck
 
     Duck.rank(:row_order).all
 
-The ranking integers stored in the `raw_order` column will be big and spaced apart.  When you
+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:
 
     @duck.update_attribute :row_order_position, 0  # or 1, 2, 37. :first and :last are also valid

data/lib/ranked-model/ranker.rb

@@ -128,7 +128,12 @@ module RankedModel
       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) ).

data/lib/ranked-model/version.rb

@@ -1,3 +1,3 @@
 module RankedModel
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/duck-model/lots_of_ducks_spec.rb

@@ -37,6 +37,32 @@ describe Duck do
 
     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 @@ describe Duck do
 
         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]) }
 
       }
 

data/spec/sti-model/element_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+describe Element do
+
+  before {
+    @elements = {
+      :chromium  => TransitionMetal.create( :symbol => 'Cr' ),
+      :manganese => TransitionMetal.create( :symbol => 'Mn' ),
+      :argon     => NobleGas.create( :symbol => 'Ar' ),
+      :helium    => NobleGas.create( :symbol => 'He' ),
+      :xenon     => NobleGas.create( :symbol => 'Xe' )
+    }
+    @elements.each { |name, element|
+      element.reload
+      element.update_attribute :combination_order_position, 0
+    }
+    @elements.each {|name, element| element.reload }
+  }
+
+  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
+
+      TransitionMetal.ranker(:combination_order).with(@elements[:chromium]).instance_eval { rebalance_ranks }
+    }
+
+    subject { NobleGas.rank(:combination_order) }
+
+    its(:size) { should == 3 }
+    
+    its(:first) { should == @elements[:xenon] }
+    
+    its(:last) { should == @elements[:argon] }
+
+  end
+
+  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
+    }
+
+    describe "NobleGas" do
+
+      subject { NobleGas.rank(:combination_order) }
+
+      its(:size) { should == 3 }
+      
+      its(:first) { should == @elements[:argon] }
+      
+      its(:last) { should == @elements[:helium] }
+
+    end
+
+    describe "TransitionMetal" do
+
+      subject { TransitionMetal.rank(:combination_order) }
+
+      its(:size) { should == 2 }
+      
+      its(:first) { should == @elements[:chromium] }
+      
+      its(:last) { should == @elements[:manganese] }
+
+    end
+
+  end
+
+end

data/spec/support/active_record.rb

@@ -30,6 +30,12 @@ ActiveRecord::Schema.define :version => 0 do
     t.integer :age
     t.string :pond
   end
+
+  create_table :elements, :force => true do |t|
+    t.string :symbol
+    t.string :type
+    t.integer :combination_order
+  end
 end
 
 class Duck < ActiveRecord::Base
@@ -58,3 +64,18 @@ class WrongFieldDuck < ActiveRecord::Base
   ranks :age, :with_same => :non_existant_field
 
 end
+
+class Element < ActiveRecord::Base
+
+  include RankedModel
+  ranks :combination_order
+
+end
+
+class TransitionMetal < Element
+
+end
+
+class NobleGas < Element
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ranked-model
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Matthew Beale
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 -04:00
+date: 2011-06-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -132,6 +132,7 @@ files:
 - spec/ranked-model/ranker_spec.rb
 - spec/ranked-model/version_spec.rb
 - spec/spec_helper.rb
+- spec/sti-model/element_spec.rb
 - spec/support/active_record.rb
 - spec/support/database.yml
 - tmp/.gitignore
@@ -176,5 +177,6 @@ test_files:
 - spec/ranked-model/ranker_spec.rb
 - spec/ranked-model/version_spec.rb
 - spec/spec_helper.rb
+- spec/sti-model/element_spec.rb
 - spec/support/active_record.rb
 - spec/support/database.yml