fabrication 2.5.3 → 2.5.4

data/lib/fabrication/generator/base.rb

@@ -19,7 +19,7 @@ class Fabrication::Generator::Base
   end
 
   def execute_callbacks(callbacks)
-    callbacks.each { |callback| __instance.instance_eval(&callback) } if callbacks
+    callbacks.each { |callback| __instance.instance_exec(__instance, __transient_attributes, &callback) } if callbacks
   end
 
   def create(attributes=[], callbacks=[])
@@ -73,7 +73,7 @@ class Fabrication::Generator::Base
 
   protected
 
-  attr_accessor :__klass, :__instance
+  attr_accessor :__klass, :__instance, :__transient_attributes
 
   def __attributes
     @__attributes ||= {}
@@ -86,15 +86,12 @@ class Fabrication::Generator::Base
   def post_initialize; end
 
   def process_attributes(attributes)
+    self.__transient_attributes = Hash.new
     attributes.each do |attribute|
-      __transient_fields << attribute.name if attribute.transient?
       __attributes[attribute.name] = attribute.processed_value(__attributes)
+      __transient_attributes[attribute.name] = __attributes[attribute.name] if attribute.transient?
     end
-    __attributes.reject! { |k| __transient_fields.include?(k) }
-  end
-
-  def __transient_fields
-    @__transient_fields ||= []
+    __attributes.reject! { |k| __transient_attributes.keys.include?(k) }
   end
 
 end

data/lib/fabrication/generator/mongoid.rb

@@ -5,7 +5,11 @@ class Fabrication::Generator::Mongoid < Fabrication::Generator::Base
   end
 
   def build_instance
-    self.__instance = __klass.new(__attributes, without_protection: true)
+    if Gem::Version.new(Mongoid::VERSION) >= Gem::Version.new('2.3.0')
+      self.__instance = __klass.new(__attributes, without_protection: true)
+    else
+      self.__instance = __klass.new(__attributes)
+    end
   end
 
 end

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '2.5.3'
+  VERSION = '2.5.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord