factory_girl 1.3.3 → 2.0.0.beta1

data/lib/factory_girl/find_definitions.rb

@@ -0,0 +1,25 @@
+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
+    # existing file will be loaded.
+    attr_accessor :definition_file_paths
+  end
+  self.definition_file_paths = %w(factories test/factories spec/factories)
+
+  def self.find_definitions #:nodoc:
+    definition_file_paths.each do |path|
+      require("#{path}.rb") if File.exists?("#{path}.rb")
+
+      if File.directory? path
+        Dir[File.join(path, '*.rb')].sort.each do |file|
+          require file
+        end
+      end
+    end
+  end
+end

data/lib/factory_girl/proxy.rb

@@ -1,5 +1,4 @@
-class Factory
-
+module FactoryGirl
   class Proxy #:nodoc:
 
     attr_reader :callbacks
@@ -47,13 +46,13 @@ class Factory
     #
     # Example:
     #
-    #   Factory.define :user do |f|
+    #   factory :user do
     #     # ...
     #   end
     #
-    #   Factory.define :post do |f|
+    #   factory :post do
     #     # ...
-    #     f.author {|a| a.association :user, :name => 'Joe' }
+    #     author { |post| post.association(:user, :name => 'Joe') }
     #   end
     #
     #   # Builds (but doesn't save) a Post and a User
@@ -75,5 +74,4 @@ class Factory
       raise NotImplementedError, "Strategies must return a result"
     end
   end
-
 end

data/lib/factory_girl/proxy/attributes_for.rb

@@ -1,4 +1,4 @@
-class Factory
+module FactoryGirl
   class Proxy #:nodoc:
     class AttributesFor < Proxy #:nodoc:
       def initialize(klass)

data/lib/factory_girl/proxy/build.rb

@@ -1,4 +1,4 @@
-class Factory
+module FactoryGirl
   class Proxy #:nodoc:
     class Build < Proxy #:nodoc:
       def initialize(klass)
@@ -13,12 +13,14 @@ class Factory
         @instance.send(:"#{attribute}=", value)
       end
 
-      def associate(name, factory, attributes)
-        set(name, Factory.create(factory, attributes))
+      def associate(name, factory_name, overrides)
+        factory = FactoryGirl.factory_by_name(factory_name)
+        set(name, factory.run(Proxy::Create, overrides))
       end
 
-      def association(factory, overrides = {})
-        Factory.create(factory, overrides)
+      def association(factory_name, overrides = {})
+        factory = FactoryGirl.factory_by_name(factory_name)
+        factory.run(Proxy::Create, overrides)
       end
 
       def result

data/lib/factory_girl/proxy/create.rb

@@ -1,4 +1,4 @@
-class Factory
+module FactoryGirl
   class Proxy #:nodoc:
     class Create < Build #:nodoc:
       def result

data/lib/factory_girl/proxy/stub.rb

@@ -1,4 +1,4 @@
-class Factory
+module FactoryGirl
   class Proxy
     class Stub < Proxy #:nodoc:
       @@next_id = 1000
@@ -26,6 +26,10 @@ class Factory
           def reload
             raise "stubbed models are not allowed to access the database"
           end
+
+          def update_attribute(*args)
+            raise "stubbed models are not allowed to access the database"
+          end
         end
       end
 
@@ -41,12 +45,14 @@ class Factory
         @instance.send(:"#{attribute}=", value)
       end
 
-      def associate(name, factory, attributes)
-        set(name, Factory.stub(factory, attributes))
+      def associate(name, factory_name, overrides)
+        factory = FactoryGirl.factory_by_name(factory_name)
+        set(name, factory.run(Proxy::Stub, overrides))
       end
 
-      def association(factory, overrides = {})
-        Factory.stub(factory, overrides)
+      def association(factory_name, overrides = {})
+        factory = FactoryGirl.factory_by_name(factory_name)
+        factory.run(Proxy::Stub, overrides)
       end
 
       def result

data/lib/factory_girl/rails2.rb

@@ -1 +1 @@
-Rails.configuration.after_initialize { Factory.find_definitions }
+Rails.configuration.after_initialize { FactoryGirl.find_definitions }

data/lib/factory_girl/sequence.rb

@@ -1,4 +1,4 @@
-class Factory
+module FactoryGirl
 
   # Raised when calling Factory.sequence from a dynamic attribute block
   class SequenceAbuseError < StandardError; end
@@ -7,15 +7,16 @@ class Factory
   # using next.
   class Sequence
 
-    def initialize (&proc) #:nodoc:
+    def initialize(value = 1, &proc) #:nodoc:
       @proc  = proc
-      @value = 0
+      @value = value || 1
     end
 
     # Returns the next value for this sequence
     def next
-      @value += 1
       @proc.call(@value)
+    ensure
+      @value = @value.next
     end
 
   end
@@ -24,40 +25,4 @@ class Factory
     attr_accessor :sequences #:nodoc:
   end
   self.sequences = {}
-
-  # Defines a new sequence that can be used to generate unique values in a specific format.
-  #
-  # Arguments:
-  #   name: (Symbol)
-  #     A unique name for this sequence. This name will be referenced when
-  #     calling next to generate new values from this sequence.
-  #   block: (Proc)
-  #     The code to generate each value in the sequence. This block will be
-  #     called with a unique number each time a value in the sequence is to be
-  #     generated. The block should return the generated value for the
-  #     sequence.
-  #
-  # Example:
-  #
-  #   Factory.sequence(:email) {|n| "somebody_#{n}@example.com" }
-  def self.sequence (name, &block)
-    self.sequences[name] = Sequence.new(&block)
-  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 self.next (sequence)
-    unless self.sequences.key?(sequence)
-      raise "No such sequence: #{sequence}"
-    end
-
-    self.sequences[sequence].next
-  end
-
 end

data/lib/factory_girl/step_definitions.rb

@@ -3,7 +3,7 @@ module FactoryGirlStepHelpers
     attribute, value = assignment.split(':', 2)
     return if value.blank?
     attributes = convert_human_hash_to_attribute_hash(attribute => value.strip)
-    factory = Factory.factory_by_name(factory_name)
+    factory = FactoryGirl.factory_by_name(factory_name)
     model_class = factory.build_class
     model_class.find(:first, :conditions => attributes) or
       Factory(factory_name, attributes)
@@ -22,31 +22,31 @@ end
 
 World(FactoryGirlStepHelpers)
 
-Factory.factories.values.each do |factory|
+FactoryGirl.factories.values.each do |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)
-      Factory.create(factory.factory_name, attributes)
+      factory.run(FactoryGirl::Proxy::Create, attributes)
     end
   end
 
   Given /^an? #{factory.human_name} exists$/ do
-    Factory(factory.factory_name)
+    Factory(factory.name)
   end
 
   Given /^(\d+) #{factory.human_name.pluralize} exist$/ do |count|
-    count.to_i.times { Factory(factory.factory_name) }
+    count.to_i.times { Factory(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.factory_name, column.name => value)
+        Factory(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.factory_name, column.name => value) }
+        count.to_i.times { Factory(factory.name, column.name => value) }
       end
     end
   end

data/lib/factory_girl/syntax.rb

@@ -1,12 +1,12 @@
-class Factory
+module FactoryGirl
   # Provides alternate syntaxes for factory_girl. If you don't like the default
-  # syntax for defining or using factories, look at one of the Factory::Syntax
-  # modules:
+  # syntax for defining or using factories, look at one of the
+  # FactoryGirl::Syntax modules:
   #
-  # * Factory::Syntax::Blueprint: definition syntax similar to Machinist
-  # * Factory::Syntax::Generate: usage syntax similar to Object Daddy
-  # * Factory::Syntax::Make: usage syntax similar to Machinist
-  # * Factory::Syntax::Sham: sequence syntax similar to Machinist
+  # * FactoryGirl::Syntax::Blueprint: definition syntax similar to Machinist
+  # * FactoryGirl::Syntax::Generate: usage syntax similar to Object Daddy
+  # * FactoryGirl::Syntax::Make: usage syntax similar to Machinist
+  # * FactoryGirl::Syntax::Sham: sequence syntax similar to Machinist
   module Syntax
   end
 end

data/lib/factory_girl/syntax/blueprint.rb

@@ -1,4 +1,4 @@
-class Factory
+module FactoryGirl
   module Syntax
 
     # Extends ActiveRecord::Base to provide a make class method, which is an
@@ -27,8 +27,9 @@ class Factory
 
           def blueprint(&block)
             instance = Factory.new(name.underscore, :class => self)
-            instance.instance_eval(&block)
-            Factory.factories[instance.factory_name] = instance
+            proxy = FactoryGirl::DefinitionProxy.new(instance)
+            proxy.instance_eval(&block)
+            FactoryGirl.register_factory(instance)
           end
 
         end
@@ -38,4 +39,4 @@ class Factory
   end
 end
 
-ActiveRecord::Base.send(:include, Factory::Syntax::Blueprint::ActiveRecord)
+ActiveRecord::Base.send(:include, FactoryGirl::Syntax::Blueprint::ActiveRecord)

data/lib/factory_girl/syntax/default.rb

@@ -0,0 +1,31 @@
+module FactoryGirl
+  module Syntax
+    module Default
+      def define(&block)
+        DSL.run(block)
+      end
+
+      class DSL
+        def self.run(block)
+          new.instance_eval(&block)
+        end
+
+        def factory(name, options = {}, &block)
+          factory = Factory.new(name, options)
+          proxy = FactoryGirl::DefinitionProxy.new(factory)
+          proxy.instance_eval(&block)
+          if parent = options.delete(:parent)
+            factory.inherit_from(FactoryGirl.factory_by_name(parent))
+          end
+          FactoryGirl.register_factory(factory)
+        end
+
+        def sequence(name, start_value = 1, &block)
+          FactoryGirl.sequences[name] = Sequence.new(start_value, &block)
+        end
+      end
+    end
+  end
+
+  extend Syntax::Default
+end

data/lib/factory_girl/syntax/generate.rb

@@ -1,4 +1,4 @@
-class Factory
+module FactoryGirl
   module Syntax
 
     # Extends ActiveRecord::Base to provide generation methods for factories.
@@ -7,9 +7,11 @@ class Factory
     #
     #   require 'factory_girl/syntax/generate'
     #
-    #   Factory.define :user do |factory|
-    #     factory.name 'Billy Bob'
-    #     factory.email 'billy@bob.example.com'
+    #   FactoryGirl.define do
+    #     factory :user do
+    #       name 'Billy Bob'
+    #       email 'billy@bob.example.com'
+    #     end
     #   end
     #
     #   # Creates a saved instance without raising (same as saving the result
@@ -40,20 +42,23 @@ class Factory
         module ClassMethods #:nodoc:
 
           def generate(overrides = {}, &block)
-            instance = Factory.build(name.underscore, overrides)
+            factory = FactoryGirl.factory_by_name(name.underscore)
+            instance = factory.run(Proxy::Build, overrides)
             instance.save
             yield(instance) if block_given?
             instance
           end
 
           def generate!(overrides = {}, &block)
-            instance = Factory.create(name.underscore, overrides)
+            factory = FactoryGirl.factory_by_name(name.underscore)
+            instance = factory.run(Proxy::Create, overrides)
             yield(instance) if block_given?
             instance
           end
 
           def spawn(overrides = {}, &block)
-            instance = Factory.build(name.underscore, overrides)
+            factory = FactoryGirl.factory_by_name(name.underscore)
+            instance = factory.run(Proxy::Build, overrides)
             yield(instance) if block_given?
             instance
           end
@@ -65,4 +70,4 @@ class Factory
   end
 end
 
-ActiveRecord::Base.send(:include, Factory::Syntax::Generate::ActiveRecord)
+ActiveRecord::Base.send(:include, FactoryGirl::Syntax::Generate::ActiveRecord)

data/lib/factory_girl/syntax/make.rb

@@ -1,4 +1,4 @@
-class Factory
+module FactoryGirl
   module Syntax
 
     # Extends ActiveRecord::Base to provide a make class method, which is a
@@ -8,9 +8,11 @@ class Factory
     #
     #   require 'factory_girl/syntax/make'
     #
-    #   Factory.define :user do |factory|
-    #     factory.name 'Billy Bob'
-    #     factory.email 'billy@bob.example.com'
+    #   FactoryGirl.define do
+    #     factory :user do
+    #       name 'Billy Bob'
+    #       email 'billy@bob.example.com'
+    #     end
     #   end
     #
     #   User.make(:name => 'Johnny')
@@ -26,7 +28,7 @@ class Factory
         module ClassMethods #:nodoc:
 
           def make(overrides = {})
-            Factory.create(name.underscore, overrides)
+            FactoryGirl.factory_by_name(name.underscore).run(Proxy::Create, overrides)
           end
 
         end
@@ -36,4 +38,4 @@ class Factory
   end
 end
 
-ActiveRecord::Base.send(:include, Factory::Syntax::Make::ActiveRecord)
+ActiveRecord::Base.send(:include, FactoryGirl::Syntax::Make::ActiveRecord)

data/lib/factory_girl/syntax/sham.rb

@@ -1,8 +1,8 @@
-class Factory
+module FactoryGirl
   module Syntax
 
     # Adds a Sham module, which provides an alternate interface to
-    # Factory::Sequence.
+    # FactoryGirl::Sequence.
     #
     # Usage:
     #
@@ -10,8 +10,10 @@ class Factory
     #
     #   Sham.email {|n| "somebody#{n}@example.com" }
     #
-    #   Factory.define :user do |factory|
-    #     factory.email { Sham.email }
+    #   FactoryGirl.define do
+    #     factory :user do
+    #       email
+    #     end
     #   end
     #
     # Note that you can also use Faker, but it is recommended that you simply
@@ -22,11 +24,12 @@ class Factory
     # This syntax was derived from Pete Yandell's machinist.
     module Sham
       module Sham #:nodoc:
-        def self.method_missing(name, &block)
+        def self.method_missing(name, *args, &block)
           if block_given?
-            Factory.sequence(name, &block)
+            start_value = args.first
+            FactoryGirl.sequences[name] = Sequence.new(start_value || 1, &block)
           else
-            Factory.next(name)
+            FactoryGirl.sequences[name].next
           end
         end
 
@@ -39,4 +42,4 @@ class Factory
   end
 end
 
-include Factory::Syntax::Sham
+include FactoryGirl::Syntax::Sham