factory_girl 2.0.0.beta1 → 2.0.0.beta2

data/lib/factory_girl/sequence.rb

@@ -3,26 +3,40 @@ module FactoryGirl
   # Raised when calling Factory.sequence from a dynamic attribute block
   class SequenceAbuseError < StandardError; end
 
-  # Sequences are defined using Factory.sequence. Sequence values are generated
-  # using next.
+  # Sequences are defined using sequence within a FactoryGirl.define block.
+  # Sequence values are generated using next.
   class Sequence
-
-    def initialize(value = 1, &proc) #:nodoc:
+    def initialize(name, value = 1, &proc) #:nodoc:
+      @name = name
       @proc  = proc
       @value = value || 1
     end
 
     # Returns the next value for this sequence
-    def next
-      @proc.call(@value)
+    def run(proxy_class = nil, overrides = {})
+      @proc ? @proc.call(@value) : @value
     ensure
       @value = @value.next
     end
 
+    def next
+      puts "WARNING: FactoryGirl::Sequence#next is deprecated."
+      puts "Use #run instead."
+      run
+    end
+
+    def default_strategy
+      :create
+    end
+
+    def names
+      [@name]
+    end
   end
 
-  class << self
-    attr_accessor :sequences #:nodoc:
+  def self.sequences
+    puts "WARNING: FactoryGirl.sequences is deprecated."
+    puts "Use FactoryGirl.registry instead."
+    registry
   end
-  self.sequences = {}
 end

data/lib/factory_girl/step_definitions.rb

@@ -1,12 +1,18 @@
 module FactoryGirlStepHelpers
+
   def convert_association_string_to_instance(factory_name, assignment)
     attribute, value = assignment.split(':', 2)
     return if value.blank?
-    attributes = convert_human_hash_to_attribute_hash(attribute => value.strip)
-    factory = FactoryGirl.factory_by_name(factory_name)
+    factory = FactoryGirl.find(factory_name)
+    attributes = convert_human_hash_to_attribute_hash({attribute => value.strip}, factory.associations)
+    attributes_find = {}
+    attributes.each do |k, v|
+      k = "#{k}_id" if v.is_a? ActiveRecord::Base
+      attributes_find[k] = v
+    end
     model_class = factory.build_class
-    model_class.find(:first, :conditions => attributes) or
-      Factory(factory_name, attributes)
+    model_class.find(:first, :conditions => attributes_find) or
+      FactoryGirl.create(factory_name, attributes)
   end
 
   def convert_human_hash_to_attribute_hash(human_hash, associations = [])
@@ -22,7 +28,7 @@ end
 
 World(FactoryGirlStepHelpers)
 
-FactoryGirl.factories.values.each do |factory|
+FactoryGirl.registry.each do |name, factory|
   Given /^the following (?:#{factory.human_name}|#{factory.human_name.pluralize}) exists?:$/ do |table|
     table.hashes.each do |human_hash|
       attributes = convert_human_hash_to_attribute_hash(human_hash, factory.associations)
@@ -31,23 +37,24 @@ FactoryGirl.factories.values.each do |factory|
   end
 
   Given /^an? #{factory.human_name} exists$/ do
-    Factory(factory.name)
+    FactoryGirl.create(factory.name)
   end
 
   Given /^(\d+) #{factory.human_name.pluralize} exist$/ do |count|
-    count.to_i.times { Factory(factory.name) }
+    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|
-        Factory(factory.name, column.name => 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 { Factory(factory.name, column.name => value) }
+        count.to_i.times { FactoryGirl.create(factory.name, column.name => value) }
       end
     end
   end
 end
+

data/lib/factory_girl/syntax/blueprint.rb

@@ -13,7 +13,7 @@ module FactoryGirl
     #     email { 'billy@bob.example.com' }
     #   end
     #
-    #   Factory(:user, :name => 'Johnny')
+    #   FactoryGirl.create(:user, :name => 'Johnny')
     #
     # This syntax was derived from Pete Yandell's machinist.
     module Blueprint
@@ -29,7 +29,7 @@ module FactoryGirl
             instance = Factory.new(name.underscore, :class => self)
             proxy = FactoryGirl::DefinitionProxy.new(instance)
             proxy.instance_eval(&block)
-            FactoryGirl.register_factory(instance)
+            FactoryGirl.register(instance)
           end
 
         end

data/lib/factory_girl/syntax/default.rb

@@ -1,6 +1,8 @@
 module FactoryGirl
   module Syntax
     module Default
+      include Methods
+
       def define(&block)
         DSL.run(block)
       end
@@ -15,13 +17,13 @@ module FactoryGirl
           proxy = FactoryGirl::DefinitionProxy.new(factory)
           proxy.instance_eval(&block)
           if parent = options.delete(:parent)
-            factory.inherit_from(FactoryGirl.factory_by_name(parent))
+            factory.inherit_from(FactoryGirl.find(parent))
           end
-          FactoryGirl.register_factory(factory)
+          FactoryGirl.register(factory)
         end
 
         def sequence(name, start_value = 1, &block)
-          FactoryGirl.sequences[name] = Sequence.new(start_value, &block)
+          FactoryGirl.register(Sequence.new(name, start_value, &block))
         end
       end
     end

data/lib/factory_girl/syntax/generate.rb

@@ -15,14 +15,14 @@ module FactoryGirl
     #   end
     #
     #   # Creates a saved instance without raising (same as saving the result
-    #   # of Factory.build)
+    #   # of FactoryGirl.build)
     #   User.generate(:name => 'Johnny')
     #
     #   # Creates a saved instance and raises when invalid (same as
-    #   # Factory.create)
+    #   # FactoryGirl.create)
     #   User.generate!
     #
-    #   # Creates an unsaved instance (same as Factory.build)
+    #   # Creates an unsaved instance (same as FactoryGirl.build)
     #   User.spawn
     #
     #   # Creates an instance and yields it to the passed block
@@ -42,7 +42,7 @@ module FactoryGirl
         module ClassMethods #:nodoc:
 
           def generate(overrides = {}, &block)
-            factory = FactoryGirl.factory_by_name(name.underscore)
+            factory = FactoryGirl.find(name.underscore)
             instance = factory.run(Proxy::Build, overrides)
             instance.save
             yield(instance) if block_given?
@@ -50,14 +50,14 @@ module FactoryGirl
           end
 
           def generate!(overrides = {}, &block)
-            factory = FactoryGirl.factory_by_name(name.underscore)
+            factory = FactoryGirl.find(name.underscore)
             instance = factory.run(Proxy::Create, overrides)
             yield(instance) if block_given?
             instance
           end
 
           def spawn(overrides = {}, &block)
-            factory = FactoryGirl.factory_by_name(name.underscore)
+            factory = FactoryGirl.find(name.underscore)
             instance = factory.run(Proxy::Build, overrides)
             yield(instance) if block_given?
             instance

data/lib/factory_girl/syntax/make.rb

@@ -2,7 +2,7 @@ module FactoryGirl
   module Syntax
 
     # Extends ActiveRecord::Base to provide a make class method, which is a
-    # shortcut for Factory.create.
+    # shortcut for FactoryGirl.create.
     #
     # Usage:
     #
@@ -28,7 +28,7 @@ module FactoryGirl
         module ClassMethods #:nodoc:
 
           def make(overrides = {})
-            FactoryGirl.factory_by_name(name.underscore).run(Proxy::Create, overrides)
+            FactoryGirl.find(name.underscore).run(Proxy::Create, overrides)
           end
 
         end

data/lib/factory_girl/syntax/methods.rb

@@ -0,0 +1,75 @@
+module FactoryGirl
+  module Syntax
+    module Methods
+      # Generates and returns a Hash of attributes from this factory. Attributes
+      # can be individually overridden by passing in a Hash of attribute => value
+      # pairs.
+      #
+      # Arguments:
+      # * name: +Symbol+ or +String+
+      #   The name of the factory that should be used.
+      # * overrides: +Hash+
+      #   Attributes to overwrite for this set.
+      #
+      # Returns: +Hash+
+      # A set of attributes that can be used to build an instance of the class
+      # this factory generates.
+      def attributes_for(name, overrides = {})
+        FactoryGirl.find(name).run(Proxy::AttributesFor, overrides)
+      end
+
+      # Generates and returns an instance from this factory. Attributes can be
+      # individually overridden by passing in a Hash of attribute => value pairs.
+      #
+      # Arguments:
+      # * name: +Symbol+ or +String+
+      #   The name of the factory that should be used.
+      # * overrides: +Hash+
+      #   Attributes to overwrite for this instance.
+      #
+      # Returns: +Object+
+      # An instance of the class this factory generates, with generated attributes
+      # assigned.
+      def build(name, overrides = {})
+        FactoryGirl.find(name).run(Proxy::Build, overrides)
+      end
+
+      # Generates, saves, and returns an instance from this factory. Attributes can
+      # be individually overridden by passing in a Hash of attribute => value
+      # pairs.
+      #
+      # Instances are saved using the +save!+ method, so ActiveRecord models will
+      # raise ActiveRecord::RecordInvalid exceptions for invalid attribute sets.
+      #
+      # Arguments:
+      # * name: +Symbol+ or +String+
+      #   The name of the factory that should be used.
+      # * overrides: +Hash+
+      #   Attributes to overwrite for this instance.
+      #
+      # Returns: +Object+
+      # A saved instance of the class this factory generates, with generated
+      # attributes assigned.
+      def create(name, overrides = {})
+        FactoryGirl.find(name).run(Proxy::Create, overrides)
+      end
+
+      # Generates and returns an object with all attributes from this factory
+      # stubbed out. Attributes can be individually overridden by passing in a Hash
+      # of attribute => value pairs.
+      #
+      # Arguments:
+      # * name: +Symbol+ or +String+
+      #   The name of the factory that should be used.
+      # * overrides: +Hash+
+      #   Attributes to overwrite for this instance.
+      #
+      # Returns: +Object+
+      # An object with generated attributes stubbed out.
+      def build_stubbed(name, overrides = {})
+        FactoryGirl.find(name).run(Proxy::Stub, overrides)
+      end
+
+    end
+  end
+end

data/lib/factory_girl/syntax/sham.rb

@@ -27,9 +27,9 @@ module FactoryGirl
         def self.method_missing(name, *args, &block)
           if block_given?
             start_value = args.first
-            FactoryGirl.sequences[name] = Sequence.new(start_value || 1, &block)
+            FactoryGirl.register(Sequence.new(name, start_value || 1, &block))
           else
-            FactoryGirl.sequences[name].next
+            FactoryGirl.find(name).run
           end
         end
 

data/lib/factory_girl/syntax/vintage.rb

@@ -2,6 +2,8 @@ module FactoryGirl
   module Syntax
     module Vintage
       module Factory
+        extend Syntax::Methods
+
         # Defines a new factory that can be used by the build strategies (create and
         # build) to build new objects.
         #
@@ -18,6 +20,7 @@ module FactoryGirl
         #   factory will be copied to the current one with an ability to override
         #   them.
         # * default_strategy: +Symbol+
+        #   DEPRECATED.
         #   The strategy that will be used by the Factory shortcut method.
         #   Defaults to :create.
         #
@@ -28,78 +31,9 @@ module FactoryGirl
           proxy = FactoryGirl::DefinitionProxy.new(factory)
           yield(proxy)
           if parent = options.delete(:parent)
-            factory.inherit_from(FactoryGirl.factory_by_name(parent))
+            factory.inherit_from(FactoryGirl.find(parent))
           end
-          FactoryGirl.register_factory(factory)
-        end
-
-        # Generates and returns a Hash of attributes from this factory. Attributes
-        # can be individually overridden by passing in a Hash of attribute => value
-        # pairs.
-        #
-        # Arguments:
-        # * name: +Symbol+ or +String+
-        #   The name of the factory that should be used.
-        # * overrides: +Hash+
-        #   Attributes to overwrite for this set.
-        #
-        # Returns: +Hash+
-        # A set of attributes that can be used to build an instance of the class
-        # this factory generates.
-        def self.attributes_for(name, overrides = {})
-          FactoryGirl.factory_by_name(name).run(Proxy::AttributesFor, overrides)
-        end
-
-        # Generates and returns an instance from this factory. Attributes can be
-        # individually overridden by passing in a Hash of attribute => value pairs.
-        #
-        # Arguments:
-        # * name: +Symbol+ or +String+
-        #   The name of the factory that should be used.
-        # * overrides: +Hash+
-        #   Attributes to overwrite for this instance.
-        #
-        # Returns: +Object+
-        # An instance of the class this factory generates, with generated attributes
-        # assigned.
-        def self.build(name, overrides = {})
-          FactoryGirl.factory_by_name(name).run(Proxy::Build, overrides)
-        end
-
-        # Generates, saves, and returns an instance from this factory. Attributes can
-        # be individually overridden by passing in a Hash of attribute => value
-        # pairs.
-        #
-        # Instances are saved using the +save!+ method, so ActiveRecord models will
-        # raise ActiveRecord::RecordInvalid exceptions for invalid attribute sets.
-        #
-        # Arguments:
-        # * name: +Symbol+ or +String+
-        #   The name of the factory that should be used.
-        # * overrides: +Hash+
-        #   Attributes to overwrite for this instance.
-        #
-        # Returns: +Object+
-        # A saved instance of the class this factory generates, with generated
-        # attributes assigned.
-        def self.create(name, overrides = {})
-          FactoryGirl.factory_by_name(name).run(Proxy::Create, overrides)
-        end
-
-        # Generates and returns an object with all attributes from this factory
-        # stubbed out. Attributes can be individually overridden by passing in a Hash
-        # of attribute => value pairs.
-        #
-        # Arguments:
-        # * name: +Symbol+ or +String+
-        #   The name of the factory that should be used.
-        # * overrides: +Hash+
-        #   Attributes to overwrite for this instance.
-        #
-        # Returns: +Object+
-        # An object with generated attributes stubbed out.
-        def self.stub(name, overrides = {})
-          FactoryGirl.factory_by_name(name).run(Proxy::Stub, overrides)
+          FactoryGirl.register(factory)
         end
 
         # Executes the default strategy for the given factory. This is usually create,
@@ -114,7 +48,7 @@ module FactoryGirl
         # Returns: +Object+
         # The result of the default strategy.
         def self.default_strategy(name, overrides = {})
-          self.send(FactoryGirl.factory_by_name(name).default_strategy, name, overrides)
+          self.send(FactoryGirl.find(name).default_strategy, name, overrides)
         end
 
         # Defines a new sequence that can be used to generate unique values in a specific format.
@@ -133,7 +67,7 @@ module FactoryGirl
         #
         #   Factory.sequence(:email) {|n| "somebody_#{n}@example.com" }
         def self.sequence(name, start_value = 1, &block)
-          FactoryGirl.sequences[name] = Sequence.new(start_value, &block)
+          FactoryGirl.register(Sequence.new(name, start_value, &block))
         end
 
         # Generates and returns the next value in a sequence.
@@ -142,14 +76,12 @@ module FactoryGirl
         #   name: (Symbol)
         #     The name of the sequence that a value should be generated for.
         #
+        # DEPRECATED. Use create instead.
+        #
         # Returns:
         #   The next value in the sequence. (Object)
-        def self.next(sequence)
-          unless FactoryGirl.sequences.key?(sequence)
-            raise "No such sequence: #{sequence}"
-          end
-
-          FactoryGirl.sequences[sequence].next
+        def self.next(name)
+          FactoryGirl.find(name).next
         end
 
         # Defines a new alias for attributes.
@@ -180,6 +112,11 @@ module FactoryGirl
           FactoryGirl.aliases << [pattern, replace]
         end
 
+        # Alias for build_stubbed. Deprecated.
+        def self.stub(name, overrides = {})
+          build_stubbed(name, overrides)
+        end
+
       end
 
       # Shortcut for Factory.default_strategy.