ranked-model 0.4.0 → 0.4.7

data/spec/duck-model/lots_of_ducks_spec.rb

@@ -5,17 +5,31 @@ describe Duck do
   before {
     200.times do |i|
       Duck.create \
-        :name => "Duck #{i}"
+        :name => "Duck #{i + 1}"
     end
   }
 
+  describe "a large number of records" do
+    before { @ducks = Duck.all }
+
+    describe "the last two ducks' rows' difference" do
+      subject { @ducks[-1].row - @ducks[-2].row }
+      it { is_expected.not_to be_between(-1, 1) }
+    end
+
+    describe "the second to last two ducks' rows' difference" do
+      subject { @ducks[-2].row - @ducks[-3].row }
+      it { is_expected.not_to be_between(-1, 1) }
+    end
+  end
+
   describe "setting and fetching by position" do
 
     describe '137' do
 
       before {
         @last = Duck.last
-        @last.update_attribute :row_position, 137
+        @last.update :row_position => 137
       }
 
       subject { Duck.ranker(:row).with(Duck.new).current_at_position(137).instance }
@@ -28,7 +42,7 @@ describe Duck do
 
       before {
         @last = Duck.last
-        @last.update_attribute :row_position, 2
+        @last.update :row_position => 2
       }
 
       subject { Duck.ranker(:row).with(Duck.new).current_at_position(2).instance }
@@ -41,7 +55,7 @@ describe Duck do
 
       before {
         @last = Duck.last
-        @last.update_attribute :row_position, :last
+        @last.update :row_position => :last
       }
 
       subject { Duck.rank(:row).last }
@@ -54,7 +68,7 @@ describe Duck do
 
       before {
         @last = Duck.last
-        @last.update_attribute :row_position, :first
+        @last.update :row_position => :first
       }
 
       subject { Duck.rank(:row).first }
@@ -73,15 +87,15 @@ describe Duck do
         @first = Duck.first
         @second = Duck.offset(1).first
         @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_in([@first.id, @second.id])).collect {|d| d.id }
-        @first.update_attribute :row, RankedModel::MAX_RANK_VALUE
-        @second.update_attribute :row, RankedModel::MAX_RANK_VALUE
+        @first.update :row => RankedModel::MAX_RANK_VALUE
+        @second.update :row => RankedModel::MAX_RANK_VALUE
       }
 
       context {
 
         subject { Duck.rank(:row).collect {|d| d.id } }
 
-        it { should == (@ordered[0..-2] + [@ordered[-1], @first.id, @second.id]) }
+        it { is_expected.to eq(@ordered[0..-2] + [@ordered[-1], @first.id, @second.id]) }
 
       }
 
@@ -91,24 +105,24 @@ describe Duck do
 
       before {
         Duck.first(50).each_with_index do |d, index|
-          d.update_attributes :age => index % 10, :pond => "Pond #{index / 10}"
+          d.update :age => index % 10, :pond => "Pond #{index / 10}"
         end
-        @duck_11 = Duck.offset(10).first
-        @duck_12 = Duck.offset(11).first
+        @duck_11 = Duck.where(:pond => 'Pond 1').rank(:age).first
+        @duck_12 = Duck.where(:pond => 'Pond 1').rank(:age).second
         @ordered = Duck.where(:pond => 'Pond 1').rank(:age).where(Duck.arel_table[:id].not_in([@duck_11.id, @duck_12.id])).collect {|d| d.id }
-        @duck_11.update_attribute :age, RankedModel::MAX_RANK_VALUE
-        @duck_12.update_attribute :age, RankedModel::MAX_RANK_VALUE
+        @duck_11.update :age => RankedModel::MAX_RANK_VALUE
+        @duck_12.update :age => RankedModel::MAX_RANK_VALUE
       }
 
       context {
         subject { Duck.where(:pond => 'Pond 1').rank(:age).collect {|d| d.id } }
 
-        it { should == (@ordered[0..-2] + [@ordered[-1], @duck_11.id, @duck_12.id]) }
+        it { is_expected.to eq(@ordered[0..-2] + [@ordered[-1], @duck_11.id, @duck_12.id]) }
       }
 
       context {
         subject { Duck.first.age }
-        it { should == 0}
+        it { is_expected.to eq(0)}
       }
       
     end
@@ -119,15 +133,15 @@ describe Duck do
         @first = Duck.first
         @second = Duck.offset(1).first
         @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_in([@first.id, @second.id])).collect {|d| d.id }
-        @first.update_attribute :row, RankedModel::MIN_RANK_VALUE
-        @second.update_attribute :row, RankedModel::MIN_RANK_VALUE
+        @first.update :row => RankedModel::MIN_RANK_VALUE
+        @second.update :row => RankedModel::MIN_RANK_VALUE
       }
 
       context {
 
         subject { Duck.rank(:row).collect {|d| d.id } }
 
-        it { should == ([@second.id, @first.id] + @ordered) }
+        it { is_expected.to eq([@second.id, @first.id] + @ordered) }
 
       }
 
@@ -135,32 +149,30 @@ describe Duck do
 
     describe "with no more gaps" do
 
-      before {
-        @first = Duck.first
-        @second = Duck.where(:row => RankedModel::MAX_RANK_VALUE).first || Duck.offset(1).first
-        @third = Duck.offset(2).first
-        @fourth = Duck.offset(4).first
+      before do
+        @first = Duck.rank(:row).first
+        @second = Duck.rank(:row).offset(1).first
+        @third = Duck.rank(:row).offset(2).first
+        @fourth = Duck.rank(:row).offset(3).first
         @lower = Duck.rank(:row).
           where(Duck.arel_table[:id].not_in([@first.id, @second.id, @third.id, @fourth.id])).
           where(Duck.arel_table[:row].lt(RankedModel::MAX_RANK_VALUE / 2)).
-          collect {|d| d.id }
+          pluck(:id)
         @upper = Duck.rank(:row).
           where(Duck.arel_table[:id].not_in([@first.id, @second.id, @third.id, @fourth.id])).
           where(Duck.arel_table[:row].gteq(RankedModel::MAX_RANK_VALUE / 2)).
-          collect {|d| d.id }
-        @first.update_attribute :row, RankedModel::MIN_RANK_VALUE
-        @second.update_attribute :row, RankedModel::MAX_RANK_VALUE
-        @third.update_attribute :row, (RankedModel::MAX_RANK_VALUE / 2)
-        @fourth.update_attribute :row, @third.row
-      }
-
-      context {
-
-        subject { Duck.rank(:row).collect {|d| d.id } }
-
-        it { should == ([@first.id] + @lower + [@fourth.id, @third.id] + @upper + [@second.id]) }
-
-      }
+          pluck(:id)
+        @first.update(row: RankedModel::MIN_RANK_VALUE)
+        @second.update(row: RankedModel::MAX_RANK_VALUE)
+        @third.update(row: (RankedModel::MAX_RANK_VALUE / 2))
+        @fourth.update(row: @third.row)
+      end
+
+      it 'works correctly' do
+        result = Duck.rank(:row).pluck(:id)
+        expected = [@first.id, *@lower, @fourth.id, @third.id, *@upper, @second.id]
+        expect(result).to eq(expected)
+      end
 
     end
 

data/spec/duck-model/wrong_ducks_spec.rb

@@ -23,3 +23,14 @@ describe WrongFieldDuck do
   end
 
 end
+
+describe ReallyWrongFieldDuck do
+
+  it "should raise an error because of a specific unknown field" do
+
+    expect {
+      ReallyWrongFieldDuck.create(:name => 'Quicky', :pond => 'Shin')
+    }.to raise_error(RankedModel::InvalidField, 'No field called "non_existant_field" found in model')
+  end
+
+end

data/spec/ego-model/ego_spec.rb

@@ -10,7 +10,7 @@ describe Ego do
     }
     @egos.each { |name, ego|
       ego.reload
-      ego.update_attribute :size_position, 0
+      ego.update :size_position => 0
       ego.save!
     }
     @egos.each {|name, ego| ego.reload }
@@ -19,8 +19,8 @@ describe Ego do
   describe "sorting on size alternative primary key" do
 
     before {
-      @egos[:nick].update_attribute :size_position, 0
-      @egos[:sally].update_attribute :size_position, 2
+      @egos[:nick].update :size_position => 0
+      @egos[:sally].update :size_position => 2
     }
 
     subject { Ego.rank(:size).to_a }

data/spec/number-model/number_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Number do
+
+  before {
+    200.times do |i|
+      Number.create :value => i
+    end
+  }
+
+  describe "a rearrangement with keyword column name" do
+
+    before {
+      @first = Number.first
+      @second = Number.offset(1).first
+      @ordered = Number.rank(:order).where(Number.arel_table[:id].not_in([@first.id, @second.id])).collect {|d| d.id }
+      @first.update :order => RankedModel::MAX_RANK_VALUE
+      @second.update :order => RankedModel::MAX_RANK_VALUE
+    }
+
+    context {
+
+      subject { Number.rank(:order).collect {|d| d.id } }
+
+      it { should == (@ordered[0..-2] + [@ordered[-1], @first.id, @second.id]) }
+
+    }
+
+  end
+
+  describe "getting a position with keyword column name" do
+
+    subject { Number.first }
+
+    its(:order_rank) { should == 0 }
+
+  end
+
+end

data/spec/player-model/records_already_exist_spec.rb

@@ -16,7 +16,7 @@ describe Player do
 
   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
+      expect{@players[:bob].update! :score_position => 1}.to_not raise_error
     end
   end
 end

data/spec/ranked-model/ranker_spec.rb

@@ -62,3 +62,21 @@ describe RankedModel::Ranker, 'unless as Proc' do
     }
   end
 end
+
+describe RankedModel::Ranker, 'unless as lambda' do
+  context 'returns true' do
+    subject { RankedModel::Ranker.new(:overview, unless: ->(_) { true }).with(Class.new) }
+    its(:handle_ranking) { should == nil }
+  end
+
+  context 'returns false' do
+    subject { RankedModel::Ranker.new(:overview, unless: ->(_) { false }).with(Class.new) }
+
+    it {
+      subject.expects(:update_index_from_position).once
+      subject.expects(:assure_unique_position).once
+
+      subject.handle_ranking
+    }
+  end
+end

data/spec/ranked-model/version_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe RankedModel do
 
-  it { should define_constant(:VERSION) }
+  it { is_expected.to define_constant(:VERSION) }
 
 end

data/spec/spec_helper.rb

@@ -1,13 +1,18 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'rspec/its'
 
 require 'ranked-model'
+require 'pry'
 
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each {|f| require f}
 
 # After the DB connection is setup
 require 'database_cleaner'
 
+# Uncomment this to see Active Record logging for tests
+# ActiveRecord::Base.logger = Logger.new(STDOUT)
+
 RSpec.configure do |config|
   config.mock_with :mocha
 
@@ -24,6 +29,8 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
+  config.order = :random
+  Kernel.srand config.seed
 end
 
 RSpec::Matchers.define :define_constant do |expected|

data/spec/sti-model/element_spec.rb

@@ -12,7 +12,7 @@ describe Element do
     }
     @elements.each { |name, element|
       element.reload
-      element.update_attribute :combination_order_position, 0
+      element.update :combination_order_position => 0
     }
     @elements.each {|name, element| element.reload }
   }
@@ -20,9 +20,9 @@ describe Element do
   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
+      @elements[:helium].update :combination_order_position => :first
+      @elements[:xenon].update :combination_order_position => :first
+      @elements[:argon].update :combination_order_position => :last
 
       TransitionMetal.ranker(:combination_order).with(@elements[:chromium]).instance_eval { rebalance_ranks }
     }
@@ -40,16 +40,16 @@ describe Element do
   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
+      @elements[:helium].update :combination_order_position => :first
+      @elements[:xenon].update :combination_order_position => :first
+      @elements[:argon].update :combination_order_position => :first
+
+      @elements[:chromium].update :combination_order_position => 1
+      @elements[:manganese].update :combination_order_position => 1
+      @elements[:manganese].update :combination_order_position => 0
+      @elements[:chromium].update :combination_order_position => 0
+      @elements[:manganese].update :combination_order_position => 0
+      @elements[:chromium].update :combination_order_position => 0
     }
 
     describe "NobleGas" do
@@ -81,16 +81,16 @@ describe Element do
   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
+      @elements[:helium].update :combination_order_position => :first
+      @elements[:xenon].update :combination_order_position => :first
+      @elements[:argon].update :combination_order_position => :first
+
+      @elements[:chromium].update :combination_order_position => 1
+      @elements[:manganese].update :combination_order_position => 1
+      @elements[:manganese].update :combination_order_position => 0
+      @elements[:chromium].update :combination_order_position => 0
+      @elements[:manganese].update :combination_order_position => 0
+      @elements[:chromium].update :combination_order_position => 0
     }
 
     describe "NobleGas" do

data/spec/sti-model/vehicle_spec.rb

@@ -12,7 +12,7 @@ describe Vehicle do
     }
     @vehicles.each { |name, vehicle|
       vehicle.reload
-      vehicle.update_attribute :parking_order_position, 0
+      vehicle.update :parking_order_position => 0
     }
     @vehicles.each {|name, vehicle| vehicle.reload }
   }
@@ -20,8 +20,8 @@ describe Vehicle do
   describe "ranking by STI parent" do
 
     before {
-      @vehicles[:volvo].update_attribute :parking_order_position, :first
-      @vehicles[:ford].update_attribute :parking_order_position, :first
+      @vehicles[:volvo].update :parking_order_position => :first
+      @vehicles[:ford].update :parking_order_position => :first
     }
 
     describe "Vehicle" do
@@ -43,7 +43,7 @@ describe Vehicle do
     describe "Vehicle" do
 
       it "should have one ranker object" do
-        Vehicle.rankers.count.should == 1
+        expect(Vehicle.rankers.count).to eq(1)
       end
 
       subject { Vehicle.rankers.first }
@@ -57,7 +57,7 @@ describe Vehicle do
     describe "MotorBike" do
 
       it "should have one ranker object" do
-        MotorBike.rankers.count.should == 1
+        expect(MotorBike.rankers.count).to eq(1)
       end
 
       subject { MotorBike.rankers.first }
@@ -72,4 +72,4 @@ describe Vehicle do
 
   end
 
-end
+end

data/spec/support/active_record.rb

@@ -1,13 +1,13 @@
 require 'active_record'
 require 'logger'
 
-ROOT = File.join(File.dirname(__FILE__), '..')
-
-DB_CONFIG = "test" + (ENV['DB'] ? "_#{ENV['DB'].downcase}" : '')
+unless ENV['DB']
+  ENV['DB'] = 'sqlite'
+end
 
 ActiveRecord::Base.logger = Logger.new('tmp/ar_debug.log')
 ActiveRecord::Base.configurations = YAML::load(IO.read('spec/support/database.yml'))
-ActiveRecord::Base.establish_connection(DB_CONFIG)
+ActiveRecord::Base.establish_connection(ENV['DB'].to_sym)
 
 ActiveRecord::Schema.define :version => 0 do
   create_table :ducks, :force => true do |t|
@@ -21,6 +21,8 @@ ActiveRecord::Schema.define :version => 0 do
     t.string :pond
   end
 
+  add_index :ducks, [:landing_order, :lake_id, :flock_id], unique: true
+
   create_table :wrong_scope_ducks, :force => true do |t|
     t.string :name
     t.integer :size
@@ -33,6 +35,12 @@ ActiveRecord::Schema.define :version => 0 do
     t.string :pond
   end
 
+  create_table :column_default_ducks, :force => true do |t|
+    t.string :name
+    t.integer :size, default: 0
+    t.string :pond
+  end
+
   create_table :elements, :force => true do |t|
     t.string :symbol
     t.string :type
@@ -56,6 +64,11 @@ ActiveRecord::Schema.define :version => 0 do
     t.string :city
     t.integer :score
   end
+
+  create_table :numbers, :force => true do |t|
+    t.float :value
+    t.integer :order
+  end
 end
 
 class Duck < ActiveRecord::Base
@@ -85,7 +98,12 @@ class WrongFieldDuck < ActiveRecord::Base
 
   include RankedModel
   ranks :age, :with_same => :non_existant_field
+end
 
+class ReallyWrongFieldDuck < ActiveRecord::Base
+  self.table_name = :wrong_field_ducks
+  include RankedModel
+  ranks :age, :with_same => [:name, :non_existant_field]
 end
 
 # Example for STI, ranking within each child class
@@ -132,7 +150,7 @@ class MotorBike < Vehicle
 end
 
 class Ego < ActiveRecord::Base
-  primary_key = :alternative_to_id
+  self.primary_key = :alternative_to_id
   include RankedModel
   ranks :size
 end
@@ -140,3 +158,8 @@ end
 class Player < ActiveRecord::Base
   # don't add rank yet, do it in the specs
 end
+
+class Number < ActiveRecord::Base
+  include RankedModel
+  ranks :order
+end