vitalish-factory_girl 1.2.5 → 1.2.6

data/lib/factory_girl/proxy/attributes_for.rb

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

data/lib/factory_girl/proxy/build.rb

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

data/lib/factory_girl/proxy/create.rb

@@ -1,10 +1,11 @@
-module FactoryGirl
+class Factory
   class Proxy #:nodoc:
     class Create < Build #:nodoc:
       def result
         run_callbacks(:after_build)
+        temp_attributes = @instance.attributes
         @instance.save!
-        run_callbacks(:after_create)
+        run_callbacks(:after_create,temp_attributes)
         @instance
       end
     end

data/lib/factory_girl/proxy/stub.rb

@@ -1,4 +1,4 @@
-module FactoryGirl
+class Factory 
   class Proxy
     class Stub < Proxy #:nodoc:
       @@next_id = 1000
@@ -11,14 +11,6 @@ module FactoryGirl
             id.nil?
           end
 
-          def save(*args)
-            raise "stubbed models are not allowed to access the database"
-          end
-
-          def destroy(*args)
-            raise "stubbed models are not allowed to access the database"
-          end
-
           def connection
             raise "stubbed models are not allowed to access the database"
           end
@@ -26,10 +18,6 @@ module FactoryGirl
           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
 
@@ -45,14 +33,12 @@ module FactoryGirl
         @instance.send(:"#{attribute}=", value)
       end
 
-      def associate(name, factory_name, overrides)
-        factory = FactoryGirl.factory_by_name(factory_name)
-        set(name, factory.run(Proxy::Stub, overrides))
+      def associate(name, factory, attributes)
+        set(name, Factory.stub(factory, attributes))
       end
 
-      def association(factory_name, overrides = {})
-        factory = FactoryGirl.factory_by_name(factory_name)
-        factory.run(Proxy::Stub, overrides)
+      def association(factory, overrides = {})
+        Factory.stub(factory, overrides)
       end
 
       def result

data/lib/factory_girl/proxy.rb

@@ -1,4 +1,5 @@
-module FactoryGirl
+class Factory
+
   class Proxy #:nodoc:
 
     attr_reader :callbacks
@@ -12,6 +13,11 @@ module FactoryGirl
 
     def set(attribute, value)
     end
+    
+    def set_param(attribute, value)
+      @params ||= {}
+      @params[attribute] = value
+    end
 
     def associate(name, factory, attributes)
     end
@@ -25,7 +31,16 @@ module FactoryGirl
     def run_callbacks(name)
       if @callbacks && @callbacks[name]
         @callbacks[name].each do |block|
-          block.arity.zero? ? block.call : block.call(@instance)
+          case block.arity
+            when 0
+              block.call
+            when 1
+              block.call(@instance)
+            when 2
+              block.call(@instance,@params)
+            when 3
+              block.call(@instance,@params,attrib)
+            end
         end
       end
     end
@@ -41,24 +56,24 @@ module FactoryGirl
     #
     # Returns:
     #   The generated association for the current build strategy. Note that
-    #   associations are not generated for the attributes_for strategy. Returns
+    #   assocaitions are not generated for the attributes_for strategy. Returns
     #   nil in this case.
     #
     # Example:
     #
-    #   factory :user do
+    #   Factory.define :user do |f|
     #     # ...
     #   end
     #
-    #   factory :post do
+    #   Factory.define :post do |f|
     #     # ...
-    #     author { |post| post.association(:user, :name => 'Joe') }
+    #     f.author {|a| a.association :user, :name => 'Joe' }
     #   end
     #
     #   # Builds (but doesn't save) a Post and a User
     #   Factory.build(:post)
     #
-    #   # Builds and saves a User, builds a Post, assigns the User to the
+    #   # Builds and saves a User, builds a Post, assigns the User to the 
     #   # author association, and saves the User.
     #   Factory.create(:post)
     #
@@ -74,4 +89,5 @@ module FactoryGirl
       raise NotImplementedError, "Strategies must return a result"
     end
   end
+
 end

data/lib/factory_girl/sequence.rb

@@ -1,4 +1,4 @@
-module FactoryGirl
+class Factory
 
   # Raised when calling Factory.sequence from a dynamic attribute block
   class SequenceAbuseError < StandardError; end
@@ -7,16 +7,15 @@ module FactoryGirl
   # using next.
   class Sequence
 
-    def initialize(value = 1, &proc) #:nodoc:
+    def initialize (&proc) #:nodoc:
       @proc  = proc
-      @value = value || 1
+      @value = 0
     end
 
     # Returns the next value for this sequence
     def next
+      @value += 1
       @proc.call(@value)
-    ensure
-      @value = @value.next
     end
 
   end
@@ -25,4 +24,40 @@ module FactoryGirl
     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

@@ -1,17 +1,10 @@
 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)
-    attributes_find = {}
-    attributes.each do |k, v|
-      k = "#{k}_id" if v.is_a? ActiveRecord::Base
-      attributes_find[k] = v
-    end
+    attributes = convert_human_hash_to_attribute_hash(attribute => value.strip)
+    factory = Factory.factory_by_name(factory_name)
     model_class = factory.build_class
-    model_class.find(:first, :conditions => attributes_find) or
+    model_class.find(:first, :conditions => attributes) or
       Factory(factory_name, attributes)
   end
 
@@ -28,31 +21,32 @@ end
 
 World(FactoryGirlStepHelpers)
 
-FactoryGirl.factories.values.each do |factory|
-  Given /^the following (?:#{factory.human_name}|#{factory.human_name.pluralize}) exists?:$/ do |table|
+Factory.factories.values.each do |factory|
+  # TODO: support irregular pluralizations
+  Given /^the following #{factory.human_name}s? exists?:$/ 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.create(factory.factory_name, attributes)
     end
   end
 
   Given /^an? #{factory.human_name} exists$/ do
-    Factory(factory.name)
+    Factory(factory.factory_name)
   end
 
-  Given /^(\d+) #{factory.human_name.pluralize} exist$/ do |count|
-    count.to_i.times { Factory(factory.name) }
+  Given /^(\d+) #{factory.human_name}s exist$/ do |count|
+    count.to_i.times { Factory(factory.human_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)
+        Factory(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.name, column.name => value) }
+      Given /^(\d+) #{factory.human_name}s exist with an? #{human_column_name} of "([^"]*)"$/i do |count, value|
+        count.to_i.times { Factory(factory.factory_name, column.name => value) }
       end
     end
   end

data/lib/factory_girl/syntax/blueprint.rb

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

data/lib/factory_girl/syntax/generate.rb

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

data/lib/factory_girl/syntax/make.rb

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

data/lib/factory_girl/syntax/sham.rb

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