factory_girl 1.2.3 → 1.2.4

data/README.rdoc

@@ -7,14 +7,12 @@ factory_girl is a fixtures replacement with a straightforward definition syntax,
 Github: http://github.com/thoughtbot/factory_girl/tree/master
 
 Gem:
-  gem install thoughtbot-factory_girl --source http://gems.github.com
+  gem install factory_girl --source http://gemcutter.org
 
-Note: if you install factory_girl using the gem from Github, you'll need this
+Note: if you install factory_girl using the gem from Gemcutter, you'll need this
 in your environment.rb if you want to use Rails 2.1+'s dependency manager:
 
-  config.gem "thoughtbot-factory_girl",
-             :lib    => "factory_girl",
-             :source => "http://gems.github.com"
+  config.gem "factory_girl", :source => "http://gemcutter.org"
 
 == Defining factories
 
@@ -43,6 +41,8 @@ Each factory has a name and a set of attributes. The name is used to guess the c
 
 It is highly recommended that you have one factory for each class that provides the simplest set of attributes necessary to create an instance of that class. If you're creating ActiveRecord objects, that means that you should only provide attributes that are required through validations and that do not have defaults. Other factories can be created through inheritance to cover common scenarios for each class.
 
+Attempting to define multiple factories with the same name will raise an error.
+
 Factories can either be defined anywhere, but will automatically be loaded if they are defined in files at the following locations:
 
   test/factories.rb
@@ -80,7 +80,7 @@ The default strategy can be overriden:
 
   user = Factory(:user)
 
-No matter which startegy is used, it's possible to override the defined attributes by passing a hash:
+No matter which strategy is used, it's possible to override the defined attributes by passing a hash:
 
   # Build a User instance and override the first_name property
   user = Factory.build(:user, :first_name => 'Joe')
@@ -191,19 +191,64 @@ a particular factory:
     f.sequence(:email) {|n| "person#{n}@example.com" }
   end
 
+== Callbacks
+
+Factory_girl makes available three callbacks for injecting some code:
+
+* after_build  - called after a factory is built   (via Factory.build)
+* after_create - called after a factory is saved   (via Factory.create)
+* after_stub   - called after a factory is stubbed (via Factory.stub)
+
+Examples:
+
+  # Define a factory that calls the generate_hashed_password method after it is built 
+  Factory.define :user do |u|
+    u.after_build { |user| do_something_to(user) }
+  end
+
+Note that you'll have an instance of the user in the block.  This can be useful.
+
+You can also define multiple types of callbacks on the same factory:
+
+  Factory.define :user do |u|
+    u.after_build  { |user| do_something_to(user) }
+    u.after_create { |user| do_something_else_to(user) }
+  end
+
+Factories can also define any number of the same kind of callback.  These callbacks will be executed in the order they are specified:
+
+  Factory.define :user do |u|
+    u.after_create { this_runs_first }
+    u.after_create { then_this }
+  end
+
+Calling Factory.create will invoke both after_build and after_create callbacks.
+
+Also, like standard attributes, child factories will inherit (and can define additional) callbacks from their parent factory.
+
 == Alternate Syntaxes
 
-Users' tastes for syntax vary dramatically, but most users are looking for a common feature set. Because of this, factory_girl supports "syntax layers" which provide alternate interfaces. See Factory::Syntax for information about the various layers available.
+Users' tastes for syntax vary dramatically, but most users are looking for a common feature set. Because of this, factory_girl supports "syntax layers" which provide alternate interfaces. See Factory::Syntax for information about the various layers available. For example, the Machinist-style syntax is popular:
 
-== More Information
+  require 'factory_girl/syntax/blueprint'
+  require 'factory_girl/syntax/make'
+  require 'factory_girl/syntax/sham'
 
-Our blog: http://giantrobots.thoughtbot.com
+  Sham.email {|n| "#{n}@example.com" }
 
-factory_girl rdoc: http://rdoc.info/projects/thoughtbot/factory_girl
+  User.blueprint do
+    name  { 'Billy Bob' }
+    email { Sham.email }
+  end
 
-Mailing list: http://groups.google.com/group/factory_girl
+  User.make(:name => 'Johnny')
+
+== More Information
 
-factory_girl issues: http://github.com/thoughtbot/factory_girl/issues
+* RDoc[http://rdoc.info/projects/thoughtbot/factory_girl]
+* Mailing list[http://groups.google.com/group/factory_girl]
+* Issues[http://github.com/thoughtbot/factory_girl/issues]
+* GIANT ROBOTS SMASHING INTO OTHER GIANT ROBOTS[http://giantrobots.thoughtbot.com]
 
 == Contributing
 
@@ -217,6 +262,7 @@ factory_girl was written by Joe Ferris with contributions from several authors,
 * Jon Yurek
 * Josh Nichols
 * Josh Owens
+* Nate Sutton
 
 The syntax layers are derived from software written by the following authors:
 * Pete Yandell
@@ -225,4 +271,4 @@ The syntax layers are derived from software written by the following authors:
 
 Thanks to all members of thoughtbot for inspiration, ideas, and funding.
 
-Copyright 2008-2009 Joe Ferris and thoughtbot[http://www.thoughtbot.com], inc.
+Copyright 2008-2010 Joe Ferris and thoughtbot[http://www.thoughtbot.com], inc.

data/Rakefile

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'rake'
 require 'rake/rdoctask'
-require 'rake/gempackagetask'
 require 'rcov/rcovtask'
 require 'date'
 
@@ -36,44 +35,43 @@ task :sync_docs => 'rdoc' do
   `rsync -ave ssh rdoc/ dev@dev.thoughtbot.com:/home/dev/www/dev.thoughtbot.com/factory_girl`
 end
 
-spec = Gem::Specification.new do |s|
-  s.name        = %q{factory_girl}
-  s.version     = "1.2.3"
-  s.summary     = %q{factory_girl provides a framework and DSL for defining and
-                     using model instance factories.}
-  s.description = %q{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.}
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name        = %q{factory_girl}
+    s.summary     = %q{factory_girl provides a framework and DSL for defining and
+                       using model instance factories.}
+    s.description = %q{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.}
 
-  s.files        = FileList['[A-Z]*', 'lib/**/*.rb', 'spec/**/*.rb']
-  s.require_path = 'lib'
-  s.test_files   = Dir[*['spec/**/*_spec.rb']]
+    s.files        = FileList['[A-Z]*', 'lib/**/*.rb', 'spec/**/*.rb']
+    s.require_path = 'lib'
+    s.test_files   = Dir[*['spec/**/*_spec.rb']]
 
-  s.has_rdoc         = true
-  s.extra_rdoc_files = ["README.rdoc"]
-  s.rdoc_options = ['--line-numbers', "--main", "README.rdoc"]
+    s.has_rdoc         = true
+    s.extra_rdoc_files = ["README.rdoc"]
+    s.rdoc_options = ['--line-numbers', "--main", "README.rdoc"]
 
-  s.authors = ["Joe Ferris"]
-  s.email   = %q{jferris@thoughtbot.com}
-  s.homepage = "http://thoughtbot.com/projects/factory_girl"
+    s.authors = ["Joe Ferris"]
+    s.email   = %q{jferris@thoughtbot.com}
+    s.homepage = "http://thoughtbot.com/projects/factory_girl"
 
-  s.platform = Gem::Platform::RUBY
-end
+    s.add_development_dependency('rcov')
+    s.add_development_dependency('rspec')
+    s.add_development_dependency('cucumber')
+    s.add_development_dependency('activerecord')
+    s.add_development_dependency('rr')
+    s.add_development_dependency('sqlite3')
 
-Rake::GemPackageTask.new spec do |pkg|
-  pkg.need_tar = true
-  pkg.need_zip = true
+    s.platform = Gem::Platform::RUBY
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: gem install jeweler"
 end
 
 desc "Clean files generated by rake tasks"
-task :clobber => [:clobber_rdoc, :clobber_package]
-
-desc "Generate a gemspec file"
-task :gemspec do
-  File.open("#{spec.name}.gemspec", 'w') do |f|
-    f.write spec.to_ruby
-  end
-end
+task :clobber => [:clobber_rdoc, :clobber_rcov]
 
 Cucumber::Rake::Task.new(:features) do |t|
   t.fork = true

data/VERSION

@@ -0,0 +1 @@
+1.2.4

data/lib/factory_girl/factory.rb

@@ -7,6 +7,10 @@ class Factory
   # Raised when a callback is defined that has an invalid name
   class InvalidCallbackNameError < RuntimeError
   end
+
+  # Raised when a factory is defined with the same name as a previously-defined factory.
+  class DuplicateDefinitionError < RuntimeError
+  end
   
   class << self
     attr_accessor :factories #:nodoc:
@@ -51,6 +55,9 @@ class Factory
     if parent = options.delete(:parent)
       instance.inherit_from(Factory.factory_by_name(parent))
     end    
+    if self.factories[instance.factory_name] 
+      raise DuplicateDefinitionError, "Factory already defined: #{name}"
+    end
     self.factories[instance.factory_name] = instance
   end
   

data/lib/factory_girl/step_definitions.rb

@@ -1,6 +1,7 @@
 module FactoryGirlStepHelpers
   def convert_association_string_to_instance(factory_name, assignment)
     attribute, value = assignment.split(':', 2)
+    return if value.blank?
     attributes = convert_human_hash_to_attribute_hash(attribute => value.strip)
     factory = Factory.factory_by_name(factory_name)
     model_class = factory.build_class

data/spec/factory_girl/factory_spec.rb

@@ -10,6 +10,8 @@ describe Factory do
       stub(Factory).new { @factory }
     end
 
+    after { Factory.factories.clear }
+
     it "should create a new factory using the specified name and options" do
       mock(Factory).new(@name, @options) { @factory }
       Factory.define(@name, @options) {|f| }
@@ -28,9 +30,17 @@ describe Factory do
       @factory.should == Factory.factories[@name]
     end
 
-    it "should allow that factory to be found by name" do
+    it "should allow a factory to be found by name" do
+      Factory.define(@name) {|f| }
       Factory.factory_by_name(@name).should == @factory
     end
+
+    it "should not allow a duplicate factory definition" do
+      lambda { 
+        2.times { Factory.define(@name) {|f| } }
+      }.should raise_error(Factory::DuplicateDefinitionError)
+    end
+
   end
 
   describe "a factory" do
@@ -420,6 +430,8 @@ describe Factory do
       end
     end
 
+    after { Factory.factories.clear }
+
     it "should raise an ArgumentError when trying to use a non-existent factory as parent" do
       lambda {
         Factory.define(:child, :parent => :nonexsitent) {}

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: factory_girl
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Joe Ferris
@@ -9,14 +14,85 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-16 00:00:00 -04:00
+date: 2010-03-30 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 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.
+                         using factories - less error-prone, more explicit, and
+                         all-around easier to work with than fixtures.
 email: jferris@thoughtbot.com
 executables: []
 
@@ -25,31 +101,32 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- Changelog
 - CONTRIBUTION_GUIDELINES.rdoc
+- Changelog
 - LICENSE
-- Rakefile
 - README.rdoc
+- Rakefile
+- VERSION
+- lib/factory_girl.rb
 - lib/factory_girl/aliases.rb
+- lib/factory_girl/attribute.rb
 - lib/factory_girl/attribute/association.rb
 - lib/factory_girl/attribute/callback.rb
 - lib/factory_girl/attribute/dynamic.rb
 - lib/factory_girl/attribute/static.rb
-- lib/factory_girl/attribute.rb
 - lib/factory_girl/factory.rb
+- lib/factory_girl/proxy.rb
 - lib/factory_girl/proxy/attributes_for.rb
 - lib/factory_girl/proxy/build.rb
 - lib/factory_girl/proxy/create.rb
 - lib/factory_girl/proxy/stub.rb
-- lib/factory_girl/proxy.rb
 - lib/factory_girl/sequence.rb
 - lib/factory_girl/step_definitions.rb
+- lib/factory_girl/syntax.rb
 - lib/factory_girl/syntax/blueprint.rb
 - lib/factory_girl/syntax/generate.rb
 - lib/factory_girl/syntax/make.rb
 - lib/factory_girl/syntax/sham.rb
-- lib/factory_girl/syntax.rb
-- lib/factory_girl.rb
 - spec/factory_girl/aliases_spec.rb
 - spec/factory_girl/attribute/association_spec.rb
 - spec/factory_girl/attribute/callback_spec.rb
@@ -85,18 +162,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: factory_girl provides a framework and DSL for defining and using model instance factories.