unscoped_associations 0.3.1 → 0.4.0

data/README.md

@@ -1,7 +1,6 @@
 Unscoped Associations
 =====================
-It may be that you've ever needed to skip `default_scope` pulling objects via associations (for some strange reasons).
-Do it easily with this lib. Supported associations:
+Want to skip the `default_scope` when you get objects through associations (for some strange reasons)? Do it easily with this lib. Supported associations:
 * `:belongs_to`
 * `:has_one`
 * `:has_many`
@@ -24,38 +23,41 @@ Basic usage example:
 
 ```ruby
 class User < ActiveRecord::Base
-
   has_many :comments # or , unscoped: false
   has_many :all_comments, class_name: 'Comment', unscoped: true
   has_one  :last_comment, class_name: 'Comment', order: 'created_at DESC', unscoped: true
 
   default_scope where( active: true )
-
 end
 
 class Comment < ActiveRecord::Base
-
   belongs_to :user, unscoped: true
 
   default_scope where( public: true )
-
 end
 
 @user.comments # => return public comments
 @user.all_comments # => return all comments skipping default_scope
 @user.last_comment # => return last comment skipping default_scope
-
 @topic.user # => return user w/o taking account 'active' flag
 
 ```
 
 ## Status
-Tested on Rails 3.x series. In Rails 4 you are able to customize data retrieving via a scope block, so you can skip `default_scope` using a block.
+Tested on Rails 3.x series and Rails 4.0.0. Originally thought and built for Rails 3, Rails 4 supported.
+
+NOTE: Rails 4 introduces some updates (and more planned for upcoming releases) related to this part. For example, in Rails 4, you are able to customize associations using a scope block, so you can skip `default_scope`:
 
+```ruby
+class User < ActiveRecord::Base
+  has_many :all_comments, -> { where public: [true, flase] }, class_name: 'Comment'
+end
+```
+
+Anyway, you can use `unscoped` option, if you prefer.
 
 ## Contributing
 Ideas, fixes, improvements or any comment are welcome!
 
-
 ## License
 Copyright (c) 2013 Marc Anguera. Unscoped Associations is released under the [MIT](http://opensource.org/licenses/MIT) License.

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/unscoped_associations.rb

@@ -11,29 +11,37 @@ module UnscopedAssociations
 
   module ClassMethods
 
-    def belongs_to_with_unscoped(name, options = {})
-      if options.delete(:unscoped)
-        add_unscoped_association(name)
-      end
-      belongs_to_without_unscoped(name, options)
+    def belongs_to_with_unscoped(name, scope = nil, options = {})
+      build_unscoped(:belongs_to, name, scope, options)
     end
 
-    def has_many_with_unscoped(name, options = {})
-      if options.delete(:unscoped)
-        add_unscoped_association(name)
-      end
-      has_many_without_unscoped(name, options)
+    def has_many_with_unscoped(name, scope = nil, options = {})
+      build_unscoped(:has_many, name, scope, options)
     end
 
-    def has_one_with_unscoped(name, options = {})
-      if options.delete(:unscoped)
-        add_unscoped_association(name)
-      end
-      has_one_without_unscoped(name, options)
+    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 = {})
+      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)
+      else
+        self.send("#{assoc_type}_without_unscoped", assoc_name, options)
+      end
+    end
+
     def add_unscoped_association(association_name)
       define_method(association_name) do
         self.class.reflect_on_association(association_name).klass.unscoped do

data/unscoped_associations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "unscoped_associations"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["markets"]
-  s.date = "2013-09-07"
+  s.date = "2013-09-11"
   s.description = "Skip default_scope in your associations"
   s.email = "srmarc.ai@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unscoped_associations
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 596675425
+      hash: -618493999
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: