passive_record 0.4.10 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd29b55c6736cf66a3dceed9de1b23d662f42803
-  data.tar.gz: 1fc06588e4ae2262ee5c138ce388c881746c66c0
+  metadata.gz: 1df1e784cf91a0992f637e1d716f80e480735de6
+  data.tar.gz: c42d72d513f9b2970ac550fac9ba4bf6cf17cf5f
 SHA512:
-  metadata.gz: 6b282a65d73fea26273adb072d74c3f56b828d753c468516ae8317330418c7161c1c0e55df1737a4e000ca7f1eedaa472cb146f35786459181f30bed39abbab6
-  data.tar.gz: f8cb9799687f87993624ff521479224c836acca05e59ce1c5680012a473790ae7cb144e448ce1661eaba8dc5ec0c7e1f90b09ef2d89deb228b274bccda26d960
+  metadata.gz: 2ac681f63db9780ce9604356125fe2d3e76efc029958e258c098da5a35599db0b871aa6fabe393dce3c6310d01bcd6f85758f7a63633ea695ad612f9d7905fd7
+  data.tar.gz: b91ffa6952369232fd89ae1c88b18cedcd6274a554c52845ebc523fda6bb32aaa641dcec8eb3f6191eec141a8b16be165812f4828d9175d636b47083147fc070

data/lib/passive_record/associations.rb

@@ -83,6 +83,7 @@ module PassiveRecord
 
     def has_many(collection_name_sym, opts={})
       target_class_name = opts.delete(:class_name) { (collection_name_sym.to_s).split('_').map(&:capitalize).join }
+      habtm = opts.delete(:habtm) { false }
 
       association = nil
       if opts.key?(:through)
@@ -92,7 +93,7 @@ module PassiveRecord
         base_association = associations.detect { |assn| assn.child_class_name == through_class_name rescue false }
 
         association = HasManyThroughAssociation.new(
-          self, target_class_name, collection_name_sym, through_class_collection_name, base_association)
+          self, target_class_name, collection_name_sym, through_class_collection_name, base_association, habtm)
 
         associate!(association)
 
@@ -180,7 +181,7 @@ module PassiveRecord
 
       if (intended_module.const_get(inverse_habtm_join_class_name) rescue false)
         has_many inverse_habtm_join_class_name.underscore.pluralize.to_sym
-        has_many collection_name_sym, :through => inverse_habtm_join_class_name.underscore.pluralize.to_sym
+        has_many collection_name_sym, :through => inverse_habtm_join_class_name.underscore.pluralize.to_sym, habtm: true
       else
         auto_collection_sym = self.name.split('::').last.underscore.pluralize.to_sym
         eval <<-ruby
@@ -191,7 +192,7 @@ module PassiveRecord
         end                                                     # end
         ruby
         has_many habtm_join_class_name.underscore.pluralize.to_sym
-        has_many(collection_name_sym, :through => habtm_join_class_name.underscore.pluralize.to_sym)
+        has_many(collection_name_sym, :through => habtm_join_class_name.underscore.pluralize.to_sym, habtm: true)
       end
     end
   end

data/lib/passive_record/associations/has_many.rb

@@ -8,6 +8,10 @@ module PassiveRecord
       def target_name_symbol
         children_name_sym
       end
+
+      def habtm
+        false #@habtm ||= false 
+      end #?
     end
 
     class HasManyRelation < HasOneRelation

data/lib/passive_record/associations/has_many_through.rb

@@ -1,6 +1,6 @@
 module PassiveRecord
   module Associations
-    class HasManyThroughAssociation < Struct.new(:parent_class, :child_class_name, :target_name_symbol, :through_class, :base_association)
+    class HasManyThroughAssociation < Struct.new(:parent_class, :child_class_name, :target_name_symbol, :through_class, :base_association, :habtm)
       def to_relation(parent_model)
         HasManyThroughRelation.new(self, parent_model)
       end
@@ -91,12 +91,20 @@ module PassiveRecord
       end
 
       def intermediary_conditions
-        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
+        if intermediary_relation.is_a?(HasManyThroughRelation)
           conds = intermediary_relation.intermediary_conditions
-          { association.through_class.to_s.singularize.to_sym => conds }
+
+          if nested_association.habtm
+            { association.through_class => conds }
+          else
+            { association.through_class.to_s.singularize.to_sym => conds }
+          end
         elsif intermediary_relation.association.is_a?(HasManyAssociation) # normal has many?
-          intermediary_key = intermediary_relation.association.children_name_sym.to_s.singularize.to_sym
+          intermediary_key = if association.habtm
+                               association.base_association.children_name_sym
+                             else
+                               intermediary_relation.association.children_name_sym.to_s.singularize.to_sym
+                             end
           nested_conds = { intermediary_key => { parent_model_id_field.to_sym => parent_model.id } }
 
           if nested_association.is_a?(HasManyThroughAssociation)

data/lib/passive_record/version.rb

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

data/spec/passive_record_spec.rb

@@ -342,6 +342,16 @@ describe "passive record models" do
               expect(network.comments.approved).not_to include(unapproved_comment)
             end
           end
+
+          describe 'should find related models a recursive has_many :thru a habtm' do
+            let!(:promoted_tag) { Post.first.create_tag(promoted: true) }
+            let!(:unpromoted_tag) { Post.last.create_tag(promoted: false) }
+
+            it 'should refine and restrict' do
+              expect(network.tags.promoted).to include(promoted_tag)
+              expect(network.tags.promoted).not_to include(unpromoted_tag)
+            end
+          end
         end
       end
     end

data/spec/spec_helper.rb

@@ -106,6 +106,7 @@ class Network < Model
   has_many :streams
   has_many :posts, :through => :streams
   has_many :comments, :through => :posts
+  has_many :tags, :through => :posts
 end
 
 class Stream < Model
@@ -131,11 +132,18 @@ class Blog < Model
   belongs_to :feed
 end
 
+class Tag < Model
+  has_and_belongs_to_many :posts
+  attr_accessor :promoted
+  def self.promoted; where(promoted: true) end
+end
+
 class Post < Model
   belongs_to :author
   belongs_to :blog
   has_many :comments
   has_many :commenters, :through => :comments, :class_name => "Author"
+  has_and_belongs_to_many :tags
 
   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.10
+  version: 0.4.11
 platform: ruby
 authors:
 - Joseph Weissman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-10 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport