factory_girl 3.2.0 → 3.3.0

data/gemfiles/3.2.gemfile

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "activerecord", "~> 3.2"
+gem "activerecord", "~> 3.2.0"
 
 gemspec :path=>"../"

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.2.0)
+    factory_girl (3.3.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -31,7 +31,7 @@ GEM
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (3.0.0)
-    childprocess (0.3.1)
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
     cucumber (1.1.9)
       builder (>= 2.1.2)
@@ -44,11 +44,11 @@ GEM
     gherkin (2.9.3)
       json (>= 1.4.6)
     i18n (0.6.0)
-    json (1.6.6)
+    json (1.7.0)
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
-    multi_json (1.2.0)
+    multi_json (1.3.4)
     rake (0.9.2.2)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
@@ -58,23 +58,23 @@ GEM
     rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
-    simplecov (0.6.1)
-      multi_json (~> 1.0)
+    simplecov (0.6.2)
+      multi_json (~> 1.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     term-ansicolor (1.0.7)
     timecop (0.3.5)
-    tzinfo (0.3.32)
-    yard (0.7.5)
+    tzinfo (0.3.33)
+    yard (0.8.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.2)
+  activerecord (~> 3.2.0)
   appraisal (~> 0.4)
   aruba
   bluecloth

data/lib/factory_girl.rb

@@ -1,14 +1,17 @@
-require "active_support/core_ext/module/delegation"
-require "active_support/notifications"
+require 'set'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/notifications'
 
+require 'factory_girl/configuration'
 require 'factory_girl/errors'
 require 'factory_girl/factory_runner'
+require 'factory_girl/strategy_syntax_method_registrar'
 require 'factory_girl/strategy_calculator'
-require "factory_girl/strategy/build"
-require "factory_girl/strategy/create"
-require "factory_girl/strategy/attributes_for"
-require "factory_girl/strategy/stub"
-require "factory_girl/strategy/null"
+require 'factory_girl/strategy/build'
+require 'factory_girl/strategy/create'
+require 'factory_girl/strategy/attributes_for'
+require 'factory_girl/strategy/stub'
+require 'factory_girl/strategy/null'
 require 'factory_girl/disallows_duplicates_registry'
 require 'factory_girl/registry'
 require 'factory_girl/null_factory'
@@ -28,6 +31,7 @@ require 'factory_girl/attribute_list'
 require 'factory_girl/trait'
 require 'factory_girl/aliases'
 require 'factory_girl/definition'
+require 'factory_girl/definition_list'
 require 'factory_girl/definition_proxy'
 require 'factory_girl/syntax'
 require 'factory_girl/syntax_runner'
@@ -36,8 +40,17 @@ require 'factory_girl/reload'
 require 'factory_girl/version'
 
 module FactoryGirl
-  def self.factories
-    @factories ||= DisallowsDuplicatesRegistry.new(Registry.new("Factory"))
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.reset_configuration
+    @configuration = nil
+  end
+
+  class << self
+    delegate :factories, :sequences, :traits, :strategies, :callback_names,
+      :to_create, :skip_create, :initialize_with, :constructor, to: :configuration
   end
 
   def self.register_factory(factory)
@@ -51,10 +64,6 @@ module FactoryGirl
     factories.find(name)
   end
 
-  def self.sequences
-    @sequences ||= DisallowsDuplicatesRegistry.new(Registry.new("Sequence"))
-  end
-
   def self.register_sequence(sequence)
     sequence.names.each do |name|
       sequences.register(name, sequence)
@@ -66,10 +75,6 @@ module FactoryGirl
     sequences.find(name)
   end
 
-  def self.traits
-    @traits ||= DisallowsDuplicatesRegistry.new(Registry.new("Trait"))
-  end
-
   def self.register_trait(trait)
     trait.names.each do |name|
       traits.register(name, trait)
@@ -81,22 +86,9 @@ module FactoryGirl
     traits.find(name)
   end
 
-  def self.strategies
-    @strategies ||= Registry.new("Strategy")
-  end
-
   def self.register_strategy(strategy_name, strategy_class)
     strategies.register(strategy_name, strategy_class)
-
-    FactoryGirl::Syntax::Methods.module_exec do
-      define_method(strategy_name) do |name, *traits_and_overrides, &block|
-        instrumentation_payload = { name: name, strategy: strategy_name }
-
-        ActiveSupport::Notifications.instrument("factory_girl.run_factory", instrumentation_payload) do
-          FactoryRunner.new(name, strategy_class, traits_and_overrides).run(&block)
-        end
-      end
-    end
+    StrategySyntaxMethodRegistrar.new(strategy_name).define_strategy_methods
   end
 
   def self.strategy_by_name(name)
@@ -104,15 +96,25 @@ module FactoryGirl
   end
 
   def self.register_default_strategies
-    FactoryGirl.register_strategy(:build,          FactoryGirl::Strategy::Build)
-    FactoryGirl.register_strategy(:create,         FactoryGirl::Strategy::Create)
-    FactoryGirl.register_strategy(:attributes_for, FactoryGirl::Strategy::AttributesFor)
-    FactoryGirl.register_strategy(:build_stubbed,  FactoryGirl::Strategy::Stub)
+    register_strategy(:build,          FactoryGirl::Strategy::Build)
+    register_strategy(:create,         FactoryGirl::Strategy::Create)
+    register_strategy(:attributes_for, FactoryGirl::Strategy::AttributesFor)
+    register_strategy(:build_stubbed,  FactoryGirl::Strategy::Stub)
+    register_strategy(:null,           FactoryGirl::Strategy::Null)
+  end
+
+  def self.register_default_callbacks
+    register_callback(:after_build)
+    register_callback(:after_create)
+    register_callback(:after_stub)
+    register_callback(:before_create)
   end
 
-  def self.callback_names
-    [:after_build, :after_create, :after_stub, :before_create].freeze
+  def self.register_callback(name)
+    name = name.to_sym
+    callback_names << name
   end
 end
 
 FactoryGirl.register_default_strategies
+FactoryGirl.register_default_callbacks

data/lib/factory_girl/aliases.rb

@@ -1,6 +1,6 @@
 module FactoryGirl
   class << self
-    attr_accessor :aliases #:nodoc:
+    attr_accessor :aliases
   end
 
   self.aliases = [
@@ -8,9 +8,8 @@ module FactoryGirl
     [/(.*)/, '\1_id']
   ]
 
-  def self.aliases_for(attribute) #:nodoc:
-    aliases.collect do |params|
-      pattern, replace = *params
+  def self.aliases_for(attribute)
+    aliases.map do |(pattern, replace)|
       if pattern.match(attribute.to_s)
         attribute.to_s.sub(pattern, replace).to_sym
       end

data/lib/factory_girl/attribute.rb

@@ -1,11 +1,11 @@
-require "factory_girl/attribute/static"
-require "factory_girl/attribute/dynamic"
-require "factory_girl/attribute/association"
-require "factory_girl/attribute/sequence"
+require 'factory_girl/attribute/static'
+require 'factory_girl/attribute/dynamic'
+require 'factory_girl/attribute/association'
+require 'factory_girl/attribute/sequence'
 
 module FactoryGirl
-
-  class Attribute #:nodoc:
+  # @api private
+  class Attribute
     attr_reader :name, :ignored
 
     def initialize(name, ignored)
@@ -29,11 +29,33 @@ module FactoryGirl
     private
 
     def ensure_non_attribute_writer!
-      if @name.to_s =~ /=$/
-        attribute_name = $`
-        raise AttributeDefinitionError,
-          "factory_girl uses 'f.#{attribute_name} value' syntax " +
-          "rather than 'f.#{attribute_name} = value'"
+      NonAttributeWriterValidator.new(@name).validate!
+    end
+
+    class NonAttributeWriterValidator
+      def initialize(method_name)
+        @method_name = method_name.to_s
+        @method_name_setter_match = @method_name.match(/(.*)=$/)
+      end
+
+      def validate!
+        if method_is_writer?
+          raise AttributeDefinitionError, error_message
+        end
+      end
+
+      private
+
+      def method_is_writer?
+        !!@method_name_setter_match
+      end
+
+      def attribute_name
+        @method_name_setter_match[1]
+      end
+
+      def error_message
+        "factory_girl uses '#{attribute_name} value' syntax rather than '#{attribute_name} = value'"
       end
     end
   end

data/lib/factory_girl/attribute/association.rb

@@ -1,6 +1,7 @@
 module FactoryGirl
-  class Attribute #:nodoc:
-    class Association < Attribute  #:nodoc:
+  class Attribute
+    # @api private
+    class Association < Attribute
       attr_reader :factory
 
       def initialize(name, factory, overrides)

data/lib/factory_girl/attribute/dynamic.rb

@@ -1,6 +1,7 @@
 module FactoryGirl
-  class Attribute #:nodoc:
-    class Dynamic < Attribute  #:nodoc:
+  class Attribute
+    # @api private
+    class Dynamic < Attribute
       def initialize(name, ignored, block)
         super(name, ignored)
         @block = block

data/lib/factory_girl/attribute/sequence.rb

@@ -1,6 +1,6 @@
 module FactoryGirl
   class Attribute
-
+    # @api private
     class Sequence < Attribute
       def initialize(name, sequence, ignored)
         super(name, ignored)
@@ -12,6 +12,5 @@ module FactoryGirl
         -> { FactoryGirl.generate(sequence) }
       end
     end
-
   end
 end

data/lib/factory_girl/attribute/static.rb

@@ -1,6 +1,7 @@
 module FactoryGirl
-  class Attribute #:nodoc:
-    class Static < Attribute  #:nodoc:
+  class Attribute
+    # @api private
+    class Static < Attribute
       def initialize(name, value, ignored)
         super(name, ignored)
         @value = value

data/lib/factory_girl/attribute_assigner.rb

@@ -1,4 +1,5 @@
 module FactoryGirl
+  # @api private
   class AttributeAssigner
     def initialize(evaluator, build_class, &instance_builder)
       @build_class = build_class
@@ -54,15 +55,15 @@ module FactoryGirl
     end
 
     def non_ignored_attribute_names
-      @attribute_list.reject(&:ignored).map(&:name)
+      @attribute_list.non_ignored.names
     end
 
     def ignored_attribute_names
-      @attribute_list.select(&:ignored).map(&:name)
+      @attribute_list.ignored.names
     end
 
     def association_names
-      @attribute_list.associations.map(&:name)
+      @attribute_list.associations.names
     end
 
     def override_names
@@ -70,11 +71,11 @@ module FactoryGirl
     end
 
     def hash_instance_methods_to_respond_to
-      @attribute_list.map(&:name) + override_names + @build_class.instance_methods
+      @attribute_list.names + override_names + @build_class.instance_methods
     end
 
     def alias_names_to_ignore
-      @attribute_list.reject(&:ignored).map do |attribute|
+      @attribute_list.non_ignored.map do |attribute|
         override_names.map {|override| attribute.name if attribute.alias_for?(override) && attribute.name != override && !ignored_attribute_names.include?(override) }
       end.flatten.compact
     end

data/lib/factory_girl/attribute_list.rb

@@ -1,10 +1,11 @@
 module FactoryGirl
+  # @api private
   class AttributeList
     include Enumerable
 
-    def initialize(name = nil)
+    def initialize(name = nil, attributes = [])
       @name       = name
-      @attributes = []
+      @attributes = attributes
     end
 
     def define_attribute(attribute)
@@ -18,8 +19,20 @@ module FactoryGirl
       @attributes.each(&block)
     end
 
+    def names
+      map(&:name)
+    end
+
     def associations
-      @attributes.select(&:association?)
+      AttributeList.new(@name, select(&:association?))
+    end
+
+    def ignored
+      AttributeList.new(@name, select(&:ignored))
+    end
+
+    def non_ignored
+      AttributeList.new(@name, reject(&:ignored))
     end
 
     def apply_attributes(attributes_to_apply)

data/lib/factory_girl/callback.rb

@@ -10,9 +10,9 @@ module FactoryGirl
 
     def run(instance, evaluator)
       case block.arity
-      when 1 then block.call(instance)
-      when 2 then block.call(instance, evaluator)
-      else block.call
+      when 1 then syntax_runner.instance_exec(instance, &block)
+      when 2 then syntax_runner.instance_exec(instance, evaluator, &block)
+      else        syntax_runner.instance_exec(&block)
       end
     end
 
@@ -32,5 +32,9 @@ module FactoryGirl
           "Valid callback names are #{FactoryGirl.callback_names.inspect}"
       end
     end
+
+    def syntax_runner
+      @syntax_runner ||= SyntaxRunner.new
+    end
   end
 end

data/lib/factory_girl/callbacks_observer.rb

@@ -1,4 +1,5 @@
 module FactoryGirl
+  # @api private
   class CallbacksObserver
     def initialize(callbacks, evaluator)
       @callbacks = callbacks

data/lib/factory_girl/configuration.rb

@@ -0,0 +1,24 @@
+module FactoryGirl
+  # @api private
+  class Configuration
+    attr_reader :factories, :sequences, :traits, :strategies, :callback_names
+
+    def initialize
+      @factories      = DisallowsDuplicatesRegistry.new(Registry.new('Factory'))
+      @sequences      = DisallowsDuplicatesRegistry.new(Registry.new('Sequence'))
+      @traits         = DisallowsDuplicatesRegistry.new(Registry.new('Trait'))
+      @strategies     = Registry.new('Strategy')
+      @callback_names = Set.new
+      @definition     = Definition.new
+
+      to_create {|instance| instance.save! }
+      initialize_with { new }
+    end
+
+    delegate :to_create, :skip_create, :constructor, to: :@definition
+
+    def initialize_with(&block)
+      @definition.define_constructor(&block)
+    end
+  end
+end