ranked-model 0.0.4 → 0.0.5

data/lib/ranked-model/ranker.rb

@@ -34,8 +34,17 @@ module RankedModel
           raise RankedModel::InvalidScope, %Q{No scope called "#{ranker.scope}" found in model}
         end
 
-        if ranker.with_same && !instance.respond_to?(ranker.with_same)
-          raise RankedModel::InvalidField, %Q{No field called "#{ranker.with_same}" found in model}
+        if ranker.with_same
+          if (case ranker.with_same
+                when Symbol
+                  !instance.respond_to?(ranker.with_same)
+                when Array
+                  ranker.with_same.detect {|attr| !instance.respond_to?(attr) }
+                else
+                  false
+              end)
+            raise RankedModel::InvalidField, %Q{No field called "#{ranker.with_same}" found in model}
+          end
         end
       end
 
@@ -128,17 +137,17 @@ module RankedModel
       end
 
       def rearrange_ranks
-        if current_first.rank > RankedModel::MIN_RANK_VALUE && rank == RankedModel::MAX_RANK_VALUE
+        if current_first.rank && 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
+        elsif current_last.rank && 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 && current_first.rank > RankedModel::MIN_RANK_VALUE && 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) ).
@@ -177,9 +186,24 @@ module RankedModel
           if ranker.scope
             _finder = _finder.send ranker.scope
           end
-          if ranker.with_same
-            _finder = _finder.where \
-              instance.class.arel_table[ranker.with_same].eq(instance.attributes["#{ranker.with_same}"])
+          case ranker.with_same
+            when Symbol
+              _finder = _finder.where \
+                instance.class.arel_table[ranker.with_same].eq(instance.attributes["#{ranker.with_same}"])
+            when Array
+              _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?
             _finder = _finder.where \

data/lib/ranked-model/version.rb

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

data/spec/duck-model/duck_spec.rb

@@ -14,6 +14,8 @@ describe Duck do
   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 }
 
 end
 
@@ -288,3 +290,82 @@ describe Duck do
   end
 
 end
+
+describe Duck do
+
+  before {
+    @ducks = {
+      :quacky => Duck.create(
+        :name => 'Quacky',
+        :lake_id => 0,
+        :flock_id => 0 ),
+      :feathers => Duck.create(
+        :name => 'Feathers',
+        :lake_id => 0,
+        :flock_id => 0 ),
+      :wingy => Duck.create(
+        :name => 'Wingy',
+        :lake_id => 0,
+        :flock_id => 0 ),
+      :webby => Duck.create(
+        :name => 'Webby',
+        :lake_id => 1,
+        :flock_id => 1 ),
+      :waddly => Duck.create(
+        :name => 'Waddly',
+        :lake_id => 1,
+        :flock_id => 0 ),
+      :beaky => Duck.create(
+        :name => 'Beaky',
+        :lake_id => 0,
+        :flock_id => 1 ),
+    }
+    @ducks.each { |name, duck|
+      duck.reload
+      duck.update_attribute :landing_order_position, 0
+      duck.save!
+    }
+    @ducks.each {|name, duck| duck.reload }
+  }
+
+  describe "sorting by landing_order" do
+
+    before {
+      @ducks[:quacky].update_attribute :landing_order_position, 0
+      @ducks[:wingy].update_attribute :landing_order_position, 1
+    }
+
+    subject { Duck.in_lake_and_flock(0,0).rank(:landing_order).all }
+
+    its(:size) { should == 3 }
+    
+    its(:first) { should == @ducks[:quacky] }
+    
+    its(:last) { should == @ducks[:feathers] }
+
+  end
+
+  describe "sorting by landing_order doesn't touch other items" do
+
+    before {
+      @untouchable_ranks = lambda {
+        [:webby, :waddly, :beaky].inject([]) do |ranks, untouchable_duck|
+          ranks << @ducks[untouchable_duck].landing_order
+        end
+      }
+
+      @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
+    }
+
+    subject { @untouchable_ranks.call }
+
+    it { should == @previous_ranks }
+
+  end
+
+end

data/spec/sti-model/element_spec.rb

@@ -78,4 +78,45 @@ describe Element do
 
   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

@@ -16,6 +16,9 @@ ActiveRecord::Schema.define :version => 0 do
     t.integer :row
     t.integer :size
     t.integer :age
+    t.integer :lake_id
+    t.integer :flock_id
+    t.integer :landing_order
     t.string :pond
   end
 
@@ -44,6 +47,9 @@ class Duck < ActiveRecord::Base
   ranks :row
   ranks :size, :scope => :in_shin_pond
   ranks :age, :with_same => :pond
+  
+  ranks :landing_order, :with_same => [:lake_id, :flock_id]
+  scope :in_lake_and_flock, lambda {|lake, flock| where(:lake_id => lake, :flock_id => flock) }
 
   scope :in_shin_pond, where(:pond => 'Shin')
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ranked-model
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Matthew Beale
@@ -15,11 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 -04:00
-default_executable: 
+date: 2011-08-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -34,8 +32,8 @@ dependencies:
         version: 3.0.3
   type: :runtime
   version_requirements: *id001
+  name: activerecord
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -48,8 +46,8 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id002
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -62,8 +60,8 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+  name: rspec-rails
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -76,8 +74,8 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+  name: sqlite3
 - !ruby/object:Gem::Dependency 
-  name: genspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -90,8 +88,8 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id005
+  name: genspec
 - !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -104,6 +102,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
+  name: mocha
 description: ranked-model is a modern row sorting library built for Rails 3. It uses ARel aggressively and is better optimized than most other libraries.
 email: 
 - matt.beale@madhatted.com
@@ -136,7 +135,6 @@ files:
 - spec/support/active_record.rb
 - spec/support/database.yml
 - tmp/.gitignore
-has_rdoc: true
 homepage: https://github.com/harvesthq/ranked-model
 licenses: []
 
@@ -166,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: An acts_as_sortable replacement built for Rails 3