From fc8ce3ab7ea762f14259174eb2a3f7690741e89c Mon Sep 17 00:00:00 2001
From: Joe Ferris <joe.r.ferris@gmail.com>
Date: Wed, 9 Jun 2010 11:45:52 -0400
Subject: [PATCH] Moved Rails 3 initialization into a separate gem
 (factory_girl_rails)

---
 lib/factory_girl.rb         |  3 +--
 lib/factory_girl/rails.rb   |  0
 lib/factory_girl/railtie.rb | 22 ----------------------
 rails/init.rb               |  4 ++--
 4 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 lib/factory_girl/rails.rb
 delete mode 100644 lib/factory_girl/railtie.rb

diff --git a/lib/factory_girl.rb b/lib/factory_girl.rb
index 463fd060f..7d9535bf7 100644
--- a/lib/factory_girl.rb
+++ b/lib/factory_girl.rb
@@ -11,7 +11,6 @@
 require 'factory_girl/attribute/callback'
 require 'factory_girl/sequence'
 require 'factory_girl/aliases'
-require 'factory_girl/railtie'
 
 # Shortcut for Factory.default_strategy.
 #
@@ -22,5 +21,5 @@ def Factory (name, attrs = {})
 end
 
 class Factory
-  VERSION = "1.2.5"
+  VERSION = "1.3.0"
 end
diff --git a/lib/factory_girl/rails.rb b/lib/factory_girl/rails.rb
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/factory_girl/railtie.rb b/lib/factory_girl/railtie.rb
deleted file mode 100644
index 404125369..000000000
--- a/lib/factory_girl/railtie.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-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
diff --git a/rails/init.rb b/rails/init.rb
index cece5b89c..635e4b45b 100644
--- a/rails/init.rb
+++ b/rails/init.rb
@@ -1,2 +1,2 @@
-require 'factory_girl/railtie'
-Factory::Railtie.configure
+require 'factory_girl'
+Rails.configuration.after_initialize { Factory.find_definitions }