passive_record 0.4.8 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f039ca57502dbf0119be19278464cfc7cae14ab
-  data.tar.gz: 414f80e091cf917d897fd89fd28902c6f2563398
+  metadata.gz: cd29b55c6736cf66a3dceed9de1b23d662f42803
+  data.tar.gz: 1fc06588e4ae2262ee5c138ce388c881746c66c0
 SHA512:
-  metadata.gz: 24ce6d75265f9edf97ecf7aa55bb1e4d10f4deed2c7452c0f08758d5890db1bb12fd6369709e7ef06f6ac5bd66df1097ac64a7ca580bf1b5fffbba2bbd1f384b
-  data.tar.gz: 1f25bb2ec4160669a6332da359410a7f1f8fc0359bb175189f54fd4b84139d61565f92e74bc6e0640f220abda45b01905df3cb16296f44af73e33e92fa00099b
+  metadata.gz: 6b282a65d73fea26273adb072d74c3f56b828d753c468516ae8317330418c7161c1c0e55df1737a4e000ca7f1eedaa472cb146f35786459181f30bed39abbab6
+  data.tar.gz: f8cb9799687f87993624ff521479224c836acca05e59ce1c5680012a473790ae7cb144e448ce1661eaba8dc5ec0c7e1f90b09ef2d89deb228b274bccda26d960

data/lib/passive_record/associations/has_many_through.rb

@@ -91,29 +91,28 @@ module PassiveRecord
       end
 
       def intermediary_conditions
-        intermediary_key = if intermediary_relation.association.is_a?(HasManyAssociation)
-                             intermediary_relation.association.children_name_sym.to_s.singularize.to_sym
-                           elsif intermediary_relation.association.is_a?(HasManyThroughAssociation)
-                             intermediary_relation.association.through_class.to_s.singularize.to_sym
-                           else 
-                             raise "Intermediary association #{intermediary_relation.association} is not has many or has many through...?"
-                           end
-        
-        nested_conds = { intermediary_key => { parent_model_id_field.to_sym => parent_model.id } }
-
-        if nested_association.is_a?(HasManyThroughAssociation)
-          n = nested_association
-          hash = nested_conds
-
-          until !n.is_a?(HasManyThroughAssociation)
-            key = n.through_class.to_s.singularize.to_sym
-            hash = {key => hash}
-            n = n.nested_association
+        if intermediary_relation.association.is_a?(HasManyThroughAssociation)
+          # we are 'thru' a has_many thru at the same level, we should be able to recurse thru its #intermediary_conds
+          conds = intermediary_relation.intermediary_conditions
+          { association.through_class.to_s.singularize.to_sym => conds }
+        elsif intermediary_relation.association.is_a?(HasManyAssociation) # normal has many?
+          intermediary_key = intermediary_relation.association.children_name_sym.to_s.singularize.to_sym
+          nested_conds = { intermediary_key => { parent_model_id_field.to_sym => parent_model.id } }
+
+          if nested_association.is_a?(HasManyThroughAssociation)
+            n = nested_association
+            hash = nested_conds
+
+            until !n.is_a?(HasManyThroughAssociation)
+              key = n.through_class.to_s.singularize.to_sym
+              hash = {key => hash}
+              n = n.nested_association
+            end
+
+            hash
+          else
+            nested_conds
           end
-
-          hash
-        else
-          nested_conds
         end
       end
 

data/lib/passive_record/version.rb

@@ -1,4 +1,4 @@
 module PassiveRecord
   # passive_record version
-  VERSION = "0.4.8"
+  VERSION = "0.4.10"
 end

data/spec/passive_record_spec.rb

@@ -157,14 +157,14 @@ describe "passive record models" do
 
         context 'nested queries' do
           let(:post) { Post.create }
-          let(:user) { User.create }
+          let(:author) { Author.create }
 
           subject(:posts_with_comment_by_user) do
-            Post.find_by comments: { user: user }
+            Post.find_by comments: { author: author }
           end
 
           before do
-            post.create_comment(user: user)
+            post.create_comment(author: author)
           end
 
           it 'should find a single record through a nested query' do
@@ -173,9 +173,9 @@ describe "passive record models" do
 
           it 'should find multiple records through a nested query' do
             another_post = Post.create
-            another_post.create_comment(user: user)
+            another_post.create_comment(author: author)
 
-            posts = Post.find_all_by comments: { user: user }
+            posts = Post.find_all_by comments: { author: author }
             expect(posts.count).to eq(2)
           end
 
@@ -332,6 +332,16 @@ describe "passive record models" do
               expect(network.posts.recent).not_to include(not_recent_post)
             end
           end
+
+          describe 'should find related models on a recursive has_many thru' do
+            let!(:approved_comment) { Post.first.create_comment(approved: true) }
+            let!(:unapproved_comment) { Post.last.create_comment(approved: false) }
+
+            it 'should refine/restrict' do
+              expect(network.comments.approved).to include(approved_comment)
+              expect(network.comments.approved).not_to include(unapproved_comment)
+            end
+          end
         end
       end
     end
@@ -501,10 +511,10 @@ describe "passive record models" do
 
       it 'should accept class name' do
         post = Post.create
-        user = User.create
-        Comment.create(post: post, user: user)
+        author = Author.create
+        Comment.create(post: post, author: author)
 
-        expect(post.commenters.all).to eq([user])
+        expect(post.commenters.all).to eq([author])
       end
     end
 

data/spec/spec_helper.rb

@@ -105,6 +105,7 @@ end
 class Network < Model
   has_many :streams
   has_many :posts, :through => :streams
+  has_many :comments, :through => :posts
 end
 
 class Stream < Model
@@ -131,9 +132,10 @@ class Blog < Model
 end
 
 class Post < Model
+  belongs_to :author
   belongs_to :blog
   has_many :comments
-  has_many :commenters, :through => :comments, :class_name => "User"
+  has_many :commenters, :through => :comments, :class_name => "Author"
 
   attr_accessor :active, :published_at
   before_create { @published_at = Time.now }
@@ -149,19 +151,18 @@ class Post < Model
   def self.published_within_days(n)
     where(:published_at => n.days.ago..Time.now)
   end
-
-  # hmmm -- why *exactly* do we need this?
-  def feed_id
-    raise 'not impl'
-    # blog.feed_id
-  end
 end
 
-class User < Model
+# whoa, we're reopening user here -- this might not be expected
+class Author < Model
+  has_many :posts
   has_many :comments
 end
 
 class Comment < Model
+  attr_accessor :approved
   belongs_to :post
-  belongs_to :user
+  belongs_to :author
+
+  def self.approved; where(approved: true) end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passive_record
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.10
 platform: ruby
 authors:
 - Joseph Weissman