gabrielg-factory_girl 1.2.1 → 1.2.2

data/README.textile

@@ -148,6 +148,15 @@ Factory.next :email
 Factory.next :email
 # => "person2@example.com"</code></pre>
 
+You can also define an anonymous sequence within a Factory.define block:
+
+<pre><code># Defines a sequence for name
+Factory.define :person do |p|
+  p.sequence :name do |n|
+    "Johnny #{n}"
+  end
+end</code></pre>
+
 h2. Callbacks
 
 Callbacks can be specified after build and after create. If the block arity is

data/lib/factory_girl/factory.rb

@@ -79,6 +79,22 @@ class Factory
     @attributes << attribute
   end
 
+  # Adds an anonymous sequence for an attribute:
+  #
+  #   Factory.define :user do |f|
+  #     f.sequence do |n|
+  #       "Johnny #{n}"
+  #     end
+  #   end
+  #
+  # When generating an instance, the next value in the sequence will be used.
+  def sequence (name, &proc)
+    sequence = Sequence.new(&proc)
+    add_attribute(name) do
+      sequence.next
+    end
+  end
+
   # Calls add_attribute using the missing method name as the name of the
   # attribute, so that:
   #
@@ -252,7 +268,7 @@ class Factory
       vals[attribute.name] = attribute.value(proxy)
       vals
     end
-    inherited_factory ? inherited_factory.attributes_for({}, strategy).merge(attrs) : attrs
+    inherited_factory ? inherited_factory.attributes_for(attrs, strategy) : attrs
   end
 
   def build_instance (override, strategy)
@@ -270,7 +286,7 @@ class Factory
 
   def class_for (class_or_to_s)
     if class_or_to_s.respond_to?(:to_sym)
-      class_or_to_s.to_s.classify.constantize
+      class_or_to_s.to_s.pluralize.classify.constantize
     else
       class_or_to_s
     end

data/test/factory_test.rb

@@ -213,6 +213,26 @@ class FactoryTest < Test::Unit::TestCase
 
     end
 
+    context "when adding a sequence attribute" do
+
+      setup do
+        @attr  = :name
+      end
+
+      should "not evaluate the block when the sequence is added" do
+        @factory.sequence(@attr){ flunk }
+      end
+
+      should "call next in the sequence when attributes are generated" do
+        @factory.sequence(@attr) do |n|
+          "sequence #{n}"
+        end
+        assert_equal "sequence 1", @factory.attributes_for[@attr]
+        assert_equal "sequence 2", @factory.attributes_for[@attr]
+      end
+
+    end
+
     context "when adding an attribute with a block" do
 
       setup do

metadata

@@ -1,20 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: gabrielg-factory_girl
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Joe Ferris
+- Alex Sharp
+- Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-09-12 00:00:00 -07:00
+date: 2008-11-20 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
 description: factory_girl provides a framework and DSL for defining and using factories - less error-prone, more explicit, and  all-around easier to work with than fixtures.
-email: jferris@thoughtbot.com
+email: pbattley@gmail.com
 executables: []
 
 extensions: []