ranked-model 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c342543b3341c81d62ceca340fc0966a3386a6115fc2ee36f309582995f8af52
-  data.tar.gz: 25408af509201219ce0539dbfe3324c8b3806bce367d3e00b80a2f15dc6e7dc4
+  metadata.gz: 608245c9f9eeed1d195c18efd1df0b32d5593465d581f269e20fb8b8867a1260
+  data.tar.gz: 83a935d3b960f7acf48ada59f9e87962ab04b40d75c9af50b3ddf5dc6c5dfe5b
 SHA512:
-  metadata.gz: 139bcf7c985b68e017e03bb3718a4377ec878ec7b249ac32ad20900d1467e5026a093e82725f8e39e1d8a378a7db0959f6a37f7571d1bccae40e9b8f70244a55
-  data.tar.gz: ca739746fb067e6de9ae52bcb08f352fcdf676a02063e04f5d3b5f3b8a54d773ff57227d5dc5fca7c6d402155920b3da39c73d83d495680ff988f67248fac321
+  metadata.gz: 9ea50e38ff89431cfcf314144141f44b7aec03dc91aa8d45db24975f2a191bc0457c032511a8cc798fc10646ca29e8e35c011dcaed5adbf0d1344bb84e5469ef
+  data.tar.gz: 9e2d0cadcc12b87d1602d40ef0eb8a6e2f23eff6270a841ffcdd2cd06ed74b49d40e8bfd9c49ace0680f08b73f06a3980de413aec425e2104b16fa5b5a9b7e71

data/Appraisals

@@ -4,6 +4,7 @@ appraise "rails-4-2" do
   end
   group :mysql do
     gem "mysql2", "~> 0.4.0", platform: :ruby
+    gem "jdbc-mysql", "~> 5.1.47", platform: :jruby
     gem "activerecord-jdbcmysql-adapter", "~> 1.3.24", platform: :jruby
   end
   group :postgresql do

data/gemfiles/rails_4_2.gemfile

@@ -16,6 +16,7 @@ end
 
 group :mysql do
   gem "mysql2", "~> 0.4.0", platform: :ruby
+  gem "jdbc-mysql", "~> 5.1.47", platform: :jruby
   gem "activerecord-jdbcmysql-adapter", "~> 1.3.24", platform: :jruby
 end
 

data/lib/ranked-model/ranker.rb

@@ -69,6 +69,10 @@ module RankedModel
           update_all(ranker.column => value)
       end
 
+      def reset_ranks!
+        finder.update_all(ranker.column => nil)
+      end
+
       def position
         instance.send "#{ranker.name}_position"
       end
@@ -209,31 +213,35 @@ module RankedModel
       end
 
       def rebalance_ranks
-        if rank && instance.persisted?
-          origin = current_order.index { |item| item.instance.id == instance.id }
-          if origin
-            destination = current_order.index { |item| rank <= item.rank }
-            destination -= 1 if origin < destination
-
-            current_order.insert destination, current_order.delete_at(origin)
+        ActiveRecord::Base.transaction do
+          if rank && instance.persisted?
+            origin = current_order.index { |item| item.instance.id == instance.id }
+            if origin
+              destination = current_order.index { |item| rank <= item.rank }
+              destination -= 1 if origin < destination
+
+              current_order.insert destination, current_order.delete_at(origin)
+            end
           end
-        end
 
-        gaps = current_order.size + 1
-        range = (RankedModel::MAX_RANK_VALUE - RankedModel::MIN_RANK_VALUE).to_f
-        gap_size = (range / gaps).ceil
+          gaps = current_order.size + 1
+          range = (RankedModel::MAX_RANK_VALUE - RankedModel::MIN_RANK_VALUE).to_f
+          gap_size = (range / gaps).ceil
 
-        current_order.each.with_index(1) do |item, position|
-          new_rank = (gap_size * position) + RankedModel::MIN_RANK_VALUE
+          reset_ranks!
 
-          if item.instance.id == instance.id
-            rank_at new_rank
-          else
-            item.update_rank! new_rank
+          current_order.each.with_index(1) do |item, position|
+            new_rank = (gap_size * position) + RankedModel::MIN_RANK_VALUE
+
+            if item.instance.id == instance.id
+              rank_at new_rank
+            else
+              item.update_rank! new_rank
+            end
           end
-        end
 
-        reset_cache
+          reset_cache
+        end
       end
 
       def finder(order = :asc)

data/lib/ranked-model/version.rb

@@ -1,3 +1,3 @@
 module RankedModel
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/spec/duck-model/duck_spec.rb

@@ -780,33 +780,41 @@ describe Duck do
   end
 
   describe "when moving between ponds should work when rebalancing" do
-
-    before {
+    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")
-        @ducks[name].reload
+        Duck.where(id: @ducks[name].id)
+          .update_all(age: RankedModel::MIN_RANK_VALUE + i, pond: "Boyden")
       end
 
-      Duck.find_by(id: @ducks[:quacky]).update!(age_position: 2, pond: "Boyden")
-    }
-
-    context {
-      subject { Duck.find_by(id: @ducks[:feathers]).age_rank }
-
-      it { should == 0 }
-    }
-
-    context {
-      subject { Duck.find_by(id: @ducks[:quacky]).age_rank }
+      @ducks[:quacky].update!(age_position: 2, pond: "Boyden")
+    end
 
-      it { should == 2 }
-    }
+    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 {
-      subject { Duck.find_by(id: @ducks[:beaky]).age_rank }
+    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 { should == 5 }
-    }
+      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

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
   }
 
@@ -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 :row => RankedModel::MIN_RANK_VALUE
-        @second.update :row => RankedModel::MAX_RANK_VALUE
-        @third.update :row => (RankedModel::MAX_RANK_VALUE / 2)
-        Duck.where(id: @fifth.id).update_all row: @third.row
-        @fourth.update :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/support/active_record.rb

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ranked-model
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Matthew Beale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord