ranked-model 0.4.4 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e92bbed2da4ae8cd7a3705fed451fb73a27b6eee
-  data.tar.gz: da248775ef6a763b5a6342587fd5343c06db9adb
+SHA256:
+  metadata.gz: '004680e8b292451d304375f3ae01d0100702db74867d93b2a713e7c908241d78'
+  data.tar.gz: cc831e2837ba8ad07c21f6b890959e071005824a4f53bd51c135c8055fb1904f
 SHA512:
-  metadata.gz: 638948178a3dd3c45bdc811e43ea8b5ca2cd8401ae7a74124c97e2cf09d5a68381bcce5e810db1d42b311281a07633cfb69946c0994e8f1a1675fb564501e70b
-  data.tar.gz: 3d37e0b29d0aac037f6ca3edf7258ffac9b17aefa55f46f472d0789999eddf37e5258ea30969a94d7f1543a95e63bf964d40b0d4c517354f6e64b057f1054cc0
+  metadata.gz: d4494e9eede725ef30ecbd05006a4d91deb89f62aced56b96fa3be2f0f5732f41336d5a3d1c450e3f5d2c0f1821a15de096a1ee68732d8cb5d10a300008270ca
+  data.tar.gz: 04fa0d21ff8b2c6533ebc6705cc00c7258bd955c88a91636995d362136de9cf2a57c6e8ca49c43e112757e1209dc9a9fe3c2285b2bfde47639bcab90d2368fd4

data/.gitignore

@@ -5,3 +5,4 @@ pkg/*
 
 Gemfile.lock
 *.gemfile.lock
+.ruby-version

data/.rspec

@@ -1,2 +1,3 @@
 --color
+--warnings
 --format documentation

data/.travis.yml

@@ -1,49 +1,56 @@
-sudo: false # use newer travis infrastructure
 language: ruby
 cache: bundler
 before_install:
-  - gem install bundler -v 1.16.1
+  - gem update --system
+  - gem install bundler
 before_script:
   - mysql -e 'create database ranked_model_test;'
   - psql -c 'create database ranked_model_test;' -U postgres
 rvm:
-  - 1.9.3
-  - 2.1.10
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+  - 3.0
   - jruby-9.1.17.0
-  - rbx-3.107
 env:
   - DB=sqlite
   - DB=mysql
   - DB=postgresql
+services:
+  - mysql
+  - postgresql
 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
+  - gemfiles/rails_6_1.gemfile
 matrix:
   exclude:
-    - rvm: 1.9.3
+    # 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: 1.9.3
+    - rvm: 3.0
       gemfile: gemfiles/rails_5_1.gemfile
-    - rvm: 1.9.3
-      gemfile: gemfiles/rails_5_2.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails_5_1.gemfile
-    - rvm: 2.1.10
+    - 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
-      gemfile: gemfiles/rails_4_1.gemfile
-    - rvm: 2.5.1
-      gemfile: gemfiles/rails_4_1.gemfile
-    - rvm: rbx-3.107
-      gemfile: gemfiles/rails_5_2.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: jruby-9.1.17.0
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/rails_6_1.gemfile
+    - rvm: jruby-9.1.17.0
+      gemfile: gemfiles/rails_6_1.gemfile

data/Appraisals

@@ -1,81 +1,86 @@
-appraise "rails-4-1" do
+appraise "rails-4-2" do
   group :sqlite do
-    gem "sqlite3", "~> 1.3.13", platform: :ruby
     gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
   end
   group :mysql do
-    gem "mysql2", "~> 0.3.21", platform: :ruby
+    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
-    gem "pg", "~> 0.18.0", platform: :ruby
+    gem "pg", "~> 0.18.4", platform: :ruby
     gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.24", platform: :jruby
   end
 
-  gem "activerecord", "~> 4.1.16"
+  gem "activerecord", "~> 4.2.0"
 end
 
-appraise "rails-4-2" do
+appraise "rails-5-0" do
   group :sqlite do
-    gem "sqlite3", "~> 1.3.13", platform: :ruby
-    gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
+    gem "activerecord-jdbcsqlite3-adapter", "~> 50.0", platform: :jruby
   end
   group :mysql do
-    gem "mysql2", "~> 0.4.10", platform: :ruby
-    gem "activerecord-jdbcmysql-adapter", "~> 1.3.24", platform: :jruby
+    gem "activerecord-jdbcmysql-adapter", "~> 50.0", platform: :jruby
   end
   group :postgresql do
-    gem "pg", "~> 0.18.0", platform: :ruby
-    gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.24", platform: :jruby
+    gem "activerecord-jdbcpostgresql-adapter", "~> 50.0", platform: :jruby
   end
 
-  gem "activerecord", "~> 4.2.10"
+  gem "activerecord", "~> 5.0.0"
 end
 
-appraise "rails-5-0" do
+appraise "rails-5-1" do
   group :sqlite do
-    gem "sqlite3", "~> 1.3.13", platform: :ruby
-    gem "activerecord-jdbcsqlite3-adapter", "~> 50.1", platform: :jruby
+    gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
   end
   group :mysql do
-    gem "mysql2", "~> 0.4.10", platform: :ruby
-    gem "activerecord-jdbcmysql-adapter", "~> 50.1", platform: :jruby
+    gem "activerecord-jdbcmysql-adapter", "~> 51.0", platform: :jruby
   end
   group :postgresql do
-    gem "pg", "~> 0.21.0", platform: :ruby
-    gem "activerecord-jdbcpostgresql-adapter", "~> 50.1", platform: :jruby
+    gem "activerecord-jdbcpostgresql-adapter", "~> 51.0", platform: :jruby
   end
 
-  gem "activerecord", "~> 5.0.7"
+  gem "activerecord", "~> 5.1.0"
 end
 
-appraise "rails-5-1" do
+appraise "rails-5-2" do
   group :sqlite do
-    gem "sqlite3", "~> 1.3.13", platform: :ruby
-    gem "activerecord-jdbcsqlite3-adapter", "~> 51.1", platform: :jruby
+    gem "activerecord-jdbcsqlite3-adapter", "~> 52.0", platform: :jruby
   end
   group :mysql do
-    gem "mysql2", "~> 0.4.10", platform: :ruby
-    gem "activerecord-jdbcmysql-adapter", "~> 51.1", platform: :jruby
+    gem "activerecord-jdbcmysql-adapter", "~> 52.0", platform: :jruby
   end
   group :postgresql do
-    gem "pg", "~> 0.21.0", platform: :ruby
-    gem "activerecord-jdbcpostgresql-adapter", "~> 51.1", platform: :jruby
+    gem "activerecord-jdbcpostgresql-adapter", "~> 52.0", platform: :jruby
   end
 
-  gem "activerecord", "~> 5.1.6"
+  gem "activerecord", "~> 5.2.0"
 end
 
-appraise "rails-5-2" do
+appraise "rails-6-0" do
   group :sqlite do
-    gem "sqlite3", "~> 1.3.13", platform: :ruby
+    gem "sqlite3", "~> 1.4", platform: :ruby
+    gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platform: :jruby
   end
   group :mysql do
-    gem "mysql2", "~> 0.4.10", platform: :ruby
+    gem "activerecord-jdbcmysql-adapter", "~> 60.0", platform: :jruby
   end
   group :postgresql do
-    gem "pg", "~> 0.21.0", platform: :ruby
+    gem "activerecord-jdbcpostgresql-adapter", "~> 60.0", platform: :jruby
   end
+  gem "activerecord", "~> 6.0.0"
+end
 
-  gem "activerecord", "~> 5.2.0"
-end
+appraise "rails-6-1" do
+  group :sqlite do
+    gem "sqlite3", "~> 1.4", platform: :ruby
+    gem "activerecord-jdbcsqlite3-adapter", "~> 61.0", platform: :jruby
+  end
+  group :mysql do
+    gem "activerecord-jdbcmysql-adapter", "~> 61.0", platform: :jruby
+  end
+  group :postgresql do
+    gem "activerecord-jdbcpostgresql-adapter", "~> 61.0", platform: :jruby
+  end
+  gem "activerecord", "~> 6.1.0"
+end

data/Gemfile

@@ -2,3 +2,15 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in ranked-model.gemspec
 gemspec
+
+group :sqlite do
+  gem "sqlite3", platform: :ruby
+end
+
+group :postgresql do
+  gem "pg", platform: :ruby
+end
+
+group :mysql do
+  gem "mysql2", platform: :ruby
+end

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.1, 4.2, 5.0, 5.1 and 5.2 for MySQL, Postgres, and SQLite on Ruby 1.9.3, 2.1 through 2.5, jruby-9.1.17.0, and rbx-3.107 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, 6.0 and 6.1 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_attribute :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).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_4_2.gemfile

@@ -2,21 +2,22 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 4.2.10"
+gem "activerecord", "~> 4.2.0"
 
 group :sqlite do
   gem "sqlite3", "~> 1.3.13", platform: :ruby
   gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.24", platform: :jruby
 end
 
-group :mysql do
-  gem "mysql2", "~> 0.4.10", platform: :ruby
-  gem "activerecord-jdbcmysql-adapter", "~> 1.3.24", platform: :jruby
-end
-
 group :postgresql do
-  gem "pg", "~> 0.18.0", platform: :ruby
+  gem "pg", "~> 0.18.4", platform: :ruby
   gem "activerecord-jdbcpostgresql-adapter", "~> 1.3.24", platform: :jruby
 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
+
 gemspec path: "../"

data/gemfiles/rails_5_0.gemfile

@@ -2,21 +2,21 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.7"
+gem "activerecord", "~> 5.0.0"
 
 group :sqlite do
   gem "sqlite3", "~> 1.3.13", platform: :ruby
-  gem "activerecord-jdbcsqlite3-adapter", "~> 50.1", platform: :jruby
+  gem "activerecord-jdbcsqlite3-adapter", "~> 50.0", platform: :jruby
 end
 
-group :mysql do
-  gem "mysql2", "~> 0.4.10", platform: :ruby
-  gem "activerecord-jdbcmysql-adapter", "~> 50.1", platform: :jruby
+group :postgresql do
+  gem "pg", "~> 1.2.0", platform: :ruby
+  gem "activerecord-jdbcpostgresql-adapter", "~> 50.0", platform: :jruby
 end
 
-group :postgresql do
-  gem "pg", "~> 0.21.0", platform: :ruby
-  gem "activerecord-jdbcpostgresql-adapter", "~> 50.1", platform: :jruby
+group :mysql do
+  gem "mysql2", "~> 0.5.0", platform: :ruby
+  gem "activerecord-jdbcmysql-adapter", "~> 50.0", platform: :jruby
 end
 
 gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -2,21 +2,21 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.1.6"
+gem "activerecord", "~> 5.1.0"
 
 group :sqlite do
   gem "sqlite3", "~> 1.3.13", platform: :ruby
-  gem "activerecord-jdbcsqlite3-adapter", "~> 51.1", platform: :jruby
+  gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
 end
 
-group :mysql do
-  gem "mysql2", "~> 0.4.10", platform: :ruby
-  gem "activerecord-jdbcmysql-adapter", "~> 51.1", platform: :jruby
+group :postgresql do
+  gem "pg", "~> 1.2.0", platform: :ruby
+  gem "activerecord-jdbcpostgresql-adapter", "~> 51.0", platform: :jruby
 end
 
-group :postgresql do
-  gem "pg", "~> 0.21.0", platform: :ruby
-  gem "activerecord-jdbcpostgresql-adapter", "~> 51.1", platform: :jruby
+group :mysql do
+  gem "mysql2", "~> 0.5.0", platform: :ruby
+  gem "activerecord-jdbcmysql-adapter", "~> 51.0", platform: :jruby
 end
 
 gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -6,14 +6,17 @@ gem "activerecord", "~> 5.2.0"
 
 group :sqlite do
   gem "sqlite3", "~> 1.3.13", platform: :ruby
+  gem "activerecord-jdbcsqlite3-adapter", "~> 52.0", platform: :jruby
 end
 
-group :mysql do
-  gem "mysql2", "~> 0.4.10", platform: :ruby
+group :postgresql do
+  gem "pg", "~> 1.2.0", platform: :ruby
+  gem "activerecord-jdbcpostgresql-adapter", "~> 52.0", platform: :jruby
 end
 
-group :postgresql do
-  gem "pg", "~> 0.21.0", platform: :ruby
+group :mysql do
+  gem "mysql2", "~> 0.5.0", platform: :ruby
+  gem "activerecord-jdbcmysql-adapter", "~> 52.0", platform: :jruby
 end
 
 gemspec path: "../"

data/gemfiles/rails_6_0.gemfile

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

data/gemfiles/rails_6_1.gemfile

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