aub-machine 1.0.1 → 1.0.2

data/Rakefile

@@ -26,7 +26,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name        = %q{machine}
-  s.version     = "1.0.1"
+  s.version     = "1.0.2"
   s.summary     = %q{machine defines a factory system for creating model objects to replace fixtures in Ruby apps.}
   s.description = %q{machine defines a factory system for creating model objects to replace fixtures in Ruby apps.}
 

data/lib/machine/machine.rb

@@ -12,8 +12,12 @@ class Machine
   # machine definitions. By default, machine will attempt to require
   # "machines," "test/machines," and "spec/machines." Only the first
   # existing file will be loaded.
-  cattr_accessor :definition_file_paths
+  class << self
+    attr_accessor :definition_file_paths
+  end
   
+  @definition_file_paths = %w(machines test/machines spec/machines)
+
   def self.find_definitions #:nodoc:
     definition_file_paths.each do |file_path|
       begin
@@ -95,17 +99,22 @@ class Machine
   #   attributes: (Hash)
   #     A set of attributes to use as a replacement for the default ones provided by
   #     the machine.
+  #   block: (Proc, optional)
+  #     If a block is passed to the function, it will attempt to call the block with
+  #     the newly created object as an argument so that manual initialization can be
+  #     done. This can be used in combination with or instead of passing an attributes hash.
   #
   # Example
   #
   #   Machine.build(:car, :model => 'Civic', :make => 'Honda')
-  def self.build(name, attributes={})
+  def self.build(name, attributes={}, &block)
     machines = machines_for(name)
     raise MachineNotFoundError if machines.empty?
     object = machines.shift.build(attributes)
     while machine = machines.shift
       machine.apply_to(object, attributes)
     end
+    block.call(object) if block_given?
     object
   end
 
@@ -117,12 +126,16 @@ class Machine
   #   attributes: (Hash)
   #     A set of attributes to use as a replacement for the default ones provided by
   #     the machine.
+  #   block: (Proc, optional)
+  #     If a block is passed to the function, it will attempt to call the block with
+  #     the newly created object as an argument so that manual initialization can be
+  #     done. This can be used in combination with or instead of passing an attributes hash.
   #
   # Example
   #
   #   Machine.build!(:car, :model => 'Civic', :make => 'Honda')  
-  def self.build!(name, attributes={})
-    result = build(name, attributes)
+  def self.build!(name, attributes={}, &block)
+    result = build(name, attributes, &block)
     result.save! if result.respond_to?(:save!)
     result
   end
@@ -187,7 +200,8 @@ class Machine
   #     address.street = machine.next(:street)
   #   end
   def self.next(sequence)
-    sequences[sequence].next if sequences.has_key?(sequence)
+    raise MachineNotFoundError unless sequences.has_key?(sequence)
+    sequences[sequence].next
   end
   
   def initialize(name, options, proc) #:nodoc

data/machine.gemspec

@@ -1,5 +1,5 @@
 Gem::Specification.new do |s|
-  s.version = '1.0.1'
+  s.version = '1.0.2'
   s.date = %q{2008-11-07}
  
   s.name = %q{machine}

data/test/machine_test.rb

@@ -266,4 +266,27 @@ class MachineTest < Test::Unit::TestCase
     end
   end
   
+  context 'with blocks on create' do
+    setup do
+      Machine.define :article do |article, machine|
+        article.title = 'aha'
+      end
+    end
+
+    should 'use a passed block in create to initialize objects' do
+      article = Machine.build(:article) do |article|
+        article.title = 'heck'
+      end
+      assert_equal 'heck', article.title
+    end
+
+    should 'use a passed block when creating with build!' do
+      article = Machine.build!(:article) do |article|
+        article.title = 'fun'
+        assert article.new_record?
+      end
+      assert_equal 'fun', article.title
+      assert !article.new_record?
+    end
+  end
 end

data/test/sequence_test.rb

@@ -2,6 +2,10 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class SequenceTest < Test::Unit::TestCase
   
+  def setup
+    Machine.sequences.clear
+  end
+
   should 'allow definition of sequences' do
     Machine.sequence :thing do
     end
@@ -36,4 +40,4 @@ class SequenceTest < Test::Unit::TestCase
       Machine.next(:who)
     end
   end  
-end
+end

data/test/test_helper.rb

@@ -1,6 +1,9 @@
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 $: << File.join(File.dirname(__FILE__))
 
+require 'rubygems'
+gem 'sqlite3-ruby'
+
 require 'test/unit'
 require 'rubygems'
 require 'ruby-debug'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aub-machine
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Aubrey Holland