8 files changed, 16 insertions, 23 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index d434310eff..c9e4f8b9ef 100755
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -22,16 +22,13 @@
 #++
 
 $:.unshift(File.dirname(__FILE__))
+$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
 
 begin
-  require 'active_support'
+  require 'active_support'  
 rescue LoadError
-  begin
-    require File.dirname(__FILE__) + '/../../activesupport/lib/active_support'
-  rescue LoadError
-    require 'rubygems'
-    require_gem 'activesupport'
-  end
+  require 'rubygems'
+  require_gem 'activesupport'
 end
 
 require 'action_controller/base'
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 7c4c226c34..e75df4c127 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -2,9 +2,6 @@ require 'action_controller/request'
 require 'action_controller/response'
 require 'action_controller/routing'
 require 'action_controller/url_rewriter'
-require 'active_support/class_attribute_accessors'
-require 'active_support/class_inheritable_attributes'
-require 'active_support/inflector'
 require 'drb'
 
 module ActionController #:nodoc:
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index ac49d114ab..94e835bdf1 100755
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -23,16 +23,13 @@
 
 
 $:.unshift(File.dirname(__FILE__))
+$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
 
 begin
-  require 'active_support'
+  require 'active_support'  
 rescue LoadError
-  begin
-    require File.dirname(__FILE__) + '/../../activesupport/lib/active_support'
-  rescue LoadError
-    require 'rubygems'
-    require_gem 'activesupport'
-  end
+  require 'rubygems'
+  require_gem 'activesupport'
 end
 
 require 'active_record/base'
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 92f5724249..1111296306 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1,6 +1,3 @@
-require 'active_support/class_attribute_accessors'
-require 'active_support/class_inheritable_attributes'
-require 'active_support/inflector'
 require 'yaml'
 
 module ActiveRecord #:nodoc:
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index b03543a7c7..5ae4bfaf30 100755
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -1,8 +1,6 @@
 require 'erb'
 require 'yaml'
 require 'csv'
-require 'active_support/class_inheritable_attributes'
-require 'active_support/inflector'
 
 # Fixtures are a way of organizing data that you want to test against; in short, sample data. They come in 3 flavours:
 #
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 11d5c4e1ec..ba6945f3e5 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -23,6 +23,10 @@
 
 $:.unshift(File.dirname(__FILE__))
 
+require 'active_support/class_attribute_accessors'
+require 'active_support/class_inheritable_attributes'
+require 'active_support/inflector'
+
 require 'active_support/core_ext'
 require 'active_support/clean_logger'
 require 'active_support/misc'
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 6d6a447f74..0d2ef851af 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed rails_generator to be usable without RubyGems #686 [Cristi BALAN]
+
 * Fixed -h/--help for generate and destroy generators #331
 
 * Added begin/rescue around the FCGI dispatcher so no uncaught exceptions can bubble up to kill the process (logs to log/fastcgi.crash.log)
diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb
index 8268f3f5f0..9c587c9552 100644
--- a/railties/lib/rails_generator.rb
+++ b/railties/lib/rails_generator.rb
@@ -22,9 +22,10 @@
 #++
 
 $:.unshift(File.dirname(__FILE__))
+$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
 
 begin
-  require 'active_support'
+  require 'active_support'  
 rescue LoadError
   require 'rubygems'
   require_gem 'activesupport'