scoped_associations 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f2bc87bc70a1e81d27afec78d623ef6eaf0172d
-  data.tar.gz: e7601bac5af7d3baa442f745ffc25979252e7e2e
+  metadata.gz: 87cba658ebd3925c7a4c54f86a83835dc02765dc
+  data.tar.gz: 635d06993d642244a3e5ee70bfe8b3056cd5b17a
 SHA512:
-  metadata.gz: f00d2ae4edca75d2ff8eb6b46cc5c2151c035b018e99ae77b3795f934773d8676bbcfdb8e6b149059ab5e963c7e6b6d1cd1ba07fcc3c145e72d2c293738c73d3
-  data.tar.gz: e60442bf36f1f03f851faa29f1d5a571efaf2bd5a4a054c92aa36d9773a9d87566cbbc7fa085016d47651b26abcfb6c993a82aecca644adfae8c7dff03c16171
+  metadata.gz: 6da6be8c4bd63955d1e2fd163b8300dc1f8de18c1cc2802195587a68d340dd3e997d5b41c3ef127b2944a55282805861a432731472e839387de28c9d8f9a3cd3
+  data.tar.gz: aef9d9d81706944fd4477ab55a388784e350bd5c978371945bb39848898569d1bff0684980f143e473bc7ce66bd326792a3b826abe72cc4bcd8e8b9c1e51a655

data/lib/scoped_associations/activerecord4/has_many.rb

@@ -49,6 +49,10 @@ module ScopedAssociations
         def association_scope
           super.where(reflection.foreign_scope => reflection.name.to_s)
         end
+
+        def target_scope
+          super.where(reflection.foreign_scope => reflection.name.to_s)
+        end
       end
     end
   end

data/lib/scoped_associations/version.rb

@@ -1,4 +1,4 @@
 module ScopedAssociations
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end
 

data/spec/integration_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe 'ScopedAssociations' do
   let(:post) { Post.new }
 
+
   context "non polymorphic" do
+
     describe "has_one" do
       it "works with direct assignment" do
         post.secondary_comment = Comment.new(comment: "foo")
@@ -70,6 +72,27 @@ describe 'ScopedAssociations' do
         expect(post.secondary_comments.size).to eq 0
       end
     end
+
+    describe "using more relation" do
+      before do
+        post.primary_comment = Comment.new(comment: "foo")
+        post.primary_comments.build(comment: "bar")
+        post.save!
+        post.reload
+      end
+
+      it "has one element" do
+        expect(post.primary_comment).to be_present
+      end
+
+      it "has many has 1 elements" do
+        expect(post.primary_comments.size).to eq(1)
+      end
+
+      it "not contain the has_one element inside has_many elements" do
+        expect(post.primary_comments).to_not include(post.primary_comment)
+      end
+    end
   end
 
   context "polymorphic" do
@@ -139,6 +162,26 @@ describe 'ScopedAssociations' do
         expect(post.secondary_tags.size).to eq 0
       end
     end
+
+    describe "using more relation" do
+      before do
+        post.primary_tag = Tag.new(name: "foo")
+        post.primary_tags.build(name: "bar")
+        post.save!
+        post.reload
+      end
+
+      it "has one element" do
+        expect(post.primary_tag).to be_present
+      end
+
+      it "has many has 1 elements" do
+        expect(post.primary_tags.size).to eq(1)
+      end
+
+      it "not contain the has_one element inside has_many elements" do
+        expect(post.primary_tags).to_not include(post.primary_tag)
+      end
+    end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scoped_associations
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler