Moved aliases out of the definition body into the definition arguments

lib/factory_girl/definition_proxy.rb

@@ -132,39 +132,6 @@ def association(name, options = {})
       @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

lib/factory_girl/factory.rb

@@ -10,10 +10,19 @@ def self.factory_by_name(name)
   end
 
   def self.register_factory(factory, options = {})
-    name = options[:as] || factory.name
+    if options[:as]
+      name = options[:as]
+    else
+      name = factory.name
+      factory.aliases.each do |alias_name|
+        register_factory(factory, :as => alias_name)
+      end
+    end
+
     if self.factories[name]
       raise DuplicateDefinitionError, "Factory already defined: #{name}"
     end
+
     self.factories[name] = factory
   end
 
@@ -110,6 +119,35 @@ def associations
       attributes.select {|attribute| attribute.is_a?(Attribute::Association) }
     end
 
+    # Alternate names for this factory.
+    #
+    # Example:
+    #
+    #   factory :user, :aliases => [:author] do
+    #     # ...
+    #   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, :aliases => [:author] do
+    #     # ...
+    #   end
+    #
+    #   factory :post do
+    #     author
+    #   end
+    #
+    #   Factory(:post).author.class
+    #   # => User
+    def aliases
+      @options[:aliases] || []
+    end
+
     private
 
     def class_for (class_or_to_s)
@@ -136,7 +174,7 @@ def attribute_defined? (name)
     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

spec/acceptance/acceptance_spec.rb

@@ -8,13 +8,11 @@
         "somebody#{n}@example.com"
       end
 
-      factory :user, :class => 'user' do
+      factory :user, :class => 'user', :aliases => [:author] do
         first_name 'Jimi'
         last_name  'Hendrix'
         admin       false
         email { "#{first_name}.#{last_name}@example.com".downcase }
-
-        aliased_as :author
       end
 
       factory Post, :default_strategy => :attributes_for do

spec/acceptance/syntax/vintage_spec.rb

@@ -53,6 +53,7 @@
     @factory = "factory"
     @proxy   = "proxy"
     stub(@factory).name { @name }
+    stub(@factory).aliases { [] }
     @options = { :class => 'magic' }
     stub(FactoryGirl::Factory).new { @factory }
     stub(FactoryGirl::DefinitionProxy).new { @proxy }

spec/factory_girl/definition_proxy_spec.rb

@@ -129,10 +129,4 @@
     factory.attributes.last.add_to(proxy)
     proxy.should have_received.set(name, 'expected')
   end
-
-  it "registers its factory for an alias" do
-    aliased_name = :guest
-    mock(FactoryGirl).register_factory(factory, :as => aliased_name)
-    subject.aliased_as aliased_name
-  end
 end

spec/factory_girl/factory_spec.rb

@@ -4,7 +4,9 @@
   before do
     @name    = :user
     @factory = "factory"
+    @aliases = [:one, :two]
     stub(@factory).name { @name }
+    stub(@factory).aliases { @aliases }
   end
 
   it "should add the factory to the list of factories" do
@@ -17,6 +19,13 @@
       2.times { FactoryGirl.register_factory(@factory) }
     }.should raise_error(FactoryGirl::DuplicateDefinitionError)
   end
+
+  it "registers aliases" do
+    FactoryGirl.register_factory(@factory)
+    @aliases.each do |name|
+      FactoryGirl.factory_by_name(name).should == @factory
+    end
+  end
 end
 
 describe FactoryGirl::Factory do
@@ -392,3 +401,11 @@
   end
 end
 
+
+describe FactoryGirl::Factory, "with aliases" do
+  it "registers the aliases" do
+    aliased_name = :guest
+    factory = FactoryGirl::Factory.new("user", :aliases => [aliased_name])
+    factory.aliases.should == [aliased_name]
+  end
+end