ranked-model 0.4.2 → 0.4.7

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/spec_helper.rb

@@ -29,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
@@ -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 = ENV["DB"] || "sqlite"
+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.to_sym)
+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
@@ -142,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ranked-model
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.7
 platform: ruby
 authors:
 - Matthew Beale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-09 00:00:00.000000000 Z
+date: 2021-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ranked-model is a modern row sorting library built for Rails 3 & 4. It
+description: 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.
 email:
 - matt.beale@madhatted.com
@@ -138,18 +138,18 @@ files:
 - LICENSE
 - Rakefile
 - Readme.mkd
-- gemfiles/rails_3_2.gemfile
-- gemfiles/rails_4_1.gemfile
 - gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
 - lib/ranked-model.rb
 - lib/ranked-model/railtie.rb
 - lib/ranked-model/ranker.rb
 - lib/ranked-model/version.rb
 - rails/init.rb
 - ranked-model.gemspec
+- spec/duck-model/column_default_ducks_spec.rb
 - spec/duck-model/duck_spec.rb
 - spec/duck-model/lots_of_ducks_spec.rb
 - spec/duck-model/wrong_ducks_spec.rb
@@ -183,12 +183,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: An acts_as_sortable replacement built for Rails 3 & 4
+summary: An acts_as_sortable replacement built for Rails 4.2+
 test_files:
+- spec/duck-model/column_default_ducks_spec.rb
 - spec/duck-model/duck_spec.rb
 - spec/duck-model/lots_of_ducks_spec.rb
 - spec/duck-model/wrong_ducks_spec.rb

data/gemfiles/rails_3_2.gemfile

@@ -1,22 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 3.2.22.5"
-
-group :sqlite do
-  gem "sqlite3", platform: :ruby
-  gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
-end
-
-group :mysql do
-  gem "mysql2", "~> 0.3.21", platform: :ruby
-  gem "activerecord-jdbcmysql-adapter", "~> 1.3.24", platform: :jruby
-end
-
-group :postgresql do
-  gem "pg", "~> 0.18.0", platform: :ruby
-  gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.24", platform: :jruby
-end
-
-gemspec path: "../"