sortability 0.1.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8de084b141765cc5613a436a6573b6a370d535c3
-  data.tar.gz: 20c7a9f1951fa31c5840cb12c8046d2c734536ce
+SHA256:
+  metadata.gz: e811a6edc06dbfee9c4432f0b81eec7a36aec4cf07e40e5604f397f84a62007f
+  data.tar.gz: 172646fbe4de26f3def8354d671378a9fc5d6faea2b95757d0973c06c6e9de43
 SHA512:
-  metadata.gz: 5d1313f9b10346d6f2dd1d5506ab6b9a24cba540ff0fdef6b388ed32631e4aaa7cb2c9b5a0949971a6dd7e19e26020d2023a18a78036d7f0e8f4d066398d3ced
-  data.tar.gz: a9fb6ac2194be7a270f51d5bdf6a48a781389f3365d4c14b239d3ab028cbaed4952e8ae449766349a8674037bb0be6c548e0ed001e96055b470bd41c1308b1c0
+  metadata.gz: 6844492fe3c495616404aa9cf5edcda32fd8082d6c3a515f706e2b64710a9e8cc459c5845647d26ab8b9f65599af332bc56c085f0cae670072fddd8293cdfadb
+  data.tar.gz: 118dd54f18ad0de05bab919d8f65dddeb0de04861fdb1b3be819ca57fce7b4b00a71531e407f3c37299ca19a293154d497c752293c7ba8093144be1a4f98f67e

data/README.md

@@ -49,7 +49,7 @@ $ rails g migration add_sort_position_to_records
 In this migration, you will want something similar to this:
 
 ```rb
-class AddSortPositionToRecords < ActiveRecord::Migration
+class AddSortPositionToRecords < ActiveRecord::Migration[4.2]
   def change
     add_sortable_column :records # , on: :sort_position
     add_sortable_index :records, scope: :container_id # , on: :sort_position
@@ -65,7 +65,7 @@ but you should still create the index using `add_sortable_index`
 to ensure that the index covers the appropriate column(s):
 
 ```rb
-class CreateRecords < ActiveRecord::Migration
+class CreateRecords < ActiveRecord::Migration[4.2]
   def change
     create_table :records do |t|
       t.sortable # on: :sort_position

data/lib/sortability/active_record/base.rb

@@ -22,7 +22,7 @@ module Sortability
           compact_peers_mname = "compact_#{onname}_peers!"
 
           class_exec do
-            before_validation before_validation_mname
+            before_validation before_validation_mname.to_sym
 
             # Returns all the sort peers for this record, including self
             define_method peers_mname do |force_scope_load = false|
@@ -56,9 +56,12 @@ module Sortability
                 send(setter_mname, max_val + 1)
               elsif peers.to_a.any? { |p| p != self && p.send(on) == val }
                 # Make a gap for the record
-                peers.where{__send__(on) >= val}.reorder(nil)
+                at = self.class.arel_table
+                peers.where(at[on].gteq(val))
+                     .reorder(nil)
                      .update_all("#{onname} = - (#{onname} + 1)")
-                peers.where{__send__(on) < 0}.reorder(nil)
+                peers.where(at[on].lt(0))
+                     .reorder(nil)
                      .update_all("#{onname} = - #{onname}")
 
                 # Cause peers to load from the DB the next time they are used
@@ -71,8 +74,8 @@ module Sortability
               val = send(on)
               peers = send(peers_mname)
               peers.loaded? ? \
-                peers.to_a.detect{|p| p.send(on) > val} : \
-                peers.where{__send__(on) > val}.first
+                peers.to_a.detect { |p| p.send(on) > val } : \
+                peers.where(peers.arel_table[on].gt(val)).first
             end
 
             # Gets the previous record among the peers
@@ -80,8 +83,8 @@ module Sortability
               val = send(on)
               peers = send(peers_mname)
               peers.loaded? ? \
-                peers.to_a.reverse.detect{|p| p.send(on) < val} : \
-                peers.where{__send__(on) < val}.last
+                peers.to_a.reverse.detect { |p| p.send(on) < val } : \
+                peers.where(peers.arel_table[on].lt(val)).last
             end
 
             # Renumbers the peers so that their numbers are sequential,
@@ -123,24 +126,24 @@ module Sortability
         end
 
         # Defines a sortable has_many relation on the container
-        def sortable_has_many(records, scope_or_options = nil, options_with_scope = {}, &extension)
-          scope, options = extract_association_params(scope_or_options, options_with_scope)
+        def sortable_has_many(records, scope_or_options = nil, **remaining_options, &extension)
+          scope, options = extract_association_params(scope_or_options, remaining_options)
           if scope.nil?
             on = options[:on] || :sort_position
             scope = -> { order(on) }
           end
 
-          class_exec { has_many records, scope, options.except(:on), &extension }
+          class_exec { has_many records, scope, **options.except(:on), &extension }
         end
 
         # Defines a sortable belongs_to relation on the child records
         def sortable_belongs_to(container, scope_or_options = nil,
-                                options_with_scope = {}, &extension)
-          scope, options = extract_association_params(scope_or_options, options_with_scope)
+                                **remaining_options, &extension)
+          scope, options = extract_association_params(scope_or_options, remaining_options)
           on = options[:on] || :sort_position
 
           class_exec do
-            belongs_to container, scope, options.except(:on, :scope), &extension
+            belongs_to container, scope, **options.except(:on, :scope), &extension
 
             reflection = reflect_on_association(container)
             options[:scope] ||= reflection.polymorphic? ? \
@@ -178,11 +181,11 @@ module Sortability
 
         protected
 
-        def extract_association_params(scope_or_options, options_with_scope)
+        def extract_association_params(scope_or_options, remaining_options)
           if scope_or_options.is_a?(Hash)
-            [nil, scope_or_options]
+            [nil, scope_or_options.merge(remaining_options)]
           else
-            [scope_or_options, options_with_scope]
+            [scope_or_options, remaining_options]
           end
         end
       end

data/lib/sortability/version.rb

@@ -1,3 +1,3 @@
 module Sortability
-  VERSION = "0.1.0"
+  VERSION = "1.1.0"
 end

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+  //= link_tree ../images
+  //= link_directory ../javascripts .js
+  //= link_directory ../stylesheets .css

data/spec/dummy/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/spec/dummy/app/models/container.rb

@@ -0,0 +1,5 @@
+class Container < ApplicationRecord
+  sortable_class
+
+  sortable_has_many :items, inverse_of: :container
+end

data/spec/dummy/app/models/item.rb

@@ -0,0 +1,3 @@
+class Item < ApplicationRecord
+  sortable_belongs_to :container, inverse_of: :items
+end

data/spec/dummy/config/application.rb

@@ -7,6 +7,9 @@ require "sortability"
 
 module Dummy
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 5.2
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.

data/spec/dummy/db/migrate/20190523235417_create_containers.rb

@@ -0,0 +1,9 @@
+class CreateContainers < ActiveRecord::Migration[5.2]
+  def change
+    create_table :containers do |t|
+      t.sortable
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20190523235430_create_items.rb

@@ -0,0 +1,12 @@
+class CreateItems < ActiveRecord::Migration[5.2]
+  def change
+    create_table :items do |t|
+      t.references :container, null: false, index: false, foreign_key: true
+      t.sortable
+
+      t.timestamps
+    end
+
+    add_sortable_index :items, scope: :container_id
+  end
+end

data/spec/dummy/db/schema.rb

@@ -0,0 +1,29 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 2019_05_23_235430) do
+
+  create_table "containers", force: :cascade do |t|
+    t.integer "sort_position", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "items", force: :cascade do |t|
+    t.integer "container_id", null: false
+    t.integer "sort_position", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["container_id", "sort_position"], name: "index_items_on_container_id_and_sort_position", unique: true
+  end
+
+end