midiskirt 1.2.1 → 1.2.2

data/lib/midiskirt/version.rb

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

data/lib/midiskirt.rb

@@ -71,8 +71,15 @@ class Midiskirt
 
       klass.new do |record|
         attributes.each do |name, value|
-          value = value.kind_of?(Proc) ? value.call(record) : value
-          record.send(:"#{name}=", value.duplicable? ? value.dup : value)
+          # Call proc if value is proc or use copy of existent value if
+          # it can be duplicated
+          value = if value.kind_of?(Proc)
+              value.call(record)
+          else
+            value.duplicable? ? value.dup : value
+          end
+
+          record.send(:"#{name}=", value)
         end
       end
     end

data/test/test_helper.rb

@@ -51,6 +51,11 @@ Midiskirt.define :guest, :class => :user do |f|
   f.settings DefaultSettings
 end
 
+Midiskirt.define :tenant, :class => :user do |f|
+  f.login "tenant"
+  f.settings { DefaultSettings }
+end
+
 Midiskirt.define :unbeatable do |f|
   f.locked false
   f.state :enabled

data/test/unit/midiskirt_test.rb

@@ -110,4 +110,8 @@ class MidiskirtTest < Test::Unit::TestCase
       Factory(:unbeatable)
     }
   end
+
+  def test_should_not_dup_proc_results
+    assert_same Factory(:tenant).settings, DefaultSettings
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: midiskirt
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   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: &70260846686360 !ruby/object:Gem::Requirement
+  requirement: &70299044510760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70260846686360
+  version_requirements: *70299044510760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70260846685920 !ruby/object:Gem::Requirement
+  requirement: &70299044509760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70260846685920
+  version_requirements: *70299044509760
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70260846685320 !ruby/object:Gem::Requirement
+  requirement: &70299044508940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70260846685320
+  version_requirements: *70299044508940
 description: Test::Unit begot MiniTest; factory_girl begot Miniskirt, Miniskirt begets
   Midiskirt
 email: