mongoid-fixture_set 1.1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08d28904367b1439b40eff8c368b9e2fbc0a685a
-  data.tar.gz: 29794db7719e71e7a33c0daf552c421beb912684
+  metadata.gz: 02b82e3dfd784198cbf75724b2478e14f557a4a8
+  data.tar.gz: 4410c8f10c4ae2497c3394071be568b2f5a2e9cd
 SHA512:
-  metadata.gz: 7836135a9f31c0c09b063e572521be6d8c3d06e828acdeec5a507b6398832daae12c87a5cee77189aafdca3e24b5ff0853845dd8cdd07e446d1880dcddc439d4
-  data.tar.gz: b4a989ce4acb13cf16f816bc27565b8f68bf06a3b2bc7d8806ab2439ee901e590649a4f19182c0156080c3cb71365bbf1fb80a88c35d4ee8d2a833491c2f0e06
+  metadata.gz: 1200a0ae4d699541d3402eb41405b833bfee3e36e27c056d76a823d8d201fed7296cab3eb9bbd30e8757393200fbfd7771f7b38f1aa373e47a1619f692866983
+  data.tar.gz: 3062a85ec71403443e653fdd888f2b67878c236934c0f16fef2013c14751869c82237a9fb352f8f1d8f0d4c50ed2970622942b558c4c1c0db4115156ef416b13

data/lib/mongoid/fixture_set/version.rb

@@ -1,6 +1,6 @@
 module Mongoid
   class FixtureSet
-    VERSION = '1.1.2'
+    VERSION = '1.2.1'
   end
 end
 

data/lib/mongoid/fixture_set.rb

@@ -104,10 +104,43 @@ module Mongoid
             document[key] = attributes[key] || document[key]
           end
         end
+        sanitize_new_embedded_documents(document)
         document.save(validate: false)
         return document
       end
 
+      def sanitize_new_embedded_documents(document, is_new = false)
+        document.relations.each do |name, relation|
+          case relation.macro
+          when :embeds_one
+            if (document.changes[name] && !document.changes[name][1].nil?) ||
+              is_new && document[name]
+
+              embedded_document_set_default_values(document.public_send(relation.name), document[name])
+            end
+          when :embeds_many
+            if (document.changes[name] && !document.changes[name][1].nil?) ||
+              is_new && document[name]
+
+              embeddeds = document.public_send(relation.name)
+              embeddeds.each_with_index do |embedded, i|
+                embedded_document_set_default_values(embedded, document[name][i])
+              end
+            end
+          end
+        end
+      end
+
+      def embedded_document_set_default_values(document, attributes)
+        sanitize_new_embedded_documents(document, true)
+        attributes.delete('_id')
+        document.fields.select do |k, v|
+          k != '_id' && v.default_val != nil && attributes[k] == document[k]
+        end.each do |k, v|
+          attributes.delete(k)
+        end
+      end
+
       def find_or_create_document(model, fixture_name)
         model = model.constantize if model.is_a? String
 

data/test/fixtures/users.yml

@@ -7,4 +7,10 @@ geoffroy:
 user1:
   firstname: Margot
   lastname: Last
-  fuckit: true
+  address:
+    city: Strasbourg
+  homes:
+    - name: Home
+      address:
+        city: Strasbourg
+        real: true

data/test/models/address.rb

@@ -0,0 +1,9 @@
+class Address
+  include Mongoid::Document
+
+  embedded_in :place, polymorphic: true
+
+  field :city
+  field :real, type: Boolean, default: true
+end
+

data/test/models/home.rb

@@ -0,0 +1,8 @@
+class Home
+  include Mongoid::Document
+
+  field :name
+
+  embeds_one :address, as: :place
+end
+

data/test/models/user.rb

@@ -2,9 +2,14 @@ class User
   include Mongoid::Document
   include Mongoid::Timestamps::Updated::Short
 
+  embeds_one :address, as: :place
+  embeds_many :homes
+
   field :firstname
   field :lastname
 
+  field :default, type: Boolean, default: true
+
   belongs_to :main_group, class_name: 'Group', inverse_of: :main_users
 
   has_and_belongs_to_many :groups

data/test/mongoid/fixture_set_test.rb

@@ -51,6 +51,7 @@ module Mongoid
       orga1 = Organisation.find_by(name: '1 Organisation')
       school = School.find_by(name: 'School')
 
+      assert_equal 1, user1.homes.count
       assert_equal geoffroy, f_geoffroy.find
       assert_equal 2, print.users.count
       assert print.users.include?(geoffroy)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-fixture_set
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Geoffroy Planquart
@@ -75,8 +75,10 @@ files:
 - test/models/group.rb
 - test/models/organisation.rb
 - test/models/school.rb
-- test/models/user.rb
 - test/models/test.rb
+- test/models/home.rb
+- test/models/address.rb
+- test/models/user.rb
 - test/mongoid.yml
 - test/fixtures/groups.yml
 - test/fixtures/schools.yml
@@ -117,8 +119,10 @@ test_files:
 - test/models/group.rb
 - test/models/organisation.rb
 - test/models/school.rb
-- test/models/user.rb
 - test/models/test.rb
+- test/models/home.rb
+- test/models/address.rb
+- test/models/user.rb
 - test/mongoid.yml
 - test/fixtures/groups.yml
 - test/fixtures/schools.yml