mongoid-fixture_set 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deee45d8bd6cce4b9e484a8adde2467f0d258a28
-  data.tar.gz: d0e05c7fa2ce09d4685998e213ab8de144c8a20e
+  metadata.gz: 08d28904367b1439b40eff8c368b9e2fbc0a685a
+  data.tar.gz: 29794db7719e71e7a33c0daf552c421beb912684
 SHA512:
-  metadata.gz: 95d1a77135689a9bbb3c8e142e43d0e2fd3df43b4f2c15d9b325ab94b8ccff6aacd72039ea867d090cafcd0de29fc2dffa0078a33738581a629120adb369f193
-  data.tar.gz: 8cd816d775042c2bda59152ad2fa5cbe475c907e118a3db5fa8510a526cbb5b8c49776640c61309e27582162977321cd027b4282aff5765e72a43a91f9a53749
+  metadata.gz: 7836135a9f31c0c09b063e572521be6d8c3d06e828acdeec5a507b6398832daae12c87a5cee77189aafdca3e24b5ff0853845dd8cdd07e446d1880dcddc439d4
+  data.tar.gz: b4a989ce4acb13cf16f816bc27565b8f68bf06a3b2bc7d8806ab2439ee901e590649a4f19182c0156080c3cb71365bbf1fb80a88c35d4ee8d2a833491c2f0e06

data/lib/mongoid/fixture_set/fixture.rb

@@ -29,7 +29,7 @@ module Mongoid
       def find
         if model_class
           model_class.unscoped do
-            model_class.find(Mongoid::FixtureSet.identify(model_class, name))
+            model_class.find_by('__fixture_name' => name)
           end
         else
           raise FixtureClassNotFound, "No class attached to find."

data/lib/mongoid/fixture_set/version.rb

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

data/lib/mongoid/fixture_set.rb

@@ -3,8 +3,6 @@ require 'mongoid/fixture_set/file'
 require 'mongoid/fixture_set/class_cache'
 require 'mongoid/fixture_set/test_helper'
 
-require 'active_support/core_ext/digest/uuid'
-
 module Mongoid
   class FixtureSet
     @@cached_fixtures = Hash.new
@@ -89,24 +87,37 @@ module Mongoid
       end
 
       def create_or_update_document(model, attributes)
-        document = model.find_or_initialize_by('_id' => attributes['_id'])
+        model = model.constantize if model.is_a? String
+
+        document = find_or_create_document(model, attributes['__fixture_name'])
+        update_document(document, attributes)
+      end
+
+      def update_document(document, attributes)
+        attributes.delete('_id') if document.attributes.has_key?('_id')
+
         keys = (attributes.keys + document.attributes.keys).uniq
-        attrs = Hash[keys.collect do |key|
-          if attributes[key].is_a?(Array) || document.attributes[key].is_a?(Array)
-            value = [attributes[key], document.attributes[key]].flatten(1).compact
+        keys.each do |key|
+          if attributes[key].is_a?(Array) || document[key].is_a?(Array)
+            document[key] = Array(attributes[key]) + Array(document[key])
           else
-            value = attributes[key] || document.attributes[key]
+            document[key] = attributes[key] || document[key]
           end
-          [key, value]
-        end]
-        document.assign_attributes(attrs)
+        end
         document.save(validate: false)
+        return document
       end
 
-      # Returns a consistent, platform-independent identifier for +label+.
-      # UUIDs are RFC 4122 version 5 SHA-1 hashes.
-      def identify(model, label)
-        Digest::UUID.uuid_v5(Digest::UUID::OID_NAMESPACE, "#{model}##{label}")
+      def find_or_create_document(model, fixture_name)
+        model = model.constantize if model.is_a? String
+
+        document = model.where('__fixture_name' => fixture_name).first
+        if document.nil?
+          document = model.new
+          document['__fixture_name'] = fixture_name
+          document.save(validate: false)
+        end
+        return document
       end
     end
 
@@ -146,8 +157,15 @@ module Mongoid
       documents[class_name] = fixtures.map do |label, fixture|
         attributes = fixture.to_hash
 
+        attributes['__fixture_name'] = label
+
         next attributes if model_class.nil?
 
+        if !attributes.has_key?('_id')
+          document = self.class.find_or_create_document(model_class, label)
+          attributes['_id'] = document.id
+        end
+
         set_attributes_timestamps(attributes, model_class)
         
         # interpolate the fixture label
@@ -155,34 +173,30 @@ module Mongoid
           attributes[key] = value.gsub("$LABEL", label) if value.is_a?(String)
         end
 
-        attributes['_id'] = self.class.identify(class_name, label)
-
         model_class.relations.each do |name, relation|
           case relation.macro
           when :belongs_to
             if value = attributes.delete(relation.name.to_s)
-              id = self.class.identify(relation.class_name, value)
               if relation.polymorphic? && value.sub!(/\s*\(([^)]*)\)\s*/, '')
                 type = $1
                 attributes[relation.foreign_key.sub(/_id$/, '_type')] = type
-                id = self.class.identify(type, value)
+                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
-              attributes[relation.foreign_key] = id
             end
           when :has_many
             if values = attributes.delete(relation.name.to_s)
               values.each do |value|
-                id = self.class.identify(relation.class_name, value)
+                document = self.class.find_or_create_document(relation.class_name, value)
                 if relation.polymorphic?
-                  self.class.create_or_update_document(relation.class_name.constantize, {
-                    '_id' => id,
+                  self.class.update_document(document, {
                     "#{relation.as}_id" => attributes['_id'],
                     "#{relation.as}_type" => model_class.name,
                   })
                 else
-                  self.class.create_or_update_document(relation.class_name.constantize, {
-                    '_id' => id,
-                    relation.foreign_key => attributes['_id'],
+                  self.class.update_document(document, {
+                    relation.foreign_key => attributes['_id']
                   })
                 end
               end
@@ -193,12 +207,11 @@ module Mongoid
               attributes[key] = []
 
               values.each do |value|
-                id = self.class.identify(relation.class_name, value)
-                attributes[key] << id
+                document = self.class.find_or_create_document(relation.class_name, value)
+                attributes[key] << document.id
 
-                self.class.create_or_update_document(relation.class_name.constantize, {
-                  '_id' => id,
-                  relation.inverse_foreign_key => [attributes['_id']]
+                self.class.update_document(document, {
+                  relation.inverse_foreign_key => Array(attributes['_id'])
                 })
               end
             end

data/test/fixtures/users.yml

@@ -7,3 +7,4 @@ geoffroy:
 user1:
   firstname: Margot
   lastname: Last
+  fuckit: true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-fixture_set
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Geoffroy Planquart
@@ -28,16 +28,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -62,28 +62,28 @@ files:
 - lib/mongoid/fixture_set/errors.rb
 - lib/mongoid/fixture_set/file.rb
 - lib/mongoid/fixture_set/class_cache.rb
+- lib/mongoid/fixture_set/test_helper.rb
 - lib/mongoid/fixture_set/fixture.rb
 - lib/mongoid/fixture_set/version.rb
-- lib/mongoid/fixture_set/test_helper.rb
 - lib/mongoid/fixture_set.rb
 - lib/mongoid-fixture_set.rb
 - MIT-LICENSE
 - Rakefile
 - test/mongoid/fixtures_test.rb
-- test/mongoid/fixture_set_test.rb
 - test/mongoid/load_once_test.rb
+- test/mongoid/fixture_set_test.rb
 - test/models/group.rb
 - test/models/organisation.rb
 - test/models/school.rb
 - test/models/user.rb
 - test/models/test.rb
 - test/mongoid.yml
-- test/fixtures/users.yml
 - test/fixtures/groups.yml
 - test/fixtures/schools.yml
 - test/fixtures/organisations.yml
 - test/fixtures/users/family.yml
 - test/fixtures/not_models.yml
+- test/fixtures/users.yml
 - test/test_helper.rb
 - test/load_once_fixtures/tests.yml
 homepage: https://github.com/Aethelflaed/mongoid-fixture_set
@@ -112,20 +112,20 @@ specification_version: 4
 summary: Fixtures for Mongoid
 test_files:
 - test/mongoid/fixtures_test.rb
-- test/mongoid/fixture_set_test.rb
 - test/mongoid/load_once_test.rb
+- test/mongoid/fixture_set_test.rb
 - test/models/group.rb
 - test/models/organisation.rb
 - test/models/school.rb
 - test/models/user.rb
 - test/models/test.rb
 - test/mongoid.yml
-- test/fixtures/users.yml
 - test/fixtures/groups.yml
 - test/fixtures/schools.yml
 - test/fixtures/organisations.yml
 - test/fixtures/users/family.yml
 - test/fixtures/not_models.yml
+- test/fixtures/users.yml
 - test/test_helper.rb
 - test/load_once_fixtures/tests.yml
 has_rdoc: