passive_record 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e167bf4e2d2ccfac858f54b3a7593292a7b71ec4
-  data.tar.gz: fa13659ef74ddc2fcc5a8e09acb0e40bc094cc88
+  metadata.gz: 57f65c2807d7cfe4fdedb6ed50a176e4d93f6372
+  data.tar.gz: e2ec1ce8b73eee02815c22acf0ce143a7388bfc4
 SHA512:
-  metadata.gz: db030a7d7fa80bc3ae96be2e5cbb600da57dc0e73bd251f0db92f5a43182e00917b249872f02141dd6e6fa8b4ea771b5f2ee2c90e27bd8c8dd99c195a84d6f49
-  data.tar.gz: e24cfde130b7c43d5cc0d99b33b7f3e27c73413ea3f3948bee3eeaa02853224dbc39511e21502350841eaff61748ebdf148c2f0d0f41322418038ae52644571c
+  metadata.gz: c3507ad80dd941d6d6afb5a5efe3542ae4b8052d53c31dfaa2c58ac737c5825d16c02b1189677e60ca80949d2e505e926c652ee46883da5ec9dcd0af3f07f055
+  data.tar.gz: 49c26b8bdfb5ffbfd4c8f4a0b152ea19763214ee8edae5ee4ed65be561e9ad7c4f15bc223c38dcd28c6c2a09ca1ab51d78ae938496b191282c746a452df687c0

data/lib/passive_record/associations/has_many_through.rb

@@ -17,17 +17,19 @@ module PassiveRecord
               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 ]
-            )
+            intermediary_model = intermediary_relation.singular? ?
+                intermediary_relation.lookup_or_create :
+                intermediary_relation.where(parent_model_id_field => parent_model.id).first_or_create
+
+            intermediary_model.update(
+                nested_ids_field => intermediary_model.send(nested_ids_field) + [ child.id ]
+              )
           end
         else
-          intermediary_relation.
+          intermediary_model = intermediary_relation.
             where(
               association.target_name_symbol.to_s.singularize + "_id" => child.id).
               first_or_create
-
         end
         self
       end
@@ -58,9 +60,10 @@ module PassiveRecord
       end
 
       def all
-        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?
+        join_results = intermediate_results
+        if intermediate_results && !join_results.empty?
+          final_results = join_results.flat_map(&nested_association.target_name_symbol)
+          if final_results.first.is_a?(Associations::Relation)
             final_results.flat_map(&:all)
           else
             Array(final_results)
@@ -71,11 +74,15 @@ module PassiveRecord
       end
 
       def intermediary_relation
-        association.base_association.to_relation(parent_model)
+        @intermediary_relation ||= association.base_association.to_relation(parent_model)
       end
 
       def intermediate_results
-        intermediary_relation.all
+        if intermediary_relation.singular?
+          Array(intermediary_relation.lookup)
+        else
+          intermediary_relation.all
+        end
       end
     end
   end

data/lib/passive_record/associations/has_one.rb

@@ -29,6 +29,10 @@ module PassiveRecord
         )
       end
 
+      def lookup_or_create
+        lookup || create
+      end
+
       def parent_model_id_field
         association.parent_class.name.demodulize.underscore + "_id"
       end

data/lib/passive_record/version.rb

@@ -1,4 +1,4 @@
 module PassiveRecord
   # passive_record version
-  VERSION = "0.3.16"
+  VERSION = "0.3.17"
 end

data/spec/passive_record_spec.rb

@@ -65,7 +65,7 @@ describe "passive record models" do
             to eq("Family::Dog (id: #{dog.id.inspect}, breed: \"#{dog.breed}\", created_at: #{dog.created_at}, sound: \"bark\", child_id: #{child.id.inspect})")
 
           expect(child.inspect).
-            to eq("Family::Child (id: #{child.id.inspect}, created_at: #{child.created_at}, name: \"Alice\", toy_id: nil, dog_ids: [#{dog.id.inspect}], parent_id: nil, secret_club_ids: [])")
+            to eq("Family::Child (id: #{child.id.inspect}, created_at: #{child.created_at}, name: \"Alice\", toy_id: nil, toy_quality_ids: [], dog_ids: [#{dog.id.inspect}], parent_id: nil, secret_club_ids: [])")
         end
       end
 
@@ -366,7 +366,7 @@ 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 {Family::Toy.count}.by(3)
         expect { 3.times { parent.toys << Family::Toy.create } }.to change {parent.toys.count}.by(3)
         expect(parent.toys.last.child).not_to be_nil
 
@@ -453,5 +453,18 @@ describe "passive record models" do
         expect(child.secret_clubs.first.create_child).to be_a(Family::Child)
       end
     end
+
+    context 'has many through has one' do
+      it 'should manage relationships' do
+        child = Family::Child.create
+        toy_quality = child.create_toy_quality(name: 'fun')
+        child.create_toy_quality(name: 'cool')
+        child.create_toy_quality(name: 'radical')
+
+        expect(child.toy_qualities.all).to include(toy_quality)
+        expect(child.toy_qualities.count).to eq(3)
+        expect(child.toy_qualities.map(&:name)).to eq(%w[ fun cool radical ])
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -26,14 +26,21 @@ module Family
     after_create { @sound = 'bark' }
   end
 
+  class ToyQuality < Model
+    attr_accessor :name
+    belongs_to :toy
+  end
+
   class Toy < Model
     belongs_to :child
+    has_many :toy_qualities
     attr_reader :kind
     after_create {@kind = %w[ stuffed_animal blocks cards ].sample}
   end
 
   class Child < Model
     has_one :toy
+    has_many :toy_qualities, :through => :toy
     has_many :dogs
     belongs_to :parent
     has_and_belongs_to_many :secret_clubs

metadata

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