factory_girl 4.2.0 → 4.3.0

data/gemfiles/3.2.gemfile

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

data/gemfiles/3.2.gemfile.lock

@@ -1,52 +1,51 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (4.2.0)
+    factory_girl (4.3.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
+    activemodel (3.2.15)
+      activesupport (= 3.2.15)
       builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
+    activerecord (3.2.15)
+      activemodel (= 3.2.15)
+      activesupport (= 3.2.15)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
+    activesupport (3.2.15)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    appraisal (0.5.1)
+    appraisal (0.5.2)
       bundler
       rake
     arel (3.0.2)
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
+    aruba (0.5.3)
+      childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    bourne (1.3.0)
-      mocha (= 0.13.0)
+    bourne (1.5.0)
+      mocha (>= 0.13.2, < 0.15)
     builder (3.0.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    cucumber (1.2.1)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.2.5)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
+      gherkin (~> 2.11.7)
+      multi_json (~> 1.3)
     diff-lcs (1.1.3)
-    ffi (1.3.1)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
-    i18n (0.6.1)
-    json (1.7.6)
+    ffi (1.9.3)
+    gherkin (2.11.8)
+      multi_json (~> 1.3)
+    i18n (0.6.5)
     metaclass (0.0.1)
-    mocha (0.13.0)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.5.0)
-    rake (10.0.3)
+    multi_json (1.8.2)
+    rake (10.1.0)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -54,21 +53,21 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    rspec-mocks (2.12.2)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sqlite3 (1.3.7)
-    timecop (0.5.9)
-    tzinfo (0.3.35)
-    yard (0.8.3)
+    sqlite3 (1.3.8)
+    timecop (0.6.3)
+    tzinfo (0.3.38)
+    yard (0.8.7.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.2.11)
+  activerecord (~> 3.2.15)
   appraisal (~> 0.5.1)
   aruba
   bourne

data/gemfiles/4.0.gemfile

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

data/gemfiles/4.0.gemfile.lock

@@ -1,63 +1,61 @@
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: 40e797827935756aacf0463e4b44e1c1c92b0aeb
-  specs:
-    activemodel (4.0.0.beta)
-      activesupport (= 4.0.0.beta)
-      builder (~> 3.1.0)
-    activerecord (4.0.0.beta)
-      activemodel (= 4.0.0.beta)
-      activerecord-deprecated_finders (= 0.0.2)
-      activesupport (= 4.0.0.beta)
-      arel (~> 3.0.2)
-    activesupport (4.0.0.beta)
-      i18n (~> 0.6)
-      minitest (~> 4.1)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.33)
-
 PATH
-  remote: /Users/joshuaclayton/dev/gems/factory_girl
+  remote: ..
   specs:
-    factory_girl (4.2.0)
+    factory_girl (4.3.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activerecord-deprecated_finders (0.0.2)
-    appraisal (0.5.1)
+    activemodel (4.0.1)
+      activesupport (= 4.0.1)
+      builder (~> 3.1.0)
+    activerecord (4.0.1)
+      activemodel (= 4.0.1)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.1)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.1)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (0.5.2)
       bundler
       rake
-    arel (3.0.2)
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
+    arel (4.0.1)
+    aruba (0.5.3)
+      childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
-    atomic (1.0.1)
-    bourne (1.3.0)
-      mocha (= 0.13.0)
+    atomic (1.1.14)
+    atomic (1.1.14-java)
+    bourne (1.5.0)
+      mocha (>= 0.13.2, < 0.15)
     builder (3.1.4)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    cucumber (1.2.1)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    cucumber (1.2.5)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
+      gherkin (~> 2.11.7)
+      multi_json (~> 1.3)
     diff-lcs (1.1.3)
-    ffi (1.3.1)
-    gherkin (2.11.5)
-      json (>= 1.4.6)
-    i18n (0.6.1)
-    json (1.7.6)
+    ffi (1.9.3)
+    ffi (1.9.3-java)
+    gherkin (2.11.8)
+      multi_json (~> 1.3)
+    gherkin (2.11.8-java)
+      multi_json (~> 1.3)
+    i18n (0.6.5)
     metaclass (0.0.1)
-    minitest (4.4.0)
-    mocha (0.13.0)
+    minitest (4.7.5)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.5.0)
-    rake (10.0.3)
+    multi_json (1.8.2)
+    rake (10.1.0)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -65,23 +63,26 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    rspec-mocks (2.12.2)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sqlite3 (1.3.7)
-    thread_safe (0.1.0)
+    sqlite3 (1.3.8)
+    thread_safe (0.1.3)
+      atomic
+    thread_safe (0.1.3-java)
       atomic
-    timecop (0.5.9)
-    tzinfo (0.3.35)
-    yard (0.8.3)
+    timecop (0.6.3)
+    tzinfo (0.3.38)
+    yard (0.8.7.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
-  activerecord!
+  activerecord (~> 4.0.1)
   appraisal (~> 0.5.1)
   aruba
   bourne

data/lib/factory_girl.rb

@@ -55,7 +55,7 @@ module FactoryGirl
   end
 
   class << self
-    delegate :factories, :sequences, :traits, :strategies, :callback_names,
+    delegate :factories, :sequences, :traits, :callbacks, :strategies, :callback_names,
       :to_create, :skip_create, :initialize_with, :constructor, :duplicate_attribute_assignment_from_initialize_with,
       :duplicate_attribute_assignment_from_initialize_with=, to: :configuration
   end

data/lib/factory_girl/attribute/dynamic.rb

@@ -11,7 +11,7 @@ module FactoryGirl
         block = @block
 
         -> {
-          value = block.arity == 1 ? block.call(self) : instance_exec(&block)
+          value = block.arity == 1 ? instance_exec(self, &block) : instance_exec(&block)
           raise SequenceAbuseError if FactoryGirl::Sequence === value
           value
         }

data/lib/factory_girl/callback.rb

@@ -10,7 +10,7 @@ module FactoryGirl
 
     def run(instance, evaluator)
       case block.arity
-      when 1 then syntax_runner.instance_exec(instance, &block)
+      when 1, -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

data/lib/factory_girl/configuration.rb

@@ -15,7 +15,8 @@ module FactoryGirl
       initialize_with { new }
     end
 
-    delegate :to_create, :skip_create, :constructor, to: :@definition
+    delegate :to_create, :skip_create, :constructor, :before, :after,
+      :callback, :callbacks, to: :@definition
 
     def initialize_with(&block)
       @definition.define_constructor(&block)

data/lib/factory_girl/definition.rb

@@ -84,6 +84,21 @@ module FactoryGirl
       @constructor = block
     end
 
+    def before(*names, &block)
+      callback(*names.map {|name| "before_#{name}" }, &block)
+    end
+
+    def after(*names, &block)
+      callback(*names.map {|name| "after_#{name}" }, &block)
+    end
+
+    def callback(*names, &block)
+      names.each do |name|
+        FactoryGirl.register_callback(name)
+        add_callback(Callback.new(name, block))
+      end
+    end
+
     private
 
     def base_traits

data/lib/factory_girl/definition_hierarchy.rb

@@ -1,7 +1,7 @@
 module FactoryGirl
   class DefinitionHierarchy
     def callbacks
-      []
+      FactoryGirl.callbacks
     end
 
     def constructor

data/lib/factory_girl/definition_proxy.rb

@@ -1,11 +1,13 @@
 module FactoryGirl
   class DefinitionProxy
-    UNPROXIED_METHODS = %w(__send__ __id__ nil? send object_id extend instance_eval initialize block_given? raise caller)
+    UNPROXIED_METHODS = %w(__send__ __id__ nil? send object_id extend instance_eval initialize block_given? raise caller method)
 
     (instance_methods + private_instance_methods).each do |method|
       undef_method(method) unless UNPROXIED_METHODS.include?(method.to_s)
     end
 
+    delegate :before, :after, :callback, to: :@definition
+
     attr_reader :child_factories
 
     def initialize(definition, ignore = false)
@@ -14,6 +16,11 @@ module FactoryGirl
       @child_factories = []
     end
 
+    def singleton_method_added(name)
+      message = "Defining methods in blocks (trait or factory) is not supported (#{name})"
+      raise FactoryGirl::MethodDefinitionError, message
+    end
+
     # Adds an attribute that should be assigned on generated instances for this
     # factory.
     #
@@ -157,20 +164,5 @@ module FactoryGirl
     def initialize_with(&block)
       @definition.define_constructor(&block)
     end
-
-    def before(*names, &block)
-      callback(*names.map {|name| "before_#{name}" }, &block)
-    end
-
-    def after(*names, &block)
-      callback(*names.map {|name| "after_#{name}" }, &block)
-    end
-
-    def callback(*names, &block)
-      names.each do |name|
-        FactoryGirl.register_callback(name)
-        @definition.add_callback(Callback.new(name, block))
-      end
-    end
   end
 end

data/lib/factory_girl/errors.rb

@@ -16,4 +16,7 @@ module FactoryGirl
   # * Defining an attribute with both a static and lazy value
   # * Defining an attribute twice in the same factory
   class AttributeDefinitionError < RuntimeError; end
+
+  # Raised when a method is defined in a factory or trait with arguments
+  class MethodDefinitionError < RuntimeError; end
 end

data/lib/factory_girl/factory.rb

@@ -8,7 +8,7 @@ module FactoryGirl
 
     def initialize(name, options = {})
       assert_valid_options(options)
-      @name             = name.is_a?(Symbol) ? name : name.to_s.underscore.to_sym
+      @name             = name.respond_to?(:to_sym) ? name.to_sym : name.to_s.underscore.to_sym
       @parent           = options[:parent]
       @aliases          = options[:aliases] || []
       @class_name       = options[:class]

data/lib/factory_girl/strategy_syntax_method_registrar.rb

@@ -8,6 +8,7 @@ module FactoryGirl
     def define_strategy_methods
       define_singular_strategy_method
       define_list_strategy_method
+      define_pair_strategy_method
     end
 
     private
@@ -28,6 +29,14 @@ module FactoryGirl
       end
     end
 
+    def define_pair_strategy_method
+      strategy_name = @strategy_name
+
+      define_syntax_method("#{strategy_name}_pair") do |name, *traits_and_overrides, &block|
+        2.times.map { send(strategy_name, name, *traits_and_overrides, &block) }
+      end
+    end
+
     def define_syntax_method(name, &block)
       FactoryGirl::Syntax::Methods.module_exec do
         define_method(name, &block)

data/lib/factory_girl/syntax/default.rb

@@ -48,6 +48,14 @@ module FactoryGirl
         def self.run(block)
           new.instance_eval(&block)
         end
+
+        delegate :before, :after, :callback, to: :configuration
+
+        private
+
+        def configuration
+          FactoryGirl.configuration
+        end
       end
 
       class ModifyDSL

data/lib/factory_girl/version.rb

@@ -1,3 +1,3 @@
 module FactoryGirl
-  VERSION = '4.2.0'
+  VERSION = '4.3.0'
 end