factory_girl 2.0.0.beta1 → 2.0.0.beta2

data/features/factory_girl_steps.feature

@@ -123,3 +123,29 @@ Feature: Use step definitions generated by factories
     And 2 categories exist
     And 2 categories exist with a name of "Future"
     Then there should be 6 categories
+
+  Scenario: create a post with an existing category group
+    Given the following category exists:
+      | ID  | name    | category group |
+      | 123 | fiction | Name: books    |
+    And the following post exists:
+      | Title                      | Author    | Category                    |
+      | a title                    | Name: Joe | Category Group: Name: books |
+    Then I should find the following for the last post:
+      | title   | category_id |
+      | a title | 123         |
+
+  Scenario: create a post with an existing category group and a new category
+    Given the following category group exists:
+      | ID  | name  |
+      | 456 | books |
+    And the following post exists:
+      | Title     | Author    | Category                    |
+      | a title   | Name: Joe | Category Group: Name: books |
+    Then I should find the following for the last post:
+      | title   |
+      | a title |
+    And I should find the following for the last category:
+      | category_group_id |
+      | 456               |
+

data/features/step_definitions/database_steps.rb

@@ -15,4 +15,6 @@ Before do
   Post.delete_all
   User.delete_all
   Category.delete_all
+  CategoryGroup.delete_all
 end
+

data/features/support/env.rb

@@ -2,14 +2,5 @@ PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 
 $: << File.join(PROJECT_ROOT, 'lib')
 
-case ENV['RAILS_VERSION']
-when '2.1' then
-  gem 'activerecord',  '~>2.1.0'
-when '3.0' then
-  gem 'activerecord',  '~>3.0.0'
-else
-  gem 'activerecord',  '~>2.3.0'
-end
-
 require 'active_record'
 require 'factory_girl'

data/features/support/factories.rb

@@ -12,7 +12,12 @@ class CreateSchema < ActiveRecord::Migration
       t.string  :body
     end
 
+    create_table :category_groups, :force => true do |t|
+      t.string :name
+    end
+
     create_table :categories, :force => true do |t|
+      t.integer :category_group_id
       t.string :name
     end
 
@@ -28,7 +33,11 @@ CreateSchema.suppress_messages { CreateSchema.migrate(:up) }
 class User < ActiveRecord::Base
 end
 
+class CategoryGroup < ActiveRecord::Base
+end
+
 class Category < ActiveRecord::Base
+  belongs_to :category_group
 end
 
 class Post < ActiveRecord::Base
@@ -48,6 +57,11 @@ end
 
 Factory.define :category do |f|
   f.name "programming"
+  f.association :category_group
+end
+
+Factory.define :category_group do |f|
+  f.name "tecnhology"
 end
 
 Factory.define :post do |f|
@@ -60,3 +74,4 @@ Factory.define :non_active_record do |f|
 end
 
 require 'factory_girl/step_definitions'
+

data/lib/factory_girl.rb

@@ -3,6 +3,7 @@ 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/factory'
 require 'factory_girl/attribute'
 require 'factory_girl/attribute/static'
@@ -12,6 +13,7 @@ require 'factory_girl/attribute/callback'
 require 'factory_girl/sequence'
 require 'factory_girl/aliases'
 require 'factory_girl/definition_proxy'
+require 'factory_girl/syntax/methods'
 require 'factory_girl/syntax/default'
 require 'factory_girl/syntax/vintage'
 require 'factory_girl/find_definitions'

data/lib/factory_girl/definition_proxy.rb

@@ -22,7 +22,7 @@ module FactoryGirl
     #
     # Arguments:
     # * name: +Symbol+ or +String+
-    #   The name of this attribute. This will be assigned using :"#{name}=" for
+    #   The name of this attribute. This will be assigned using "name=" for
     #   generated instances.
     # * value: +Object+
     #   If no block is given, this value will be used for this attribute.
@@ -59,7 +59,7 @@ module FactoryGirl
     # or association with the same name. This means that:
     #
     #   factory :user do
-    #     email { Factory.next(:email) }
+    #     email { create(:email) }
     #     association :account
     #   end
     #
@@ -73,11 +73,7 @@ module FactoryGirl
     # are equivilent.
     def method_missing(name, *args, &block)
       if args.empty? && block.nil?
-        if sequence = FactoryGirl.sequences[name]
-          add_attribute(name) { sequence.next }
-        else
-          association(name)
-        end
+        association(name)
       else
         add_attribute(name, *args, &block)
       end
@@ -95,13 +91,13 @@ module FactoryGirl
     #   sequence(:email) { |n| "person#{n}@example.com" }
     #
     #   factory :user do
-    #     email { Factory.next(:email) }
+    #     email { FactoryGirl.create(:email) }
     #   end
     #
     # Except that no globally available sequence will be defined.
     def sequence(name, start_value = 1, &block)
-      sequence = Sequence.new(start_value, &block)
-      add_attribute(name) { sequence.next }
+      sequence = Sequence.new(name, start_value, &block)
+      add_attribute(name) { sequence.run }
     end
 
     # Adds an attribute that builds an association. The associated instance will
@@ -132,39 +128,6 @@ module FactoryGirl
       @factory.define_attribute(Attribute::Association.new(name, factory_name, options))
     end
 
-    # Registers an alias for this factory using the given name.
-    #
-    # Arguments:
-    # * name: +Symbol+
-    #   The name of the alias.
-    #
-    # Example:
-    #
-    #   factory :user do
-    #     aliased_as :author
-    #   end
-    #
-    #   Factory(:author).class
-    #   # => User
-    #
-    # Because an attribute defined without a value or block will build an
-    # association with the same name, this allows associations to be defined
-    # without factories, such as:
-    #
-    #   factory :user do
-    #     aliased_as :author
-    #   end
-    #
-    #   factory :post do
-    #     author
-    #   end
-    #
-    #   Factory(:post).author.class
-    #   # => User
-    def aliased_as(name)
-      FactoryGirl.register_factory(@factory, :as => name)
-    end
-
     def after_build(&block)
       @factory.add_callback(:after_build, &block)
     end
@@ -176,5 +139,9 @@ module FactoryGirl
     def after_stub(&block)
       @factory.add_callback(:after_stub, &block)
     end
+
+    def to_create(&block)
+      @factory.to_create(&block)
+    end
   end
 end

data/lib/factory_girl/factory.rb

@@ -1,20 +1,14 @@
 module FactoryGirl
-  class << self
-    attr_accessor :factories #:nodoc:
+  def self.factories
+    puts "WARNING: FactoryGirl.factories is deprecated."
+    puts "Use FactoryGirl.registry instead."
+    registry
   end
 
-  self.factories = {}
-
   def self.factory_by_name(name)
-    factories[name.to_sym] or raise ArgumentError.new("No such factory: #{name.to_s}")
-  end
-
-  def self.register_factory(factory, options = {})
-    name = options[:as] || factory.name
-    if self.factories[name]
-      raise DuplicateDefinitionError, "Factory already defined: #{name}"
-    end
-    self.factories[name] = factory
+    puts "WARNING: FactoryGirl.factory_by_name is deprecated."
+    puts "Use FactoryGirl.find instead."
+    registry.find(name)
   end
 
   # Raised when a factory is defined that attempts to instantiate itself.
@@ -89,7 +83,7 @@ module FactoryGirl
       @attributes << Attribute::Callback.new(name.to_sym, block)
     end
 
-    def run (proxy_class, overrides) #:nodoc:
+    def run(proxy_class, overrides) #:nodoc:
       proxy = proxy_class.new(build_class)
       overrides = symbolize_keys(overrides)
       overrides.each {|attr, val| proxy.set(attr, val) }
@@ -99,7 +93,7 @@ module FactoryGirl
           attribute.add_to(proxy)
         end
       end
-      proxy.result
+      proxy.result(@to_create_block)
     end
 
     def human_name(*args, &block)
@@ -110,6 +104,39 @@ module FactoryGirl
       attributes.select {|attribute| attribute.is_a?(Attribute::Association) }
     end
 
+    # Names for this factory, including aliases.
+    #
+    # Example:
+    #
+    #   factory :user, :aliases => [:author] do
+    #     # ...
+    #   end
+    #
+    #   FactoryGirl.create(:author).class
+    #   # => User
+    #
+    # Because an attribute defined without a value or block will build an
+    # association with the same name, this allows associations to be defined
+    # without factories, such as:
+    #
+    #   factory :user, :aliases => [:author] do
+    #     # ...
+    #   end
+    #
+    #   factory :post do
+    #     author
+    #   end
+    #
+    #   FactoryGirl.create(:post).author.class
+    #   # => User
+    def names
+      [name] + (@options[:aliases] || [])
+    end
+
+    def to_create(&block)
+      @to_create_block = block
+    end
+
     private
 
     def class_for (class_or_to_s)
@@ -136,11 +163,15 @@ module FactoryGirl
     end
 
     def assert_valid_options(options)
-      invalid_keys = options.keys - [:class, :parent, :default_strategy]
+      invalid_keys = options.keys - [:class, :parent, :default_strategy, :aliases]
       unless invalid_keys == []
         raise ArgumentError, "Unknown arguments: #{invalid_keys.inspect}"
       end
-      assert_valid_strategy(options[:default_strategy]) if options[:default_strategy]
+      if options[:default_strategy]
+        assert_valid_strategy(options[:default_strategy])
+        puts "WARNING: default_strategy is deprecated."
+        puts "Override to_create if you need to prevent a call to #save!."
+      end
     end
 
     def assert_valid_strategy(strategy)

data/lib/factory_girl/proxy.rb

@@ -56,11 +56,11 @@ module FactoryGirl
     #   end
     #
     #   # Builds (but doesn't save) a Post and a User
-    #   Factory.build(:post)
+    #   FactoryGirl.build(:post)
     #
     #   # Builds and saves a User, builds a Post, assigns the User to the
     #   # author association, and saves the User.
-    #   Factory.create(:post)
+    #   FactoryGirl.create(:post)
     #
     def association(name, overrides = {})
       nil
@@ -70,7 +70,7 @@ module FactoryGirl
       get(method)
     end
 
-    def result
+    def result(to_create)
       raise NotImplementedError, "Strategies must return a result"
     end
   end

data/lib/factory_girl/proxy/attributes_for.rb

@@ -13,7 +13,7 @@ module FactoryGirl
         @hash[attribute] = value
       end
 
-      def result
+      def result(to_create)
         @hash
       end
     end

data/lib/factory_girl/proxy/build.rb

@@ -14,16 +14,16 @@ module FactoryGirl
       end
 
       def associate(name, factory_name, overrides)
-        factory = FactoryGirl.factory_by_name(factory_name)
+        factory = FactoryGirl.find(factory_name)
         set(name, factory.run(Proxy::Create, overrides))
       end
 
       def association(factory_name, overrides = {})
-        factory = FactoryGirl.factory_by_name(factory_name)
+        factory = FactoryGirl.find(factory_name)
         factory.run(Proxy::Create, overrides)
       end
 
-      def result
+      def result(to_create)
         run_callbacks(:after_build)
         @instance
       end

data/lib/factory_girl/proxy/create.rb

@@ -1,9 +1,13 @@
 module FactoryGirl
   class Proxy #:nodoc:
     class Create < Build #:nodoc:
-      def result
+      def result(to_create)
         run_callbacks(:after_build)
-        @instance.save!
+        if to_create
+          to_create.call(@instance)
+        else
+          @instance.save!
+        end
         run_callbacks(:after_create)
         @instance
       end

data/lib/factory_girl/proxy/stub.rb

@@ -46,16 +46,16 @@ module FactoryGirl
       end
 
       def associate(name, factory_name, overrides)
-        factory = FactoryGirl.factory_by_name(factory_name)
+        factory = FactoryGirl.find(factory_name)
         set(name, factory.run(Proxy::Stub, overrides))
       end
 
       def association(factory_name, overrides = {})
-        factory = FactoryGirl.factory_by_name(factory_name)
+        factory = FactoryGirl.find(factory_name)
         factory.run(Proxy::Stub, overrides)
       end
 
-      def result
+      def result(to_create)
         run_callbacks(:after_stub)
         @instance
       end

data/lib/factory_girl/registry.rb

@@ -0,0 +1,59 @@
+module FactoryGirl
+  class Registry
+    def initialize
+      @items = {}
+    end
+
+    def add(item)
+      item.names.each { |name| add_as(name, item) }
+      item
+    end
+
+    def find(name)
+      @items[name.to_sym] or raise ArgumentError.new("Not registered: #{name.to_s}")
+    end
+
+    def each(&block)
+      @items.each(&block)
+    end
+
+    def [](name)
+      find(name)
+    end
+
+    def registered?(name)
+      @items.key?(name.to_sym)
+    end
+
+    private
+
+    def add_as(name, item)
+      if registered?(name)
+        raise DuplicateDefinitionError, "Already defined: #{name}"
+      else
+        @items[name.to_sym] = item
+      end
+    end
+  end
+
+  def self.register(item)
+    registry.add(item)
+  end
+
+  def self.registered?(name)
+    registry.registered?(name)
+  end
+
+  def self.find(name)
+    registry.find(name)
+  end
+
+  def self.registry
+    @registry ||= Registry.new
+  end
+
+  def self.registry=(registry)
+    @registry = registry
+  end
+end
+