passive_record 0.3.14 → 0.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b01350b2c51dae72a7383e4752d6bfaf450ba98
-  data.tar.gz: 3b0bcbc94736f53de51156504791562116687bdf
+  metadata.gz: 08dd9a55dcc21162ef347d7ca570df92cb35cecf
+  data.tar.gz: 0e8c8a07e5edbb224b9737efbad16f9ae127d7ff
 SHA512:
-  metadata.gz: 0a3f2c488bf01cea83122cfb4cb5a8b8d4f0e41f175827f0ccc0ab404a71b8b6c0104b170fe0cb15e68dd29da32424c53df0a714c603f29c0a32c9b7470d9684
-  data.tar.gz: bd24c57315e0b57bd6df836e19e55471dd90c699bbae4476e9eb4c3c0beea2dbb242555ee396e7a9404595b7c2094f32b378c864dfbb5153083f8856a763683e
+  metadata.gz: b27ddf9aafe4b6e6b40feea2f7fe71c20d0f3a37d371a96a1fb485fc22a9b3015026b7529b341bb1d19846b709463304c04ae799aadfe25db7f9d813f81029b5
+  data.tar.gz: afe63b9e603d25506c67a2fa54d55e459cfe4ae6a4562d8ae1279129a2eeaae5923f8609d8fb34417d20303a14b065fed632e7ffad54d6323e7c456215e24bd2

data/README.md

@@ -176,7 +176,10 @@ PassiveRecord may be right for you!
 
   - `before_create :call_a_method`
   - `after_create :call_another_method, :and_then_call_another_one`
+  - `before_update do manually_invoke(a_method) end`
   - `after_update { or_use_a_block }`
+  - `before_destroy :something`
+  - `after_destroy { something_else }`
 
 ## Copyright
 

data/lib/passive_record/associations.rb

@@ -109,16 +109,25 @@ module PassiveRecord
           end
 
           # add in new ones...
-          target_name = relation.association.target_name_symbol.to_s
-          new_collection_ids.each do |child_id|
-            intermediary.create(target_name.singularize + "_id" => child_id, relation.parent_model_id_field => relation.id )
+          singular_target = collection_name_sym.to_s.singularize
+          if !(relation.nested_association.is_a?(BelongsToAssociation))# && 
+            intermediary.create(
+              singular_target + "_ids" => new_collection_ids,
+              relation.parent_model_id_field => relation.id 
+            )
+          else
+            new_collection_ids.each do |child_id|
+              intermediary.create(
+                singular_target + "_id" => child_id, 
+                relation.parent_model_id_field => relation.id 
+              )
+            end
           end
         end
       else
         association = HasManyAssociation.new(self, target_class_name, collection_name_sym)
         associate!(association)
 
-
         define_method(:"#{collection_name_sym}=") do |new_collection|
           relation = instance_eval{relata}.detect { |rel| rel.association == association }
 
@@ -145,12 +154,12 @@ module PassiveRecord
       end
 
       define_method(:"#{collection_name_sym.to_s.singularize}_ids") do
-        send(collection_name_sym).map(&:id)
+        send(collection_name_sym).map(&:id) rescue binding.pry
       end
 
       define_method(:"create_#{collection_name_sym.to_s.singularize}") do |attrs={}|
         relation = instance_eval{relata}.detect { |rel| rel.association == association }
-        relation.create(attrs)
+      relation.create(attrs)
       end
     end
 
@@ -167,7 +176,7 @@ module PassiveRecord
       module_name = self.name.deconstantize
       module_name = "Object" if module_name.empty?
       intended_module = module_name.constantize
-      
+
       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

data/lib/passive_record/associations/has_many_through.rb

@@ -9,7 +9,19 @@ module PassiveRecord
     class HasManyThroughRelation < HasManyRelation
       def <<(child)
         if nested_association.is_a?(HasManyAssociation)
-          intermediary_relation.create(association.target_name_symbol.to_s.singularize + "_ids" => [child.id])
+          intermediary_id =
+            child.send(association.base_association.target_name_symbol.to_s.singularize + "_id")
+
+          if intermediary_id
+            intermediary_relation.child_class.find(intermediary_id).
+              send(:"#{parent_model_id_field}=", parent_model.id)
+          else
+            nested_ids_field = nested_association.children_name_sym.to_s.singularize + "_ids"
+            intermediary_relation.create(
+              parent_model_id_field => parent_model.id,
+              nested_ids_field => [ child.id ]
+            )
+          end
         else
           intermediary_relation.
             where(
@@ -49,7 +61,7 @@ module PassiveRecord
         if intermediate_results && !intermediate_results.empty?
           final_results = intermediate_results.flat_map(&nested_association.target_name_symbol)
           if final_results.first.is_a?(Associations::Relation) && !final_results.first.singular?
-            final_results.first.send(:all)
+            final_results.flat_map(&:all)
           else
             Array(final_results)
           end

data/lib/passive_record/class_methods.rb

@@ -70,6 +70,9 @@ module PassiveRecord
       end
 
       instance
+    rescue => ex
+      binding.pry
+      raise ex
     end
 
     def destroy(id)

data/lib/passive_record/version.rb

@@ -1,4 +1,4 @@
 module PassiveRecord
   # passive_record version
-  VERSION = "0.3.14"
+  VERSION = "0.3.15"
 end

data/spec/passive_record_spec.rb

@@ -374,7 +374,13 @@ describe "passive record models" do
       end
 
       it 'should construct intermediary relations with many-through-many' do
-        expect{parent.create_dog}.to change{Family::Dog.count}.by(1)
+        expect{parent.dogs << Family::Dog.create}.to change{parent.dogs.count}.by(1)
+
+        expect{parent.create_dog}.to change{parent.dogs.count}.by(1)
+
+        expect{parent.toys << Family::Toy.create}.to change{parent.toys.count}.by(1)
+        expect{parent.create_dog(child: child)}.to change{child.dogs.count}.by(1)
+        expect{parent.create_dog(child_id: child.id)}.to change{child.dogs.count}.by(1)
       end
 
       it 'should accept class name' do

metadata

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