ranked-model 0.4.0 → 0.4.7

data/lib/ranked-model/version.rb

@@ -1,3 +1,3 @@
 module RankedModel
-  VERSION = "0.4.0"
+  VERSION = "0.4.7"
 end

data/ranked-model.gemspec

@@ -9,17 +9,18 @@ Gem::Specification.new do |s|
   s.authors     = ["Matthew Beale"]
   s.email       = ["matt.beale@madhatted.com"]
   s.homepage    = "https://github.com/mixonic/ranked-model"
-  s.summary     = %q{An acts_as_sortable replacement built for Rails 3 & 4}
-  s.description = %q{ranked-model is a modern row sorting library built for Rails 3 & 4. It uses ARel aggressively and is better optimized than most other libraries.}
+  s.summary     = %q{An acts_as_sortable replacement built for Rails 4.2+}
+  s.description = %q{ranked-model is a modern row sorting library built for Rails 4.2+. It uses ARel aggressively and is better optimized than most other libraries.}
   s.license     = 'MIT'
 
-  s.add_dependency "activerecord", ">= 3.1.12"
-  s.add_development_dependency "rspec", "~> 2.13.0"
-  s.add_development_dependency "sqlite3", "~> 1.3.7"
-  s.add_development_dependency "genspec", "~> 0.2.8"
-  s.add_development_dependency "mocha", "~> 0.14.0"
-  s.add_development_dependency "database_cleaner", "~> 1.2.0"
+  s.add_dependency "activerecord", ">= 4.2"
+  s.add_development_dependency "rspec", "~> 3"
+  s.add_development_dependency "rspec-its"
+  s.add_development_dependency "mocha"
+  s.add_development_dependency "database_cleaner", "~> 1.7.0"
   s.add_development_dependency "rake", "~> 10.1.0"
+  s.add_development_dependency "appraisal"
+  s.add_development_dependency "pry"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/duck-model/column_default_ducks_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe 'ColumnDefaultDuck' do
+
+	it "should raise an error if we try to initialise ranked_model on a column with a default value" do
+		expect {
+			class ColumnDefaultDuck < ActiveRecord::Base
+			  include RankedModel
+			  ranks :size, :with_same => :pond
+			end
+		}.to raise_error(RankedModel::NonNilColumnDefault, 'Your ranked model column "size" must not have a default value in the database.')
+	end
+
+	it "should not raise an error if we don't have a database connection when checking for default value" do
+		begin
+			ActiveRecord::Base.remove_connection
+
+			expect {
+				class ColumnDefaultDuck < ActiveRecord::Base
+				  include RankedModel
+				  ranks :size, :with_same => :pond
+				end
+			}.not_to raise_error
+		ensure
+			ActiveRecord::Base.establish_connection(ENV['DB'].to_sym)
+		end
+	end
+
+end

data/spec/duck-model/duck_spec.rb

@@ -8,14 +8,18 @@ describe Duck do
 
   subject { @duck }
 
-  it { subject.respond_to?(:row_position).should be_true }
-  it { subject.respond_to?(:row_position=).should be_true }
-  it { subject.respond_to?(:size_position).should be_true }
-  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 }
+  it { expect(subject).to respond_to(:row_position) }
+  it { expect(subject).to respond_to(:row_position=) }
+  it { expect(subject).to respond_to(:row_rank) }
+  it { expect(subject).to respond_to(:size_position) }
+  it { expect(subject).to respond_to(:size_position=) }
+  it { expect(subject).to respond_to(:size_rank) }
+  it { expect(subject).to respond_to(:age_position) }
+  it { expect(subject).to respond_to(:age_position=) }
+  it { expect(subject).to respond_to(:age_rank) }
+  it { expect(subject).to respond_to(:landing_order_position) }
+  it { expect(subject).to respond_to(:landing_order_position=) }
+  it { expect(subject).to respond_to(:landing_order_rank) }
 
 end
 
@@ -44,9 +48,9 @@ describe Duck do
     }
     @ducks.each { |name, duck|
       duck.reload
-      duck.update_attribute :row_position, 0
-      duck.update_attribute :size_position, 0
-      duck.update_attribute :age_position, 0
+      duck.update :row_position => 0
+      duck.update :size_position => 0
+      duck.update :age_position => 0
       duck.save!
     }
     @ducks.each {|name, duck| duck.reload }
@@ -55,8 +59,8 @@ describe Duck do
   describe "sorting by size on in_shin_pond" do
 
     before {
-      @ducks[:quacky].update_attribute :size_position, 0
-      @ducks[:wingy].update_attribute :size_position, 2
+      @ducks[:quacky].update :size_position => 0
+      @ducks[:wingy].update :size_position => 2
     }
 
     subject { Duck.in_shin_pond.rank(:size).to_a }
@@ -72,8 +76,8 @@ describe Duck do
   describe "sorting by age on Shin pond" do
 
     before {
-      @ducks[:feathers].update_attribute :age_position, 0
-      @ducks[:wingy].update_attribute :age_position, 0
+      @ducks[:feathers].update :age_position => 0
+      @ducks[:wingy].update :age_position => 0
     }
 
     subject { Duck.where(:pond => 'Shin').rank(:age).to_a }
@@ -89,10 +93,10 @@ describe Duck do
   describe "sorting by row" do
 
     before {
-      @ducks[:beaky].update_attribute :row_position, 0
-      @ducks[:webby].update_attribute :row_position, 2
-      @ducks[:waddly].update_attribute :row_position, 2
-      @ducks[:wingy].update_attribute :row_position, 6
+      @ducks[:beaky].update :row_position => 0
+      @ducks[:webby].update :row_position => 2
+      @ducks[:waddly].update :row_position => 2
+      @ducks[:wingy].update :row_position => 6
     }
 
     subject { Duck.rank(:row).to_a }
@@ -108,13 +112,13 @@ describe Duck do
   describe "mixed sorting by" do
 
     before {
-      @ducks[:quacky].update_attribute :size_position, 0
-      @ducks[:beaky].update_attribute :row_position, 0
-      @ducks[:webby].update_attribute :row_position, 2
-      @ducks[:wingy].update_attribute :size_position, 1
-      @ducks[:waddly].update_attribute :row_position, 2
-      @ducks[:wingy].update_attribute :row_position, 6
-      @ducks[:webby].update_attribute :row_position, 6
+      @ducks[:quacky].update :size_position => 0
+      @ducks[:beaky].update :row_position => 0
+      @ducks[:webby].update :row_position => 2
+      @ducks[:wingy].update :size_position => 1
+      @ducks[:waddly].update :row_position => 2
+      @ducks[:wingy].update :row_position => 6
+      @ducks[:webby].update :row_position => 6
     }
 
     describe "row" do
@@ -148,9 +152,9 @@ describe Duck 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)
+      expect(->{
+        duck.update :name => 'New Name'
+      }).to_not change(duck.reload, :age)
       # puts Duck.rank(:age).collect {|duck| "#{duck.name} #{duck.age}" }
     end
 
@@ -161,7 +165,7 @@ describe Duck do
     it "marks record as changed" do
       duck = Duck.rank(:age)[2]
       duck.age_position = 1
-      duck.changed?.should be_true
+      expect(duck.changed?).to be true
     end
 
   end
@@ -172,7 +176,7 @@ describe Duck do
 
     it "doesnt set empty string" do
       subject.age_position = ''
-      subject.age_position.should be_nil
+      expect(subject.age_position).to be_nil
     end
 
   end
@@ -183,7 +187,7 @@ describe Duck do
 
       before {
         @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect {|duck| duck.id }
-        @ducks[:wingy].update_attribute :row_position, 2
+        @ducks[:wingy].update :row_position => 2
       }
 
       context {
@@ -198,9 +202,9 @@ describe Duck do
 
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
-        it { subject[0..1].should == @ordered[0..1] }
+        it { expect(subject[0..1]).to eq(@ordered[0..1]) }
 
-        it { subject[3..subject.length].should == @ordered[2..@ordered.length] }
+        it { expect(subject[3..subject.length]).to eq(@ordered[2..@ordered.length]) }
 
       }
 
@@ -210,7 +214,7 @@ describe Duck do
 
       before {
         @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect {|duck| duck.id }
-        @ducks[:wingy].update_attribute :row_position, 0
+        @ducks[:wingy].update :row_position => 0
       }
 
       context {
@@ -233,7 +237,38 @@ describe Duck do
 
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
-        it { subject[1..subject.length].should == @ordered }
+        it { expect(subject[1..subject.length]).to eq(@ordered) }
+
+      }
+
+    end
+
+    describe "second to last" do
+
+      before {
+        [:quacky, :feathers, :wingy, :webby, :waddly, :beaky].each_with_index do |name, i|
+           Duck.where(id: @ducks[name].id).update_all(row: RankedModel::MAX_RANK_VALUE - i)
+           @ducks[name].reload
+         end
+      }
+
+      context {
+
+        before { @ducks[:wingy].update :row_position => (@ducks.size - 2) }
+
+        subject { Duck.ranker(:row).with(Duck.new).current_at_position(@ducks.size - 2).instance }
+
+        its(:id) { should == @ducks[:wingy].id }
+
+      }
+
+      context {
+
+        before { @ducks[:wingy].update :row_position => :down }
+
+        subject { Duck.ranker(:row).with(Duck.new).current_at_position(@ducks.size - 2).instance }
+
+        its(:id) { should == @ducks[:wingy].id }
 
       }
 
@@ -243,7 +278,7 @@ describe Duck do
 
       before {
         @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect {|duck| duck.id }
-        @ducks[:wingy].update_attribute :row_position, (@ducks.size - 1)
+        @ducks[:wingy].update :row_position => (@ducks.size - 1)
       }
 
       context {
@@ -274,7 +309,7 @@ describe Duck do
 
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
-        it { subject[0..-2].should == @ordered }
+        it { expect(subject[0..-2]).to eq(@ordered) }
 
       }
 
@@ -284,7 +319,7 @@ describe Duck do
 
       before {
         @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect {|duck| duck.id }
-        @ducks[:wingy].update_attribute :row_position, :last
+        @ducks[:wingy].update :row_position => :last
       }
 
       context {
@@ -315,7 +350,7 @@ describe Duck do
 
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
-        it { subject[0..-2].should == @ordered }
+        it { expect(subject[0..-2]).to eq(@ordered) }
 
       }
 
@@ -325,7 +360,7 @@ describe Duck do
 
       before {
         @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect {|duck| duck.id }
-        @ducks[:wingy].update_attribute :row_position, 'last'
+        @ducks[:wingy].update :row_position => 'last'
       }
 
       context {
@@ -356,7 +391,7 @@ describe Duck do
 
         subject { Duck.rank(:row).collect {|duck| duck.id } }
 
-        it { subject[0..-2].should == @ordered }
+        it { expect(subject[0..-2]).to eq(@ordered) }
 
       }
 
@@ -368,7 +403,7 @@ describe Duck do
 
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect { |duck| duck.id }
-          @ducks[:wingy].update_attribute :row_position, :down
+          @ducks[:wingy].update :row_position => :down
         }
 
         context {
@@ -383,9 +418,9 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..3].should == @ordered[0..3] }
+          it { expect(subject[0..3]).to eq(@ordered[0..3]) }
 
-          it { subject[5..subject.length].should == @ordered[4..@ordered.length] }
+          it { expect(subject[5..subject.length]).to eq(@ordered[4..@ordered.length]) }
 
         }
 
@@ -395,7 +430,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:quacky].id).collect { |duck| duck.id }
-          @ducks[:quacky].update_attribute :row_position, :down
+          @ducks[:quacky].update :row_position => :down
         }
 
         context {
@@ -410,7 +445,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..-2].should eq(@ordered) }
+          it { expect(subject[0..-2]).to eq(@ordered) }
 
         }
 
@@ -420,7 +455,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:feathers].id).collect { |duck| duck.id }
-          @ducks[:feathers].update_attribute :row_position, :down
+          @ducks[:feathers].update :row_position => :down
         }
 
         context {
@@ -435,7 +470,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..-2].should eq(@ordered) }
+          it { expect(subject[0..-2]).to eq(@ordered) }
 
         }
 
@@ -449,7 +484,7 @@ describe Duck do
 
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect { |duck| duck.id }
-          @ducks[:wingy].update_attribute :row_position, 'down'
+          @ducks[:wingy].update :row_position => 'down'
         }
 
         context {
@@ -464,9 +499,9 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..3].should == @ordered[0..3] }
+          it { expect(subject[0..3]).to eq(@ordered[0..3]) }
 
-          it { subject[5..subject.length].should == @ordered[4..@ordered.length] }
+          it { expect(subject[5..subject.length]).to eq(@ordered[4..@ordered.length]) }
 
         }
 
@@ -476,7 +511,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:quacky].id).collect { |duck| duck.id }
-          @ducks[:quacky].update_attribute :row_position, 'down'
+          @ducks[:quacky].update :row_position => 'down'
         }
 
         context {
@@ -491,7 +526,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..-2].should eq(@ordered) }
+          it { expect(subject[0..-2]).to eq(@ordered) }
 
         }
 
@@ -501,7 +536,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:feathers].id).collect { |duck| duck.id }
-          @ducks[:feathers].update_attribute :row_position, 'down'
+          @ducks[:feathers].update :row_position => 'down'
         }
 
         context {
@@ -516,7 +551,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..-2].should eq(@ordered) }
+          it { expect(subject[0..-2]).to eq(@ordered) }
 
         }
 
@@ -530,7 +565,7 @@ describe Duck do
 
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect { |duck| duck.id }
-          @ducks[:wingy].update_attribute :row_position, :up
+          @ducks[:wingy].update :row_position => :up
         }
 
         context {
@@ -545,9 +580,9 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..1].should == @ordered[0..1] }
+          it { expect(subject[0..1]).to eq(@ordered[0..1]) }
 
-          it { subject[3..subject.length].should == @ordered[2..@ordered.length] }
+          it { expect(subject[3..subject.length]).to eq(@ordered[2..@ordered.length]) }
 
         }
 
@@ -557,7 +592,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:beaky].id).collect { |duck| duck.id }
-          @ducks[:beaky].update_attribute :row_position, :up
+          @ducks[:beaky].update :row_position => :up
         }
 
         context {
@@ -572,7 +607,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[1..subject.length].should eq(@ordered) }
+          it { expect(subject[1..subject.length]).to eq(@ordered) }
 
         }
 
@@ -582,7 +617,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:waddly].id).collect { |duck| duck.id }
-          @ducks[:waddly].update_attribute :row_position, :up
+          @ducks[:waddly].update :row_position => :up
         }
 
         context {
@@ -597,12 +632,41 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[1..subject.length].should eq(@ordered) }
+          it { expect(subject[1..subject.length]).to eq(@ordered) }
+
+        }
+
+      end
+
+      context "from position without gaps with rebalance" do
+
+        before {
+          [:quacky, :feathers, :wingy, :webby, :waddly, :beaky].each_with_index do |name, i|
+            Duck.where(id: @ducks[name].id).update_all(row: i)
+            @ducks[name].reload
+          end
+          @ducks[:wingy].update :row_position => :up
+        }
+
+        context {
+
+          subject { Duck.ranker(:row).with(Duck.new).current_at_position(1).instance }
+
+          its(:id) { should == @ducks[:wingy].id }
+
+        }
+
+        context {
+
+          subject { Duck.ranker(:row).with(Duck.new).current_at_position(2).instance }
+
+          its(:id) { should == @ducks[:feathers].id }
 
         }
 
       end
 
+
     end
 
     describe "up with string" do
@@ -611,7 +675,7 @@ describe Duck do
 
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:wingy].id).collect { |duck| duck.id }
-          @ducks[:wingy].update_attribute :row_position, 'up'
+          @ducks[:wingy].update :row_position => 'up'
         }
 
         context {
@@ -626,9 +690,9 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[0..1].should == @ordered[0..1] }
+          it { expect(subject[0..1]).to eq(@ordered[0..1]) }
 
-          it { subject[3..subject.length].should == @ordered[2..@ordered.length] }
+          it { expect(subject[3..subject.length]).to eq(@ordered[2..@ordered.length]) }
 
         }
 
@@ -638,7 +702,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:beaky].id).collect { |duck| duck.id }
-          @ducks[:beaky].update_attribute :row_position, 'up'
+          @ducks[:beaky].update :row_position => 'up'
         }
 
         context {
@@ -653,7 +717,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[1..subject.length].should eq(@ordered) }
+          it { expect(subject[1..subject.length]).to eq(@ordered) }
 
         }
 
@@ -663,7 +727,7 @@ describe Duck do
         
         before {
           @ordered = Duck.rank(:row).where(Duck.arel_table[:id].not_eq @ducks[:waddly].id).collect { |duck| duck.id }
-          @ducks[:waddly].update_attribute :row_position, 'up'
+          @ducks[:waddly].update :row_position => 'up'
         }
 
         context {
@@ -678,7 +742,7 @@ describe Duck do
 
           subject { Duck.rank(:row).collect { |duck| duck.id } }
 
-          it { subject[1..subject.length].should eq(@ordered) }
+          it { expect(subject[1..subject.length]).to eq(@ordered) }
 
         }
 
@@ -688,6 +752,71 @@ describe Duck do
 
   end
 
+  describe "fetching rank for an instance" do
+    before {
+      [:quacky, :feathers, :wingy, :webby, :waddly, :beaky].each_with_index do |name, i|
+         Duck.where(id: @ducks[name].id).update_all(row: RankedModel::MAX_RANK_VALUE - i)
+         @ducks[name].reload
+      end
+    }
+
+    context {
+      subject { Duck.find_by(id: @ducks[:beaky]).row_rank }
+
+      it { should == 0 }
+    }
+
+    context {
+      subject { Duck.find_by(id: @ducks[:wingy]).row_rank }
+
+      it { should == 3 }
+    }
+
+    context {
+      subject { Duck.find_by(id: @ducks[:quacky]).row_rank }
+
+      it { should == 5 }
+    }
+  end
+
+  describe "when moving between ponds should work when rebalancing" do
+    before do
+      [:feathers, :wingy, :webby, :waddly, :beaky].each_with_index do |name, i|
+        Duck.where(id: @ducks[name].id)
+          .update_all(age: RankedModel::MIN_RANK_VALUE + i, pond: "Boyden")
+      end
+
+      @ducks[:quacky].update!(age_position: 2, pond: "Boyden")
+    end
+
+    it 'rebalances ranks correctly' do
+      expect(@ducks[:feathers].reload.age_rank).to eq 0
+      expect(@ducks[:quacky].reload.age_rank).to eq 2
+      expect(@ducks[:beaky].reload.age_rank).to eq 5
+    end
+
+    context 'when attempting to update position to a non-unique value' do
+      before do
+        @duck_one = Duck.create(landing_order: RankedModel::MIN_RANK_VALUE,
+                               lake_id: 42, flock_id: 42)
+        # Duck one's landing order will be rebalanced to -715_827_883.
+        # Given a unique index on [:landing_order, :lake_id, :flock_id] we
+        # verify that the operation succeeds despite the value already being
+        # occupied by duck two.
+        @duck_two = Duck.create(landing_order: -715_827_883,
+                                lake_id: 42, flock_id: 42)
+      end
+
+      it 'rebalances ranks correctly' do
+        @ducks[:quacky].update!(landing_order_position: :first,
+                                lake_id: 42, flock_id: 42)
+        expect(@ducks[:quacky].reload.landing_order_rank).to eq 0
+        expect(@duck_one.reload.landing_order_rank).to eq 1
+        expect(@duck_two.reload.landing_order_rank).to eq 2
+      end
+    end
+  end
+
 end
 
 describe Duck do
@@ -721,7 +850,7 @@ describe Duck do
     }
     @ducks.each { |name, duck|
       duck.reload
-      duck.update_attribute :landing_order_position, 0
+      duck.update :landing_order_position => 0
       duck.save!
     }
     @ducks.each {|name, duck| duck.reload }
@@ -730,8 +859,8 @@ describe Duck do
   describe "sorting by landing_order" do
 
     before {
-      @ducks[:quacky].update_attribute :landing_order_position, 0
-      @ducks[:wingy].update_attribute :landing_order_position, 1
+      @ducks[:quacky].update :landing_order_position => 0
+      @ducks[:wingy].update :landing_order_position => 1
     }
 
     subject { Duck.in_lake_and_flock(0,0).rank(:landing_order).to_a }
@@ -755,15 +884,15 @@ describe Duck do
 
       @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
+      @ducks[:quacky].update :landing_order_position => 0
+      @ducks[:wingy].update :landing_order_position => 1
+      @ducks[:feathers].update :landing_order_position => 0
+      @ducks[:wingy].update :landing_order_position => 1
     }
 
     subject { @untouchable_ranks.call }
 
-    it { should == @previous_ranks }
+    it { is_expected.to eq(@previous_ranks) }
 
   end