ranked-model 0.4.4 → 0.4.8

data/lib/ranked-model/version.rb

@@ -1,3 +1,3 @@
 module RankedModel
-  VERSION = "0.4.4"
+  VERSION = "0.4.8"
 end

data/lib/ranked-model.rb

@@ -69,7 +69,7 @@ module RankedModel
     end
 
     def column_default ranker
-      column_defaults[ranker.name.to_s] if ActiveRecord::Base.connected?
+      column_defaults[ranker.name.to_s] if ActiveRecord::Base.connected? && table_exists?
     end
 
   end

data/ranked-model.gemspec

@@ -9,16 +9,16 @@ 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", ">= 4.1.16"
+  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 "rake", ">= 12.3.3"
   s.add_development_dependency "appraisal"
   s.add_development_dependency "pry"
 

data/spec/duck-model/column_default_ducks_spec.rb

@@ -22,7 +22,7 @@ describe 'ColumnDefaultDuck' do
 				end
 			}.not_to raise_error
 		ensure
-			ActiveRecord::Base.establish_connection(DB_CONFIG.to_sym)
+			ActiveRecord::Base.establish_connection(ENV['DB'].to_sym)
 		end
 	end
 

data/spec/duck-model/duck_spec.rb

@@ -48,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 }
@@ -59,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 }
@@ -76,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 }
@@ -93,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 }
@@ -112,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
@@ -153,7 +153,7 @@ describe Duck do
       # puts Duck.rank(:age).collect {|duck| "#{duck.name} #{duck.age}" }
       duck = Duck.rank(:age)[2]
       expect(->{
-        duck.update_attribute :name, 'New Name'
+        duck.update :name => 'New Name'
       }).to_not change(duck.reload, :age)
       # puts Duck.rank(:age).collect {|duck| "#{duck.name} #{duck.age}" }
     end
@@ -187,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 {
@@ -214,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 {
@@ -254,7 +254,7 @@ describe Duck do
 
       context {
 
-        before { @ducks[:wingy].update_attribute :row_position, (@ducks.size - 2) }
+        before { @ducks[:wingy].update :row_position => (@ducks.size - 2) }
 
         subject { Duck.ranker(:row).with(Duck.new).current_at_position(@ducks.size - 2).instance }
 
@@ -264,7 +264,7 @@ describe Duck do
 
       context {
 
-        before { @ducks[:wingy].update_attribute :row_position, :down }
+        before { @ducks[:wingy].update :row_position => :down }
 
         subject { Duck.ranker(:row).with(Duck.new).current_at_position(@ducks.size - 2).instance }
 
@@ -278,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 {
@@ -319,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 {
@@ -360,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 {
@@ -403,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 {
@@ -430,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 {
@@ -455,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 {
@@ -484,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 {
@@ -511,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 {
@@ -536,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 {
@@ -565,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 {
@@ -592,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 {
@@ -617,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 {
@@ -645,7 +645,7 @@ describe Duck do
             Duck.where(id: @ducks[name].id).update_all(row: i)
             @ducks[name].reload
           end
-          @ducks[:wingy].update_attribute :row_position, :up
+          @ducks[:wingy].update :row_position => :up
         }
 
         context {
@@ -675,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 {
@@ -702,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 {
@@ -727,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 {
@@ -779,6 +779,44 @@ describe Duck do
     }
   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
@@ -812,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 }
@@ -821,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 }
@@ -846,10 +884,10 @@ 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 }

data/spec/duck-model/lots_of_ducks_spec.rb

@@ -5,7 +5,7 @@ describe Duck do
   before {
     200.times do |i|
       Duck.create \
-        :name => "Duck #{i}"
+        :name => "Duck #{i + 1}"
     end
   }
 
@@ -29,7 +29,7 @@ describe Duck 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 }
@@ -42,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 }
@@ -55,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 }
@@ -68,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 }
@@ -87,8 +87,8 @@ 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 {
@@ -105,13 +105,13 @@ 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.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 {
@@ -133,8 +133,8 @@ 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 {
@@ -149,34 +149,30 @@ describe Duck do
 
     describe "with no more gaps" do
 
-      before {
+      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(4).first
-        @fifth = Duck.rank(:row).offset(5).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, @fifth.id])).
+          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, @fifth.id])).
+          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)
-        Duck.where(id: @fifth.id).update_all row: @third.row
-        @fourth.update_attribute :row, @third.row
-      }
-
-      context {
-
-        subject { Duck.rank(:row).collect {|d| d.id } }
-
-        it { is_expected.to eq([@first.id] + @lower + [@fourth.id, @third.id, @fifth.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/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

@@ -14,8 +14,8 @@ describe Number do
       @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_attribute :order, RankedModel::MAX_RANK_VALUE
-      @second.update_attribute :order, RankedModel::MAX_RANK_VALUE
+      @first.update :order => RankedModel::MAX_RANK_VALUE
+      @second.update :order => RankedModel::MAX_RANK_VALUE
     }
 
     context {
@@ -28,4 +28,12 @@ describe Number do
 
   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/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