factory_girl 2.2.0 → 2.3.0

data/.autotest

@@ -2,7 +2,7 @@ Autotest.add_hook :initialize do |at|
   at.clear_mappings
 
   at.add_mapping(%r{^test/.*_test\.rb$})              {|f, _| [f] }
-  at.add_mapping(%r{^lib/factory_girl/(.*)\.rb$})     {|_, m| ["test/#{m[1]}_test.rb", 
+  at.add_mapping(%r{^lib/factory_girl/(.*)\.rb$})     {|_, m| ["test/#{m[1]}_test.rb",
                                                                "test/integration_test.rb"] }
   at.add_mapping(%r{^test/(test_helper|models)\.rb$}) { at.files_matching %r{^test/.*_test\.rb$} }
   at.add_mapping(%r{^lib/.*\.rb$})                    { at.files_matching %r{^test/.*_test\.rb$} }

data/CONTRIBUTION_GUIDELINES.md

@@ -1,4 +1,4 @@
-Contributing to factory_girl:
+Contributing to factory\_girl:
 
 1. Fork the [official repository](http://github.com/thoughtbot/factory_girl/tree/master).
 2. Make your changes in a topic branch.

data/Changelog

@@ -1,3 +1,16 @@
+2.3.0 (November 18, 2011)
+  Registries are named, resulting in better messages when factories, traits,
+    or sequences cannot be found
+  Fix incorrect tests
+  Internals refactoring introducing FactoryGirl::NullFactory,
+    FactoryGirl::Definition, and FactoryGirl::DeclarationList
+  Use ActiveSupport for Hash#except and its delegation capabilities
+  Fix usage of callbacks when added via implicit traits
+  Use Bundler tasks and clean up dependencies
+  Fix failing spec for big letters in factory name passed as symbol
+  Add ability for traits to be added dynamically when creating an instance via
+    build, create, build_stubbed, or attributes_for
+
 2.2.0 (October 14, 2011)
   Clean up RSpec suite to not use 'should'
   Use create_list in step definitions
@@ -41,7 +54,7 @@
 		Josh Nichols)
   Factory names ending in 's' no longer cause problems (thanks to Alex Sharp
 		and Josh Owens)
-  
+
 1.1.3 (September 12, 2008)
   Automatically pull in definitions from factories.rb, test/factories.rb, or
 	spec/factories.rb
@@ -54,10 +67,10 @@
 1.1.1 (June 23, 2008)
   The attribute "name" no longer requires using #add_attribute
 
-1.1.0 (June 3, 2008)
+1.1.0 (June 03, 2008)
 	Added support for dependent attributes
 	Fixed the attributes_for build strategy to not build associations
   Added support for sequences
 
-1.0.0 (May 31, 208)
+1.0.0 (May 31, 2008)
   First version

data/GETTING_STARTED.md

@@ -69,7 +69,7 @@ factory\_girl supports several different build strategies: build, create, attrib
     attrs = FactoryGirl.attributes_for(:user)
 
     # Returns an object with all defined attributes stubbed out
-    stub = FactoryGirl.build_stubbed(:user
+    stub = FactoryGirl.build_stubbed(:user)
 
     # Passing a block to any of the methods above will yield the return object
     FactoryGirl.create(:user) do |user|
@@ -87,7 +87,7 @@ If repeating "FactoryGirl" is too verbose for you, you can mix the syntax method
 
     # rspec
     RSpec.configure do |config|
-      config.include Factory::Syntax::Methods
+      config.include FactoryGirl::Syntax::Methods
     end
 
     # Test::Unit
@@ -404,6 +404,26 @@ You can also override individual attributes granted by a trait in subclasses.
       end
     end
 
+Traits can also be passed in as a list of symbols when you construct an instance from FactoryGirl.
+
+    factory :user do
+      name "Friendly User"
+
+      trait :male do
+        name   "John Doe"
+        gender "Male"
+      end
+
+      trait :admin do
+        admin true
+      end
+    end
+
+    # creates an admin user with gender "Male" and name "Jon Snow"
+    FactoryGirl.create(:user, :admin, :male, :name => "Jon Snow")
+
+This ability works with `build`, `build_stubbed`, `attributes_for`, and `create`.
+
 Callbacks
 ---------
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (2.2.0)
+    factory_girl (2.3.0)
       activesupport
 
 GEM

data/Rakefile

@@ -1,13 +1,13 @@
 require 'rubygems'
-require 'bundler/setup'
+require 'bundler'
 require 'rake'
-require 'rcov/rcovtask'
-require 'date'
-require 'rake/gempackagetask'
-require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
 require 'appraisal'
 require 'yard'
+require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
+require 'rcov/rcovtask'
+
+Bundler::GemHelper.install_tasks
 
 desc 'Default: run the specs and features.'
 task :default => 'spec:unit' do
@@ -30,9 +30,11 @@ desc "Run the unit and acceptance specs"
 task :spec => ['spec:unit', 'spec:acceptance']
 
 desc 'Performs code coverage on the factory_girl plugin.'
-Rcov::RcovTask.new do |t|
-  t.test_files = FileList['spec/*_spec.rb']
-  t.verbose = true
+RSpec::Core::RakeTask.new(:rcov) do |task|
+  task.pattern = 'spec/**/*_spec.rb'
+  task.rcov = true
+  task.rspec_opts = "--format progress"
+  task.rcov_opts = %{--exclude osx\/objc,spec,gems\/ --aggregate coverage/coverage.data}
 end
 
 desc "Clean files generated by rake tasks"
@@ -43,12 +45,6 @@ Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
 end
 
-eval("$specification = begin; #{IO.read('factory_girl.gemspec')}; end")
-Rake::GemPackageTask.new($specification) do |package|
-  package.need_zip = true
-  package.need_tar = true
-end
-
 YARD::Rake::YardocTask.new do |t|
 end
 

data/gemfiles/2.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.2.0)
+    factory_girl (2.3.0)
       activesupport
 
 GEM

data/gemfiles/2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.2.0)
+    factory_girl (2.3.0)
       activesupport
 
 GEM

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.2.0)
+    factory_girl (2.3.0)
       activesupport
 
 GEM

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.2.0)
+    factory_girl (2.3.0)
       activesupport
 
 GEM

data/lib/factory_girl.rb

@@ -1,9 +1,12 @@
+require "active_support/core_ext/module/delegation"
+
 require 'factory_girl/proxy'
 require 'factory_girl/proxy/build'
 require 'factory_girl/proxy/create'
 require 'factory_girl/proxy/attributes_for'
 require 'factory_girl/proxy/stub'
 require 'factory_girl/registry'
+require 'factory_girl/null_factory'
 require 'factory_girl/factory'
 require 'factory_girl/attribute'
 require 'factory_girl/attribute/static'
@@ -11,6 +14,7 @@ require 'factory_girl/attribute/dynamic'
 require 'factory_girl/attribute/association'
 require 'factory_girl/attribute/sequence'
 require 'factory_girl/callback'
+require 'factory_girl/declaration_list'
 require 'factory_girl/declaration'
 require 'factory_girl/declaration/static'
 require 'factory_girl/declaration/dynamic'
@@ -20,6 +24,7 @@ require 'factory_girl/sequence'
 require 'factory_girl/attribute_list'
 require 'factory_girl/trait'
 require 'factory_girl/aliases'
+require 'factory_girl/definition'
 require 'factory_girl/definition_proxy'
 require 'factory_girl/syntax/methods'
 require 'factory_girl/syntax/default'
@@ -44,7 +49,7 @@ module FactoryGirl
   class DuplicateDefinitionError < RuntimeError; end
 
   def self.factories
-    @factories ||= Registry.new
+    @factories ||= Registry.new("Factory")
   end
 
   def self.register_factory(factory)
@@ -56,7 +61,7 @@ module FactoryGirl
   end
 
   def self.sequences
-    @sequences ||= Registry.new
+    @sequences ||= Registry.new("Sequence")
   end
 
   def self.register_sequence(sequence)
@@ -68,7 +73,7 @@ module FactoryGirl
   end
 
   def self.traits
-    @traits ||= Registry.new
+    @traits ||= Registry.new("Trait")
   end
 
   def self.register_trait(trait)

data/lib/factory_girl/attribute.rb

@@ -52,5 +52,13 @@ module FactoryGirl
           "rather than 'f.#{attribute_name} = value'"
       end
     end
+
+    def set_proxy_value(proxy, value)
+      if @ignored
+        proxy.set_ignored(name, value)
+      else
+        proxy.set(name, value)
+      end
+    end
   end
 end

data/lib/factory_girl/attribute/dynamic.rb

@@ -12,11 +12,7 @@ module FactoryGirl
           raise SequenceAbuseError
         end
 
-        if @ignored
-          proxy.set_ignored(name, value)
-        else
-          proxy.set(name, value)
-        end
+        set_proxy_value(proxy, value)
       end
     end
   end

data/lib/factory_girl/attribute/sequence.rb

@@ -9,11 +9,7 @@ module FactoryGirl
 
       def add_to(proxy)
         value = FactoryGirl.generate(@sequence)
-        if @ignored
-          proxy.set_ignored(name, value)
-        else
-          proxy.set(name, value)
-        end
+        set_proxy_value(proxy, value)
       end
     end
 

data/lib/factory_girl/attribute/static.rb

@@ -11,11 +11,7 @@ module FactoryGirl
       end
 
       def add_to(proxy)
-        if @ignored
-          proxy.set_ignored(name, @value)
-        else
-          proxy.set(name, @value)
-        end
+        set_proxy_value(proxy, @value)
       end
 
       def priority

data/lib/factory_girl/attribute_list.rb

@@ -2,47 +2,27 @@ module FactoryGirl
   class AttributeList
     include Enumerable
 
-    attr_reader :callbacks, :declarations
-
-    def initialize
-      @attributes  = {}
-      @declarations = []
-      @overridable = false
-      @callbacks = []
-    end
-
-    def declare_attribute(declaration)
-      @declarations << declaration
-      declaration
+    def initialize(name = nil)
+      @name       = name
+      @attributes = {}
     end
 
     def define_attribute(attribute)
-      if !overridable? && attribute_defined?(attribute.name)
-        raise AttributeDefinitionError, "Attribute already defined: #{attribute.name}"
-      end
+      ensure_attribute_not_self_referencing! attribute
+      ensure_attribute_not_defined! attribute
 
       add_attribute attribute
     end
 
-    def add_callback(callback)
-      @callbacks << callback
-    end
-
     def each(&block)
       flattened_attributes.each(&block)
     end
 
     def apply_attributes(attributes_to_apply)
-      attributes_to_apply.callbacks.reverse.each { |callback| prepend_callback(callback) }
       new_attributes = []
 
       attributes_to_apply.each do |attribute|
-        new_attribute = if !overridable? && defined_attribute = find_attribute(attribute.name)
-          defined_attribute
-        else
-          attribute
-        end
-
+        new_attribute = find_attribute(attribute.name) || attribute
         delete_attribute(attribute.name)
         new_attributes << new_attribute
       end
@@ -50,32 +30,14 @@ module FactoryGirl
       prepend_attributes new_attributes
     end
 
-    def overridable
-      @overridable = true
-    end
-
-    def overridable?
-      @overridable
-    end
-
-    def size
-      to_a.size
-    end
-
     private
 
     def add_attribute(attribute)
-      delete_attribute(attribute.name) if overridable?
-
       @attributes[attribute.priority] ||= []
       @attributes[attribute.priority] << attribute
       attribute
     end
 
-    def prepend_callback(callback)
-      @callbacks.unshift(callback)
-    end
-
     def prepend_attributes(new_attributes)
       new_attributes.group_by {|attr| attr.priority }.each do |priority, attributes|
         @attributes[priority] ||= []
@@ -90,6 +52,18 @@ module FactoryGirl
       end.flatten
     end
 
+    def ensure_attribute_not_defined!(attribute)
+      if attribute_defined?(attribute.name)
+        raise AttributeDefinitionError, "Attribute already defined: #{attribute.name}"
+      end
+    end
+
+    def ensure_attribute_not_self_referencing!(attribute)
+      if attribute.respond_to?(:factory) && attribute.factory == @name
+        raise AssociationDefinitionError, "Self-referencing association '#{attribute.name}' in '#{attribute.factory}'"
+      end
+    end
+
     def attribute_defined?(attribute_name)
       !!find_attribute(attribute_name)
     end

data/lib/factory_girl/callback.rb

@@ -18,6 +18,11 @@ module FactoryGirl
       end
     end
 
+    def ==(other)
+      name == other.name &&
+        block == other.block
+    end
+
     private
 
     def check_name

data/lib/factory_girl/declaration.rb

@@ -15,5 +15,8 @@ module FactoryGirl
     def to_attributes
       build
     end
+
+    protected
+    attr_reader :ignored
   end
 end

data/lib/factory_girl/declaration/association.rb

@@ -6,6 +6,14 @@ module FactoryGirl
         @options = options
       end
 
+      def ==(other)
+        name == other.name &&
+          options == other.options
+      end
+
+      protected
+      attr_reader :options
+
       private
 
       def build