mongoid-fixture_set 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02b82e3dfd784198cbf75724b2478e14f557a4a8
-  data.tar.gz: 4410c8f10c4ae2497c3394071be568b2f5a2e9cd
+  metadata.gz: 3f8d0e4ca3845297cbc4d603eb34e7498f6472c5
+  data.tar.gz: 2cbc44d1a2aac525c1d6741f03edcece4f9dceca
 SHA512:
-  metadata.gz: 1200a0ae4d699541d3402eb41405b833bfee3e36e27c056d76a823d8d201fed7296cab3eb9bbd30e8757393200fbfd7771f7b38f1aa373e47a1619f692866983
-  data.tar.gz: 3062a85ec71403443e653fdd888f2b67878c236934c0f16fef2013c14751869c82237a9fb352f8f1d8f0d4c50ed2970622942b558c4c1c0db4115156ef416b13
+  metadata.gz: c8faf0c64f4475fcabb706e78b45dbafd36c933281ea8b693e6b853fbbc0a92d04958d09f4b5e00fdc5884fb03f68e69b2052350e63ab47b95f0c4345272ffcd
+  data.tar.gz: 4536e3e4d4597db95ab88e3c77dad7cebdcb82d6d2c8be16ed49458b073e5866f1984b6240f769f9fa1e80bfb5d589eeeb12bd407286d76c9357920f52f3bdeb

data/lib/mongoid/fixture_set/version.rb

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

data/lib/mongoid/fixture_set.rb

@@ -210,6 +210,16 @@ module Mongoid
           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
+
               if relation.polymorphic? && value.sub!(/\s*\(([^)]*)\)\s*/, '')
                 type = $1
                 attributes[relation.foreign_key.sub(/_id$/, '_type')] = type
@@ -221,6 +231,18 @@ module Mongoid
           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, {

data/test/fixtures/users.yml

@@ -4,6 +4,10 @@ geoffroy:
   main_group: sudoers
   groups:
     - print
+  items:
+    - {
+      name: Test
+    }
 user1:
   firstname: Margot
   lastname: Last
@@ -14,3 +18,7 @@ user1:
       address:
         city: Strasbourg
         real: true
+user2:
+  firstname: user2
+  main_group:
+      name: Win?

data/test/models/item.rb

@@ -0,0 +1,8 @@
+class Item
+  include Mongoid::Document
+
+  belongs_to :user
+
+  field :name
+end
+

data/test/models/user.rb

@@ -13,5 +13,8 @@ class User
   belongs_to :main_group, class_name: 'Group', inverse_of: :main_users
 
   has_and_belongs_to_many :groups
+
+  has_many :items
+  accepts_nested_attributes_for :items
 end
 

data/test/mongoid/fixture_set_test.rb

@@ -33,6 +33,17 @@ module Mongoid
       end
     end
 
+    test 'should raised if nested polymorphic relation' do
+      Mongoid::FixtureSet.reset_cache
+
+      begin
+        fs = Mongoid::FixtureSet.create_fixtures('test/nested_polymorphic_relation_fixtures', %w(groups))
+        assert false
+      rescue Mongoid::FixtureSet::FixtureError
+        assert true
+      end
+    end
+
     def test_should_create_fixtures
       Mongoid::FixtureSet.reset_cache
       fs = Mongoid::FixtureSet.create_fixtures('test/fixtures/', %w(users groups schools organisations))
@@ -41,7 +52,7 @@ module Mongoid
       f_geoffroy = users['geoffroy']
 
       assert_equal 6, School.count
-      assert_equal 4, User.count
+      assert_equal 5, User.count
 
       geoffroy = User.find_by(firstname: 'Geoffroy')
       user1 = User.find_by(firstname: 'Margot')
@@ -50,6 +61,9 @@ module Mongoid
       group1 = Group.find_by(name: 'Margot')
       orga1 = Organisation.find_by(name: '1 Organisation')
       school = School.find_by(name: 'School')
+      test_item = Item.find_by(name: 'Test')
+      user2 = User.find_by(firstname: 'user2')
+      win_group = Group.find_by(name: 'Win?')
 
       assert_equal 1, user1.homes.count
       assert_equal geoffroy, f_geoffroy.find
@@ -59,6 +73,8 @@ module Mongoid
       assert sudoers.main_users.include?(geoffroy)
       assert_equal group1, user1.main_group
       assert_equal print, user1.groups.first
+      assert_equal geoffroy, test_item.user
+      assert win_group.main_users.include?(user2)
 
       assert_equal 1, school.groups.count
       assert_equal group1, school.groups.first

data/test/nested_polymorphic_relation_fixtures/groups.yml

@@ -0,0 +1,4 @@
+will_fail:
+  name: will_fail
+  something:
+    name: NOK

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-fixture_set
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Geoffroy Planquart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -79,6 +79,7 @@ files:
 - test/models/home.rb
 - test/models/address.rb
 - test/models/user.rb
+- test/models/item.rb
 - test/mongoid.yml
 - test/fixtures/groups.yml
 - test/fixtures/schools.yml
@@ -88,6 +89,7 @@ files:
 - test/fixtures/users.yml
 - test/test_helper.rb
 - test/load_once_fixtures/tests.yml
+- test/nested_polymorphic_relation_fixtures/groups.yml
 homepage: https://github.com/Aethelflaed/mongoid-fixture_set
 licenses:
 - MIT
@@ -123,6 +125,7 @@ test_files:
 - test/models/home.rb
 - test/models/address.rb
 - test/models/user.rb
+- test/models/item.rb
 - test/mongoid.yml
 - test/fixtures/groups.yml
 - test/fixtures/schools.yml
@@ -132,4 +135,5 @@ test_files:
 - test/fixtures/users.yml
 - test/test_helper.rb
 - test/load_once_fixtures/tests.yml
+- test/nested_polymorphic_relation_fixtures/groups.yml
 has_rdoc: