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

4 files changed, 53 insertions, 40 deletions

diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 9f088a18dd..f8d97840c1 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -23,9 +23,13 @@ module Rails
       @unpack_directory = nil
     end
 
+    def unpacked_paths
+      Dir[File.join(self.class.unpacked_path, "#{@name}-#{@version || "*"}")]
+    end
+
     def add_load_paths
       return if @loaded || @load_paths_added
-      unpacked_paths = Dir[File.join(self.class.unpacked_path, "#{@name}-#{@version || "*"}")]
+      unpacked_paths = self.unpacked_paths
       if unpacked_paths.empty?
         args = [@name]
         args << @requirement.to_s if @requirement
@@ -39,7 +43,7 @@ module Rails
       @load_paths_added = true
     rescue Gem::LoadError
     end
-    
+
     def dependencies
       all_dependencies = specification.dependencies.map do |dependency|
         GemDependency.new(dependency.name, :requirement => dependency.version_requirements)
@@ -47,7 +51,7 @@ module Rails
       all_dependencies += all_dependencies.map(&:dependencies).flatten
       all_dependencies.uniq
     end
-    
+
     def gem_dir(base_directory)
       File.join(base_directory, specification.full_name)
     end
@@ -78,13 +82,13 @@ module Rails
       puts cmd
       puts %x(#{cmd})
     end
-    
+
     def unpack_to(directory)
       FileUtils.mkdir_p directory
       Dir.chdir directory do
         Gem::GemRunner.new.run(unpack_command)
       end
-      
+
       # copy the gem's specification into GEMDIR/.specification so that
       # we can access information about the gem on deployment systems
       # without having the gem installed
@@ -98,27 +102,26 @@ module Rails
       self.name == other.name && self.requirement == other.requirement
     end
 
-private ###################################################################
-
     def specification
       @spec ||= Gem.source_index.search(Gem::Dependency.new(@name, @requirement)).sort_by { |s| s.version }.last
     end
-    
-    def gem_command
-      RUBY_PLATFORM =~ /win32/ ? 'gem.bat' : 'gem'
-    end
 
-    def install_command
-      cmd = %w(install) << @name
-      cmd << "--version" << %("#{@requirement.to_s}") if @requirement
-      cmd << "--source"  << @source  if @source
-      cmd
-    end
-    
-    def unpack_command
-      cmd = %w(unpack) << @name
-      cmd << "--version" << "#{@requirement.to_s}" if @requirement
-      cmd
-    end
+    private
+      def gem_command
+        RUBY_PLATFORM =~ /win32/ ? 'gem.bat' : 'gem'
+      end
+
+      def install_command
+        cmd = %w(install) << @name
+        cmd << "--version" << %("#{@requirement.to_s}") if @requirement
+        cmd << "--source"  << @source  if @source
+        cmd
+      end
+
+      def unpack_command
+        cmd = %w(unpack) << @name
+        cmd << "--version" << %("#{@requirement.to_s}") if @requirement
+        cmd
+      end
   end
-end
\ No newline at end of file
+end
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 256f4b0132..b8b2b57038 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -74,10 +74,18 @@ module Rails
         File.join(directory, 'lib')
       end
 
-      def init_path
+      def classic_init_path
         File.join(directory, 'init.rb')
       end
 
+      def gem_init_path
+        File.join(directory, 'rails', 'init.rb')
+      end
+
+      def init_path
+        File.file?(gem_init_path) ? gem_init_path : classic_init_path
+      end
+
       def has_lib_directory?
         File.directory?(lib_path)
       end
@@ -87,14 +95,14 @@ module Rails
       end
 
       def evaluate_init_rb(initializer)
-         if has_init_file?
-           silence_warnings do
-             # Allow plugins to reference the current configuration object
-             config = initializer.configuration
-             
-             eval(IO.read(init_path), binding, init_path)
-           end
-         end
+        if has_init_file?
+          silence_warnings do
+            # Allow plugins to reference the current configuration object
+            config = initializer.configuration
+            
+            eval(IO.read(init_path), binding, init_path)
+          end
+        end
       end               
   end
 
@@ -103,8 +111,9 @@ module Rails
   # to Dependencies.load_paths.
   class GemPlugin < Plugin
     # Initialize this plugin from a Gem::Specification.
-    def initialize(spec)
-      super(File.join(spec.full_gem_path))
+    def initialize(spec, gem)
+      directory = (gem.frozen? && gem.unpacked_paths.first) || File.join(spec.full_gem_path)
+      super(directory)
       @name = spec.name
     end
 
diff --git a/railties/lib/rails/plugin/loader.rb b/railties/lib/rails/plugin/loader.rb
index 1e542dd038..948d497007 100644
--- a/railties/lib/rails/plugin/loader.rb
+++ b/railties/lib/rails/plugin/loader.rb
@@ -45,9 +45,9 @@ module Rails
         plugins.each do |plugin|
           plugin.load_paths.each do |path|
             $LOAD_PATH.insert(application_lib_index + 1, path)
-            Dependencies.load_paths      << path
+            ActiveSupport::Dependencies.load_paths      << path
             unless Rails.configuration.reload_plugins?
-              Dependencies.load_once_paths << path
+              ActiveSupport::Dependencies.load_once_paths << path
             end
           end
         end
diff --git a/railties/lib/rails/plugin/locator.rb b/railties/lib/rails/plugin/locator.rb
index f06a51a572..79c07fccd1 100644
--- a/railties/lib/rails/plugin/locator.rb
+++ b/railties/lib/rails/plugin/locator.rb
@@ -78,8 +78,9 @@ module Rails
     # a <tt>rails/init.rb</tt> file.
     class GemLocator < Locator
       def plugins
-        specs  = initializer.configuration.gems.map(&:specification)
-        specs += Gem.loaded_specs.values.select do |spec|
+        gem_index = initializer.configuration.gems.inject({}) { |memo, gem| memo.update gem.specification => gem }
+        specs     = gem_index.keys
+        specs    += Gem.loaded_specs.values.select do |spec|
           spec.loaded_from && # prune stubs
             File.exist?(File.join(spec.full_gem_path, "rails", "init.rb"))
         end
@@ -91,7 +92,7 @@ module Rails
         deps.add(*specs) unless specs.empty?
 
         deps.dependency_order.collect do |spec|
-          Rails::GemPlugin.new(spec)
+          Rails::GemPlugin.new(spec, gem_index[spec])
         end
       end
     end