fabrication 2.13.0 → 2.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63f6c7600246d2a616c443cfe4f1f40d97dfdfc7
-  data.tar.gz: df342015cfb8dd239fa9fbab926772d4ba06f023
+  metadata.gz: 3bf1a185c7e419f212a6191338886551776c72db
+  data.tar.gz: 65cc299c8b6d9e50f1f25ac125bca674b3fb13df
 SHA512:
-  metadata.gz: d1913a5783bbfc4989a912f3483612fa9dea69548c02a08bc365576395eec0ce64713f5104afea0cceeafa9fa1a1ca00f95676e35a85005da628943dbf8b9e9d
-  data.tar.gz: dfff237fd6789080b8713f12e2ace38d273cc7e3191e35b40b6b16995836fd9c2ae54e35bb1389cbc2b69ec62e38d8d5127e83a650f66cf145c4211e02ab6eac
+  metadata.gz: 3219c8c9d6349d9cb4e4f4866b1e48dc4d7043f7567bb2127499aa0d4ee217c889983c67a3c2125385e0386bd7ced152caf77016cefadff13b88f2a464fa7820
+  data.tar.gz: 4b855c9506ee8155dfa77fba9c979f5ab1713502f77b51d151a4b56e22d8297b5618e4d5ab6684b8d29aad42abe8982771a95a2d108c4ef0b203ddca6bf30ead

data/lib/fabrication/schematic/definition.rb

@@ -8,18 +8,11 @@ class Fabrication::Schematic::Definition
     Fabrication::Generator::Base
   ]
 
-  attr_accessor :name, :options
+  attr_accessor :name, :options, :block
   def initialize(name, options={}, &block)
     self.name = name
     self.options = options
-
-    if parent
-      merge_result = parent.merge(&block)
-      @attributes = merge_result.attributes
-      @callbacks = merge_result.callbacks
-    else
-      process_block(&block)
-    end
+    self.block = block
   end
 
   def process_block(&block)
@@ -42,11 +35,13 @@ class Fabrication::Schematic::Definition
 
   attr_writer :attributes
   def attributes
+    load_body
     @attributes ||= []
   end
 
   attr_writer :callbacks
   def callbacks
+    load_body
     @callbacks ||= {}
   end
 
@@ -109,6 +104,15 @@ class Fabrication::Schematic::Definition
     self.attributes = original.attributes.clone
   end
 
+  def generate_value(name, params)
+    if params[:count]
+      name = Fabrication::Support.singularize(name.to_s)
+      proc { Fabricate.build(params[:fabricator] || name) }
+    else
+      proc { Fabricate(params[:fabricator] || name) }
+    end
+  end
+
   def merge(overrides={}, &block)
     clone.tap do |definition|
       definition.process_block(&block)
@@ -118,17 +122,22 @@ class Fabrication::Schematic::Definition
     end
   end
 
-  def generate_value(name, params)
-    if params[:count]
-      name = Fabrication::Support.singularize(name.to_s)
-      proc { Fabricate.build(params[:fabricator] || name) }
+  protected
+
+  def loaded?; !!@loaded end
+  def load_body
+    return if loaded?
+    @loaded = true
+
+    if parent
+      merge_result = parent.merge(&block)
+      @attributes = merge_result.attributes
+      @callbacks = merge_result.callbacks
     else
-      proc { Fabricate(params[:fabricator] || name) }
+      process_block(&block)
     end
   end
 
-  protected
-
   def parent
     @parent ||= Fabrication.manager[options[:from].to_s] if options[:from]
   end

data/lib/fabrication/version.rb

@@ -1,3 +1,3 @@
 module Fabrication
-  VERSION = '2.13.0'
+  VERSION = '2.13.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fabrication
 version: !ruby/object:Gem::Version
-  version: 2.13.0
+  version: 2.13.1
 platform: ruby
 authors:
 - Paul Elliott