factory_girl 2.0.0.beta5 → 2.0.0.rc1

data/features/factory_girl_steps.feature

@@ -182,3 +182,11 @@ Feature: Use step definitions generated by factories
     Then there should be 3 categories
     Given 3 Categories exist with a name of "science"
     Then there should be 6 Categories
+
+  Scenario: step definitions work correctly with aliases
+    Given the following person exists:
+      | ID  | Name |
+      | 123 | Joe  |
+    Then I should find the following for the last user:
+      | id  | name |
+      | 123 | Joe  |

data/features/support/factories.rb

@@ -54,11 +54,10 @@ FactoryGirl.define do
     "email#{n}@example.com"
   end
 
-  factory :user do
-  end
-
-  factory :admin_user, :parent => :user do
-    admin true
+  factory :user, :aliases => [:person] do
+    factory :admin_user do
+      admin true
+    end
   end
 
   factory :category do

data/lib/factory_girl/factory.rb

@@ -84,8 +84,8 @@ module FactoryGirl
       proxy.result(@to_create_block)
     end
 
-    def human_name(*args, &block)
-      name.to_s.gsub('_', ' ')
+    def human_names
+      names.map {|name| name.to_s.gsub('_', ' ') }
     end
 
     def associations

data/lib/factory_girl/registry.rb

@@ -16,7 +16,7 @@ module FactoryGirl
     end
 
     def each(&block)
-      @items.values.each(&block)
+      @items.values.uniq.each(&block)
     end
 
     def [](name)

data/lib/factory_girl/step_definitions.rb

@@ -1,24 +1,92 @@
 module FactoryGirlStepHelpers
-
-  def convert_association_string_to_instance(factory_name, assignment)
-    attribute, value = assignment.split(':', 2)
-    return if value.blank?
-    factory = FactoryGirl.factory_by_name(factory_name)
-    attributes = convert_human_hash_to_attribute_hash({attribute => value.strip}, factory.associations)
-    model_class = factory.build_class
-    model_class.find(:first, :conditions => attributes) or
-      FactoryGirl.create(factory_name, attributes)
+  def convert_human_hash_to_attribute_hash(human_hash, associations = [])
+    HumanHashToAttributeHash.new(human_hash, associations).attributes
   end
 
-  def convert_human_hash_to_attribute_hash(human_hash, associations = [])
-    human_hash.inject({}) do |attribute_hash, (human_key, value)|
-      key = human_key.downcase.gsub(' ', '_').to_sym
-      if association = associations.detect {|association| association.name == key }
-        association_instance = convert_association_string_to_instance(association.factory, value)
-        key = "#{key}_id"
-        value = association_instance.id if association_instance
+  class HumanHashToAttributeHash
+    attr_reader :associations
+
+    def initialize(human_hash, associations)
+      @human_hash   = human_hash
+      @associations = associations
+    end
+
+    def attributes(strategy = CreateAttributes)
+      @human_hash.inject({}) do |attribute_hash, (human_key, value)|
+        attributes = strategy.new(self, *process_key_value(human_key, value))
+        attribute_hash.merge({ attributes.key => attributes.value })
+      end
+    end
+
+    private
+
+    def process_key_value(key, value)
+      [key.downcase.gsub(' ', '_').to_sym, value.strip]
+    end
+
+    class AssociationManager
+      def initialize(human_hash_to_attributes_hash, key, value)
+        @human_hash_to_attributes_hash = human_hash_to_attributes_hash
+        @key   = key
+        @value = value
+      end
+
+      def association
+        @human_hash_to_attributes_hash.associations.detect {|association| association.name == @key }
+      end
+
+      def association_instance
+        return unless association
+
+        if attributes_hash = nested_attribute_hash
+          factory.build_class.find(:first, :conditions => attributes_hash.attributes(FindAttributes)) or
+          FactoryGirl.create(association.factory, attributes_hash.attributes)
+        end
+      end
+
+      private
+
+      def factory
+        FactoryGirl.factory_by_name(association.factory)
+      end
+
+      def nested_attribute_hash
+        attribute, value = @value.split(':', 2)
+        return if value.blank?
+
+        HumanHashToAttributeHash.new({ attribute => value }, factory.associations)
+      end
+    end
+
+    class AttributeStrategy
+      attr_reader :key, :value, :association_manager
+
+      def initialize(human_hash_to_attributes_hash, key, value)
+        @association_manager = AssociationManager.new(human_hash_to_attributes_hash, key, value)
+        @key   = key
+        @value = value
+      end
+    end
+
+    class FindAttributes < AttributeStrategy
+      def initialize(human_hash_to_attributes_hash, key, value)
+        super
+
+        if association_manager.association
+          @key = "#{@key}_id"
+          @value = association_manager.association_instance.try(:id)
+        end
+      end
+    end
+
+    class CreateAttributes < AttributeStrategy
+      def initialize(human_hash_to_attributes_hash, key, value)
+        super
+
+        if association_manager.association
+          @value = association_manager.association_instance
+        end
       end
-      attribute_hash.merge(key => value)
     end
   end
 end
@@ -26,30 +94,32 @@ end
 World(FactoryGirlStepHelpers)
 
 FactoryGirl.factories.each do |factory|
-  Given /^the following (?:#{factory.human_name}|#{factory.human_name.pluralize}) exists?:$/i do |table|
-    table.hashes.each do |human_hash|
-      attributes = convert_human_hash_to_attribute_hash(human_hash, factory.associations)
-      factory.run(FactoryGirl::Proxy::Create, attributes)
+  factory.human_names.each do |human_name|
+    Given /^the following (?:#{human_name}|#{human_name.pluralize}) exists?:$/i do |table|
+      table.hashes.each do |human_hash|
+        attributes = convert_human_hash_to_attribute_hash(human_hash, factory.associations)
+        FactoryGirl.create(factory.name, attributes)
+      end
     end
-  end
 
-  Given /^an? #{factory.human_name} exists$/i do
-    FactoryGirl.create(factory.name)
-  end
+    Given /^an? #{human_name} exists$/i do
+      FactoryGirl.create(factory.name)
+    end
 
-  Given /^(\d+) #{factory.human_name.pluralize} exist$/i do |count|
-    count.to_i.times { FactoryGirl.create(factory.name) }
-  end
+    Given /^(\d+) #{human_name.pluralize} exist$/i do |count|
+      count.to_i.times { FactoryGirl.create(factory.name) }
+    end
 
-  if factory.build_class.respond_to?(:columns)
-    factory.build_class.columns.each do |column|
-      human_column_name = column.name.downcase.gsub('_', ' ')
-      Given /^an? #{factory.human_name} exists with an? #{human_column_name} of "([^"]*)"$/i do |value|
-        FactoryGirl.create(factory.name, column.name => value)
-      end
+    if factory.build_class.respond_to?(:columns)
+      factory.build_class.columns.each do |column|
+        human_column_name = column.name.downcase.gsub('_', ' ')
+        Given /^an? #{human_name} exists with an? #{human_column_name} of "([^"]*)"$/i do |value|
+          FactoryGirl.create(factory.name, column.name => value)
+        end
 
-      Given /^(\d+) #{factory.human_name.pluralize} exist with an? #{human_column_name} of "([^"]*)"$/i do |count, value|
-        count.to_i.times { FactoryGirl.create(factory.name, column.name => value) }
+        Given /^(\d+) #{human_name.pluralize} exist with an? #{human_column_name} of "([^"]*)"$/i do |count, value|
+          count.to_i.times { FactoryGirl.create(factory.name, column.name => value) }
+        end
       end
     end
   end

data/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.0.0.beta5"
+  VERSION = "2.0.0.rc1"
 end
 

data/spec/factory_girl/factory_spec.rb

@@ -354,14 +354,22 @@ describe FactoryGirl::Factory do
 
 end
 
-describe FactoryGirl::Factory, "with an underscore in the name" do
-  subject { FactoryGirl::Factory.new("happy_users") }
+describe FactoryGirl::Factory, "human names" do
+  context "factory name without underscores" do
+    subject           { FactoryGirl::Factory.new("user") }
+    its(:human_names) { should == ["user"] }
+  end
 
-  it "has a human name" do
-    subject.human_name.should == 'happy users'
+  context "factory name with underscores" do
+    subject           { FactoryGirl::Factory.new("happy_user") }
+    its(:human_names) { should == ["happy user"] }
   end
-end
 
+  context "factory name with aliases" do
+    subject           { FactoryGirl::Factory.new("happy_user", :aliases => ["gleeful_user", "person"]) }
+    its(:human_names) { should == ["happy user", "gleeful user", "person"] }
+  end
+end
 
 describe FactoryGirl::Factory, "with aliases" do
   it "registers the aliases" do
@@ -370,4 +378,11 @@ describe FactoryGirl::Factory, "with aliases" do
     factory = FactoryGirl::Factory.new(:user, :aliases => [aliased_name])
     factory.names.should =~ [name, aliased_name]
   end
+
+  it "has human names" do
+    name = :user
+    aliased_name = :guest
+    factory = FactoryGirl::Factory.new(:user, :aliases => [aliased_name])
+    factory.human_names.should =~ [name.to_s, aliased_name.to_s]
+  end
 end

data/spec/factory_girl/registry_spec.rb

@@ -50,6 +50,19 @@ describe FactoryGirl::Registry do
     result.should =~ [factory, other_factory]
   end
 
+  it "iterates registered factories uniquely with aliases" do
+    other_factory = FactoryGirl::Factory.new(:string, :aliases => [:awesome])
+    subject.add(factory)
+    subject.add(other_factory)
+    result = []
+
+    subject.each do |value|
+      result << value
+    end
+
+    result.should =~ [factory, other_factory]
+  end
+
   it "registers an sequence" do
     sequence = FactoryGirl::Sequence.new(:email) { |n| "somebody#{n}@example.com" }
     subject.add(sequence)

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: factory_girl
 version: !ruby/object:Gem::Version 
+  hash: 15424087
   prerelease: 6
-  version: 2.0.0.beta5
+  segments: 
+  - 2
+  - 0
+  - 0
+  - rc
+  - 1
+  version: 2.0.0.rc1
 platform: ruby
 authors: 
 - Joe Ferris
@@ -10,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 -04:00
+date: 2011-06-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +28,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -32,6 +42,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -43,6 +56,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -54,6 +70,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
   type: :development
   version_requirements: *id004
@@ -65,6 +86,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 62196421
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta
+        - 3
         version: 3.0.0.beta3
   type: :development
   version_requirements: *id005
@@ -76,6 +104,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -87,6 +118,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -201,12 +235,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []