passive_record 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4650224c2791ed204faef1985b4ea12f646dae7e
-  data.tar.gz: 9a0af9c4a3d86353cffa3b1b860040de882a2e59
+  metadata.gz: bddfa4e4c2c50662999f1bc1949e44f1e0878a93
+  data.tar.gz: 50b8eba073d411dd99e0cca965d6e5e7676418ca
 SHA512:
-  metadata.gz: 6a1c134e1dbac7da33ffe7055f31b7b263deb1c4e7be5cd02b91b252370a07c00c2a7918e1230ea83259ff19d7e10fd3b3705bdc22e6c9c049826d9abd00d368
-  data.tar.gz: f84219b4fbca873039a48d226e5b20d91854bc2a8083c67ed2e3d78f6f0e3ef5d6a49c85d1fd7e450a5d6d718b69af154425fe3257a36bc434577a6901b03445
+  metadata.gz: 90549bebdef9863aa15c1d0fd32a0dd71eeb411a8705d63e263b84656bd4e79db976467aa39d41fdc205e7cf0c7fd4e43590d3a9b7973137548e9cc0bcbc3264
+  data.tar.gz: ad5276c142395eb0b9432952f6bae95ab1e3dd0179d91964dac484aa0358f47d88738e8f13f2fb3e641b0862b1bd64e7ccd5cfa9368185c9669c87cba531eba3

data/lib/passive_record/associations/has_many_through.rb

@@ -4,6 +4,11 @@ module PassiveRecord
       def to_relation(parent_model)
         HasManyThroughRelation.new(self, parent_model)
       end
+
+      def nested_association
+        thru_klass = base_association.child_class_name.singularize.constantize
+        thru_klass.associations.detect { |assn| assn.child_class_name == child_class_name }
+      end
     end
 
     class HasManyThroughRelation < HasManyRelation
@@ -85,11 +90,33 @@ module PassiveRecord
         end
       end
 
-      def where(conditions={})
-        child_class.where(conditions.merge(
+      def intermediary_conditions
+        nested_conds = {
           intermediary_relation.association.children_name_sym.to_s.singularize.to_sym => {
             parent_model_id_field.to_sym => parent_model.id
-          }))
+          }
+        }
+
+        if nested_association.is_a?(HasManyThroughAssociation)
+          n = nested_association
+          hash = nested_conds
+          compound_key = []
+
+          until n.is_a?(HasManyAssociation)
+            key = n.through_class.to_s.singularize.to_sym
+            compound_key.push(key)
+            hash = {key => hash}
+            n = n.nested_association
+          end
+
+          hash
+        else
+          nested_conds
+        end
+      end
+
+      def where(conditions={})
+        child_class.where(conditions.merge(intermediary_conditions))
       end
     end
   end

data/lib/passive_record/associations/has_one.rb

@@ -8,6 +8,8 @@ module PassiveRecord
       def target_name_symbol
         child_name_sym
       end
+
+      def children_name_sym; child_name_sym end
     end
 
     class Relation < Struct.new(:association, :parent_model)

data/lib/passive_record/core/query.rb

@@ -98,7 +98,11 @@ module PassiveRecord
           if association.is_a?(Associations::Relation) && !association.singular?
             association.where(association_field => val).any?
           else
-            association.send(association_field) == val
+            if val.is_a?(Hash)
+              evaluate_nested_conditions(association, association_field, val)
+            else
+              association.send(association_field) == val
+            end
           end
         end
       end

data/lib/passive_record/version.rb

@@ -1,4 +1,4 @@
 module PassiveRecord
   # passive_record version
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/spec/passive_record_spec.rb

@@ -177,6 +177,15 @@ describe "passive record models" do
             posts = Post.find_all_by comments: { user: user }
             expect(posts.count).to eq(2)
           end
+
+          it 'should find records through a doubly-nested query' do
+            feed = Feed.create
+            blog = feed.create_blog
+            post = blog.create_post
+
+            # expect( Post.find_by(blog: { feed_id: feed.id }) ).to eq(post)
+            expect( Post.find_by(blog: { feed: { id: feed.id }}) ).to eq(post)
+          end
         end
 
         context 'queries with ranges' do
@@ -259,28 +268,51 @@ describe "passive record models" do
           end
         end
 
-        context 'scopes on relations' do
-          let(:feed) { Feed.create }
-          let(:a_blog) { feed.create_blog } #.create }
-          let(:not_recent_post) { a_blog.create_post(published_at: 10.days.ago) }
-
-          let(:recent_post) do
+        context 'querying with scopes through relationships' do
+          let!(:network) { Network.create }
+          let!(:stream) { network.create_stream }
+          let!(:channel) { stream.create_channel }
+          let!(:feed) { channel.create_feed }
+          let!(:a_blog) { feed.create_blog }
+          let!(:not_recent_post) { a_blog.create_post(published_at: 10.days.ago) }
+          let!(:recent_post) do
             a_blog.create_post(published_at: 1.day.ago)
           end
 
           describe 'should find related models through a has many' do
-            it 'should restrict as expected' do
+            it 'should restrict' do
               expect(a_blog.posts.recent).to include(recent_post)
               expect(a_blog.posts.recent).not_to include(not_recent_post)
             end
           end
 
           describe 'should find related models on a has_many through' do
-            it 'should restrict as expected' do
+            it 'should restrict' do
               expect(feed.posts.recent).to include(recent_post)
               expect(feed.posts.recent).not_to include(not_recent_post)
             end
           end
+
+          describe 'should find related models on a nested has_many thru' do
+            it 'should restrict' do
+              expect(channel.posts.recent).to include(recent_post)
+              expect(channel.posts.recent).not_to include(not_recent_post)
+            end
+          end
+
+          describe 'should find related models on a double-nested has_many thru' do
+            it 'should restrict' do
+              expect(stream.posts.recent).to include(recent_post)
+              expect(stream.posts.recent).not_to include(not_recent_post)
+            end
+          end
+
+          describe 'should find related models on a deeply nested has_many thru' do
+            it 'should restrict' do
+              expect(network.posts.recent).to include(recent_post)
+              expect(network.posts.recent).not_to include(not_recent_post)
+            end
+          end
         end
       end
     end

data/spec/spec_helper.rb

@@ -102,7 +102,25 @@ end
 ###
 #
 
+class Network < Model
+  has_many :streams
+  has_many :posts, :through => :streams
+end
+
+class Stream < Model
+  belongs_to :network
+  has_many :channels
+  has_many :posts, :through => :channels
+end
+
+class Channel < Model
+  belongs_to :stream
+  has_many :feeds
+  has_many :posts, :through => :feeds
+end
+
 class Feed < Model
+  belongs_to :channel
   has_many :blogs
   has_many :posts, :through => :blogs
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passive_record
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Joseph Weissman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport