passive_record 0.4.12 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca6a576aa3a31b7353bc0c5eb63341f499e8ae44
-  data.tar.gz: b341ffd2c74c73110f91c6de4f409cfe8705ffb1
+  metadata.gz: d211fdab7ab67cfa36f0eb20919b98f334b1f52a
+  data.tar.gz: 3b222ff303400e4b17b8bb776fd621c0d4b06ffa
 SHA512:
-  metadata.gz: 11bb9c9f548185b19bf87c62264266d4529161f5b198f0b62e1bf85fd3dd8b1c63036a97b2d0ff818a6538a2f07e97303fe04d227012fff56ecb2cc0c64afe90
-  data.tar.gz: 99105eb8a1b8fbd8d50b166deaa98f7a671ab730736684d89a3c3e386a4fba242360f45fa1792d3be857adfa60d56c8ba9ac6838fb36620529f2877217a91a4d
+  metadata.gz: 127ac6578c9583d0a9d24819818c92a9b01fab3b7c9a00507d3c422bede8055135c62aff00c81155281f5276aca747d787a8819646f0a3d8206a2dbb006ef974
+  data.tar.gz: a6ceaf8115ed8e8dd11c1cc1333eef38f5f66cb0a9f1d3a86988758b60f9b6de6dde2b819ed925f97316b57bef15c41fd3b1638af5316af7188b318c04c35380

data/lib/passive_record/associations/has_many_through.rb

@@ -31,6 +31,7 @@ module PassiveRecord
               )
           end
         else
+          # binding.pry
           intermediary_model = intermediary_relation.
             where(
               association.target_name_symbol.to_s.singularize + "_id" => child.id).
@@ -95,7 +96,7 @@ module PassiveRecord
         if intermediary_relation.is_a?(HasManyThroughRelation)
           conds = intermediary_relation.intermediary_conditions
 
-          if nested_association.habtm
+          if nested_association.habtm || nested_association.is_a?(HasManyThroughAssociation)
             { association.through_class => conds }
           else
             { association.through_class.to_s.singularize.to_sym => conds }
@@ -132,10 +133,13 @@ module PassiveRecord
 
             until !n.is_a?(HasManyThroughAssociation)
               key = n.through_class.to_s.singularize.to_sym
+              p [ :n_class, n.class, key ] 
               hash = {key => hash}
               n = n.nested_association
             end
 
+            # binding.pry
+
             hash
           else
             nested_conds
@@ -144,7 +148,9 @@ module PassiveRecord
       end
 
       def where(conditions={})
-        child_class.where(conditions.merge(intermediary_conditions))
+        merged_conditions = conditions.merge(intermediary_conditions)
+        # binding.pry
+        child_class.where(merged_conditions)
       end
     end
   end

data/lib/passive_record/version.rb

@@ -1,4 +1,4 @@
 module PassiveRecord
   # passive_record version
-  VERSION = "0.4.12"
+  VERSION = "0.4.13"
 end

data/spec/passive_record_spec.rb

@@ -352,6 +352,16 @@ describe "passive record models" do
               expect(network.tags.promoted).not_to include(unpromoted_tag)
             end
           end
+
+          describe 'should find related nested models through a manual habtm' do
+            let!(:special_category) { Post.first.create_category(special: true) }
+            let!(:unspecial_category) { Post.last.create_category(special: false) }
+
+            it 'should refine and restrict' do
+              expect(network.categories.special).to include(special_category)
+              expect(network.categories.special).not_to include(unspecial_category)
+            end
+          end
         end
       end
     end
@@ -578,7 +588,6 @@ describe "passive record models" do
 
       it 'should permit querying' do
         ResourceAllocation.create(user: user, resource: resource)
-        # binding.pry
         expect(user.resources.where.all).to include(resource)
       end
     end

data/spec/spec_helper.rb

@@ -122,6 +122,7 @@ class Network < Model
   has_many :posts, :through => :streams
   has_many :comments, :through => :posts
   has_many :tags, :through => :posts
+  has_many :categories, :through => :posts
 end
 
 class Stream < Model
@@ -153,6 +154,19 @@ class Tag < Model
   def self.promoted; where(promoted: true) end
 end
 
+class Category < Model
+  attr_accessor :special
+  has_many :post_categories
+  has_many :posts, :through => :post_categories
+
+  def self.special; where(special: true) end
+end
+
+class PostCategory < Model
+  belongs_to :post
+  belongs_to :category
+end
+
 class Post < Model
   belongs_to :author
   belongs_to :blog
@@ -160,6 +174,9 @@ class Post < Model
   has_many :commenters, :through => :comments, :class_name => "Author"
   has_and_belongs_to_many :tags
 
+  has_many :post_categories
+  has_many :categories, :through => :post_categories
+
   attr_accessor :active, :published_at
   before_create { @published_at = Time.now }
 

metadata

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