sortability 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbdc9e49977965ce964ed77b4c14f31c1a8c771e2a46691a7328b862b653846b
-  data.tar.gz: 8af55ed58e116a9adb941e2e4d0fc87fc530bce25ea5c49d3eca1f66b536dd5a
+  metadata.gz: e811a6edc06dbfee9c4432f0b81eec7a36aec4cf07e40e5604f397f84a62007f
+  data.tar.gz: 172646fbe4de26f3def8354d671378a9fc5d6faea2b95757d0973c06c6e9de43
 SHA512:
-  metadata.gz: 59b9f1de09e97914319f9e5ffff0db36c74227e8d67cac491fbeb9e48f866eb09df5a330b1b781a9b8d5eb3f652a70410d17d76e5dd792dc958a9820f5963e10
-  data.tar.gz: 21e9610b6552387393948733057f37526242282ee98a8617820be01065cf65b127db2670e1bf9800889cb74b9ad259fadbdc821ac455d304bef7149077f6c8c1
+  metadata.gz: 6844492fe3c495616404aa9cf5edcda32fd8082d6c3a515f706e2b64710a9e8cc459c5845647d26ab8b9f65599af332bc56c085f0cae670072fddd8293cdfadb
+  data.tar.gz: 118dd54f18ad0de05bab919d8f65dddeb0de04861fdb1b3be819ca57fce7b4b00a71531e407f3c37299ca19a293154d497c752293c7ba8093144be1a4f98f67e

data/lib/sortability/active_record/base.rb

@@ -126,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? ? \
@@ -181,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 = "1.0.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