Merge commit 'mainstream/master'

Conflicts:

	actionpack/lib/action_view/helpers/javascript_helper.rb
	activesupport/lib/active_support/dependencies.rb
	activesupport/lib/active_support/inflector.rb
	activesupport/lib/active_support/values/time_zone.rb

9 files changed, 109 insertions, 85 deletions

diff --git a/railties/test/fixtures/plugins/default/gemlike/init.rb b/railties/test/fixtures/plugins/default/gemlike/init.rb
new file mode 100644
index 0000000000..6a771b5b68
--- /dev/null
+++ b/railties/test/fixtures/plugins/default/gemlike/init.rb
@@ -0,0 +1 @@
+raise 'This init.rb should not be evaluated because rails/init.rb exists'
diff --git a/railties/test/fixtures/plugins/default/gemlike/lib/gemlike.rb b/railties/test/fixtures/plugins/default/gemlike/lib/gemlike.rb
new file mode 100644
index 0000000000..2088103e45
--- /dev/null
+++ b/railties/test/fixtures/plugins/default/gemlike/lib/gemlike.rb
@@ -0,0 +1,2 @@
+module Gemlike
+end
\ No newline at end of file
diff --git a/railties/test/fixtures/plugins/default/gemlike/rails/init.rb b/railties/test/fixtures/plugins/default/gemlike/rails/init.rb
new file mode 100644
index 0000000000..171a293eb3
--- /dev/null
+++ b/railties/test/fixtures/plugins/default/gemlike/rails/init.rb
@@ -0,0 +1,7 @@
+# I have access to my directory and the Rails config.
+raise 'directory expected but undefined in init.rb' unless defined? directory
+raise 'config expected but undefined in init.rb' unless defined? config
+
+# My lib/ dir must be in the load path.
+require 'gemlike'
+raise 'missing mixin from my lib/ dir' unless defined? Gemlike
diff --git a/railties/test/gem_dependency_test.rb b/railties/test/gem_dependency_test.rb
index 3ae0189327..b5946aa7b8 100644
--- a/railties/test/gem_dependency_test.rb
+++ b/railties/test/gem_dependency_test.rb
@@ -10,13 +10,13 @@ uses_mocha "Plugin Tests" do
       @gem              = Rails::GemDependency.new "hpricot"
       @gem_with_source  = Rails::GemDependency.new "hpricot", :source => "http://code.whytheluckystiff.net"
       @gem_with_version = Rails::GemDependency.new "hpricot", :version => "= 0.6"
-      @gem_with_lib     = Rails::GemDependency.new "aws-s3", :lib => "aws/s3" 
+      @gem_with_lib     = Rails::GemDependency.new "aws-s3", :lib => "aws/s3"
     end
 
     def test_configuration_adds_gem_dependency
       config = Rails::Configuration.new
       config.gem "aws-s3", :lib => "aws/s3", :version => "0.4.0"
-      assert_equal [["install", "aws-s3", "--version", "= 0.4.0"]], config.gems.collect(&:install_command)
+      assert_equal [["install", "aws-s3", "--version", '"= 0.4.0"']], config.gems.collect(&:install_command)
     end
 
     def test_gem_creates_install_command
@@ -28,7 +28,7 @@ uses_mocha "Plugin Tests" do
     end
 
     def test_gem_with_version_creates_install_command
-      assert_equal ["install", "hpricot", "--version", "= 0.6"], @gem_with_version.install_command
+      assert_equal ["install", "hpricot", "--version", '"= 0.6"'], @gem_with_version.install_command
     end
 
     def test_gem_creates_unpack_command
@@ -36,26 +36,26 @@ uses_mocha "Plugin Tests" do
     end
 
     def test_gem_with_version_unpack_install_command
-      assert_equal ["unpack", "hpricot", "--version", "= 0.6"], @gem_with_version.unpack_command
+      assert_equal ["unpack", "hpricot", "--version", '"= 0.6"'], @gem_with_version.unpack_command
     end
 
     def test_gem_adds_load_paths
       @gem.expects(:gem).with(@gem.name)
       @gem.add_load_paths
     end
-  
+
     def test_gem_with_version_adds_load_paths
       @gem_with_version.expects(:gem).with(@gem_with_version.name, @gem_with_version.requirement.to_s)
       @gem_with_version.add_load_paths
     end
-  
+
     def test_gem_loading
       @gem.expects(:gem).with(@gem.name)
       @gem.expects(:require).with(@gem.name)
       @gem.add_load_paths
       @gem.load
     end
-  
+
     def test_gem_with_lib_loading
       @gem_with_lib.expects(:gem).with(@gem_with_lib.name)
       @gem_with_lib.expects(:require).with(@gem_with_lib.lib)
@@ -63,4 +63,4 @@ uses_mocha "Plugin Tests" do
       @gem_with_lib.load
     end
   end
-end
\ No newline at end of file
+end
diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb
index 0df0164ca6..dee7abe05f 100644
--- a/railties/test/initializer_test.rb
+++ b/railties/test/initializer_test.rb
@@ -30,64 +30,66 @@ class Initializer_load_environment_Test < Test::Unit::TestCase
 
 end
 
-class Initializer_after_initialize_with_blocks_environment_Test < Test::Unit::TestCase
-  def setup
-    config = ConfigurationMock.new("")
-    config.after_initialize do
-      $test_after_initialize_block1 = "success"
-    end
-    config.after_initialize do
-      $test_after_initialize_block2 = "congratulations"
-    end    
-    assert_nil $test_after_initialize_block1
-    assert_nil $test_after_initialize_block2    
-
-    Rails::Initializer.run(:after_initialize, config)
-  end
-  
-  def teardown
-    $test_after_initialize_block1 = nil
-    $test_after_initialize_block2 = nil    
-  end
+uses_mocha 'Initializer after_initialize' do
+  class Initializer_after_initialize_with_blocks_environment_Test < Test::Unit::TestCase
+    def setup
+      config = ConfigurationMock.new("")
+      config.after_initialize do
+        $test_after_initialize_block1 = "success"
+      end
+      config.after_initialize do
+        $test_after_initialize_block2 = "congratulations"
+      end
+      assert_nil $test_after_initialize_block1
+      assert_nil $test_after_initialize_block2
 
-  def test_should_have_called_the_first_after_initialize_block
-    assert_equal "success", $test_after_initialize_block1
-  end
-  
-  def test_should_have_called_the_second_after_initialize_block
-    assert_equal "congratulations", $test_after_initialize_block2
-  end
-end
-  
-class Initializer_after_initialize_with_no_block_environment_Test < Test::Unit::TestCase
+      Rails::Initializer.any_instance.expects(:gems_dependencies_loaded).returns(true)
+      Rails::Initializer.run(:after_initialize, config)
+    end
 
-  def setup
-    config = ConfigurationMock.new("")
-    config.after_initialize do
-      $test_after_initialize_block1 = "success"
+    def teardown
+      $test_after_initialize_block1 = nil
+      $test_after_initialize_block2 = nil
     end
-    config.after_initialize # don't pass a block, this is what we're testing!
-    config.after_initialize do
-      $test_after_initialize_block2 = "congratulations"
-    end    
-    assert_nil $test_after_initialize_block1
 
-    Rails::Initializer.run(:after_initialize, config)
-  end
+    def test_should_have_called_the_first_after_initialize_block
+      assert_equal "success", $test_after_initialize_block1
+    end
 
-  def teardown
-    $test_after_initialize_block1 = nil
-    $test_after_initialize_block2 = nil    
+    def test_should_have_called_the_second_after_initialize_block
+      assert_equal "congratulations", $test_after_initialize_block2
+    end
   end
 
-  def test_should_have_called_the_first_after_initialize_block
-    assert_equal "success", $test_after_initialize_block1, "should still get set"
-  end
+  class Initializer_after_initialize_with_no_block_environment_Test < Test::Unit::TestCase
+    def setup
+      config = ConfigurationMock.new("")
+      config.after_initialize do
+        $test_after_initialize_block1 = "success"
+      end
+      config.after_initialize # don't pass a block, this is what we're testing!
+      config.after_initialize do
+        $test_after_initialize_block2 = "congratulations"
+      end
+      assert_nil $test_after_initialize_block1
 
-  def test_should_have_called_the_second_after_initialize_block
-    assert_equal "congratulations", $test_after_initialize_block2
-  end
+      Rails::Initializer.any_instance.expects(:gems_dependencies_loaded).returns(true)
+      Rails::Initializer.run(:after_initialize, config)
+    end
+
+    def teardown
+      $test_after_initialize_block1 = nil
+      $test_after_initialize_block2 = nil
+    end
 
+    def test_should_have_called_the_first_after_initialize_block
+      assert_equal "success", $test_after_initialize_block1, "should still get set"
+    end
+
+    def test_should_have_called_the_second_after_initialize_block
+      assert_equal "congratulations", $test_after_initialize_block2
+    end
+  end
 end
 
 uses_mocha 'framework paths' do
@@ -95,7 +97,7 @@ uses_mocha 'framework paths' do
     def setup
       @config = Rails::Configuration.new
       @config.frameworks.clear
-      
+
       File.stubs(:directory?).returns(true)
       @config.stubs(:framework_root_path).returns('')
     end
@@ -112,7 +114,7 @@ uses_mocha 'framework paths' do
     def test_actioncontroller_or_actionview_add_actionpack
       @config.frameworks << :action_controller
       assert_framework_path '/actionpack/lib'
-      
+
       @config.frameworks = [:action_view]
       assert_framework_path '/actionpack/lib'
     end
@@ -171,7 +173,7 @@ uses_mocha "Initializer plugin loading tests" do
     def test_all_plugins_are_loaded_when_registered_plugin_list_is_untouched
       failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
       load_plugins!
-      assert_plugins [:a, :acts_as_chunky_bacon, :plugin_with_no_lib_dir, :stubby], @initializer.loaded_plugins, failure_tip
+      assert_plugins [:a, :acts_as_chunky_bacon, :gemlike, :plugin_with_no_lib_dir, :stubby], @initializer.loaded_plugins, failure_tip
     end
 
     def test_all_plugins_loaded_when_all_is_used
@@ -179,7 +181,7 @@ uses_mocha "Initializer plugin loading tests" do
       only_load_the_following_plugins! plugin_names
       load_plugins!
       failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
-      assert_plugins [:stubby, :acts_as_chunky_bacon, :a, :plugin_with_no_lib_dir], @initializer.loaded_plugins, failure_tip
+      assert_plugins [:stubby, :acts_as_chunky_bacon, :a, :gemlike, :plugin_with_no_lib_dir], @initializer.loaded_plugins, failure_tip
     end
 
     def test_all_plugins_loaded_after_all
@@ -187,7 +189,7 @@ uses_mocha "Initializer plugin loading tests" do
       only_load_the_following_plugins! plugin_names
       load_plugins!
       failure_tip = "It's likely someone has added a new plugin fixture without updating this list"
-      assert_plugins [:stubby, :a, :plugin_with_no_lib_dir, :acts_as_chunky_bacon], @initializer.loaded_plugins, failure_tip
+      assert_plugins [:stubby, :a, :gemlike, :plugin_with_no_lib_dir, :acts_as_chunky_bacon], @initializer.loaded_plugins, failure_tip
     end
 
     def test_plugin_names_may_be_strings
@@ -204,22 +206,22 @@ uses_mocha "Initializer plugin loading tests" do
         load_plugins!
       end
     end
-    
+
     def test_should_ensure_all_loaded_plugins_load_paths_are_added_to_the_load_path
       only_load_the_following_plugins! [:stubby, :acts_as_chunky_bacon]
 
       @initializer.add_plugin_load_paths
-      
+
       assert $LOAD_PATH.include?(File.join(plugin_fixture_path('default/stubby'), 'lib'))
       assert $LOAD_PATH.include?(File.join(plugin_fixture_path('default/acts/acts_as_chunky_bacon'), 'lib'))
     end
-    
+
     private
-    
+
       def load_plugins!
         @initializer.add_plugin_load_paths
         @initializer.load_plugins
       end
   end
-  
-end  
+
+end
diff --git a/railties/test/plugin_loader_test.rb b/railties/test/plugin_loader_test.rb
index 41bd6ec7ea..f429bae15c 100644
--- a/railties/test/plugin_loader_test.rb
+++ b/railties/test/plugin_loader_test.rb
@@ -48,16 +48,16 @@ uses_mocha "Plugin Loader Tests" do
     end
 
     def test_should_find_all_availble_plugins_and_return_as_all_plugins
-      assert_plugins [:stubby, :plugin_with_no_lib_dir, :acts_as_chunky_bacon, :a], @loader.all_plugins.reverse, @failure_tip
+      assert_plugins [:stubby, :plugin_with_no_lib_dir, :gemlike, :acts_as_chunky_bacon, :a], @loader.all_plugins.reverse, @failure_tip
     end
 
     def test_should_return_all_plugins_as_plugins_when_registered_plugin_list_is_untouched
-      assert_plugins [:a, :acts_as_chunky_bacon, :plugin_with_no_lib_dir, :stubby], @loader.plugins, @failure_tip
+      assert_plugins [:a, :acts_as_chunky_bacon, :gemlike, :plugin_with_no_lib_dir, :stubby], @loader.plugins, @failure_tip
     end
 
     def test_should_return_all_plugins_as_plugins_when_registered_plugin_list_is_nil
       @configuration.plugins = nil
-      assert_plugins [:a, :acts_as_chunky_bacon, :plugin_with_no_lib_dir, :stubby], @loader.plugins, @failure_tip
+      assert_plugins [:a, :acts_as_chunky_bacon, :gemlike, :plugin_with_no_lib_dir, :stubby], @loader.plugins, @failure_tip
     end
 
     def test_should_return_specific_plugins_named_in_config_plugins_array_if_set
@@ -74,17 +74,17 @@ uses_mocha "Plugin Loader Tests" do
 
     def test_should_load_all_plugins_in_natural_order_when_all_is_used
       only_load_the_following_plugins! [:all]
-      assert_plugins [:a, :acts_as_chunky_bacon, :plugin_with_no_lib_dir, :stubby], @loader.plugins, @failure_tip
+      assert_plugins [:a, :acts_as_chunky_bacon, :gemlike, :plugin_with_no_lib_dir, :stubby], @loader.plugins, @failure_tip
     end
 
     def test_should_load_specified_plugins_in_order_and_then_all_remaining_plugins_when_all_is_used
       only_load_the_following_plugins! [:stubby, :acts_as_chunky_bacon, :all]
-      assert_plugins [:stubby, :acts_as_chunky_bacon, :a, :plugin_with_no_lib_dir], @loader.plugins, @failure_tip
+      assert_plugins [:stubby, :acts_as_chunky_bacon, :a, :gemlike, :plugin_with_no_lib_dir], @loader.plugins, @failure_tip
     end
 
     def test_should_be_able_to_specify_loading_of_plugins_loaded_after_all
       only_load_the_following_plugins!  [:stubby, :all, :acts_as_chunky_bacon]
-      assert_plugins [:stubby, :a, :plugin_with_no_lib_dir, :acts_as_chunky_bacon], @loader.plugins, @failure_tip
+      assert_plugins [:stubby, :a, :gemlike, :plugin_with_no_lib_dir, :acts_as_chunky_bacon], @loader.plugins, @failure_tip
     end
 
     def test_should_accept_plugin_names_given_as_strings
@@ -94,7 +94,7 @@ uses_mocha "Plugin Loader Tests" do
 
     def test_should_add_plugin_load_paths_to_global_LOAD_PATH_array
       only_load_the_following_plugins! [:stubby, :acts_as_chunky_bacon]
-      stubbed_application_lib_index_in_LOAD_PATHS = 5
+      stubbed_application_lib_index_in_LOAD_PATHS = 4
       @loader.stubs(:application_lib_index).returns(stubbed_application_lib_index_in_LOAD_PATHS)
 
       @loader.add_plugin_load_paths
@@ -108,8 +108,8 @@ uses_mocha "Plugin Loader Tests" do
 
       @loader.add_plugin_load_paths
 
-      assert Dependencies.load_paths.include?(File.join(plugin_fixture_path('default/stubby'), 'lib'))
-      assert Dependencies.load_paths.include?(File.join(plugin_fixture_path('default/acts/acts_as_chunky_bacon'), 'lib'))
+      assert ActiveSupport::Dependencies.load_paths.include?(File.join(plugin_fixture_path('default/stubby'), 'lib'))
+      assert ActiveSupport::Dependencies.load_paths.include?(File.join(plugin_fixture_path('default/acts/acts_as_chunky_bacon'), 'lib'))
     end
 
     def test_should_add_plugin_load_paths_to_Dependencies_load_once_paths
@@ -117,8 +117,8 @@ uses_mocha "Plugin Loader Tests" do
 
       @loader.add_plugin_load_paths
 
-      assert Dependencies.load_once_paths.include?(File.join(plugin_fixture_path('default/stubby'), 'lib'))
-      assert Dependencies.load_once_paths.include?(File.join(plugin_fixture_path('default/acts/acts_as_chunky_bacon'), 'lib'))
+      assert ActiveSupport::Dependencies.load_once_paths.include?(File.join(plugin_fixture_path('default/stubby'), 'lib'))
+      assert ActiveSupport::Dependencies.load_once_paths.include?(File.join(plugin_fixture_path('default/acts/acts_as_chunky_bacon'), 'lib'))
     end
 
     def test_should_add_all_load_paths_from_a_plugin_to_LOAD_PATH_array
diff --git a/railties/test/plugin_locator_test.rb b/railties/test/plugin_locator_test.rb
index 5f1dd991ea..363fa27f15 100644
--- a/railties/test/plugin_locator_test.rb
+++ b/railties/test/plugin_locator_test.rb
@@ -47,12 +47,12 @@ uses_mocha "Plugin Locator Tests" do
     end
   
     def test_should_return_all_plugins_found_under_the_set_plugin_paths
-      assert_equal ["a", "acts_as_chunky_bacon", "plugin_with_no_lib_dir", "stubby"].sort, @locator.plugins.map(&:name).sort
+      assert_equal ["a", "acts_as_chunky_bacon", "gemlike", "plugin_with_no_lib_dir", "stubby"].sort, @locator.plugins.map(&:name).sort
     end
   
     def test_should_find_plugins_only_under_the_plugin_paths_set_in_configuration
       @configuration.plugin_paths = [File.join(plugin_fixture_root_path, "default")]
-      assert_equal ["acts_as_chunky_bacon", "plugin_with_no_lib_dir", "stubby"].sort, @locator.plugins.map(&:name).sort
+      assert_equal ["acts_as_chunky_bacon", "gemlike", "plugin_with_no_lib_dir", "stubby"].sort, @locator.plugins.map(&:name).sort
     
       @configuration.plugin_paths = [File.join(plugin_fixture_root_path, "alternate")]
       assert_equal ["a"], @locator.plugins.map(&:name)
diff --git a/railties/test/plugin_test.rb b/railties/test/plugin_test.rb
index 1445338f14..50124240a5 100644
--- a/railties/test/plugin_test.rb
+++ b/railties/test/plugin_test.rb
@@ -5,9 +5,10 @@ uses_mocha "Plugin Tests" do
   class PluginTest < Test::Unit::TestCase
 
     def setup
-      @initializer       = Rails::Initializer.new(Rails::Configuration.new)
-      @valid_plugin_path = plugin_fixture_path('default/stubby')
-      @empty_plugin_path = plugin_fixture_path('default/empty')    
+      @initializer         = Rails::Initializer.new(Rails::Configuration.new)
+      @valid_plugin_path   = plugin_fixture_path('default/stubby')
+      @empty_plugin_path   = plugin_fixture_path('default/empty')
+      @gemlike_plugin_path = plugin_fixture_path('default/gemlike')
     end
 
     def test_should_determine_plugin_name_from_the_directory_of_the_plugin
@@ -70,7 +71,14 @@ uses_mocha "Plugin Tests" do
         plugin.stubs(:evaluate_init_rb)
         plugin.send(:load, @initializer)
       end
-    
+
+      # This path is fine so nothing is raised
+      assert_nothing_raised do
+        plugin = plugin_for(@gemlike_plugin_path)
+        plugin.stubs(:evaluate_init_rb)
+        plugin.send(:load, @initializer)
+      end
+
       # This is an empty path so it raises
       assert_raises(LoadError) do
         plugin = plugin_for(@empty_plugin_path)
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index 17c7d9deea..e1872ebf33 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -30,6 +30,8 @@ class Rails::InfoControllerTest < Test::Unit::TestCase
     @controller = Rails::InfoController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+
+    ActionController::Base.consider_all_requests_local = true
   end
 
   def test_rails_info_properties_table_rendered_for_local_request
@@ -41,6 +43,8 @@ class Rails::InfoControllerTest < Test::Unit::TestCase
   
   def test_rails_info_properties_error_rendered_for_non_local_request
     Rails::InfoController.local_request = false
+    ActionController::Base.consider_all_requests_local = false
+
     get :properties
     assert_tag :tag => 'p'
     assert_response 500