unscoped_associations 0.6.2 → 0.6.3

data/lib/unscoped_associations.rb

@@ -46,8 +46,14 @@ module UnscopedAssociations
 
     def add_unscoped_association(association_name)
       define_method(association_name) do
-        self.class.reflect_on_association(association_name).klass.unscoped do
-          super(association_name)
+        if self.class.reflect_on_association(association_name).polymorphic?
+          self.association(association_name).klass.unscoped do
+            super(association_name)
+          end
+        else
+          self.class.reflect_on_association(association_name).klass.unscoped do
+            super(association_name)
+          end
         end
       end
     end

data/lib/unscoped_associations/version.rb

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

data/spec/support/models.rb

@@ -14,6 +14,8 @@ class User < ActiveRecord::Base
   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
 
+  has_many :votes, as: :votable, unscoped: true
+
   default_scope { where(active: true) }
 end
 
@@ -21,6 +23,13 @@ class Comment < ActiveRecord::Base
   belongs_to :user
   belongs_to :scoped_user, class_name: 'User', foreign_key: 'user_id', unscoped: false
   belongs_to :unscoped_user, class_name: 'User', foreign_key: 'user_id', unscoped: true
+  has_many :votes, as: :votable
+
+  default_scope { where(public: true) }
+end
+
+class Vote < ActiveRecord::Base
+  belongs_to :votable, polymorphic: true, unscoped: true
 
   default_scope { where(public: true) }
 end

data/spec/support/schema.rb

@@ -15,4 +15,10 @@ ActiveRecord::Schema.define do
     t.boolean :public
     t.timestamps
   end
-end
+
+  create_table :votes, force: true do |t|
+    t.references :votable, polymorphic: true
+    t.boolean :public
+    t.timestamps
+  end
+end

data/spec/unscoped_associations_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe UnscopedAssociations do
   let(:user) { User.create active: false }
   let(:comment) { Comment.create user_id: user.id, public: false }
+  let(:user_vote) { user.votes.create public: false }
+  let(:comment_vote) { comment.votes.create }
 
   context 'a belongs to association' do
     subject { comment }
@@ -51,4 +53,20 @@ describe UnscopedAssociations do
       end
     end
   end
+
+  context 'has_many with unscoped polymorphic' do
+    subject { user }
+
+    context 'unscoped_votable' do
+      its(:votes) { should eq [user_vote] }
+    end
+  end
+
+  context 'belongs_to with unscoped polymorphic' do
+    subject { comment_vote }
+
+    context 'unscoped_votable' do
+      its(:votable) { should eq comment }
+    end
+  end
 end

metadata

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