lib/unscoped_associations.rb in unscoped_associations-0.6.1 vs lib/unscoped_associations.rb in unscoped_associations-0.6.2
- old
+ new
@@ -15,34 +15,34 @@
def belongs_to_with_unscoped(name, scope = nil, options = {})
build_unscoped(:belongs_to, name, scope, options)
end
- def has_many_with_unscoped(name, scope = nil, options = {})
- build_unscoped(:has_many, name, scope, options)
+ def has_many_with_unscoped(name, scope = nil, options = {}, &extension)
+ build_unscoped(:has_many, name, scope, options, &extension)
end
def has_one_with_unscoped(name, scope = nil, options = {})
build_unscoped(:has_one, name, scope, options)
end
private
- def build_unscoped(assoc_type, assoc_name, scope = nil, options = {})
+ def build_unscoped(assoc_type, assoc_name, scope = nil, options = {}, &extension)
if scope.is_a?(Hash)
options = scope
scope = nil
end
if options.delete(:unscoped)
add_unscoped_association(assoc_name)
end
if scope
- self.send("#{assoc_type}_without_unscoped", assoc_name, scope, options)
+ self.send("#{assoc_type}_without_unscoped", assoc_name, scope, options, &extension)
else
- self.send("#{assoc_type}_without_unscoped", assoc_name, options)
+ self.send("#{assoc_type}_without_unscoped", assoc_name, options, &extension)
end
end
def add_unscoped_association(association_name)
define_method(association_name) do
@@ -52,6 +52,6 @@
end
end
end
end
-ActiveRecord::Base.instance_eval { include UnscopedAssociations }
\ No newline at end of file
+ActiveRecord::Base.instance_eval { include UnscopedAssociations }