midiskirt 1.2.0 → 1.2.1

data/lib/midiskirt.rb

@@ -1,5 +1,6 @@
 require 'active_support/inflector'
 require 'active_support/core_ext/hash'
+require 'active_support/core_ext/object/duplicable'
 
 # Factory girl, relaxed.
 #
@@ -70,7 +71,8 @@ class Midiskirt
 
       klass.new do |record|
         attributes.each do |name, value|
-          record.send(:"#{name}=", (value.kind_of?(Proc) ? value.call(record) : value).dup)
+          value = value.kind_of?(Proc) ? value.call(record) : value
+          record.send(:"#{name}=", value.duplicable? ? value.dup : value)
         end
       end
     end

data/lib/midiskirt/version.rb

@@ -1,3 +1,3 @@
 class Midiskirt
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/test/test_helper.rb

@@ -23,6 +23,10 @@ class Post < Mock
   attr_accessor :user
 end
 
+class Unbeatable < Mock
+  attr_accessor :locked, :state, :email, :age, :male
+end
+
 Midiskirt.define :admin, :parent => :user do |f|
   f.login "admin"
 end
@@ -45,4 +49,12 @@ DefaultSettings = {
 Midiskirt.define :guest, :class => :user do |f|
   f.login "guest"
   f.settings DefaultSettings
+end
+
+Midiskirt.define :unbeatable do |f|
+  f.locked false
+  f.state :enabled
+  f.email nil
+  f.age 19
+  f.male true
 end

data/test/unit/midiskirt_test.rb

@@ -87,14 +87,14 @@ class MidiskirtTest < Test::Unit::TestCase
 
   def test_objects_should_not_corrupt_attribute_templates
     factories = Midiskirt.instance_variable_get(:@factories)
-    assert_not_equal DefaultSettings.object_id, factories["guest"].__attrs__["settings"].object_id
+    assert_not_same DefaultSettings, factories["guest"].__attrs__["settings"]
   end
 
   def test_factories_should_not_corrupt_attribute_templates
     alice = Factory.build :guest
     bob = Factory.build :guest
 
-    assert_not_equal DefaultSettings.object_id, alice.object_id, "Object from factory should not reference to template object"
+    assert_not_same DefaultSettings, alice.settings
 
     alice.settings["eyes"] = "brown"
 
@@ -104,4 +104,10 @@ class MidiskirtTest < Test::Unit::TestCase
   def test_should_sequence_without_database
     assert_not_equal Factory.build(:user).login, Factory.build(:user).login
   end
+
+  def test_should_not_dup_singletons
+    assert_nothing_raised(TypeError) {
+      Factory(:unbeatable)
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: midiskirt
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70132610155420 !ruby/object:Gem::Requirement
+  requirement: &70260846686360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70132610155420
+  version_requirements: *70260846686360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70132610155000 !ruby/object:Gem::Requirement
+  requirement: &70260846685920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70132610155000
+  version_requirements: *70260846685920
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70132610154440 !ruby/object:Gem::Requirement
+  requirement: &70260846685320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70132610154440
+  version_requirements: *70260846685320
 description: Test::Unit begot MiniTest; factory_girl begot Miniskirt, Miniskirt begets
   Midiskirt
 email: