passive_record 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de382da8a3a2ab040066d8602ae28c3949c53d63
-  data.tar.gz: 91c7c31efa8ba22d39dbe0197c6260b5021e48b3
+  metadata.gz: 4b01350b2c51dae72a7383e4752d6bfaf450ba98
+  data.tar.gz: 3b0bcbc94736f53de51156504791562116687bdf
 SHA512:
-  metadata.gz: 7e90366ff1718151ab079032aa41755c40f1bfb68c8fcedc45f58804f26f728405b840d2e3a82043b92de2afdbb7a2fe21999bd099eaa41632941df77ee3e183
-  data.tar.gz: be96a58c45ac7cef2f498a6e0738ab4b1ed8f2119f904442a3c392a7cccb0be7b5e9661aa29db6df08c8042e437dbe76dc9fb72fe509dc290977e3b2e53e50b5
+  metadata.gz: 0a3f2c488bf01cea83122cfb4cb5a8b8d4f0e41f175827f0ccc0ab404a71b8b6c0104b170fe0cb15e68dd29da32424c53df0a714c603f29c0a32c9b7470d9684
+  data.tar.gz: bd24c57315e0b57bd6df836e19e55471dd90c699bbae4476e9eb4c3c0beea2dbb242555ee396e7a9404595b7c2094f32b378c864dfbb5153083f8856a763683e

data/README.md

@@ -96,6 +96,7 @@ PassiveRecord may be right for you!
 
   A class `Role` which is declared to `include PassiveRecord` will gain the following instance methods:
   - `role.update(attrs_hash)`
+  - `role.destroy`
   - `role.to_h`
   - We override `role.inspect` to show ID and visible attributes
 

data/lib/passive_record/associations.rb

@@ -71,7 +71,7 @@ module PassiveRecord
       define_method(:"#{child_name_sym}_id=") do |new_child_id|
         relation = instance_eval{relata}.detect { |rel| rel.association == association }
         # detach existing child...
-        relation.lookup.send(:"#{relation.parent_model_id_field}=", nil)
+        relation.lookup&.send(:"#{relation.parent_model_id_field}=", nil)
 
         relation.child_class.
           find(new_child_id).
@@ -95,6 +95,10 @@ module PassiveRecord
         associate!(association)
 
         define_method(:"#{collection_name_sym}=") do |new_collection|
+          send(:"#{collection_name_sym.to_s.singularize}_ids=", new_collection.map(&:id))
+        end
+
+        define_method(:"#{collection_name_sym.to_s.singularize}_ids=") do |new_collection_ids|
           relation = instance_eval{relata}.detect { |rel| rel.association == association }
 
           intermediary = relation.intermediary_relation
@@ -106,8 +110,8 @@ module PassiveRecord
 
           # add in new ones...
           target_name = relation.association.target_name_symbol.to_s
-          new_collection.each do |child|
-            intermediary.create(target_name.singularize + "_id" => child.id, relation.parent_model_id_field => relation.id )
+          new_collection_ids.each do |child_id|
+            intermediary.create(target_name.singularize + "_id" => child_id, relation.parent_model_id_field => relation.id )
           end
         end
       else
@@ -128,6 +132,11 @@ module PassiveRecord
             child.send(:"#{relation.parent_model_id_field}=", relation.id)
           end
         end
+
+        define_method(:"#{collection_name_sym.to_s.singularize}_ids=") do |new_collection_ids|
+          relation = instance_eval{relata}.detect { |rel| rel.association == association }
+          send(:"#{collection_name_sym}=", relation.child_class.find(new_collection_ids))
+        end
       end
 
       define_method(collection_name_sym) do
@@ -141,7 +150,6 @@ module PassiveRecord
 
       define_method(:"create_#{collection_name_sym.to_s.singularize}") do |attrs={}|
         relation = instance_eval{relata}.detect { |rel| rel.association == association }
-        # binding.pry
         relation.create(attrs)
       end
     end

data/lib/passive_record/associations/has_many.rb

@@ -19,6 +19,10 @@ module PassiveRecord
       end
       def_delegators :all, :each
 
+      def last
+        all.last
+      end
+
       def all?(*args)
         all.all?(*args)
       end

data/lib/passive_record/associations/has_many_through.rb

@@ -8,10 +8,15 @@ module PassiveRecord
 
     class HasManyThroughRelation < HasManyRelation
       def <<(child)
-        intermediary_relation.
-          where(
-            association.target_name_symbol.to_s.singularize + "_id" => child.id).
-          first_or_create
+        if nested_association.is_a?(HasManyAssociation)
+          intermediary_relation.create(association.target_name_symbol.to_s.singularize + "_ids" => [child.id])
+        else
+          intermediary_relation.
+            where(
+              association.target_name_symbol.to_s.singularize + "_id" => child.id).
+              first_or_create
+
+        end
         self
       end
 

data/lib/passive_record/version.rb

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

data/spec/passive_record_spec.rb

@@ -366,6 +366,15 @@ describe "passive record models" do
         expect { parent.create_toy(child: child) }.to change {Family::Toy.count}.by(1)
         expect(Family::Toy.last.child).to eq(child)
         expect(Family::Toy.last.child.parent).to eq(parent)
+
+        expect { 3.times { parent.toys << Family::Toy.create } }.to change {parent.toys.count}.by(3)
+        expect(parent.toys.last.child).not_to be_nil
+
+        expect{parent.create_toy}.to change{Family::Toy.count}.by(1)
+      end
+
+      it 'should construct intermediary relations with many-through-many' do
+        expect{parent.create_dog}.to change{Family::Dog.count}.by(1)
       end
 
       it 'should accept class name' do
@@ -389,6 +398,10 @@ describe "passive record models" do
         expect(patient.doctors.all).to eq([doctor])
         expect(doctor.patients.all).to eq([patient])
       end
+
+      it 'should handle insertion' do
+        expect{patient.doctors << Doctor.create}.to change{patient.doctors.count}.by(1)
+      end
     end
 
     context 'self-referential many-to-many' do

metadata

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