ranked-model 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fa03565f2d58125cad4f32d6e9e9eb71287a7c33
+  data.tar.gz: 7dc3963857902ef6872a26d90a0156869622a1be
+SHA512:
+  metadata.gz: 21d43557aa038bd4a588dcb5b2742f67661398557a51367f2cd759b37727b2f96bf00cfcc3952d4985a61409a4f1d6ab39b634d35c4dd1bd927bf7f506529018
+  data.tar.gz: 0e6d81072a17f1c6c6abe519a38f2750181685dc174f320c6cb96e3866a78403316b68ecc363258a2e01ada3a2064b366ed38652743cc17249bd62ceaa6c932f

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 rvm:
   - "1.9.2"
   - "1.9.3"
+  - "2.0.0"

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in ranked-model.gemspec
 gemspec

data/lib/ranked-model/ranker.rb

@@ -29,7 +29,7 @@ module RankedModel
 
         validate_ranker_for_instance!
       end
-      
+
       def validate_ranker_for_instance!
         if ranker.scope && !instance_class.respond_to?(ranker.scope)
           raise RankedModel::InvalidScope, %Q{No scope called "#{ranker.scope}" found in model}
@@ -64,7 +64,7 @@ module RankedModel
       def update_rank! value
         # Bypass callbacks
         #
-        instance_class.where(:id => instance.id).update_all ["#{ranker.column} = ?", value]
+        instance_class.where(instance_class.primary_key => instance.id).update_all ["#{ranker.column} = ?", value]
       end
 
       def position
@@ -152,7 +152,7 @@ module RankedModel
         _scope = finder
         unless instance.id.nil?
           # Never update ourself, shift others around us.
-          _scope = _scope.where( instance_class.arel_table[:id].not_eq(instance.id) )
+          _scope = _scope.where( instance_class.arel_table[instance_class.primary_key].not_eq(instance.id) )
         end
         if current_first.rank && current_first.rank > RankedModel::MIN_RANK_VALUE && rank == RankedModel::MAX_RANK_VALUE
           _scope.
@@ -221,9 +221,9 @@ module RankedModel
           end
           if !new_record?
             _finder = _finder.where \
-              instance_class.arel_table[:id].not_eq(instance.id)
+              instance_class.arel_table[instance_class.primary_key].not_eq(instance.id)
           end
-          _finder.order(instance_class.arel_table[ranker.column].asc).select([instance_class.arel_table[:id], instance_class.arel_table[ranker.column]])
+          _finder.order(instance_class.arel_table[ranker.column].asc).select([instance_class.arel_table[instance_class.primary_key], instance_class.arel_table[ranker.column]])
         end
       end
 

data/lib/ranked-model/version.rb

@@ -1,3 +1,3 @@
 module RankedModel
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/ranked-model.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "activerecord", ">= 3.0.3"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "rspec-rails", "~> 2.12.0"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "genspec"
   s.add_development_dependency "mocha"

data/spec/duck-model/duck_spec.rb

@@ -143,6 +143,19 @@ describe Duck do
 
   end
 
+  describe "changing an unrelated attribute" do
+
+    it "doesn't change ranking" do
+      # puts Duck.rank(:age).collect {|duck| "#{duck.name} #{duck.age}" }
+      duck = Duck.rank(:age)[2]
+      ->{
+        duck.update_attribute :name, 'New Name'
+      }.should_not change(duck.reload, :age)
+      # puts Duck.rank(:age).collect {|duck| "#{duck.name} #{duck.age}" }
+    end
+
+  end
+
   describe "setting and fetching by positioning" do
 
     describe "in the middle" do

data/spec/ego-model/ego_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Ego do
+
+  before {
+    @egos = {
+      :bob   => Ego.create(:name => 'Bob'),
+      :nick  => Ego.create(:name => 'Nick'),
+      :sally => Ego.create(:name => 'Sally')
+    }
+    @egos.each { |name, ego|
+      ego.reload
+      ego.update_attribute :size_position, 0
+      ego.save!
+    }
+    @egos.each {|name, ego| ego.reload }
+  }
+
+  describe "sorting on size alternative primary key" do
+
+    before {
+      @egos[:nick].update_attribute :size_position, 0
+      @egos[:sally].update_attribute :size_position, 2
+    }
+
+    subject { Ego.rank(:size).all }
+
+    its(:size) { should == 3 }
+
+    its(:first) { should == @egos[:nick] }
+
+    its(:last) { should == @egos[:sally] }
+
+  end
+
+end

data/spec/support/active_record.rb

@@ -46,6 +46,11 @@ ActiveRecord::Schema.define :version => 0 do
     t.string :type
     t.integer :parking_order
   end
+
+  create_table :egos, :primary_key => :alternative_to_id, :force => true do |t|
+    t.string :name
+    t.integer :size
+  end
 end
 
 class Duck < ActiveRecord::Base
@@ -119,4 +124,10 @@ class MotorBike < Vehicle
   include RankedModel
   ranks :parking_order, :class_name => 'Vehicle', :with_same => :color
 
-end
+end
+
+class Ego < ActiveRecord::Base
+  primary_key = :alternative_to_id
+  include RankedModel
+  ranks :size
+end

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: ranked-model
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Matthew Beale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: genspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ranked-model is a modern row sorting library built for Rails 3. It uses
@@ -131,6 +118,7 @@ files:
 - spec/duck-model/duck_spec.rb
 - spec/duck-model/lots_of_ducks_spec.rb
 - spec/duck-model/wrong_ducks_spec.rb
+- spec/ego-model/ego_spec.rb
 - spec/ranked-model/ranker_spec.rb
 - spec/ranked-model/version_spec.rb
 - spec/spec_helper.rb
@@ -141,38 +129,32 @@ files:
 - tmp/.gitignore
 homepage: https://github.com/harvesthq/ranked-model
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3607802699364138868
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3607802699364138868
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An acts_as_sortable replacement built for Rails 3
 test_files:
 - spec/duck-model/duck_spec.rb
 - spec/duck-model/lots_of_ducks_spec.rb
 - spec/duck-model/wrong_ducks_spec.rb
+- spec/ego-model/ego_spec.rb
 - spec/ranked-model/ranker_spec.rb
 - spec/ranked-model/version_spec.rb
 - spec/spec_helper.rb