unscoped_associations 0.6.1 → 0.6.2

data/README.md

@@ -53,7 +53,7 @@ NOTE: Rails 4 introduces some updates (and more planned for upcoming releases) r
 
 ```ruby
 class User < ActiveRecord::Base
-  has_many :all_comments, -> { where public: [true, flase] }, class_name: 'Comment'
+  has_many :all_comments, -> { where(public: [true, false]) }, class_name: 'Comment'
 end
 ```
 

data/lib/unscoped_associations/version.rb

@@ -1,3 +1,3 @@
 module UnscopedAssociations
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/lib/unscoped_associations.rb

@@ -17,8 +17,8 @@ module UnscopedAssociations
       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 = {})
@@ -27,7 +27,7 @@ module UnscopedAssociations
 
     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
@@ -38,9 +38,9 @@ module UnscopedAssociations
       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
 
@@ -54,4 +54,4 @@ module UnscopedAssociations
   end
 end
 
-ActiveRecord::Base.instance_eval { include UnscopedAssociations }
+ActiveRecord::Base.instance_eval { include UnscopedAssociations }

data/spec/support/models.rb

@@ -1,6 +1,16 @@
 class User < ActiveRecord::Base
-  has_many :comments
-  has_many :unscoped_comments, class_name: 'Comment', unscoped: true
+  has_many :comments do
+    def today
+      where('created_at <= ?', Time.now.end_of_day)
+    end
+  end
+
+  has_many :unscoped_comments, class_name: 'Comment', unscoped: true do
+    def today
+      where('created_at <= ?', Time.now.end_of_day)
+    end
+  end
+
   has_one  :last_comment, class_name: 'Comment', order: 'created_at DESC'
   has_one  :unscoped_last_comment, class_name: 'Comment', order: 'created_at DESC', unscoped: true
 

data/spec/unscoped_associations_spec.rb

@@ -1,50 +1,54 @@
 require 'spec_helper'
 
 describe UnscopedAssociations do
-  context 'unscoped association omits default_scope' do
-    it 'belongs_to' do
-      user = User.create(active: false)
-      comment = Comment.create(user_id: user.id)
+  let(:user) { User.create active: false }
+  let(:comment) { Comment.create user_id: user.id, public: false }
 
-      expect(comment.unscoped_user).to eq(user)
-    end
-
-    it 'has_many' do
-      user = User.create
-      comment = Comment.create(user_id: user.id, public: false)
+  context 'a belongs to association' do
+    subject { comment }
 
-      expect(user.unscoped_comments).to be_present
+    context 'scoped' do
+      its(:user) { should be_nil }
+      its(:scoped_user) { should be_nil }
     end
 
-    it 'has_one' do
-      user = User.create
-      comment = Comment.create(user_id: user.id, public: false)
-
-      expect(user.unscoped_last_comment).to be_present
+    context 'unscoped' do
+      its(:unscoped_user) { should eq user }
     end
   end
 
-  context 'no unscoped association takes default_scope' do
-    it 'belongs_to' do
-      user = User.create(active: false)
-      comment = Comment.create(user_id: user.id)
+  context 'a has one association' do
+    subject { user }
 
-      expect(comment.user).to be_nil
-      expect(comment.scoped_user).to be_nil
+    context 'scoped' do
+      its(:last_comment) { should be_nil }
     end
 
-    it 'has_many' do
-      user = User.create
-      comment = Comment.create(user_id: user.id, public: false)
+    context 'unscoped' do
+      its(:unscoped_last_comment) { should eq comment }
+    end
+  end
+
+  context 'a has many association' do
+    subject { user }
+
+    context 'scoped' do
+      its(:comments) { should be_empty }
 
-      expect(user.comments).to be_empty
+      context 'with an extension' do
+        its('comments.today') { should be_empty }
+      end
     end
 
-    it 'has_one' do
-      user = User.create
-      comment = Comment.create(user_id: user.id, public: false)
+    context 'unscoped' do
+      its(:unscoped_comments) { should eq [comment] }
 
-      expect(user.last_comment).to be_nil
+      context 'with an extension' do
+        # Extended methods take the default_scope
+        its('unscoped_comments.today') { should be_empty }
+        # Ideally, it should skip the default_scope
+        # its('unscoped_comments.today') { should eq [comment] }
+      end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unscoped_associations
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord