factory_girl 2.0.0.beta2 → 2.0.0.beta3

data/lib/factory_girl/attribute/sequence.rb

@@ -0,0 +1,16 @@
+module FactoryGirl
+  class Attribute
+
+    class Sequence < Attribute
+      def initialize(name, sequence)
+        super(name)
+        @sequence = sequence
+      end
+
+      def add_to(proxy)
+        proxy.set(name, FactoryGirl.generate(@sequence))
+      end
+    end
+
+  end
+end

data/lib/factory_girl/definition_proxy.rb

@@ -73,7 +73,7 @@ module FactoryGirl
     # are equivilent.
     def method_missing(name, *args, &block)
       if args.empty? && block.nil?
-        association(name)
+        @factory.define_attribute(Attribute::Implicit.new(name))
       else
         add_attribute(name, *args, &block)
       end
@@ -97,7 +97,7 @@ module FactoryGirl
     # Except that no globally available sequence will be defined.
     def sequence(name, start_value = 1, &block)
       sequence = Sequence.new(name, start_value, &block)
-      add_attribute(name) { sequence.run }
+      add_attribute(name) { sequence.next }
     end
 
     # Adds an attribute that builds an association. The associated instance will

data/lib/factory_girl/factory.rb

@@ -1,16 +1,4 @@
 module FactoryGirl
-  def self.factories
-    puts "WARNING: FactoryGirl.factories is deprecated."
-    puts "Use FactoryGirl.registry instead."
-    registry
-  end
-
-  def self.factory_by_name(name)
-    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.
   class AssociationDefinitionError < RuntimeError
   end
@@ -101,7 +89,7 @@ module FactoryGirl
     end
 
     def associations
-      attributes.select {|attribute| attribute.is_a?(Attribute::Association) }
+      attributes.select {|attribute| attribute.association? }
     end
 
     # Names for this factory, including aliases.

data/lib/factory_girl/find_definitions.rb

@@ -1,8 +1,6 @@
 module FactoryGirl
 
   class << self
-    attr_accessor :factories #:nodoc:
-
     # An Array of strings specifying locations that should be searched for
     # factory definitions. By default, factory_girl will attempt to require
     # "factories," "test/factories," and "spec/factories." Only the first
@@ -16,7 +14,7 @@ module FactoryGirl
       require("#{path}.rb") if File.exists?("#{path}.rb")
 
       if File.directory? path
-        Dir[File.join(path, '*.rb')].sort.each do |file|
+        Dir[File.join(path, '**', '*.rb')].sort.each do |file|
           require file
         end
       end

data/lib/factory_girl/proxy/build.rb

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

data/lib/factory_girl/proxy/stub.rb

@@ -7,6 +7,10 @@ module FactoryGirl
         @instance = klass.new
         @instance.id = next_id
         @instance.instance_eval do
+          def persisted?
+            !new_record?
+          end
+
           def new_record?
             id.nil?
           end
@@ -46,12 +50,12 @@ module FactoryGirl
       end
 
       def associate(name, factory_name, overrides)
-        factory = FactoryGirl.find(factory_name)
+        factory = FactoryGirl.factory_by_name(factory_name)
         set(name, factory.run(Proxy::Stub, overrides))
       end
 
       def association(factory_name, overrides = {})
-        factory = FactoryGirl.find(factory_name)
+        factory = FactoryGirl.factory_by_name(factory_name)
         factory.run(Proxy::Stub, overrides)
       end
 

data/lib/factory_girl/rails2.rb

@@ -1 +1,7 @@
-Rails.configuration.after_initialize { FactoryGirl.find_definitions }
+Rails.configuration.after_initialize do
+  FactoryGirl.definition_file_paths = [
+    File.join(Rails.root, 'test', 'factories'),
+    File.join(Rails.root, 'spec', 'factories')
+  ]
+  FactoryGirl.find_definitions
+end

data/lib/factory_girl/registry.rb

@@ -1,5 +1,7 @@
 module FactoryGirl
   class Registry
+    include Enumerable
+
     def initialize
       @items = {}
     end
@@ -14,7 +16,7 @@ module FactoryGirl
     end
 
     def each(&block)
-      @items.each(&block)
+      @items.values.each(&block)
     end
 
     def [](name)
@@ -25,6 +27,10 @@ module FactoryGirl
       @items.key?(name.to_sym)
     end
 
+    def clear
+      @items.clear
+    end
+
     private
 
     def add_as(name, item)
@@ -35,25 +41,5 @@ module FactoryGirl
       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
 

data/lib/factory_girl/sequence.rb

@@ -6,25 +6,20 @@ module FactoryGirl
   # Sequences are defined using sequence within a FactoryGirl.define block.
   # Sequence values are generated using next.
   class Sequence
+    attr_reader :name
+
     def initialize(name, value = 1, &proc) #:nodoc:
       @name = name
       @proc  = proc
       @value = value || 1
     end
 
-    # Returns the next value for this sequence
-    def run(proxy_class = nil, overrides = {})
+    def next
       @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
@@ -33,10 +28,4 @@ module FactoryGirl
       [@name]
     end
   end
-
-  def self.sequences
-    puts "WARNING: FactoryGirl.sequences is deprecated."
-    puts "Use FactoryGirl.registry instead."
-    registry
-  end
 end

data/lib/factory_girl/step_definitions.rb

@@ -3,7 +3,7 @@ module FactoryGirlStepHelpers
   def convert_association_string_to_instance(factory_name, assignment)
     attribute, value = assignment.split(':', 2)
     return if value.blank?
-    factory = FactoryGirl.find(factory_name)
+    factory = FactoryGirl.factory_by_name(factory_name)
     attributes = convert_human_hash_to_attribute_hash({attribute => value.strip}, factory.associations)
     attributes_find = {}
     attributes.each do |k, v|
@@ -28,19 +28,19 @@ end
 
 World(FactoryGirlStepHelpers)
 
-FactoryGirl.registry.each do |name, factory|
-  Given /^the following (?:#{factory.human_name}|#{factory.human_name.pluralize}) exists?:$/ do |table|
+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)
     end
   end
 
-  Given /^an? #{factory.human_name} exists$/ do
+  Given /^an? #{factory.human_name} exists$/i do
     FactoryGirl.create(factory.name)
   end
 
-  Given /^(\d+) #{factory.human_name.pluralize} exist$/ do |count|
+  Given /^(\d+) #{factory.human_name.pluralize} exist$/i do |count|
     count.to_i.times { FactoryGirl.create(factory.name) }
   end
 

data/lib/factory_girl/syntax/blueprint.rb

@@ -29,7 +29,7 @@ module FactoryGirl
             instance = Factory.new(name.underscore, :class => self)
             proxy = FactoryGirl::DefinitionProxy.new(instance)
             proxy.instance_eval(&block)
-            FactoryGirl.register(instance)
+            FactoryGirl.register_factory(instance)
           end
 
         end

data/lib/factory_girl/syntax/default.rb

@@ -17,13 +17,13 @@ module FactoryGirl
           proxy = FactoryGirl::DefinitionProxy.new(factory)
           proxy.instance_eval(&block)
           if parent = options.delete(:parent)
-            factory.inherit_from(FactoryGirl.find(parent))
+            factory.inherit_from(FactoryGirl.factory_by_name(parent))
           end
-          FactoryGirl.register(factory)
+          FactoryGirl.register_factory(factory)
         end
 
         def sequence(name, start_value = 1, &block)
-          FactoryGirl.register(Sequence.new(name, start_value, &block))
+          FactoryGirl.register_sequence(Sequence.new(name, start_value, &block))
         end
       end
     end

data/lib/factory_girl/syntax/generate.rb

@@ -42,7 +42,7 @@ module FactoryGirl
         module ClassMethods #:nodoc:
 
           def generate(overrides = {}, &block)
-            factory = FactoryGirl.find(name.underscore)
+            factory = FactoryGirl.factory_by_name(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.find(name.underscore)
+            factory = FactoryGirl.factory_by_name(name.underscore)
             instance = factory.run(Proxy::Create, overrides)
             yield(instance) if block_given?
             instance
           end
 
           def spawn(overrides = {}, &block)
-            factory = FactoryGirl.find(name.underscore)
+            factory = FactoryGirl.factory_by_name(name.underscore)
             instance = factory.run(Proxy::Build, overrides)
             yield(instance) if block_given?
             instance

data/lib/factory_girl/syntax/make.rb

@@ -28,7 +28,11 @@ module FactoryGirl
         module ClassMethods #:nodoc:
 
           def make(overrides = {})
-            FactoryGirl.find(name.underscore).run(Proxy::Create, overrides)
+            FactoryGirl.factory_by_name(name.underscore).run(Proxy::Build, overrides)
+          end
+
+          def make!(overrides = {})
+            FactoryGirl.factory_by_name(name.underscore).run(Proxy::Create, overrides)
           end
 
         end

data/lib/factory_girl/syntax/methods.rb

@@ -15,7 +15,7 @@ module FactoryGirl
       # 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)
+        FactoryGirl.factory_by_name(name).run(Proxy::AttributesFor, overrides)
       end
 
       # Generates and returns an instance from this factory. Attributes can be
@@ -31,7 +31,7 @@ module FactoryGirl
       # An instance of the class this factory generates, with generated attributes
       # assigned.
       def build(name, overrides = {})
-        FactoryGirl.find(name).run(Proxy::Build, overrides)
+        FactoryGirl.factory_by_name(name).run(Proxy::Build, overrides)
       end
 
       # Generates, saves, and returns an instance from this factory. Attributes can
@@ -51,7 +51,7 @@ module FactoryGirl
       # A saved instance of the class this factory generates, with generated
       # attributes assigned.
       def create(name, overrides = {})
-        FactoryGirl.find(name).run(Proxy::Create, overrides)
+        FactoryGirl.factory_by_name(name).run(Proxy::Create, overrides)
       end
 
       # Generates and returns an object with all attributes from this factory
@@ -67,9 +67,56 @@ module FactoryGirl
       # Returns: +Object+
       # An object with generated attributes stubbed out.
       def build_stubbed(name, overrides = {})
-        FactoryGirl.find(name).run(Proxy::Stub, overrides)
+        FactoryGirl.factory_by_name(name).run(Proxy::Stub, overrides)
       end
 
+      # Builds and returns multiple instances from this factory as an array. Attributes can be
+      # individually overridden by passing in a Hash of attribute => value pairs.
+      #
+      # Arguments:
+      # * name: +Symbol+ or +String+
+      #   The name of the factory to be used.
+      # * amount: +Integer+
+      #   number of instances to be built.
+      # * overrides: +Hash+
+      #   Attributes to overwrite for each instance.
+      #
+      # Returns: +Array+
+      # An array of instances of the class this factory generates, with generated attributes
+      # assigned.
+      def build_list(name, amount, overrides = {})
+        amount.times.map { build(name, overrides) }
+      end
+
+      # Creates and returns multiple instances from this factory as an array. Attributes can be
+      # individually overridden by passing in a Hash of attribute => value pairs.
+      #
+      # Arguments:
+      # * name: +Symbol+ or +String+
+      #   The name of the factory to be used.
+      # * amount: +Integer+
+      #   number of instances to be created.
+      # * overrides: +Hash+
+      #   Attributes to overwrite for each instance.
+      #
+      # Returns: +Array+
+      # An array of instances of the class this factory generates, with generated attributes
+      # assigned.
+      def create_list(name, amount, overrides = {})
+        amount.times.map { create(name, overrides) }
+      end
+
+      # Generates and returns the next value in a sequence.
+      #
+      # Arguments:
+      #   name: (Symbol)
+      #     The name of the sequence that a value should be generated for.
+      #
+      # Returns:
+      #   The next value in the sequence. (Object)
+      def generate(name)
+        FactoryGirl.sequence_by_name(name).next
+      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.register(Sequence.new(name, start_value || 1, &block))
+            FactoryGirl.register_sequence(Sequence.new(name, start_value || 1, &block))
           else
-            FactoryGirl.find(name).run
+            FactoryGirl.sequence_by_name(name).next
           end
         end
 

data/lib/factory_girl/syntax/vintage.rb

@@ -2,8 +2,6 @@ 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.
         #
@@ -31,14 +29,18 @@ module FactoryGirl
           proxy = FactoryGirl::DefinitionProxy.new(factory)
           yield(proxy)
           if parent = options.delete(:parent)
-            factory.inherit_from(FactoryGirl.find(parent))
+            factory.inherit_from(FactoryGirl.factory_by_name(parent))
           end
-          FactoryGirl.register(factory)
+          FactoryGirl.register_factory(factory)
         end
 
         # Executes the default strategy for the given factory. This is usually create,
         # but it can be overridden for each factory.
         #
+        # DEPRECATED
+        #
+        # Use create instead.
+        #
         # Arguments:
         # * name: +Symbol+ or +String+
         #   The name of the factory that should be used.
@@ -48,7 +50,7 @@ module FactoryGirl
         # Returns: +Object+
         # The result of the default strategy.
         def self.default_strategy(name, overrides = {})
-          self.send(FactoryGirl.find(name).default_strategy, name, overrides)
+          FactoryGirl.send(FactoryGirl.factory_by_name(name).default_strategy, name, overrides)
         end
 
         # Defines a new sequence that can be used to generate unique values in a specific format.
@@ -67,7 +69,7 @@ module FactoryGirl
         #
         #   Factory.sequence(:email) {|n| "somebody_#{n}@example.com" }
         def self.sequence(name, start_value = 1, &block)
-          FactoryGirl.register(Sequence.new(name, start_value, &block))
+          FactoryGirl.register_sequence(Sequence.new(name, start_value, &block))
         end
 
         # Generates and returns the next value in a sequence.
@@ -76,12 +78,10 @@ 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(name)
-          FactoryGirl.find(name).next
+          FactoryGirl.generate(name)
         end
 
         # Defines a new alias for attributes.
@@ -112,15 +112,34 @@ module FactoryGirl
           FactoryGirl.aliases << [pattern, replace]
         end
 
-        # Alias for build_stubbed. Deprecated.
-        def self.stub(name, overrides = {})
-          build_stubbed(name, overrides)
+        # Alias for FactoryGirl.attributes_for
+        def self.attributes_for(name, overrides = {})
+          FactoryGirl.attributes_for(name, overrides)
+        end
+
+        # Alias for FactoryGirl.build
+        def self.build(name, overrides = {})
+          FactoryGirl.build(name, overrides)
         end
 
+        # Alias for FactoryGirl.create
+        def self.create(name, overrides = {})
+          FactoryGirl.create(name, overrides)
+        end
+
+        # Alias for FactoryGirl.build_stubbed.
+        def self.stub(name, overrides = {})
+          FactoryGirl.build_stubbed(name, overrides)
+        end
       end
 
       # Shortcut for Factory.default_strategy.
       #
+      # DEPRECATION WARNING:
+      #
+      # In a future release, default_strategy will be removed and this will
+      # simply call create instead.
+      #
       # Example:
       #   Factory(:user, :name => 'Joe')
       def Factory(name, attrs = {})