sortability 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0c25a30046ab1c63c849bf3f5c5955b30e237b5
-  data.tar.gz: b21fea91cfbc95d4a3d62d4a56b75106452d3b61
+  metadata.gz: 8de084b141765cc5613a436a6573b6a370d535c3
+  data.tar.gz: 20c7a9f1951fa31c5840cb12c8046d2c734536ce
 SHA512:
-  metadata.gz: 689a20e1ea4bee8f63f5fd9854f75331393d375408cec56de3d02761d9fe65c7c3b7b2cff1830c6684c9efdf006470ebfee0d2ece1e295b1815754598adbe03d
-  data.tar.gz: 7b1123cc8b8a6b52eb931b200201a712a358c16b757b9fe576cfe0b84e2bdf4e8f8623c5376a45c0436acb932ac148d207d1198581a1e75d4ada2a8631fbe794
+  metadata.gz: 5d1313f9b10346d6f2dd1d5506ab6b9a24cba540ff0fdef6b388ed32631e4aaa7cb2c9b5a0949971a6dd7e19e26020d2023a18a78036d7f0e8f4d066398d3ced
+  data.tar.gz: a9fb6ac2194be7a270f51d5bdf6a48a781389f3365d4c14b239d3ab028cbaed4952e8ae449766349a8674037bb0be6c548e0ed001e96055b470bd41c1308b1c0

data/README.md

@@ -87,10 +87,16 @@ sortable_belongs_to :container, inverse_of: :records,
                                 scope: :container_id # , on: :sort_position
 ```
 
+You can also specify a custom association scope:
+
+```rb
+sortable_belongs_to :container, -> { with_deleted },
+                                inverse_of: :records, scope: :container_id # , on: :sort_position
+```
+
 It is highly recommended that you specify the `inverse_of` and `scope` options.
 
-If `records` are sorted globally, without a `container`,
-use the `sortable_class` method instead:
+If `records` are sorted globally, without a `container`, use the `sortable_class` method instead:
 
 ```rb
 sortable_class # on: :sort_position, scope: :sort_group_number
@@ -104,6 +110,16 @@ Simply replace the `has_many :records` relation in your `Container` model with:
 sortable_has_many :records, inverse_of: :container # , on: :sort_position
 ```
 
+You can also specify a custom association scope,
+but in that case you have to order the records yourself:
+
+```rb
+sortable_has_many :records, ->{ with_deleted.order(:sort_position) },
+                            inverse_of: :container # , on: :sort_position
+```
+
+Once again, it is highly recommended that you specify the `inverse_of` option.
+
 ## Usage
 
 Once you have run the migrations and modified your models according to the installation instructions, you are ready to start sorting the `records`.

data/lib/sortability/active_record/base.rb

@@ -26,9 +26,10 @@ module Sortability
 
             # Returns all the sort peers for this record, including self
             define_method peers_mname do |force_scope_load = false|
-              cont = container.nil? ? nil : send(container)
-              return send(container).send(inverse_of) \
-                unless force_scope_load || cont.nil? || inverse_of.nil?
+              unless force_scope_load || container.nil? || inverse_of.nil?
+                cont = send(container)
+                return cont.send(inverse_of) unless cont.nil?
+              end
 
               relation = self.class.unscoped
               scope_array.each do |s|
@@ -122,20 +123,24 @@ module Sortability
         end
 
         # Defines a sortable has_many relation on the container
-        def sortable_has_many(records, options = {})
-          on = options[:on] || :sort_position
-
-          class_exec do
-            has_many records, lambda { order(on) }, options.except(:on)
+        def sortable_has_many(records, scope_or_options = nil, options_with_scope = {}, &extension)
+          scope, options = extract_association_params(scope_or_options, options_with_scope)
+          if scope.nil?
+            on = options[:on] || :sort_position
+            scope = -> { order(on) }
           end
+
+          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, options = {})
+        def sortable_belongs_to(container, scope_or_options = nil,
+                                options_with_scope = {}, &extension)
+          scope, options = extract_association_params(scope_or_options, options_with_scope)
           on = options[:on] || :sort_position
 
           class_exec do
-            belongs_to container, options.except(:on, :scope)
+            belongs_to container, scope, options.except(:on, :scope), &extension
 
             reflection = reflect_on_association(container)
             options[:scope] ||= reflection.polymorphic? ? \
@@ -170,6 +175,16 @@ module Sortability
 
           sortable_methods(options)
         end
+
+        protected
+
+        def extract_association_params(scope_or_options, options_with_scope)
+          if scope_or_options.is_a?(Hash)
+            [nil, scope_or_options]
+          else
+            [scope_or_options, options_with_scope]
+          end
+        end
       end
     end
   end

data/lib/sortability/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sortability
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Dante Soares
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Rails gem that provides easy to use ordered records