mongoid-fixture_set 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7e6e3f628466c6643665b562f50ae06e4b2068e
-  data.tar.gz: c0978d43e8aa95bc8622a7f22261146b939320bc
+  metadata.gz: 954c1649aade85a048af51c936b5243633c71bb1
+  data.tar.gz: a91c7e1f646481b7da07d0e11dcced34e1ab9bad
 SHA512:
-  metadata.gz: 051d3f4ee6018932783edba6a288d1197eb2e469d0f7b44bd92d9a03d7a161ad6e4718184a13bc35032a5c66cd6ed7437d3ce3bb0b66aa251683193d4c760f01
-  data.tar.gz: c1c8260fed59e349f53167aab4e20d97de28feb46450001ae0de7980a6db10c474dd740ba60eb871cc9dac9317721d9c9e54d0f4fec77a994e6983c6c5a2becb
+  metadata.gz: 025d7524855339e96cdf1228fbc0e2019c5ca38c992c346a746944715c1f9b90c063e476a9439636bd0f3045afe74cce8aa96d8680e06ba98ce7294c9ea35b09
+  data.tar.gz: 4ab38d9670943e6b4bd08c5ce6200a225a0b375122e171e2890dafb0ab9c771007a6654a14fb99845b31ca8f0eae7973060188c86f5ba4eea237af37b156a94d

data/lib/mongoid/fixture_set.rb

@@ -1,3 +1,4 @@
+require 'mongoid/fixture_set/errors'
 require 'mongoid/fixture_set/fixture'
 require 'mongoid/fixture_set/file'
 require 'mongoid/fixture_set/class_cache'
@@ -114,13 +115,13 @@ module Mongoid
           case relation.macro
           when :embeds_one
             if (document.changes[name] && !document.changes[name][1].nil?) ||
-              is_new && document[name]
+              (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]
+              (is_new && document[name])
 
               embeddeds = document.public_send(relation.name)
               embeddeds.each_with_index do |embedded, i|
@@ -178,8 +179,6 @@ module Mongoid
       fixtures[x]
     end
 
-    # Returns a hash of documents to be inserted. The key is the model class, the value is
-    # a list of documents to insert in th relative collection.
     def collection_documents
       # allow a standard key to be used for doing defaults in YAML
       fixtures.delete('DEFAULTS')
@@ -188,99 +187,137 @@ module Mongoid
       documents = Hash.new
 
       documents[class_name] = fixtures.map do |label, fixture|
-        attributes = fixture.to_hash
+        unmarshall_fixture(label, fixture, model_class)
+      end
 
-        attributes['__fixture_name'] = label
+      return documents
+    end
 
-        next attributes if model_class.nil?
+    private
+    def unmarshall_fixture(label, attributes, model_class)
+      model_class = model_class.constantize if model_class.is_a? String
+      attributes = attributes.to_hash
 
-        if !attributes.has_key?('_id')
-          document = self.class.find_or_create_document(model_class, label)
-          attributes['_id'] = document.id
-        end
+      if label
+        attributes['__fixture_name'] = label
 
-        set_attributes_timestamps(attributes, model_class)
-        
         # interpolate the fixture label
         attributes.each do |key, value|
           attributes[key] = value.gsub("$LABEL", label) if value.is_a?(String)
         end
+      end
 
-        model_class.relations.each do |name, relation|
-          case relation.macro
-          when :belongs_to
-            if value = attributes.delete(relation.name.to_s)
-              if value.is_a? Hash
-                if relation.polymorphic?
-                  raise Mongoid::FixtureSet::FixtureError.new "Unable to create document from nested attributes in a polymorphic relation"
-                end
-                document = relation.class_name.constantize.new
-                document = self.class.update_document(document, value)
-                attributes[relation.foreign_key] = document.id
-                next
-              end
+      return attributes if model_class.nil?
 
-              if relation.polymorphic? && value.sub!(/\s*\(([^)]*)\)\s*/, '')
-                type = $1
-                attributes[relation.foreign_key.sub(/_id$/, '_type')] = type
-                attributes[relation.foreign_key] = self.class.find_or_create_document(type, value).id
-              else
-                attributes[relation.foreign_key] = self.class.find_or_create_document(relation.class_name, value).id
-              end
-            end
-          when :has_many
-            if values = attributes.delete(relation.name.to_s)
-              values.each do |value|
-                if value.is_a? Hash
-                  document = relation.class_name.constantize.new
-                  if relation.polymorphic?
-                    value["#{relation.as}_id"] = attributes['_id']
-                    value["#{relation.as}_type"] = model_class.name
-                  else
-                    value[relation.foreign_key] = attributes['_id']
-                  end
-                  self.class.update_document(document, value)
-                  next
-                end
-
-                document = self.class.find_or_create_document(relation.class_name, value)
-                if relation.polymorphic?
-                  self.class.update_document(document, {
-                    "#{relation.as}_id" => attributes['_id'],
-                    "#{relation.as}_type" => model_class.name,
-                  })
-                else
-                  self.class.update_document(document, {
-                    relation.foreign_key => attributes['_id']
-                  })
-                end
-              end
-            end
-          when :has_and_belongs_to_many
-            if values = attributes.delete(relation.name.to_s)
-              key = "#{relation.name.to_s.singularize}_ids"
-              attributes[key] = []
-
-              values.each do |value|
-                document = self.class.find_or_create_document(relation.class_name, value)
-                attributes[key] << document.id
-
-                self.class.update_document(document, {
-                  relation.inverse_foreign_key => Array(attributes['_id'])
-                })
-              end
-            end
+      if !attributes.has_key?('_id')
+        if label
+          document = self.class.find_or_create_document(model_class, label)
+        else
+          document = model_class.new
+        end
+        attributes['_id'] = document.id
+      end
+
+      set_attributes_timestamps(model_class, attributes)
+
+      model_class.relations.each_value do |relation|
+        case relation.macro
+        when :belongs_to
+          unmarshall_belongs_to(model_class, attributes, relation)
+        when :has_many
+          unmarshall_has_many(model_class, attributes, relation)
+        when :has_and_belongs_to_many
+          unmarshall_has_and_belongs_to_many(model_class, attributes, relation)
+        end
+      end
+
+      return attributes
+    end
+
+    def unmarshall_belongs_to(model_class, attributes, relation)
+      value = attributes.delete(relation.name.to_s)
+      return if value.nil?
+
+      if value.is_a? Hash
+        if relation.polymorphic?
+          raise Mongoid::FixtureSet::FixtureError.new "Unable to create document from nested attributes in a polymorphic relation"
+        end
+        document = relation.class_name.constantize.new
+        value = unmarshall_fixture(nil, value, relation.class_name)
+        document = self.class.update_document(document, value)
+        attributes[relation.foreign_key] = document.id
+        return
+      end
+
+      if relation.polymorphic? && value.sub!(/\s*\(([^)]*)\)\s*/, '')
+        type = $1
+        attributes[relation.inverse_type] = type
+        attributes[relation.foreign_key]  = self.class.find_or_create_document(type, value).id
+      else
+        attributes[relation.foreign_key]  = self.class.find_or_create_document(relation.class_name, value).id
+      end
+    end
+
+    def unmarshall_has_many(model_class, attributes, relation)
+      values = attributes.delete(relation.name.to_s)
+      return if values.nil?
+
+      values.each do |value|
+        if value.is_a? Hash
+          document = relation.class_name.constantize.new
+          if relation.polymorphic?
+            value[relation.foreign_key] = attributes['_id']
+            value[relation.type]        = model_class.name
+          else
+            value[relation.foreign_key] = attributes['_id']
           end
+          value = unmarshall_fixture(nil, value, relation.class_name)
+          self.class.update_document(document, value)
+          next
         end
 
-        attributes
+        document = self.class.find_or_create_document(relation.class_name, value)
+        if relation.polymorphic?
+          self.class.update_document(document, {
+            relation.foreign_key => attributes['_id'],
+            relation.type        => model_class.name,
+          })
+        else
+          self.class.update_document(document, {
+            relation.foreign_key => attributes['_id']
+          })
+        end
       end
+    end
 
-      return documents
+    def unmarshall_has_and_belongs_to_many(model_class, attributes, relation)
+      values = attributes.delete(relation.name.to_s)
+      return if values.nil?
+
+      key = relation.foreign_key
+      attributes[key] = []
+
+      values.each do |value|
+        if value.is_a? Hash
+          document = relation.class_name.constantize.new
+          value[relation.inverse_foreign_key] = Array(attributes['_id'])
+          value = unmarshall_fixture(nil, value, relation.class_name)
+          self.class.update_document(document, value)
+          attributes[key] << document.id
+
+          next
+        end
+
+        document = self.class.find_or_create_document(relation.class_name, value)
+        attributes[key] << document.id
+
+        self.class.update_document(document, {
+          relation.inverse_foreign_key => Array(attributes['_id'])
+        })
+      end
     end
 
-    private
-    def set_attributes_timestamps(attributes, model_class)
+    def set_attributes_timestamps(model_class, attributes)
       now = Time.now.utc
 
       if model_class < Mongoid::Timestamps::Created::Short

data/lib/mongoid/fixture_set/errors.rb

@@ -3,6 +3,9 @@ module Mongoid
     class FixtureError < Mongoid::Errors::MongoidError
     end
 
+    class FixtureNotFound < FixtureError
+    end
+
     class FormatError < FixtureError
     end
 

data/lib/mongoid/fixture_set/test_helper.rb

@@ -53,7 +53,7 @@ module Mongoid
                  if @loaded_fixtures[fs_name] && @loaded_fixtures[fs_name][f_name]
                    @fixture_cache[fs_name][f_name] ||= @loaded_fixtures[fs_name][f_name].find
                  else
-                   raise StandardError, "No fixture named '#{f_name}' found for fixture set '#{fs_name}'"
+                   raise FixtureNotFound, "No fixture named '#{f_name}' found for fixture set '#{fs_name}'"
                  end
                end
                instances.size == 1 ? instances.first : instances
@@ -68,7 +68,7 @@ module Mongoid
         @fixture_cache = {}
 
         if self.class.cached_fixtures && self.class.load_fixtures_once
-          self.class.fixtures(:all)
+          self.class.fixtures(self.class.fixture_set_names)
           @loaded_fixtures = self.class.cached_fixtures
         else
           Mongoid::FixtureSet.reset_cache

data/lib/mongoid/fixture_set/version.rb

@@ -1,6 +1,6 @@
 module Mongoid
   class FixtureSet
-    VERSION = '1.3.2'
+    VERSION = '1.3.3'
   end
 end
 

data/test/fixtures/users.yml

@@ -4,6 +4,15 @@ geoffroy:
   main_group: sudoers
   groups:
     - print
+    - !ruby/hash
+      name: Test nested polymorphic belongs_to
+      something: orga1 (Organisation)
+    - !ruby/hash
+      name: Test nested has_many creation
+      main_users:
+        - {
+          firstname: 'Created in nested group'
+        }
   items:
     - {
       name: Test

data/test/mongoid/fixture_set_test.rb

@@ -52,7 +52,7 @@ module Mongoid
       f_geoffroy = users['geoffroy']
 
       assert_equal 6, School.count
-      assert_equal 5, User.count
+      assert_equal 6, User.count
 
       geoffroy = User.find_by(firstname: 'Geoffroy')
       user1 = User.find_by(firstname: 'Margot')
@@ -64,6 +64,9 @@ module Mongoid
       test_item = Item.find_by(name: 'Test')
       user2 = User.find_by(firstname: 'user2')
       win_group = Group.find_by(name: 'Win?')
+      test_nested_polymorphic_belongs_to = Group.find_by(name: 'Test nested polymorphic belongs_to')
+      test_nested_has_many_creation = Group.find_by(name: 'Test nested has_many creation')
+      User.find_by(firstname: 'Created in nested group')
 
       assert_equal 1, user1.homes.count
       assert_equal geoffroy, f_geoffroy.find
@@ -80,7 +83,7 @@ module Mongoid
       assert_equal group1, school.groups.first
       assert_equal school, group1.something
 
-      assert_equal 2, orga1.groups.count
+      assert_equal 3, orga1.groups.count
       assert orga1.groups.include?(sudoers)
       assert_equal orga1, sudoers.something
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-fixture_set
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Geoffroy Planquart
@@ -59,10 +59,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/mongoid/fixture_set/errors.rb
 - lib/mongoid/fixture_set/file.rb
 - lib/mongoid/fixture_set/fixture.rb
 - lib/mongoid/fixture_set/class_cache.rb
+- lib/mongoid/fixture_set/errors.rb
 - lib/mongoid/fixture_set/test_helper.rb
 - lib/mongoid/fixture_set/version.rb
 - lib/mongoid/fixture_set.rb
@@ -85,8 +85,8 @@ files:
 - test/fixtures/organisations.yml
 - test/fixtures/users/family.yml
 - test/fixtures/not_models.yml
-- test/fixtures/users.yml
 - test/fixtures/groups.yml
+- test/fixtures/users.yml
 - test/test_helper.rb
 - test/load_once_fixtures/tests.yml
 - test/nested_polymorphic_relation_fixtures/groups.yml
@@ -131,8 +131,8 @@ test_files:
 - test/fixtures/organisations.yml
 - test/fixtures/users/family.yml
 - test/fixtures/not_models.yml
-- test/fixtures/users.yml
 - test/fixtures/groups.yml
+- test/fixtures/users.yml
 - test/test_helper.rb
 - test/load_once_fixtures/tests.yml
 - test/nested_polymorphic_relation_fixtures/groups.yml