Added a Railtie for initialization. Automatically load under Rails 2.* and 3.*

factory_girl.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
                        using factories - less error-prone, more explicit, and
                        all-around easier to work with than fixtures.}
 
-    s.files        = Dir['[A-Z]*', 'lib/**/*.rb', 'spec/**/*.rb', 'features/**/*']
+    s.files        = Dir['[A-Z]*', 'lib/**/*.rb', 'spec/**/*.rb', 'features/**/*', 'rails/**/*']
     s.require_path = 'lib'
     s.test_files   = Dir['spec/**/*_spec.rb', 'features/**/*']
 

lib/factory_girl.rb

@@ -11,6 +11,7 @@ require 'factory_girl/attribute/association'
 require 'factory_girl/attribute/callback'
 require 'factory_girl/sequence'
 require 'factory_girl/aliases'
+require 'factory_girl/railtie'
 
 # Shortcut for Factory.default_strategy.
 #
@@ -19,16 +20,3 @@ require 'factory_girl/aliases'
 def Factory (name, attrs = {})
   Factory.default_strategy(name, attrs)
 end
-
-if defined? Rails.configuration
-  Rails.configuration.after_initialize do
-    Factory.definition_file_paths = [
-      File.join(Rails.root, 'test', 'factories'),
-      File.join(Rails.root, 'spec', 'factories')
-    ]
-    Factory.find_definitions
-  end
-else
-  Factory.find_definitions
-end
-

lib/factory_girl/factory.rb

@@ -1,5 +1,5 @@
 class Factory
-  VERSION = "1.2.4"
+  VERSION = "1.2.5.beta1"
 
   # Raised when a factory is defined that attempts to instantiate itself.
   class AssociationDefinitionError < RuntimeError

lib/factory_girl/railtie.rb

@@ -0,0 +1,22 @@
+require 'factory_girl'
+
+class Factory
+  if defined? Rails::Railtie
+    require 'rails'
+    class Railtie < Rails::Railtie
+      config.after_initialize do
+        Factory::Railtie.configure
+      end
+    end
+  end
+
+  class Railtie
+    def self.configure
+      Factory.definition_file_paths = [
+        File.join(Rails.root, 'test', 'factories'),
+        File.join(Rails.root, 'spec', 'factories')
+      ]
+      Factory.find_definitions
+    end
+  end
+end

rails/init.rb

@@ -0,0 +1,2 @@
+require 'factory_girl/railtie'
+Factory::Railtie.configure