fabrication 2.5.4 → 2.6.0

data/lib/fabrication/generator/active_record.rb

@@ -8,4 +8,8 @@ class Fabrication::Generator::ActiveRecord < Fabrication::Generator::Base
     self.__instance = __klass.new(__attributes, without_protection: true)
   end
 
+  def validate_instance
+    __instance.valid?
+  end
+
 end

data/lib/fabrication/generator/base.rb

@@ -12,23 +12,27 @@ class Fabrication::Generator::Base
     else
       build_instance
     end
-
     execute_callbacks(callbacks[:after_build])
-
+    execute_callbacks(callbacks[:before_validation])
+    validate_instance
+    execute_callbacks(callbacks[:after_validation])
     __instance
   end
 
-  def execute_callbacks(callbacks)
-    callbacks.each { |callback| __instance.instance_exec(__instance, __transient_attributes, &callback) } if callbacks
-  end
-
   def create(attributes=[], callbacks=[])
     build(attributes, callbacks)
+    execute_callbacks(callbacks[:before_save])
+    execute_callbacks(callbacks[:before_create])
     persist
     execute_callbacks(callbacks[:after_create])
+    execute_callbacks(callbacks[:after_save])
     __instance
   end
 
+  def execute_callbacks(callbacks)
+    callbacks.each { |callback| __instance.instance_exec(__instance, __transient_attributes, &callback) } if callbacks
+  end
+
   def to_hash(attributes=[], callbacks=[])
     process_attributes(attributes)
     (Fabrication::Config.active_support? ? HashWithIndifferentAccess.new : {}).tap do |hash|
@@ -71,6 +75,8 @@ class Fabrication::Generator::Base
     __attributes[method_name] || super
   end
 
+  def validate_instance; end
+
   protected
 
   attr_accessor :__klass, :__instance, :__transient_attributes

data/lib/fabrication/generator/data_mapper.rb

@@ -8,9 +8,14 @@ class Fabrication::Generator::DataMapper < Fabrication::Generator::Base
     self.__instance = __klass.new(__attributes)
   end
 
+  def validate_instance
+    __instance.valid?
+  end
+
   protected
 
   def persist
     __instance.save
   end
+
 end

data/lib/fabrication/generator/keymaker.rb

@@ -8,4 +8,8 @@ class Fabrication::Generator::Keymaker < Fabrication::Generator::Base
     __instance.save
   end
 
+  def validate_instance
+    __instance.valid?
+  end
+
 end

data/lib/fabrication/generator/mongoid.rb

@@ -12,4 +12,8 @@ class Fabrication::Generator::Mongoid < Fabrication::Generator::Base
     end
   end
 
+  def validate_instance
+    __instance.valid?
+  end
+
 end

data/lib/fabrication/generator/sequel.rb

@@ -26,4 +26,8 @@ class Fabrication::Generator::Sequel < Fabrication::Generator::Base
     __instance.save
   end
 
+  def validate_instance
+    __instance.valid?
+  end
+
 end

data/lib/fabrication/schematic/evaluator.rb

@@ -13,15 +13,41 @@ class Fabrication::Schematic::Evaluator < BasicObject
   end
 
   def after_build(&block)
+    ::Kernel.puts "DEPRECATION WARNING: after_build callbacks will be removed in fabrication 2.7"
     @_definition.callbacks[:after_build] ||= []
     @_definition.callbacks[:after_build] << block
   end
 
+  def before_validation(&block)
+    @_definition.callbacks[:before_validation] ||= []
+    @_definition.callbacks[:before_validation] << block
+  end
+
+  def after_validation(&block)
+    @_definition.callbacks[:after_validation] ||= []
+    @_definition.callbacks[:after_validation] << block
+  end
+
+  def before_save(&block)
+    @_definition.callbacks[:before_save] ||= []
+    @_definition.callbacks[:before_save] << block
+  end
+
+  def before_create(&block)
+    @_definition.callbacks[:before_create] ||= []
+    @_definition.callbacks[:before_create] << block
+  end
+
   def after_create(&block)
     @_definition.callbacks[:after_create] ||= []
     @_definition.callbacks[:after_create] << block
   end
 
+  def after_save(&block)
+    @_definition.callbacks[:after_save] ||= []
+    @_definition.callbacks[:after_save] << block
+  end
+
   def on_init(&block)
     @_definition.callbacks[:on_init] = block
   end

data/lib/fabrication/version.rb

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

metadata

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