factory_girl 1.1.3 → 1.1.4

data/Rakefile

@@ -3,6 +3,7 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
+require 'rcov/rcovtask'
 require 'date'
 
 desc 'Default: run unit tests.'
@@ -15,6 +16,13 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
+desc 'Performs code coverage on the factory_girl plugin.'
+Rcov::RcovTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
+end
+
 desc 'Generate documentation for the factory_girl plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -31,7 +39,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name        = %q{factory_girl}
-  s.version     = "1.1.3"
+  s.version     = "1.1.4"
   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

data/lib/factory_girl.rb

@@ -13,4 +13,15 @@ def Factory (name, attrs = {})
   Factory.create(name, attrs)
 end
 
-Factory.find_definitions
+if defined? Rails
+  Rails.configuration.after_initialize do
+    Factory.definition_file_paths = [
+      File.join(RAILS_ROOT, 'test', 'factories'),
+      File.join(RAILS_ROOT, 'spec', 'factories')
+    ]
+    Factory.find_definitions
+  end
+else
+  Factory.find_definitions
+end
+

data/lib/factory_girl/attribute_proxy.rb

@@ -47,7 +47,7 @@ class Factory
       if strategy == :attributes_for
         nil
       else
-        Factory.send(strategy, name, attributes)
+        Factory.create(name, attributes)
       end
     end
 

data/lib/factory_girl/factory.rb

@@ -182,10 +182,12 @@ class Factory
 
     def find_definitions #:nodoc:
       definition_file_paths.each do |path|
-        begin
-          require(path)
-          break
-        rescue LoadError
+        require("#{path}.rb") if File.exists?("#{path}.rb")
+
+        if File.directory? path
+          Dir[File.join(path, '*.rb')].each do |file|
+            require file
+          end
         end
       end
     end
@@ -223,7 +225,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/attribute_proxy_test.rb

@@ -68,6 +68,26 @@ class AttributeProxyTest < Test::Unit::TestCase
 
     end
 
+    context "building an association using the build strategy" do
+
+      setup do
+        @strategy = :build
+        @built    = 'object'
+        @proxy    = Factory::AttributeProxy.new(@factory, @attr, @strategy, @attrs)
+        Factory.stubs(:create).returns(@built)
+      end
+
+      should "create the association" do
+        Factory.expects(:create).with(:user, {}).returns(@built)
+        @proxy.association(:user)
+      end
+
+      should "return the created object" do
+        assert_equal @built, @proxy.association(:user)
+      end
+
+    end
+
     context "fetching the value of an attribute" do
 
       setup do

data/test/factory_test.rb

@@ -159,6 +159,7 @@ class FactoryTest < Test::Unit::TestCase
         @name    = :user
         @factory.association(@name)
         Post.any_instance.stubs(:user=)
+        Factory.stubs(:create)
       end
 
       should "add an attribute with the name of the association" do
@@ -166,7 +167,7 @@ class FactoryTest < Test::Unit::TestCase
       end
 
       should "create a block that builds the association" do
-        Factory.expects(:build).with(@name, {})
+        Factory.expects(:create).with(@name, {})
         @factory.build
       end
 
@@ -179,6 +180,7 @@ class FactoryTest < Test::Unit::TestCase
         @name         = :author
         @factory_name = :user
         @factory.association(@name, :factory => @factory_name)
+        Factory.stubs(:create)
       end
 
       should "add an attribute with the name of the association" do
@@ -186,7 +188,7 @@ class FactoryTest < Test::Unit::TestCase
       end
 
       should "create a block that builds the association" do
-        Factory.expects(:build).with(@factory_name, {})
+        Factory.expects(:create).with(@factory_name, {})
         @factory.build
       end
 
@@ -344,6 +346,24 @@ class FactoryTest < Test::Unit::TestCase
     end
 
   end
+  
+  context "a factory with a name ending in s" do
+    
+    setup do
+      @name    = :business
+      @class   = Business
+      @factory = Factory.new(@name)
+    end
+    
+    should "have a factory name" do
+      assert_equal @name, @factory.factory_name
+    end
+
+    should "have a build class" do
+      assert_equal @class, @factory.build_class
+    end
+    
+  end
 
   context "a factory with a string for a name" do
 
@@ -414,21 +434,61 @@ class FactoryTest < Test::Unit::TestCase
     end
 
   end
+  
+  def self.context_in_directory_with_files(*files)
+    context "in a directory with #{files.to_sentence}" do
+      setup do
+        @pwd = Dir.pwd
+        @tmp_dir = File.join(File.dirname(__FILE__), 'tmp')
+        FileUtils.mkdir_p @tmp_dir
+        Dir.chdir(@tmp_dir)
+        
+        files.each do |file|
+          FileUtils.mkdir_p File.dirname(file)
+          FileUtils.touch file
+          Factory.stubs(:require).with(file)
+        end
+      end
+      
+      teardown do
+        Dir.chdir(@pwd)
+        FileUtils.rm_rf(@tmp_dir)
+      end
 
-  Factory.definition_file_paths.each do |file|
-    should "automatically load definitions from #{file}.rb" do
-      Factory.stubs(:require).raises(LoadError)
+      yield
+    end
+  end
+  
+  def self.should_require_definitions_from(file)
+    should "load definitions from #{file}" do
       Factory.expects(:require).with(file)
       Factory.find_definitions
-    end
+    end    
+  end
+  
+  context_in_directory_with_files 'factories.rb' do
+    should_require_definitions_from 'factories.rb'
   end
+  
+  %w(spec test).each do |dir|
+    context_in_directory_with_files File.join(dir, 'factories.rb') do
+      should_require_definitions_from "#{dir}/factories.rb"
+    end
+
+    context_in_directory_with_files File.join(dir, 'factories', 'post_factory.rb') do
+      should_require_definitions_from "#{dir}/factories/post_factory.rb"
+    end
+
+    context_in_directory_with_files File.join(dir, 'factories', 'post_factory.rb'), File.join(dir, 'factories', 'person_factory.rb') do
+      should_require_definitions_from "#{dir}/factories/post_factory.rb"
+      should_require_definitions_from "#{dir}/factories/person_factory.rb"
+    end
 
-  should "only load the first set of factories detected" do
-    first, second, third = Factory.definition_file_paths
-    Factory.expects(:require).with(first).raises(LoadError)
-    Factory.expects(:require).with(second)
-    Factory.expects(:require).with(third).never
-    Factory.find_definitions
+    context_in_directory_with_files File.join(dir, 'factories.rb'), File.join(dir, 'factories', 'post_factory.rb'), File.join(dir, 'factories', 'person_factory.rb') do
+      should_require_definitions_from "#{dir}/factories.rb"
+      should_require_definitions_from "#{dir}/factories/post_factory.rb"
+      should_require_definitions_from "#{dir}/factories/person_factory.rb"
+    end
   end
 
 end

data/test/integration_test.rb

@@ -70,8 +70,8 @@ class IntegrationTest < Test::Unit::TestCase
       assert_kind_of User, @instance.author
     end
 
-    should "not save associations" do
-      assert @instance.author.new_record?
+    should "save associations" do
+      assert !@instance.author.new_record?
     end
 
     should "not assign both an association and its foreign key" do

data/test/models.rb

@@ -16,6 +16,11 @@ class CreateSchema < ActiveRecord::Migration
       t.string  :name  
       t.integer :author_id
     end
+    
+    create_table :business, :force => true do |t|
+      t.string  :name  
+      t.integer :owner_id
+    end
   end
 end
 
@@ -26,6 +31,11 @@ class User < ActiveRecord::Base
   has_many :posts, :foreign_key => 'author_id'
 end
 
+class Business < ActiveRecord::Base
+  validates_presence_of :name, :owner_id
+  belongs_to :owner, :class_name => 'User'
+end
+
 class Post < ActiveRecord::Base
   validates_presence_of :name, :author_id
   belongs_to :author, :class_name => 'User'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: factory_girl
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors: 
 - Joe Ferris
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-12 00:00:00 -04:00
+date: 2008-11-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency