ranked-model 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 608245c9f9eeed1d195c18efd1df0b32d5593465d581f269e20fb8b8867a1260
-  data.tar.gz: 83a935d3b960f7acf48ada59f9e87962ab04b40d75c9af50b3ddf5dc6c5dfe5b
+  metadata.gz: 8dac9a4acefc5a44cfe74e77931854bb8edd031cc986f3bc0bd8232f543dc0f9
+  data.tar.gz: 9bd6120114a23ef47ae08581b860cd0cb4fa18779fb237b9b9570d94a889cc75
 SHA512:
-  metadata.gz: 9ea50e38ff89431cfcf314144141f44b7aec03dc91aa8d45db24975f2a191bc0457c032511a8cc798fc10646ca29e8e35c011dcaed5adbf0d1344bb84e5469ef
-  data.tar.gz: 9e2d0cadcc12b87d1602d40ef0eb8a6e2f23eff6270a841ffcdd2cd06ed74b49d40e8bfd9c49ace0680f08b73f06a3980de413aec425e2104b16fa5b5a9b7e71
+  metadata.gz: dc8d0ad9348de7596934a2eab69da78228c3351bd4d16303eae592b3893ecfedc28ff4620997977e8a88dc9d26dc27999c99e6e2abddc7ab6fe1f24aeb108527
+  data.tar.gz: 03a77db0fc8e9f59b4ffaccf24c966a54125141ab07a931046387e30cf62b7bf0577d9d983d268322dc69a7004c68c001168083d428cffff118832085afe3d21

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 cache: bundler
-sudo: false
 before_install:
   - gem update --system
   - gem install bundler
@@ -8,9 +7,11 @@ before_script:
   - mysql -e 'create database ranked_model_test;'
   - psql -c 'create database ranked_model_test;' -U postgres
 rvm:
-  - 2.4.4
-  - 2.5.1
-  - 2.6.4
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
   - jruby-9.1.17.0
 env:
   - DB=sqlite
@@ -27,9 +28,24 @@ gemfile:
   - gemfiles/rails_6_0.gemfile
 matrix:
   exclude:
+    # Rails <6 does not support Ruby 3, see:
+    # https://github.com/rails/rails/issues/40938#issuecomment-751898275
+    - rvm: 3.0
+      gemfile: gemfiles/rails_4_2.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/rails_5_2.gemfile
+    # Ruby ≥2.7 uses a `bigdecimal` version that doesn't support BigDecimal.new
+    # that Rails 4.2 uses. See also:
+    # https://github.com/ruby/bigdecimal#which-version-should-you-select
+    - rvm: 2.7
+      gemfile: gemfiles/rails_4_2.gemfile
     - rvm: jruby-9.1.17.0
       gemfile: gemfiles/rails_5_2.gemfile
-    - rvm: 2.4.4
+    - rvm: 2.4
       gemfile: gemfiles/rails_6_0.gemfile
     - rvm: jruby-9.1.17.0
       gemfile: gemfiles/rails_6_0.gemfile

data/Gemfile

@@ -8,7 +8,7 @@ group :sqlite do
 end
 
 group :postgresql do
-  gem "pg", "~> 1.1.4", platform: :ruby
+  gem "pg", "~> 1.2.0", platform: :ruby
 end
 
 group :mysql do

data/Readme.mkd

@@ -1,13 +1,11 @@
-**ranked-model** is a modern row sorting library built for Rails 3, 4 and 5.  It uses ARel aggressively and is better optimized than most other libraries.
+**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.
 
 [![Build Status](https://travis-ci.org/mixonic/ranked-model.png)](https://travis-ci.org/mixonic/ranked-model)
 
 Installation
 ------------
 
-ranked-model passes specs with Rails 4.2, 5.0, 5.1, 5.2, 6.0 for MySQL, Postgres, and SQLite on Ruby 2.4 through 2.6, and jruby-9.1.17.0 where Rails supports the platform. This is with the exception of Postgres before Rails 4.0 on all platforms, which is unsupported by `ranked-model`. Note that the `pg` gem has pulled support for rbx (Rubinius) from version 1 onward.
-
-TL;DR, if you are using Rails 4 and up you are 100% good to go. Before Rails 4, be wary of Postgres.
+ranked-model passes specs with Rails 4.2, 5.0, 5.1, 5.2 and 6.0 for MySQL, Postgres, and SQLite on Ruby 2.4 through 3.0 (with exceptions, please check the CI setup for supported combinations), and jruby-9.1.17.0 where Rails supports the platform.
 
 To install ranked-model, just add it to your `Gemfile`:
 
@@ -16,7 +14,7 @@ gem 'ranked-model'
 
 # Or pin ranked-model to git
 # gem 'ranked-model',
-#   :git => 'git@github.com:mixonic/ranked-model.git'
+#   git: 'git@github.com:mixonic/ranked-model.git'
 ```
 
 Then use `bundle install` to update your `Gemfile.lock`.
@@ -31,6 +29,18 @@ class Duck < ActiveRecord::Base
 end
 ```
 
+Give them an order (integer column):
+
+```bash
+rails g migration AddRowOrderToDucks row_order:integer
+rails db:migrate
+```
+
+**IMPORTANT: The `_order` table column MUST allow null values. For the reason behind this requirement see [issue#167](https://github.com/mixonic/ranked-model/issues/167)**
+
+
+
+
 Put your ducks in a row:
 
 ``` ruby
@@ -42,7 +52,7 @@ class Duck < ActiveRecord::Base
 end
 ```
 
-This simple example assumes an integer column called `row_order`.  To order Ducks by this order:
+Order the Ducks by this order:
 
 ``` ruby
 Duck.rank(:row_order).all
@@ -52,7 +62,7 @@ The ranking integers stored in the `row_order` column will be big and spaced apa
 implement a sorting UI, just update the resource by appending the column name with `_position` and indicating the desired position:
 
 ``` ruby
-@duck.update :row_order_position => 0  # or 1, 2, 37. :first, :last, :up and :down are also valid
+@duck.update row_order_position: 0  # or 1, 2, 37. :first, :last, :up and :down are also valid
 ```
 
 **IMPORTANT: Note that you MUST append _position to the column name when setting a new position on an instance. This is a fake column that can take relative as well as absolute index-based values for position.**
@@ -92,19 +102,27 @@ class Duck < ActiveRecord::Base
   include RankedModel
 
   ranks :row_order,                  # Name this ranker, used with rank()
-    :column => :sort_order           # Override the default column, which defaults to the name
+    column: :sort_order              # Override the default column, which defaults to the name
 
   belongs_to :pond
   ranks :swimming_order,
-    :with_same => :pond_id           # Ducks belong_to Ponds, make the ranker scoped to one pond
+    with_same: :pond_id              # Ducks belong_to Ponds, make the ranker scoped to one pond
 
   ranks :row_order,
-    :with_same => [:pond_id, :breed] # Lets rank them by breed
+    with_same: [:pond_id, :breed]    # Lets rank them by breed
 
-  scope :walking, where(:walking => true )
+  scope :walking, where(walking: true )
   ranks :walking_order,
-    :scope => :walking               # Narrow this ranker to a scope
+    scope: :walking                  # Narrow this ranker to a scope
+
+  belongs_to :parent, class_name: 'Duck', optional: true
+  ranks :child_order,
+    unless: :has_no_parent?,         # Rank only ducks that have a parent. Alternatively a Proc or lambda can be passed, e.g. proc { parent.nil? }
+    with_same: :parent_id
 
+  def has_no_parent?
+    parent.nil?
+  end
 end
 ```
 
@@ -172,6 +190,35 @@ truck.row_order
 => 4194304
 ```
 
+Migrations for existing data
+----------------------------
+
+If you use `ranked_model` with existing data, the following migration (for Rails
+6) can be a starting point. Make sure to declare `include RankedModel` and
+`ranks :row_order` in your `Duck` before running the migration.
+
+```bash
+rails g migration AddRowOrderToDucks row_order:integer
+```
+
+Then, adjust the migration:
+```ruby
+# e.g. file db/migrate/20200325095038_add_row_order_to_ducks.rb
+class AddRowOrderToDucks < ActiveRecord::Migration[6.0]
+  def change
+    add_column :ducks, :row_order, :integer
+
+    # Newest Duck shall rank "highest"" (be last).
+    Duck.update_all('row_order = EXTRACT(EPOCH FROM created_at)')
+
+    # Alternatively, implement any other sorting default
+    # Duck.order(created_at: :desc).desc.each do |duck|
+    #   duck.update!(row_order: duck.created_at.to_i + duck.age / 2)
+    # end
+  end
+end
+```
+
 Internals
 ---------
 
@@ -189,6 +236,8 @@ Contributing
 
 Fork, clone, write a test, write some code, commit, push, send a pull request.  Github FTW!
 
+The code is published under the [MIT License](LICENSE).
+
 The specs can be run with sqlite, postgres, and mysql:
 
 ```

data/gemfiles/rails_5_0.gemfile

@@ -10,7 +10,7 @@ group :sqlite do
 end
 
 group :postgresql do
-  gem "pg", "~> 1.1.4", platform: :ruby
+  gem "pg", "~> 1.2.0", platform: :ruby
   gem "activerecord-jdbcpostgresql-adapter", "~> 50.0", platform: :jruby
 end
 

data/gemfiles/rails_5_1.gemfile

@@ -10,7 +10,7 @@ group :sqlite do
 end
 
 group :postgresql do
-  gem "pg", "~> 1.1.4", platform: :ruby
+  gem "pg", "~> 1.2.0", platform: :ruby
   gem "activerecord-jdbcpostgresql-adapter", "~> 51.0", platform: :jruby
 end
 

data/gemfiles/rails_5_2.gemfile

@@ -10,7 +10,7 @@ group :sqlite do
 end
 
 group :postgresql do
-  gem "pg", "~> 1.1.4", platform: :ruby
+  gem "pg", "~> 1.2.0", platform: :ruby
   gem "activerecord-jdbcpostgresql-adapter", "~> 52.0", platform: :jruby
 end
 

data/gemfiles/rails_6_0.gemfile

@@ -10,7 +10,7 @@ group :sqlite do
 end
 
 group :postgresql do
-  gem "pg", "~> 1.1.4", platform: :ruby
+  gem "pg", "~> 1.2.0", platform: :ruby
   gem "activerecord-jdbcpostgresql-adapter", "~> 60.0", platform: :jruby
 end
 

data/lib/ranked-model/ranker.rb

@@ -78,7 +78,9 @@ module RankedModel
       end
 
       def relative_rank
-        finder.where("#{ranker.column} < #{rank}").count(:all)
+        escaped_column = instance_class.connection.quote_column_name ranker.column
+
+        finder.where("#{escaped_column} < #{rank}").count(:all)
       end
 
       def rank
@@ -187,7 +189,7 @@ module RankedModel
 
       def rearrange_ranks
         _scope = finder
-        escaped_column = ActiveRecord::Base.connection.quote_column_name ranker.column
+        escaped_column = instance_class.connection.quote_column_name ranker.column
         # If there is room at the bottom of the list and we're added to the very top of the list...
         if current_first.rank && current_first.rank > RankedModel::MIN_RANK_VALUE && rank == RankedModel::MAX_RANK_VALUE
           # ...then move everyone else down 1 to make room for us at the end

data/lib/ranked-model/version.rb

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

data/spec/number-model/number_spec.rb

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

metadata

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