From 9bc5e6517c409d1fa71ba704bbf514afdbc0831b Mon Sep 17 00:00:00 2001
From: Noah Silas <noah@causes.com>
Date: Fri, 8 Jun 2012 18:11:58 -0700
Subject: Fix javascript_include_tag when no js runtime is available
In a production environment where the assets have been precompiled, we
don't want an assets compile step to happen on the application server at
all. To ensure this, a js runtime may not be available on the app
servers. In this environment, pages using javascript_include_tag for
assets with non-standard or chained extensions were throwing 500 errors.
For instance, `javascript_include_tag('jquery.min')` would blow up.
Sprockets was attempting to build the assets being included during the
rewrite_extension step (responsible for appending a '.js' extension to
assets being included by the basename rather than a fully qualified
name). This was happening as a step to resolve #6310, which required
checking for the presence of an asset with a non-standard extension
before appending the extension.
We can check for the presence of an asset without invoking the asset
build step by using Sprockets' resolve method, which will search for the
base file without building it (and is the method that find_asset uses
internally to get the path to the asset before attempting to build it).
When rewriting the extension on an asset, these are the steps:
- If the source does not have an extension, assume that the default
extension is desired and append it.
- If there is an extension and it doesn't match the default extension,
check to see if a file with the precise name specified exists amongst
the assets; if it is present, do not append the default extension.
(This is the step that resolves #6310).
---
actionpack/lib/sprockets/helpers/rails_helper.rb | 25 +++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
(limited to 'actionpack/lib')
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index 690c71b472..a1e504be25 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -157,18 +157,25 @@ module Sprockets
end
def rewrite_extension(source, dir, ext)
- source_ext = File.extname(source)
- if ext && source_ext != ".#{ext}"
- if !source_ext.empty? && (asset = asset_environment[source]) &&
- asset.pathname.to_s =~ /#{source}\Z/
- source
- else
- "#{source}.#{ext}"
- end
- else
+ source_ext = File.extname(source)[1..-1]
+
+ if !ext || ext == source_ext
+ source
+ elsif source_ext.blank?
+ "#{source}.#{ext}"
+ elsif exact_match_present?(source)
source
+ else
+ "#{source}.#{ext}"
end
end
+
+ def exact_match_present?(source)
+ pathname = asset_environment.resolve(source)
+ pathname.to_s =~ /#{Regexp.escape(source)}\Z/
+ rescue Sprockets::FileNotFound
+ false
+ end
end
end
end
--
cgit v1.2.3