4 files changed, 21 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb
index fe0288521f..ec6c2c8db3 100644
--- a/actionpack/lib/action_view/helpers/number_helper.rb
+++ b/actionpack/lib/action_view/helpers/number_helper.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'active_support/core_ext/big_decimal/conversions'
 require 'active_support/core_ext/float/rounding'
 require 'active_support/core_ext/object/blank'
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index 51c784493e..c0ac332c4e 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -362,14 +362,28 @@ module ActionView
     def partial_path(object = @object)
       @partial_names[object.class.name] ||= begin
         object = object.to_model if object.respond_to?(:to_model)
-
         object.class.model_name.partial_path.dup.tap do |partial|
           path = @lookup_context.prefixes.first
-          partial.insert(0, "#{File.dirname(path)}/") if partial.include?(?/) && path.include?(?/)
+          merge_path_into_partial(path, partial)
         end
       end
     end
 
+    def merge_path_into_partial(path, partial)
+      if path.include?(?/) && partial.include?(?/)
+        overlap = []
+        path_array = File.dirname(path).split('/')
+        partial_array = partial.split('/')[0..-3] # skip model dir & partial
+
+        path_array.each_with_index do |dir, index|
+          overlap << dir if dir == partial_array[index]
+        end
+
+        partial.gsub!(/^#{overlap.join('/')}\//,'')
+        partial.insert(0, "#{File.dirname(path)}/")
+      end
+    end
+
     def retrieve_variable(path)
       variable = @options[:as].try(:to_sym) || path[%r'_?(\w+)(\.\w+)*$', 1].to_sym
       variable_counter = :"#{variable}_counter" if @collection
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index a68f0e84f8..424eeae35c 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -10,6 +10,7 @@ namespace :assets do
     Sprockets::Helpers::RailsHelper
 
     assets = Rails.application.config.assets.precompile
+    Rails.application.config.action_controller.perform_caching = true
     Rails.application.assets.precompile(*assets)
   end
 
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index a95e7c0649..ec3d36d5ad 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -72,6 +72,8 @@ module Sprockets
       def debug_assets?
         params[:debug_assets] == '1' ||
           params[:debug_assets] == 'true'
+      rescue NoMethodError
+        false
       end
 
       # Override to specify an alternative prefix for asset path generation.