fabrication 0.2.2 → 0.2.3

data/lib/fabrication/generator/active_record.rb

@@ -1,21 +1,14 @@
 class Fabrication::Generator::ActiveRecord < Fabrication::Generator::Base
 
-  attr_accessor :options
-
-  def generate(options)
-    self.options = options
-    self.instance = super.tap { |t| t.save }
-  end
-
   def self.supports?(klass)
     defined?(ActiveRecord) && klass.ancestors.include?(ActiveRecord::Base)
   end
 
   def method_missing(method_name, *args, &block)
     method_name = method_name.to_s
-    count = (args && args.first && args.first[:count]) || 0
     unless options.include?(method_name.to_sym)
       if block_given?
+        count = (args && args.first && args.first[:count]) || 0
         unless (args.first && args.first[:force]) || instance.class.columns.map(&:name).include?(method_name)
           # copy the original getter
           instance.instance_variable_set("@__#{method_name}_original", instance.method(method_name).clone)
@@ -48,4 +41,10 @@ class Fabrication::Generator::ActiveRecord < Fabrication::Generator::Base
     end
   end
 
+  protected
+
+  def after_generation
+    instance.save
+  end
+
 end

data/lib/fabrication/generator/base.rb

@@ -1,28 +1,39 @@
 class Fabrication::Generator::Base
 
-  attr_accessor :klass, :parent, :block, :instance
+  def self.supports?(klass); true end
 
-  def initialize(klass, parent=nil, &block)
-    self.klass = klass
-    self.parent = parent
-    self.block = block
+  def after_create(&block)
+    self.after_create_block = block if block_given?
   end
 
   def generate(options={})
     self.instance = parent ? parent.fabricate : klass.new
-    instance_eval &block
+    self.options = options
+    instance_eval(&block)
     options.each { |k,v| assign(instance, k, v) }
+    after_generation
+    after_create_block.call(instance) if after_create_block
     instance
   end
 
+  def initialize(klass, parent=nil, &block)
+    self.klass = klass
+    self.parent = parent
+    self.block = block
+  end
+
   def method_missing(method_name, *args, &block)
     assign(instance, method_name.to_s, args.first, &block)
   end
 
-  def self.supports?(klass); true end
+  protected
+
+  def after_generation; end
 
   private
 
+  attr_accessor :after_create_block, :block, :instance, :klass, :options, :parent
+
   def assign(instance, method_name, param)
     value = nil
     if param.is_a?(Hash) && param[:count] && param[:count] > 1

data/lib/fabrication/generator/mongoid.rb

@@ -1,7 +1,7 @@
 class Fabrication::Generator::Mongoid < Fabrication::Generator::Base
 
-  def generate(options)
-    self.instance = super.tap { |t| t.save }
+  def after_generation
+    instance.save
   end
 
   def self.supports?(klass)

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/spec.opts

@@ -1,2 +1,3 @@
 --colour
 --format nested
+--backtrace

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabrication
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Paul Elliott
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 -04:00
+date: 2010-07-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency