Permalink
Browse files

Fixed assets loading performance in 3.2.13

The PR #8756 uses Sprockets for resolving files that already exists on disk, for those files their extensions don't need to be rewritten.

Fixes #9803
  • Loading branch information...
1 parent 517060a commit 687e68d88f5e1a7bb6a2d876fbbc5b8c4571d853 @fredwu fredwu committed Mar 20, 2013
View
2 actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -163,7 +163,7 @@ def rewrite_extension(source, dir, ext)
source
elsif source_ext.blank?
"#{source}.#{ext}"
- elsif exact_match_present?(source)
+ elsif File.exists?(source) || exact_match_present?(source)
source
else
"#{source}.#{ext}"
View
9 actionpack/test/template/sprockets_helper_test.rb
@@ -277,6 +277,15 @@ def compute_host(source, request, options = {})
assert_nothing_raised { javascript_include_tag('foo.min') }
end
+ test "assets that exist on filesystem don't need to go through Sprockets" do
+ @config.assets.digest = false
+ @config.assets.debug = true
+
+ Rails.application.assets.expects(:resolve).never
+
+ asset_paths.asset_for(FIXTURES.join("sprockets/app/javascripts/foo.min.js").to_path, 'min')
+ end
+
test "stylesheet path through asset_path" do
assert_match %r{/assets/application-[0-9a-f]+.css}, asset_path(:application, :ext => "css")

0 comments on commit 687e68d

Please sign in to comment.