modelizer 5.0.1 → 5.0.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 5.0.2 // 2011-09-15
+
+* Support circular factory initialization.
+
 === 5.0.1 // 2011-09-14
 
 * Include fixture name and errors when fixtures can't be saved.

data/lib/modelizer.rb

@@ -2,52 +2,47 @@ require "zlib"
 
 module Modelizer
 
-  VERSION = "5.0.1"
+  VERSION = "5.0.2"
 
-  def build name, overrides = nil, &block
-    model, *initializers = Modelizer.factories[name]
-    raise "Can't find the \"#{name}\" factory." unless model
+  module Helpers
+    def build name, overrides = nil, &block
+      model, *initializers = Modelizer.factories[name]
+      raise "Can't find the \"#{name}\" factory." unless model
 
-    obj = model.new
+      obj = model.new
+      ctx = FactoryContext.new overrides || {}
 
-    initializers << block if block_given?
-    initializers.each { |i| instance_exec obj, &i }
+      initializers << block if block_given?
 
-    overrides.each { |k, v| obj.send "#{k}=", v } if overrides
-    
-    obj
-  end
-
-  def create name, overrides = nil, &block
-    obj = build name, overrides, &block
-
-    obj.save!
-
-    obj
-  end
+      initializers.each { |i| ctx.instance_exec obj, &i }
+      overrides.each    { |k, v| obj.send "#{k}=", v } if overrides
+      
+      obj
+    end
 
-  def use name
-    model, id = Modelizer.ids[name]
-    raise "Can't find the \"#{name}\" fixture." unless model
+    def create name, overrides = nil, &block
+      obj = build name, overrides, &block
 
-    model.find id
-  end
+      obj.save!
 
-  class Context < Struct.new(:instances)
-    def identify name
-      Modelizer.identify name
+      obj
     end
 
     def use name
-      instances[name] or raise "Can't find the \"#{name}\" fixture."
+      model, id = Modelizer.ids[name]
+      raise "Can't find the \"#{name}\" fixture." unless model
+
+      model.find id
     end
   end
 
+  include Helpers
+
   def self.included klass
     Dir[glob].sort.each { |f| instance_eval File.read(f), f, 1 }
 
     instances = {}
-    context   = Context.new instances
+    context   = FixtureContext.new instances
 
     fixtures.each do |name, value|
       instances[name] = value.first.new
@@ -103,4 +98,22 @@ module Modelizer
   def self.ids
     @ids ||= {}
   end
+
+  class FactoryContext < Struct.new(:overrides)
+    include Helpers
+
+    def build name, *args, &block
+      self.overrides[name] || super
+    end
+  end
+
+  class FixtureContext < Struct.new(:instances)
+    def identify name
+      Modelizer.identify name
+    end
+
+    def use name
+      instances[name] or raise "Can't find the \"#{name}\" fixture."
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modelizer
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-14 00:00:00.000000000Z
+date: 2011-09-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70313184032840 !ruby/object:Gem::Requirement
+  requirement: &70187039960200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70313184032840
+  version_requirements: *70187039960200
 description: ! 'Need a simple, consistent way to create model instances and check
 
   validations in your ActiveRecord 3.1+ tests? Use the Modelizer. Just