From 5de741c4cd4528fd86cae1091cdea984449cc926 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Wed, 15 Jun 2016 11:05:04 -0500
Subject: Allow a more explicit public behavior

We want to make it more explicit when a user wants to avoid the asset pipeline to do this we will add `public_*` methods to all path helpers. So if someone wants to use an asset that isn't maintained by the asset pipeline they can use `public_asset_path` instead of `asset_path` and letting it fall through.

The main reason for this change is the desire to raise helpful errors in the future. Right now if you typo an asset name, then we assume you intended an asset in the `public/` folder and not in the pipeline so nothing fails and the error sits silently until you realize the page didn't render correctly. We have to deprecate today so we can raise meaningful error messages in the future.
---
 .../lib/action_view/helpers/asset_url_helper.rb    | 39 ++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb
index 76a4893f2e..e925a8184c 100644
--- a/actionview/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -141,8 +141,17 @@ module ActionView
           source = "#{source}#{extname}"
         end
 
-        if source[0] != ?/
-          source = compute_asset_path(source, options)
+        if options[:public_folder]
+          source = public_compute_asset_path(source, options) unless options[:raw]
+        else
+          if source[0] != ?/
+            source = compute_asset_path(source, options) unless options[:raw]
+          elsif !options[:raw]
+            message =  "Skipping computing asset path since asset #{ source.inspect } starts with a slash `/`.\n"
+            message << "This behavior is deprecated and will be removed. Instead explicitly\n"
+            message << "use a `public_*` helper instead. Optionally pass in `raw: true` to get the exact same behavior."
+            ActiveSupport::Deprecation.warn(message)
+          end
         end
 
         relative_url_root = defined?(config.relative_url_root) && config.relative_url_root
@@ -158,6 +167,11 @@ module ActionView
       end
       alias_method :path_to_asset, :asset_path # aliased to avoid conflicts with an asset_path named route
 
+
+      def public_asset_path(source, options = {})
+        path_to_asset(source, {public_folder: true}.merge!(options))
+      end
+
       # Computes the full URL to an asset in the public directory. This
       # will use +asset_path+ internally, so most of their behaviors
       # will be the same. If :host options is set, it overwrites global
@@ -203,6 +217,7 @@ module ActionView
         dir = ASSET_PUBLIC_DIRECTORIES[options[:type]] || ""
         File.join(dir, source)
       end
+      alias :public_compute_asset_path :compute_asset_path
 
       # Pick an asset host for this source. Returns +nil+ if no host is set,
       # the host if no wildcard is set, the host interpolated with the
@@ -258,6 +273,9 @@ module ActionView
       end
       alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with a javascript_path named route
 
+      def public_javascript_path(source, options = {})
+        path_to_javascript(source, {public_folder: true}.merge!(options))
+      end
       # Computes the full URL to a JavaScript asset in the public javascripts directory.
       # This will use +javascript_path+ internally, so most of their behaviors will be the same.
       # Since +javascript_url+ is based on +asset_url+ method you can set :host options. If :host
@@ -285,6 +303,10 @@ module ActionView
       end
       alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with a stylesheet_path named route
 
+      def public_stylesheet_path(source, options)
+        path_to_stylesheet(source, {public_folder: true}.merge!(options))
+      end
+
       # Computes the full URL to a stylesheet asset in the public stylesheets directory.
       # This will use +stylesheet_path+ internally, so most of their behaviors will be the same.
       # Since +stylesheet_url+ is based on +asset_url+ method you can set :host options. If :host
@@ -315,6 +337,9 @@ module ActionView
       end
       alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
 
+      def public_image_path(source, options)
+        path_to_image(source, {public_folder: true}.merge!(options))
+      end
       # Computes the full URL to an image asset.
       # This will use +image_path+ internally, so most of their behaviors will be the same.
       # Since +image_url+ is based on +asset_url+ method you can set :host options. If :host
@@ -341,6 +366,10 @@ module ActionView
       end
       alias_method :path_to_video, :video_path # aliased to avoid conflicts with a video_path named route
 
+      def public_video_path(source, options)
+        path_to_video(source, {public_folder: true}.merge!(options))
+      end
+
       # Computes the full URL to a video asset in the public videos directory.
       # This will use +video_path+ internally, so most of their behaviors will be the same.
       # Since +video_url+ is based on +asset_url+ method you can set :host options. If :host
@@ -367,6 +396,9 @@ module ActionView
       end
       alias_method :path_to_audio, :audio_path # aliased to avoid conflicts with an audio_path named route
 
+      def public_audio_path(source, options = {})
+        path_to_audio(source, {public_folder: true}.merge!(options))
+      end
       # Computes the full URL to an audio asset in the public audios directory.
       # This will use +audio_path+ internally, so most of their behaviors will be the same.
       # Since +audio_url+ is based on +asset_url+ method you can set :host options. If :host
@@ -392,6 +424,9 @@ module ActionView
       end
       alias_method :path_to_font, :font_path # aliased to avoid conflicts with an font_path named route
 
+      def public_font_path(source, options = {})
+        path_to_font(source, {public_folder: true}.merge!(options))
+      end
       # Computes the full URL to a font asset.
       # This will use +font_path+ internally, so most of their behaviors will be the same.
       # Since +font_url+ is based on +asset_url+ method you can set :host options. If :host
-- 
cgit v1.2.3


From 4b84ef6d8bdad08a4b9860c6545a08f26a963d34 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Wed, 15 Jun 2016 11:36:42 -0500
Subject: Make sure routes don't interfere with paths

---
 actionview/lib/action_view/helpers/asset_url_helper.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb
index e925a8184c..61e87e6f78 100644
--- a/actionview/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -171,6 +171,7 @@ module ActionView
       def public_asset_path(source, options = {})
         path_to_asset(source, {public_folder: true}.merge!(options))
       end
+      alias_method :path_to_public_asset, :public_asset_path
 
       # Computes the full URL to an asset in the public directory. This
       # will use +asset_path+ internally, so most of their behaviors
@@ -276,6 +277,8 @@ module ActionView
       def public_javascript_path(source, options = {})
         path_to_javascript(source, {public_folder: true}.merge!(options))
       end
+      alias_method :path_to_public_javascript, :public_javascript_path
+
       # Computes the full URL to a JavaScript asset in the public javascripts directory.
       # This will use +javascript_path+ internally, so most of their behaviors will be the same.
       # Since +javascript_url+ is based on +asset_url+ method you can set :host options. If :host
@@ -306,6 +309,7 @@ module ActionView
       def public_stylesheet_path(source, options)
         path_to_stylesheet(source, {public_folder: true}.merge!(options))
       end
+      alias_method :path_to_public_stylesheet, :public_stylesheet_path
 
       # Computes the full URL to a stylesheet asset in the public stylesheets directory.
       # This will use +stylesheet_path+ internally, so most of their behaviors will be the same.
@@ -340,6 +344,8 @@ module ActionView
       def public_image_path(source, options)
         path_to_image(source, {public_folder: true}.merge!(options))
       end
+      alias_method :path_to_public_image, :public_image_path
+
       # Computes the full URL to an image asset.
       # This will use +image_path+ internally, so most of their behaviors will be the same.
       # Since +image_url+ is based on +asset_url+ method you can set :host options. If :host
@@ -369,6 +375,7 @@ module ActionView
       def public_video_path(source, options)
         path_to_video(source, {public_folder: true}.merge!(options))
       end
+      alias_method :path_to_public_video, :public_video_path
 
       # Computes the full URL to a video asset in the public videos directory.
       # This will use +video_path+ internally, so most of their behaviors will be the same.
@@ -399,6 +406,8 @@ module ActionView
       def public_audio_path(source, options = {})
         path_to_audio(source, {public_folder: true}.merge!(options))
       end
+      alias_method :path_to_public_audio, :public_audio_path
+
       # Computes the full URL to an audio asset in the public audios directory.
       # This will use +audio_path+ internally, so most of their behaviors will be the same.
       # Since +audio_url+ is based on +asset_url+ method you can set :host options. If :host
@@ -427,6 +436,8 @@ module ActionView
       def public_font_path(source, options = {})
         path_to_font(source, {public_folder: true}.merge!(options))
       end
+      alias_method :path_to_public_font, :public_font_path
+
       # Computes the full URL to a font asset.
       # This will use +font_path+ internally, so most of their behaviors will be the same.
       # Since +font_url+ is based on +asset_url+ method you can set :host options. If :host
-- 
cgit v1.2.3


From 5b576af97efe7ff5375572ad325b18429e9a75a8 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Wed, 15 Jun 2016 11:39:55 -0500
Subject: Add descriptive comment

---
 actionview/lib/action_view/helpers/asset_url_helper.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb
index 61e87e6f78..8db65adc5d 100644
--- a/actionview/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -171,7 +171,7 @@ module ActionView
       def public_asset_path(source, options = {})
         path_to_asset(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_asset, :public_asset_path
+      alias_method :path_to_public_asset, :public_asset_path # aliased to avoid conflicts with an font_path named route
 
       # Computes the full URL to an asset in the public directory. This
       # will use +asset_path+ internally, so most of their behaviors
@@ -277,7 +277,7 @@ module ActionView
       def public_javascript_path(source, options = {})
         path_to_javascript(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_javascript, :public_javascript_path
+      alias_method :path_to_public_javascript, :public_javascript_path # aliased to avoid conflicts with an font_path named route
 
       # Computes the full URL to a JavaScript asset in the public javascripts directory.
       # This will use +javascript_path+ internally, so most of their behaviors will be the same.
@@ -309,7 +309,7 @@ module ActionView
       def public_stylesheet_path(source, options)
         path_to_stylesheet(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_stylesheet, :public_stylesheet_path
+      alias_method :path_to_public_stylesheet, :public_stylesheet_path # aliased to avoid conflicts with an font_path named route
 
       # Computes the full URL to a stylesheet asset in the public stylesheets directory.
       # This will use +stylesheet_path+ internally, so most of their behaviors will be the same.
@@ -344,7 +344,7 @@ module ActionView
       def public_image_path(source, options)
         path_to_image(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_image, :public_image_path
+      alias_method :path_to_public_image, :public_image_path # aliased to avoid conflicts with an font_path named route
 
       # Computes the full URL to an image asset.
       # This will use +image_path+ internally, so most of their behaviors will be the same.
@@ -375,7 +375,7 @@ module ActionView
       def public_video_path(source, options)
         path_to_video(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_video, :public_video_path
+      alias_method :path_to_public_video, :public_video_path # aliased to avoid conflicts with an font_path named route
 
       # Computes the full URL to a video asset in the public videos directory.
       # This will use +video_path+ internally, so most of their behaviors will be the same.
@@ -406,7 +406,7 @@ module ActionView
       def public_audio_path(source, options = {})
         path_to_audio(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_audio, :public_audio_path
+      alias_method :path_to_public_audio, :public_audio_path # aliased to avoid conflicts with an font_path named route
 
       # Computes the full URL to an audio asset in the public audios directory.
       # This will use +audio_path+ internally, so most of their behaviors will be the same.
@@ -436,7 +436,7 @@ module ActionView
       def public_font_path(source, options = {})
         path_to_font(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_font, :public_font_path
+      alias_method :path_to_public_font, :public_font_path # aliased to avoid conflicts with an font_path named route
 
       # Computes the full URL to a font asset.
       # This will use +font_path+ internally, so most of their behaviors will be the same.
-- 
cgit v1.2.3


From e4b233a2523960b604d8829a5a23d329fba52d23 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Wed, 15 Jun 2016 12:14:32 -0500
Subject: Add public URL helpers

---
 .../lib/action_view/helpers/asset_url_helper.rb    | 56 ++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb
index 8db65adc5d..bd91ace5c8 100644
--- a/actionview/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -188,6 +188,14 @@ module ActionView
       end
       alias_method :url_to_asset, :asset_url # aliased to avoid conflicts with an asset_url named route
 
+      # Computes the full URL to a asset in the public folder.
+      # This uses +asset_url+ and skips any asset lookups by assuming the asset is in the
+      # `public` folder.
+      def public_asset_url(source, options = {})
+        url_to_asset(source, {public_folder: true}.merge!(options))
+      end
+      alias_method :path_to_public_asset, :public_asset_path # aliased to avoid conflicts with an asset_path named route
+
       ASSET_EXTENSIONS = {
         javascript: ".js",
         stylesheet: ".css"
@@ -291,6 +299,14 @@ module ActionView
       end
       alias_method :url_to_javascript, :javascript_url # aliased to avoid conflicts with a javascript_url named route
 
+      # Computes the full URL to a javascript asset in the public folder.
+      # This uses +javascript_url+ and skips any asset lookups by assuming the asset is in the
+      # `public` folder.
+      def public_javascript_url(source, options = {})
+        url_to_javascript(source, {public_folder: true}.merge!(options))
+      end
+      alias_method :path_to_public_javascript, :public_javascript_path # aliased to avoid conflicts with an javascript_path named route
+
       # Computes the path to a stylesheet asset in the public stylesheets directory.
       # If the +source+ filename has no extension, .css will be appended (except for explicit URIs).
       # Full paths from the document root will be passed through.
@@ -323,6 +339,14 @@ module ActionView
       end
       alias_method :url_to_stylesheet, :stylesheet_url # aliased to avoid conflicts with a stylesheet_url named route
 
+      # Computes the full URL to a stylesheet asset in the public folder.
+      # This uses +stylesheet_url+ and skips any asset lookups by assuming the asset is in the
+      # `public` folder.
+      def public_stylesheet_url(source, options = {})
+        url_to_stylesheet(source, {public_folder: true}.merge!(options))
+      end
+      alias_method :path_to_public_stylesheet, :public_stylesheet_path # aliased to avoid conflicts with an stylesheet_path named route
+
       # Computes the path to an image asset.
       # Full paths from the document root will be passed through.
       # Used internally by +image_tag+ to build the image path:
@@ -358,6 +382,14 @@ module ActionView
       end
       alias_method :url_to_image, :image_url # aliased to avoid conflicts with an image_url named route
 
+      # Computes the full URL to a image asset in the public folder.
+      # This uses +image_url+ and skips any asset lookups by assuming the asset is in the
+      # `public` folder.
+      def public_image_url(source, options = {})
+        url_to_image(source, {public_folder: true}.merge!(options))
+      end
+      alias_method :path_to_public_image, :public_image_path # aliased to avoid conflicts with an image_path named route
+
       # Computes the path to a video asset in the public videos directory.
       # Full paths from the document root will be passed through.
       # Used internally by +video_tag+ to build the video path.
@@ -389,6 +421,14 @@ module ActionView
       end
       alias_method :url_to_video, :video_url # aliased to avoid conflicts with an video_url named route
 
+      # Computes the full URL to a video asset in the public folder.
+      # This uses +video_url+ and skips any asset lookups by assuming the asset is in the
+      # `public` folder.
+      def public_video_url(source, options = {})
+        url_to_video(source, {public_folder: true}.merge!(options))
+      end
+      alias_method :path_to_public_video, :public_video_path # aliased to avoid conflicts with an video_path named route
+
       # Computes the path to an audio asset in the public audios directory.
       # Full paths from the document root will be passed through.
       # Used internally by +audio_tag+ to build the audio path.
@@ -420,6 +460,14 @@ module ActionView
       end
       alias_method :url_to_audio, :audio_url # aliased to avoid conflicts with an audio_url named route
 
+      # Computes the full URL to a audio asset in the public folder.
+      # This uses +audio_url+ and skips any asset lookups by assuming the asset is in the
+      # `public` folder.
+      def public_audio_url(source, options = {})
+        url_to_audio(source, {public_folder: true}.merge!(options))
+      end
+      alias_method :path_to_public_audio, :public_audio_path # aliased to avoid conflicts with an audio_path named route
+
       # Computes the path to a font asset.
       # Full paths from the document root will be passed through.
       #
@@ -449,6 +497,14 @@ module ActionView
         url_to_asset(source, { type: :font }.merge!(options))
       end
       alias_method :url_to_font, :font_url # aliased to avoid conflicts with an font_url named route
+
+      # Computes the full URL to a font asset in the public folder.
+      # This uses +font_url+ and skips any asset lookups by assuming the asset is in the
+      # `public` folder.
+      def public_font_url(source, options = {})
+        url_to_font(source, {public_folder: true}.merge!(options))
+      end
+      alias_method :path_to_public_font, :public_font_path # aliased to avoid conflicts with an public_font_url named route
     end
   end
 end
-- 
cgit v1.2.3


From b8905f3c85e0bdd96c01ca181eda91705db0bc74 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Wed, 15 Jun 2016 12:21:19 -0500
Subject: Add docs to `public_*_path` methods & fix comments

---
 .../lib/action_view/helpers/asset_url_helper.rb    | 51 +++++++++++++++-------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb
index bd91ace5c8..844826386a 100644
--- a/actionview/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -168,10 +168,13 @@ module ActionView
       alias_method :path_to_asset, :asset_path # aliased to avoid conflicts with an asset_path named route
 
 
+      # Computes the path to an asset in the public folder.
+      # This uses +asset_path+ and skips any asset lookups by assuming the asset is in the
+      # `public` folder.
       def public_asset_path(source, options = {})
         path_to_asset(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_asset, :public_asset_path # aliased to avoid conflicts with an font_path named route
+      alias_method :path_to_public_asset, :public_asset_path # aliased to avoid conflicts with an public_asset_path named route
 
       # Computes the full URL to an asset in the public directory. This
       # will use +asset_path+ internally, so most of their behaviors
@@ -188,13 +191,13 @@ module ActionView
       end
       alias_method :url_to_asset, :asset_url # aliased to avoid conflicts with an asset_url named route
 
-      # Computes the full URL to a asset in the public folder.
+      # Computes the full URL to an asset in the public folder.
       # This uses +asset_url+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_asset_url(source, options = {})
         url_to_asset(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_asset, :public_asset_path # aliased to avoid conflicts with an asset_path named route
+      alias_method :path_to_public_asset, :public_asset_path # aliased to avoid conflicts with a public_asset_path named route
 
       ASSET_EXTENSIONS = {
         javascript: ".js",
@@ -282,10 +285,13 @@ module ActionView
       end
       alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with a javascript_path named route
 
+      # Computes the path to a javascript asset in the public folder.
+      # This uses +javascript_path+ and skips any asset lookups by assuming the asset is in the
+      # `public` folder.
       def public_javascript_path(source, options = {})
         path_to_javascript(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_javascript, :public_javascript_path # aliased to avoid conflicts with an font_path named route
+      alias_method :path_to_public_javascript, :public_javascript_path # aliased to avoid conflicts with a public_javascript_path named route
 
       # Computes the full URL to a JavaScript asset in the public javascripts directory.
       # This will use +javascript_path+ internally, so most of their behaviors will be the same.
@@ -305,7 +311,7 @@ module ActionView
       def public_javascript_url(source, options = {})
         url_to_javascript(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_javascript, :public_javascript_path # aliased to avoid conflicts with an javascript_path named route
+      alias_method :path_to_public_javascript, :public_javascript_path # aliased to avoid conflicts with a public_javascript_path named route
 
       # Computes the path to a stylesheet asset in the public stylesheets directory.
       # If the +source+ filename has no extension, .css will be appended (except for explicit URIs).
@@ -322,10 +328,13 @@ module ActionView
       end
       alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with a stylesheet_path named route
 
+      # Computes the path to a stylesheet asset in the public folder.
+      # This uses +stylesheet_path+ and skips any asset lookups by assuming the asset is in the
+      # `public` folder.
       def public_stylesheet_path(source, options)
         path_to_stylesheet(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_stylesheet, :public_stylesheet_path # aliased to avoid conflicts with an font_path named route
+      alias_method :path_to_public_stylesheet, :public_stylesheet_path # aliased to avoid conflicts with a public_stylesheet_path named route
 
       # Computes the full URL to a stylesheet asset in the public stylesheets directory.
       # This will use +stylesheet_path+ internally, so most of their behaviors will be the same.
@@ -345,7 +354,7 @@ module ActionView
       def public_stylesheet_url(source, options = {})
         url_to_stylesheet(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_stylesheet, :public_stylesheet_path # aliased to avoid conflicts with an stylesheet_path named route
+      alias_method :path_to_public_stylesheet, :public_stylesheet_path # aliased to avoid conflicts with a public_stylesheet_path named route
 
       # Computes the path to an image asset.
       # Full paths from the document root will be passed through.
@@ -365,10 +374,13 @@ module ActionView
       end
       alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
 
+      # Computes the path to a image asset in the public folder.
+      # This uses +image_path+ and skips any asset lookups by assuming the asset is in the
+      # `public` folder.
       def public_image_path(source, options)
         path_to_image(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_image, :public_image_path # aliased to avoid conflicts with an font_path named route
+      alias_method :path_to_public_image, :public_image_path # aliased to avoid conflicts with a public_image_path named route
 
       # Computes the full URL to an image asset.
       # This will use +image_path+ internally, so most of their behaviors will be the same.
@@ -388,7 +400,7 @@ module ActionView
       def public_image_url(source, options = {})
         url_to_image(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_image, :public_image_path # aliased to avoid conflicts with an image_path named route
+      alias_method :path_to_public_image, :public_image_path # aliased to avoid conflicts with a public_image_path named route
 
       # Computes the path to a video asset in the public videos directory.
       # Full paths from the document root will be passed through.
@@ -404,10 +416,13 @@ module ActionView
       end
       alias_method :path_to_video, :video_path # aliased to avoid conflicts with a video_path named route
 
+      # Computes the path to a video asset in the public folder.
+      # This uses +video_path+ and skips any asset lookups by assuming the asset is in the
+      # `public` folder.
       def public_video_path(source, options)
         path_to_video(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_video, :public_video_path # aliased to avoid conflicts with an font_path named route
+      alias_method :path_to_public_video, :public_video_path # aliased to avoid conflicts with a public_video_path named route
 
       # Computes the full URL to a video asset in the public videos directory.
       # This will use +video_path+ internally, so most of their behaviors will be the same.
@@ -427,7 +442,7 @@ module ActionView
       def public_video_url(source, options = {})
         url_to_video(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_video, :public_video_path # aliased to avoid conflicts with an video_path named route
+      alias_method :path_to_public_video, :public_video_path # aliased to avoid conflicts with a public_video_path named route
 
       # Computes the path to an audio asset in the public audios directory.
       # Full paths from the document root will be passed through.
@@ -443,10 +458,13 @@ module ActionView
       end
       alias_method :path_to_audio, :audio_path # aliased to avoid conflicts with an audio_path named route
 
+      # Computes the path to a audio asset in the public folder.
+      # This uses +audio_path+ and skips any asset lookups by assuming the asset is in the
+      # `public` folder.
       def public_audio_path(source, options = {})
         path_to_audio(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_audio, :public_audio_path # aliased to avoid conflicts with an font_path named route
+      alias_method :path_to_public_audio, :public_audio_path # aliased to avoid conflicts with a public_audio_path named route
 
       # Computes the full URL to an audio asset in the public audios directory.
       # This will use +audio_path+ internally, so most of their behaviors will be the same.
@@ -466,7 +484,7 @@ module ActionView
       def public_audio_url(source, options = {})
         url_to_audio(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_audio, :public_audio_path # aliased to avoid conflicts with an audio_path named route
+      alias_method :path_to_public_audio, :public_audio_path # aliased to avoid conflicts with a public_audio_path named route
 
       # Computes the path to a font asset.
       # Full paths from the document root will be passed through.
@@ -481,10 +499,13 @@ module ActionView
       end
       alias_method :path_to_font, :font_path # aliased to avoid conflicts with an font_path named route
 
+      # Computes the path to a font asset in the public folder.
+      # This uses +font_path+ and skips any asset lookups by assuming the asset is in the
+      # `public` folder.
       def public_font_path(source, options = {})
         path_to_font(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_font, :public_font_path # aliased to avoid conflicts with an font_path named route
+      alias_method :path_to_public_font, :public_font_path # aliased to avoid conflicts with a public_font_path named route
 
       # Computes the full URL to a font asset.
       # This will use +font_path+ internally, so most of their behaviors will be the same.
@@ -504,7 +525,7 @@ module ActionView
       def public_font_url(source, options = {})
         url_to_font(source, {public_folder: true}.merge!(options))
       end
-      alias_method :path_to_public_font, :public_font_path # aliased to avoid conflicts with an public_font_url named route
+      alias_method :path_to_public_font, :public_font_path # aliased to avoid conflicts with a public_font_url named route
     end
   end
 end
-- 
cgit v1.2.3


From e8b081133a6780b37d1143becf4cfc945c41cb49 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Wed, 15 Jun 2016 14:16:10 -0500
Subject: Match method signature

---
 actionview/lib/action_view/helpers/asset_url_helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb
index 844826386a..26ba955f07 100644
--- a/actionview/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -331,7 +331,7 @@ module ActionView
       # Computes the path to a stylesheet asset in the public folder.
       # This uses +stylesheet_path+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
-      def public_stylesheet_path(source, options)
+      def public_stylesheet_path(source, options = {})
         path_to_stylesheet(source, {public_folder: true}.merge!(options))
       end
       alias_method :path_to_public_stylesheet, :public_stylesheet_path # aliased to avoid conflicts with a public_stylesheet_path named route
@@ -377,7 +377,7 @@ module ActionView
       # Computes the path to a image asset in the public folder.
       # This uses +image_path+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
-      def public_image_path(source, options)
+      def public_image_path(source, options = {})
         path_to_image(source, {public_folder: true}.merge!(options))
       end
       alias_method :path_to_public_image, :public_image_path # aliased to avoid conflicts with a public_image_path named route
@@ -419,7 +419,7 @@ module ActionView
       # Computes the path to a video asset in the public folder.
       # This uses +video_path+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
-      def public_video_path(source, options)
+      def public_video_path(source, options = {})
         path_to_video(source, {public_folder: true}.merge!(options))
       end
       alias_method :path_to_public_video, :public_video_path # aliased to avoid conflicts with a public_video_path named route
-- 
cgit v1.2.3


From 0a633b324eb8239a467fa7fbb9fa18abcd5759d3 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Wed, 15 Jun 2016 14:16:21 -0500
Subject: Test `public_` methods.

---
 railties/test/application/asset_debugging_test.rb | 72 +++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index a732869d62..92d10ec827 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -68,5 +68,77 @@ module ApplicationTests
       assert_match(/<script src="\/assets\/application(\.self)?-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
       assert_match(/<script src="\/assets\/xmlhr(\.self)?-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
     end
+
+    test "public path methods are not over-written by the asset pipeline" do
+      contents = "doesnotexist"
+      cases = {
+        public_asset_path:       %r{/#{ contents }},
+        public_image_path:       %r{/images/#{ contents }},
+        public_video_path:       %r{/videos/#{ contents }},
+        public_audio_path:       %r{/audios/#{ contents }},
+        public_font_path:        %r{/fonts/#{ contents }},
+        public_javascript_path:  %r{/javascripts/#{ contents }},
+        public_stylesheet_path:  %r{/stylesheets/#{ contents }},
+      }
+
+      cases.each do |(view_method, tag_match)|
+        app_file "app/views/posts/index.html.erb", "<%= #{ view_method } '#{contents}' %>"
+
+        app "development"
+
+        class ::PostsController < ActionController::Base ; end
+
+        get '/posts?debug_assets=true'
+
+        body = last_response.body
+        assert_match(tag_match, body, "Expected `#{view_method}` to produce a match to #{ tag_match }, but did not: #{ body }")
+      end
+    end
+
+    test "public url methods are not over-written by the asset pipeline" do
+      contents = "doesnotexist"
+      cases = {
+        public_asset_url:       %r{http://example.org/#{ contents }},
+        public_image_url:       %r{http://example.org/images/#{ contents }},
+        public_video_url:       %r{http://example.org/videos/#{ contents }},
+        public_audio_url:       %r{http://example.org/audios/#{ contents }},
+        public_font_url:        %r{http://example.org/fonts/#{ contents }},
+        public_javascript_url:  %r{http://example.org/javascripts/#{ contents }},
+        public_stylesheet_url:  %r{http://example.org/stylesheets/#{ contents }},
+      }
+
+      cases.each do |(view_method, tag_match)|
+        app_file "app/views/posts/index.html.erb", "<%= #{ view_method } '#{contents}' %>"
+
+        app "development"
+
+        class ::PostsController < ActionController::Base ; end
+
+        get '/posts?debug_assets=true'
+
+        body = last_response.body
+        assert_match(tag_match, body, "Expected `#{view_method}` to produce a match to #{ tag_match }, but did not: #{ body }")
+      end
+    end
+
+    test "public path methods do not use the asset pipeline" do
+      cases = {
+        asset_path:        /\/assets\/application-.*.\.js/,
+        public_asset_path: /application.js/
+      }
+
+      cases.each do |(view_method, tag_match)|
+        app_file "app/views/posts/index.html.erb", "<%= #{ view_method } 'application.js' %>"
+
+        app "development"
+
+        class ::PostsController < ActionController::Base ; end
+
+        get '/posts?debug_assets=true'
+
+        body = last_response.body.strip
+        assert_match(tag_match, body, "Expected `#{view_method}` to produce a match to #{ tag_match }, but did not: #{ body }")
+      end
+    end
   end
 end
-- 
cgit v1.2.3


From 9b22681cfc6b98343a8de0fbc0e2527aa688f36a Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Thu, 18 Aug 2016 15:24:13 -0500
Subject: Add `public_*` helpers to all the `_tag` methods.

---
 .../lib/action_view/helpers/asset_tag_helper.rb    | 68 ++++++++++++++++++----
 railties/test/application/asset_debugging_test.rb  | 24 +++++---
 2 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb
index 6cac4bc0ad..3a83701ef3 100644
--- a/actionview/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_tag_helper.rb
@@ -56,7 +56,7 @@ module ActionView
       #   # => <script src="http://www.example.com/xmlhr.js"></script>
       def javascript_include_tag(*sources)
         options = sources.extract_options!.stringify_keys
-        path_options = options.extract!("protocol", "extname", "host").symbolize_keys
+        path_options = options.extract!("protocol", "extname", "host", "public_folder").symbolize_keys
         sources.uniq.map { |source|
           tag_options = {
             "src" => path_to_javascript(source, path_options)
@@ -65,6 +65,14 @@ module ActionView
         }.join("\n").html_safe
       end
 
+      # Computes the path to a series of javascript assets in the public
+      # folder. This uses +javascript_include_tag+ and skips any asset
+      # lookups by assuming any assets are in the `public` folder.
+      def public_javascript_include_tag(*sources)
+        options = sources.extract_options!
+        javascript_include_tag(*sources, { public_folder: true }.merge!(options))
+      end
+
       # Returns a stylesheet link tag for the sources specified as arguments. If
       # you don't specify an extension, <tt>.css</tt> will be appended automatically.
       # You can modify the link attributes by passing a hash as the last argument.
@@ -92,8 +100,7 @@ module ActionView
       #   #    <link href="/css/stylish.css" media="screen" rel="stylesheet" />
       def stylesheet_link_tag(*sources)
         options = sources.extract_options!.stringify_keys
-        path_options = options.extract!("protocol", "host").symbolize_keys
-
+        path_options = options.extract!("protocol", "host", "public_folder").symbolize_keys
         sources.uniq.map { |source|
           tag_options = {
             "rel" => "stylesheet",
@@ -104,6 +111,14 @@ module ActionView
         }.join("\n").html_safe
       end
 
+      # Computes the path to a series of stylesheet assets in the public
+      # folder. This uses +stylesheet_link_tag+ and skips any asset
+      # lookups by assuming any assets are in the `public` folder.
+      def public_stylesheet_link_tag(*sources)
+        options = sources.extract_options!
+        stylesheet_link_tag(*sources, { public_folder: true }.merge!(options))
+      end
+
       # Returns a link tag that browsers and feed readers can use to auto-detect
       # an RSS or Atom feed. The +type+ can either be <tt>:rss</tt> (default) or
       # <tt>:atom</tt>. Control the link options in url_for format using the
@@ -171,13 +186,20 @@ module ActionView
       #   favicon_link_tag 'mb-icon.png', rel: 'apple-touch-icon', type: 'image/png'
       #   # => <link href="/assets/mb-icon.png" rel="apple-touch-icon" type="image/png" />
       def favicon_link_tag(source="favicon.ico", options={})
-        tag("link", {
+        tag('link', {
           rel: "shortcut icon",
           type: "image/x-icon",
-          href: path_to_image(source)
+          href: path_to_image(source, { public_folder: options.delete(:public_folder) })
         }.merge!(options.symbolize_keys))
       end
 
+      # Returns a link tag for a favicon asset in the public
+      # folder. This uses +favicon_link_tag+ and skips any asset
+      # lookups by assuming any assets are in the `public` folder.
+      def public_favicon_link_tag(source='favicon.ico', options={})
+        favicon_link_tag(source, { public_folder: true }.merge!(options))
+      end
+
       # Returns an HTML image tag for the +source+. The +source+ can be a full
       # path or a file.
       #
@@ -212,7 +234,7 @@ module ActionView
         options = options.symbolize_keys
         check_for_image_tag_errors(options)
 
-        src = options[:src] = path_to_image(source)
+        src = options[:src] = path_to_image(source, { public_folder: options.delete(:public_folder) })
 
         unless src.start_with?("cid:") || src.start_with?("data:") || src.blank?
           options[:alt] = options.fetch(:alt) { image_alt(src) }
@@ -222,6 +244,13 @@ module ActionView
         tag("img", options)
       end
 
+      # Returns an HTML image tag for the source asset in the public
+      # folder. This uses +image_tag+ and skips any asset
+      # lookups by assuming any assets are in the `public` folder.
+      def public_image_tag(source, options={})
+        image_tag(source,  { public_folder: true }.merge!(options))
+      end
+
       # Returns a string suitable for an HTML image tag alt attribute.
       # The +src+ argument is meant to be an image file path.
       # The method removes the basename of the file path and the digest,
@@ -282,12 +311,23 @@ module ActionView
       #   video_tag(["trailer.ogg", "trailer.flv"], size: "160x120")
       #   # => <video height="120" width="160"><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video>
       def video_tag(*sources)
+        options = sources.extract_options!.symbolize_keys
+        public_poster_folder = options.delete(:public_poster_folder)
+        sources << options
         multiple_sources_tag("video", sources) do |options|
-          options[:poster] = path_to_image(options[:poster]) if options[:poster]
+          options[:poster] = path_to_image(options[:poster], { public_folder: public_poster_folder }) if options[:poster]
           options[:width], options[:height] = extract_dimensions(options.delete(:size)) if options[:size]
         end
       end
 
+      # Returns an HTML video tag for the source asset in the public
+      # folder. This uses +video_tag+ and skips any asset
+      # lookups by assuming any assets are in the `public` folder.
+      def public_video_tag(*sources)
+        options = sources.extract_options!
+        video_tag(*sources, { public_folder: true , public_poster_folder: true}.merge!(options))
+      end
+
       # Returns an HTML audio tag for the +source+.
       # The +source+ can be full path or file that exists in
       # your public audios directory.
@@ -304,19 +344,27 @@ module ActionView
         multiple_sources_tag("audio", sources)
       end
 
+      # Returns an HTML audio tag for the source asset in the public
+      # folder. This uses +audio_tag+ and skips any asset
+      def public_audio_tag(*sources)
+        options = sources.extract_options!
+        audio_tag(*sources, { public_folder: true }.merge!(options))
+      end
+
       private
         def multiple_sources_tag(type, sources)
-          options = sources.extract_options!.symbolize_keys
+          options       = sources.extract_options!.symbolize_keys
+          public_folder = options.delete(:public_folder)
           sources.flatten!
 
           yield options if block_given?
 
           if sources.size > 1
             content_tag(type, options) do
-              safe_join sources.map { |source| tag("source", src: send("path_to_#{type}", source)) }
+              safe_join sources.map { |source| tag("source", src: send("path_to_#{type}", source, { public_folder: public_folder })) }
             end
           else
-            options[:src] = send("path_to_#{type}", sources.first)
+            options[:src] = send("path_to_#{type}", sources.first, { public_folder: public_folder })
             content_tag(type, nil, options)
           end
         end
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index 92d10ec827..bbaabdb077 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -69,16 +69,22 @@ module ApplicationTests
       assert_match(/<script src="\/assets\/xmlhr(\.self)?-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
     end
 
-    test "public path methods are not over-written by the asset pipeline" do
+    test "public path and tag methods are not over-written by the asset pipeline" do
       contents = "doesnotexist"
       cases = {
-        public_asset_path:       %r{/#{ contents }},
-        public_image_path:       %r{/images/#{ contents }},
-        public_video_path:       %r{/videos/#{ contents }},
-        public_audio_path:       %r{/audios/#{ contents }},
-        public_font_path:        %r{/fonts/#{ contents }},
-        public_javascript_path:  %r{/javascripts/#{ contents }},
-        public_stylesheet_path:  %r{/stylesheets/#{ contents }},
+        public_asset_path:             %r{/#{ contents }},
+        public_image_path:             %r{/images/#{ contents }},
+        public_video_path:             %r{/videos/#{ contents }},
+        public_audio_path:             %r{/audios/#{ contents }},
+        public_font_path:              %r{/fonts/#{ contents }},
+        public_javascript_path:        %r{/javascripts/#{ contents }},
+        public_stylesheet_path:        %r{/stylesheets/#{ contents }},
+        public_image_tag:              %r{<img src="/images/#{ contents }"},
+        public_favicon_link_tag:       %r{<link rel="shortcut icon" type="image/x-icon" href="/images/#{ contents }" />},
+        public_stylesheet_link_tag:    %r{<link rel="stylesheet" media="screen" href="/stylesheets/#{ contents }.css" />},
+        public_javascript_include_tag: %r{<script src="/javascripts/#{ contents }.js">},
+        public_audio_tag:              %r{<audio src="/audios/#{ contents }"></audio>},
+        public_video_tag:              %r{<video src="/videos/#{ contents }"></video>}
       }
 
       cases.each do |(view_method, tag_match)|
@@ -124,7 +130,7 @@ module ApplicationTests
     test "public path methods do not use the asset pipeline" do
       cases = {
         asset_path:        /\/assets\/application-.*.\.js/,
-        public_asset_path: /application.js/
+        public_asset_path: /application.js/,
       }
 
       cases.each do |(view_method, tag_match)|
-- 
cgit v1.2.3


From a22164a282b013e1b3305ea457b84656fba12c2e Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Thu, 18 Aug 2016 15:24:20 -0500
Subject: Fix formatting

---
 .../lib/action_view/helpers/asset_tag_helper.rb    | 16 ++++++------
 .../lib/action_view/helpers/asset_url_helper.rb    | 29 +++++++++++-----------
 railties/test/application/asset_debugging_test.rb  |  6 ++---
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb
index 3a83701ef3..2e31bfbc9a 100644
--- a/actionview/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_tag_helper.rb
@@ -186,17 +186,17 @@ module ActionView
       #   favicon_link_tag 'mb-icon.png', rel: 'apple-touch-icon', type: 'image/png'
       #   # => <link href="/assets/mb-icon.png" rel="apple-touch-icon" type="image/png" />
       def favicon_link_tag(source="favicon.ico", options={})
-        tag('link', {
+        tag("link", {
           rel: "shortcut icon",
           type: "image/x-icon",
-          href: path_to_image(source, { public_folder: options.delete(:public_folder) })
+          href: path_to_image(source, public_folder: options.delete(:public_folder))
         }.merge!(options.symbolize_keys))
       end
 
       # Returns a link tag for a favicon asset in the public
       # folder. This uses +favicon_link_tag+ and skips any asset
       # lookups by assuming any assets are in the `public` folder.
-      def public_favicon_link_tag(source='favicon.ico', options={})
+      def public_favicon_link_tag(source="favicon.ico", options={})
         favicon_link_tag(source, { public_folder: true }.merge!(options))
       end
 
@@ -234,7 +234,7 @@ module ActionView
         options = options.symbolize_keys
         check_for_image_tag_errors(options)
 
-        src = options[:src] = path_to_image(source, { public_folder: options.delete(:public_folder) })
+        src = options[:src] = path_to_image(source, public_folder: options.delete(:public_folder))
 
         unless src.start_with?("cid:") || src.start_with?("data:") || src.blank?
           options[:alt] = options.fetch(:alt) { image_alt(src) }
@@ -315,7 +315,7 @@ module ActionView
         public_poster_folder = options.delete(:public_poster_folder)
         sources << options
         multiple_sources_tag("video", sources) do |options|
-          options[:poster] = path_to_image(options[:poster], { public_folder: public_poster_folder }) if options[:poster]
+          options[:poster] = path_to_image(options[:poster], public_folder: public_poster_folder) if options[:poster]
           options[:width], options[:height] = extract_dimensions(options.delete(:size)) if options[:size]
         end
       end
@@ -325,7 +325,7 @@ module ActionView
       # lookups by assuming any assets are in the `public` folder.
       def public_video_tag(*sources)
         options = sources.extract_options!
-        video_tag(*sources, { public_folder: true , public_poster_folder: true}.merge!(options))
+        video_tag(*sources, { public_folder: true , public_poster_folder: true }.merge!(options))
       end
 
       # Returns an HTML audio tag for the +source+.
@@ -361,10 +361,10 @@ module ActionView
 
           if sources.size > 1
             content_tag(type, options) do
-              safe_join sources.map { |source| tag("source", src: send("path_to_#{type}", source, { public_folder: public_folder })) }
+              safe_join sources.map { |source| tag("source", src: send("path_to_#{type}", source, public_folder: public_folder)) }
             end
           else
-            options[:src] = send("path_to_#{type}", sources.first, { public_folder: public_folder })
+            options[:src] = send("path_to_#{type}", sources.first, public_folder: public_folder)
             content_tag(type, nil, options)
           end
         end
diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb
index 26ba955f07..a21536dd9d 100644
--- a/actionview/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -167,12 +167,11 @@ module ActionView
       end
       alias_method :path_to_asset, :asset_path # aliased to avoid conflicts with an asset_path named route
 
-
       # Computes the path to an asset in the public folder.
       # This uses +asset_path+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_asset_path(source, options = {})
-        path_to_asset(source, {public_folder: true}.merge!(options))
+        path_to_asset(source, { public_folder: true }.merge!(options))
       end
       alias_method :path_to_public_asset, :public_asset_path # aliased to avoid conflicts with an public_asset_path named route
 
@@ -195,7 +194,7 @@ module ActionView
       # This uses +asset_url+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_asset_url(source, options = {})
-        url_to_asset(source, {public_folder: true}.merge!(options))
+        url_to_asset(source, { public_folder: true }.merge!(options))
       end
       alias_method :path_to_public_asset, :public_asset_path # aliased to avoid conflicts with a public_asset_path named route
 
@@ -289,7 +288,7 @@ module ActionView
       # This uses +javascript_path+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_javascript_path(source, options = {})
-        path_to_javascript(source, {public_folder: true}.merge!(options))
+        path_to_javascript(source, { public_folder: true }.merge!(options))
       end
       alias_method :path_to_public_javascript, :public_javascript_path # aliased to avoid conflicts with a public_javascript_path named route
 
@@ -309,7 +308,7 @@ module ActionView
       # This uses +javascript_url+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_javascript_url(source, options = {})
-        url_to_javascript(source, {public_folder: true}.merge!(options))
+        url_to_javascript(source, { public_folder: true }.merge!(options))
       end
       alias_method :path_to_public_javascript, :public_javascript_path # aliased to avoid conflicts with a public_javascript_path named route
 
@@ -332,7 +331,7 @@ module ActionView
       # This uses +stylesheet_path+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_stylesheet_path(source, options = {})
-        path_to_stylesheet(source, {public_folder: true}.merge!(options))
+        path_to_stylesheet(source, { public_folder: true }.merge!(options))
       end
       alias_method :path_to_public_stylesheet, :public_stylesheet_path # aliased to avoid conflicts with a public_stylesheet_path named route
 
@@ -352,7 +351,7 @@ module ActionView
       # This uses +stylesheet_url+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_stylesheet_url(source, options = {})
-        url_to_stylesheet(source, {public_folder: true}.merge!(options))
+        url_to_stylesheet(source, { public_folder: true }.merge!(options))
       end
       alias_method :path_to_public_stylesheet, :public_stylesheet_path # aliased to avoid conflicts with a public_stylesheet_path named route
 
@@ -378,7 +377,7 @@ module ActionView
       # This uses +image_path+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_image_path(source, options = {})
-        path_to_image(source, {public_folder: true}.merge!(options))
+        path_to_image(source, { public_folder: true }.merge!(options))
       end
       alias_method :path_to_public_image, :public_image_path # aliased to avoid conflicts with a public_image_path named route
 
@@ -398,7 +397,7 @@ module ActionView
       # This uses +image_url+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_image_url(source, options = {})
-        url_to_image(source, {public_folder: true}.merge!(options))
+        url_to_image(source, { public_folder: true }.merge!(options))
       end
       alias_method :path_to_public_image, :public_image_path # aliased to avoid conflicts with a public_image_path named route
 
@@ -420,7 +419,7 @@ module ActionView
       # This uses +video_path+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_video_path(source, options = {})
-        path_to_video(source, {public_folder: true}.merge!(options))
+        path_to_video(source, { public_folder: true }.merge!(options))
       end
       alias_method :path_to_public_video, :public_video_path # aliased to avoid conflicts with a public_video_path named route
 
@@ -440,7 +439,7 @@ module ActionView
       # This uses +video_url+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_video_url(source, options = {})
-        url_to_video(source, {public_folder: true}.merge!(options))
+        url_to_video(source, { public_folder: true }.merge!(options))
       end
       alias_method :path_to_public_video, :public_video_path # aliased to avoid conflicts with a public_video_path named route
 
@@ -462,7 +461,7 @@ module ActionView
       # This uses +audio_path+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_audio_path(source, options = {})
-        path_to_audio(source, {public_folder: true}.merge!(options))
+        path_to_audio(source, { public_folder: true }.merge!(options))
       end
       alias_method :path_to_public_audio, :public_audio_path # aliased to avoid conflicts with a public_audio_path named route
 
@@ -482,7 +481,7 @@ module ActionView
       # This uses +audio_url+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_audio_url(source, options = {})
-        url_to_audio(source, {public_folder: true}.merge!(options))
+        url_to_audio(source, { public_folder: true }.merge!(options))
       end
       alias_method :path_to_public_audio, :public_audio_path # aliased to avoid conflicts with a public_audio_path named route
 
@@ -503,7 +502,7 @@ module ActionView
       # This uses +font_path+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_font_path(source, options = {})
-        path_to_font(source, {public_folder: true}.merge!(options))
+        path_to_font(source, { public_folder: true }.merge!(options))
       end
       alias_method :path_to_public_font, :public_font_path # aliased to avoid conflicts with a public_font_path named route
 
@@ -523,7 +522,7 @@ module ActionView
       # This uses +font_url+ and skips any asset lookups by assuming the asset is in the
       # `public` folder.
       def public_font_url(source, options = {})
-        url_to_font(source, {public_folder: true}.merge!(options))
+        url_to_font(source, { public_folder: true }.merge!(options))
       end
       alias_method :path_to_public_font, :public_font_path # aliased to avoid conflicts with a public_font_url named route
     end
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index bbaabdb077..1d27cecd3c 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -94,7 +94,7 @@ module ApplicationTests
 
         class ::PostsController < ActionController::Base ; end
 
-        get '/posts?debug_assets=true'
+        get "/posts?debug_assets=true"
 
         body = last_response.body
         assert_match(tag_match, body, "Expected `#{view_method}` to produce a match to #{ tag_match }, but did not: #{ body }")
@@ -120,7 +120,7 @@ module ApplicationTests
 
         class ::PostsController < ActionController::Base ; end
 
-        get '/posts?debug_assets=true'
+        get "/posts?debug_assets=true"
 
         body = last_response.body
         assert_match(tag_match, body, "Expected `#{view_method}` to produce a match to #{ tag_match }, but did not: #{ body }")
@@ -140,7 +140,7 @@ module ApplicationTests
 
         class ::PostsController < ActionController::Base ; end
 
-        get '/posts?debug_assets=true'
+        get "/posts?debug_assets=true"
 
         body = last_response.body.strip
         assert_match(tag_match, body, "Expected `#{view_method}` to produce a match to #{ tag_match }, but did not: #{ body }")
-- 
cgit v1.2.3


From b47970294e53ed9142ed16a560a8f68b1ae1b5d0 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Sun, 21 Aug 2016 14:08:24 -0500
Subject: Favor  `public_folder: true` over `public_*`

Adding all those `public_*` methods is a bit heavy handed, we can change the API to instead  use `public_folder: true`. Change was pretty easy since it was already implemented that way.
---
 .../lib/action_view/helpers/asset_tag_helper.rb    |  35 +------
 .../lib/action_view/helpers/asset_url_helper.rb    | 112 ---------------------
 railties/test/application/asset_debugging_test.rb  |  69 ++++++++-----
 3 files changed, 47 insertions(+), 169 deletions(-)

diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb
index 2e31bfbc9a..4ff2b8c872 100644
--- a/actionview/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_tag_helper.rb
@@ -193,13 +193,6 @@ module ActionView
         }.merge!(options.symbolize_keys))
       end
 
-      # Returns a link tag for a favicon asset in the public
-      # folder. This uses +favicon_link_tag+ and skips any asset
-      # lookups by assuming any assets are in the `public` folder.
-      def public_favicon_link_tag(source="favicon.ico", options={})
-        favicon_link_tag(source, { public_folder: true }.merge!(options))
-      end
-
       # Returns an HTML image tag for the +source+. The +source+ can be a full
       # path or a file.
       #
@@ -244,13 +237,6 @@ module ActionView
         tag("img", options)
       end
 
-      # Returns an HTML image tag for the source asset in the public
-      # folder. This uses +image_tag+ and skips any asset
-      # lookups by assuming any assets are in the `public` folder.
-      def public_image_tag(source, options={})
-        image_tag(source,  { public_folder: true }.merge!(options))
-      end
-
       # Returns a string suitable for an HTML image tag alt attribute.
       # The +src+ argument is meant to be an image file path.
       # The method removes the basename of the file path and the digest,
@@ -314,20 +300,12 @@ module ActionView
         options = sources.extract_options!.symbolize_keys
         public_poster_folder = options.delete(:public_poster_folder)
         sources << options
-        multiple_sources_tag("video", sources) do |options|
+        multiple_sources_tag_builder("video", sources) do |options|
           options[:poster] = path_to_image(options[:poster], public_folder: public_poster_folder) if options[:poster]
           options[:width], options[:height] = extract_dimensions(options.delete(:size)) if options[:size]
         end
       end
 
-      # Returns an HTML video tag for the source asset in the public
-      # folder. This uses +video_tag+ and skips any asset
-      # lookups by assuming any assets are in the `public` folder.
-      def public_video_tag(*sources)
-        options = sources.extract_options!
-        video_tag(*sources, { public_folder: true , public_poster_folder: true }.merge!(options))
-      end
-
       # Returns an HTML audio tag for the +source+.
       # The +source+ can be full path or file that exists in
       # your public audios directory.
@@ -341,18 +319,11 @@ module ActionView
       #   audio_tag("sound.wav", "sound.mid")
       #   # => <audio><source src="/audios/sound.wav" /><source src="/audios/sound.mid" /></audio>
       def audio_tag(*sources)
-        multiple_sources_tag("audio", sources)
-      end
-
-      # Returns an HTML audio tag for the source asset in the public
-      # folder. This uses +audio_tag+ and skips any asset
-      def public_audio_tag(*sources)
-        options = sources.extract_options!
-        audio_tag(*sources, { public_folder: true }.merge!(options))
+        multiple_sources_tag_builder("audio", sources)
       end
 
       private
-        def multiple_sources_tag(type, sources)
+        def multiple_sources_tag_builder(type, sources)
           options       = sources.extract_options!.symbolize_keys
           public_folder = options.delete(:public_folder)
           sources.flatten!
diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb
index a21536dd9d..50b13c0271 100644
--- a/actionview/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -167,14 +167,6 @@ module ActionView
       end
       alias_method :path_to_asset, :asset_path # aliased to avoid conflicts with an asset_path named route
 
-      # Computes the path to an asset in the public folder.
-      # This uses +asset_path+ and skips any asset lookups by assuming the asset is in the
-      # `public` folder.
-      def public_asset_path(source, options = {})
-        path_to_asset(source, { public_folder: true }.merge!(options))
-      end
-      alias_method :path_to_public_asset, :public_asset_path # aliased to avoid conflicts with an public_asset_path named route
-
       # Computes the full URL to an asset in the public directory. This
       # will use +asset_path+ internally, so most of their behaviors
       # will be the same. If :host options is set, it overwrites global
@@ -190,14 +182,6 @@ module ActionView
       end
       alias_method :url_to_asset, :asset_url # aliased to avoid conflicts with an asset_url named route
 
-      # Computes the full URL to an asset in the public folder.
-      # This uses +asset_url+ and skips any asset lookups by assuming the asset is in the
-      # `public` folder.
-      def public_asset_url(source, options = {})
-        url_to_asset(source, { public_folder: true }.merge!(options))
-      end
-      alias_method :path_to_public_asset, :public_asset_path # aliased to avoid conflicts with a public_asset_path named route
-
       ASSET_EXTENSIONS = {
         javascript: ".js",
         stylesheet: ".css"
@@ -284,14 +268,6 @@ module ActionView
       end
       alias_method :path_to_javascript, :javascript_path # aliased to avoid conflicts with a javascript_path named route
 
-      # Computes the path to a javascript asset in the public folder.
-      # This uses +javascript_path+ and skips any asset lookups by assuming the asset is in the
-      # `public` folder.
-      def public_javascript_path(source, options = {})
-        path_to_javascript(source, { public_folder: true }.merge!(options))
-      end
-      alias_method :path_to_public_javascript, :public_javascript_path # aliased to avoid conflicts with a public_javascript_path named route
-
       # Computes the full URL to a JavaScript asset in the public javascripts directory.
       # This will use +javascript_path+ internally, so most of their behaviors will be the same.
       # Since +javascript_url+ is based on +asset_url+ method you can set :host options. If :host
@@ -304,14 +280,6 @@ module ActionView
       end
       alias_method :url_to_javascript, :javascript_url # aliased to avoid conflicts with a javascript_url named route
 
-      # Computes the full URL to a javascript asset in the public folder.
-      # This uses +javascript_url+ and skips any asset lookups by assuming the asset is in the
-      # `public` folder.
-      def public_javascript_url(source, options = {})
-        url_to_javascript(source, { public_folder: true }.merge!(options))
-      end
-      alias_method :path_to_public_javascript, :public_javascript_path # aliased to avoid conflicts with a public_javascript_path named route
-
       # Computes the path to a stylesheet asset in the public stylesheets directory.
       # If the +source+ filename has no extension, .css will be appended (except for explicit URIs).
       # Full paths from the document root will be passed through.
@@ -327,14 +295,6 @@ module ActionView
       end
       alias_method :path_to_stylesheet, :stylesheet_path # aliased to avoid conflicts with a stylesheet_path named route
 
-      # Computes the path to a stylesheet asset in the public folder.
-      # This uses +stylesheet_path+ and skips any asset lookups by assuming the asset is in the
-      # `public` folder.
-      def public_stylesheet_path(source, options = {})
-        path_to_stylesheet(source, { public_folder: true }.merge!(options))
-      end
-      alias_method :path_to_public_stylesheet, :public_stylesheet_path # aliased to avoid conflicts with a public_stylesheet_path named route
-
       # Computes the full URL to a stylesheet asset in the public stylesheets directory.
       # This will use +stylesheet_path+ internally, so most of their behaviors will be the same.
       # Since +stylesheet_url+ is based on +asset_url+ method you can set :host options. If :host
@@ -347,14 +307,6 @@ module ActionView
       end
       alias_method :url_to_stylesheet, :stylesheet_url # aliased to avoid conflicts with a stylesheet_url named route
 
-      # Computes the full URL to a stylesheet asset in the public folder.
-      # This uses +stylesheet_url+ and skips any asset lookups by assuming the asset is in the
-      # `public` folder.
-      def public_stylesheet_url(source, options = {})
-        url_to_stylesheet(source, { public_folder: true }.merge!(options))
-      end
-      alias_method :path_to_public_stylesheet, :public_stylesheet_path # aliased to avoid conflicts with a public_stylesheet_path named route
-
       # Computes the path to an image asset.
       # Full paths from the document root will be passed through.
       # Used internally by +image_tag+ to build the image path:
@@ -373,14 +325,6 @@ module ActionView
       end
       alias_method :path_to_image, :image_path # aliased to avoid conflicts with an image_path named route
 
-      # Computes the path to a image asset in the public folder.
-      # This uses +image_path+ and skips any asset lookups by assuming the asset is in the
-      # `public` folder.
-      def public_image_path(source, options = {})
-        path_to_image(source, { public_folder: true }.merge!(options))
-      end
-      alias_method :path_to_public_image, :public_image_path # aliased to avoid conflicts with a public_image_path named route
-
       # Computes the full URL to an image asset.
       # This will use +image_path+ internally, so most of their behaviors will be the same.
       # Since +image_url+ is based on +asset_url+ method you can set :host options. If :host
@@ -393,14 +337,6 @@ module ActionView
       end
       alias_method :url_to_image, :image_url # aliased to avoid conflicts with an image_url named route
 
-      # Computes the full URL to a image asset in the public folder.
-      # This uses +image_url+ and skips any asset lookups by assuming the asset is in the
-      # `public` folder.
-      def public_image_url(source, options = {})
-        url_to_image(source, { public_folder: true }.merge!(options))
-      end
-      alias_method :path_to_public_image, :public_image_path # aliased to avoid conflicts with a public_image_path named route
-
       # Computes the path to a video asset in the public videos directory.
       # Full paths from the document root will be passed through.
       # Used internally by +video_tag+ to build the video path.
@@ -415,14 +351,6 @@ module ActionView
       end
       alias_method :path_to_video, :video_path # aliased to avoid conflicts with a video_path named route
 
-      # Computes the path to a video asset in the public folder.
-      # This uses +video_path+ and skips any asset lookups by assuming the asset is in the
-      # `public` folder.
-      def public_video_path(source, options = {})
-        path_to_video(source, { public_folder: true }.merge!(options))
-      end
-      alias_method :path_to_public_video, :public_video_path # aliased to avoid conflicts with a public_video_path named route
-
       # Computes the full URL to a video asset in the public videos directory.
       # This will use +video_path+ internally, so most of their behaviors will be the same.
       # Since +video_url+ is based on +asset_url+ method you can set :host options. If :host
@@ -435,14 +363,6 @@ module ActionView
       end
       alias_method :url_to_video, :video_url # aliased to avoid conflicts with an video_url named route
 
-      # Computes the full URL to a video asset in the public folder.
-      # This uses +video_url+ and skips any asset lookups by assuming the asset is in the
-      # `public` folder.
-      def public_video_url(source, options = {})
-        url_to_video(source, { public_folder: true }.merge!(options))
-      end
-      alias_method :path_to_public_video, :public_video_path # aliased to avoid conflicts with a public_video_path named route
-
       # Computes the path to an audio asset in the public audios directory.
       # Full paths from the document root will be passed through.
       # Used internally by +audio_tag+ to build the audio path.
@@ -457,14 +377,6 @@ module ActionView
       end
       alias_method :path_to_audio, :audio_path # aliased to avoid conflicts with an audio_path named route
 
-      # Computes the path to a audio asset in the public folder.
-      # This uses +audio_path+ and skips any asset lookups by assuming the asset is in the
-      # `public` folder.
-      def public_audio_path(source, options = {})
-        path_to_audio(source, { public_folder: true }.merge!(options))
-      end
-      alias_method :path_to_public_audio, :public_audio_path # aliased to avoid conflicts with a public_audio_path named route
-
       # Computes the full URL to an audio asset in the public audios directory.
       # This will use +audio_path+ internally, so most of their behaviors will be the same.
       # Since +audio_url+ is based on +asset_url+ method you can set :host options. If :host
@@ -477,14 +389,6 @@ module ActionView
       end
       alias_method :url_to_audio, :audio_url # aliased to avoid conflicts with an audio_url named route
 
-      # Computes the full URL to a audio asset in the public folder.
-      # This uses +audio_url+ and skips any asset lookups by assuming the asset is in the
-      # `public` folder.
-      def public_audio_url(source, options = {})
-        url_to_audio(source, { public_folder: true }.merge!(options))
-      end
-      alias_method :path_to_public_audio, :public_audio_path # aliased to avoid conflicts with a public_audio_path named route
-
       # Computes the path to a font asset.
       # Full paths from the document root will be passed through.
       #
@@ -498,14 +402,6 @@ module ActionView
       end
       alias_method :path_to_font, :font_path # aliased to avoid conflicts with an font_path named route
 
-      # Computes the path to a font asset in the public folder.
-      # This uses +font_path+ and skips any asset lookups by assuming the asset is in the
-      # `public` folder.
-      def public_font_path(source, options = {})
-        path_to_font(source, { public_folder: true }.merge!(options))
-      end
-      alias_method :path_to_public_font, :public_font_path # aliased to avoid conflicts with a public_font_path named route
-
       # Computes the full URL to a font asset.
       # This will use +font_path+ internally, so most of their behaviors will be the same.
       # Since +font_url+ is based on +asset_url+ method you can set :host options. If :host
@@ -517,14 +413,6 @@ module ActionView
         url_to_asset(source, { type: :font }.merge!(options))
       end
       alias_method :url_to_font, :font_url # aliased to avoid conflicts with an font_url named route
-
-      # Computes the full URL to a font asset in the public folder.
-      # This uses +font_url+ and skips any asset lookups by assuming the asset is in the
-      # `public` folder.
-      def public_font_url(source, options = {})
-        url_to_font(source, { public_folder: true }.merge!(options))
-      end
-      alias_method :path_to_public_font, :public_font_path # aliased to avoid conflicts with a public_font_url named route
     end
   end
 end
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index 1d27cecd3c..e6a660cf25 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -72,23 +72,23 @@ module ApplicationTests
     test "public path and tag methods are not over-written by the asset pipeline" do
       contents = "doesnotexist"
       cases = {
-        public_asset_path:             %r{/#{ contents }},
-        public_image_path:             %r{/images/#{ contents }},
-        public_video_path:             %r{/videos/#{ contents }},
-        public_audio_path:             %r{/audios/#{ contents }},
-        public_font_path:              %r{/fonts/#{ contents }},
-        public_javascript_path:        %r{/javascripts/#{ contents }},
-        public_stylesheet_path:        %r{/stylesheets/#{ contents }},
-        public_image_tag:              %r{<img src="/images/#{ contents }"},
-        public_favicon_link_tag:       %r{<link rel="shortcut icon" type="image/x-icon" href="/images/#{ contents }" />},
-        public_stylesheet_link_tag:    %r{<link rel="stylesheet" media="screen" href="/stylesheets/#{ contents }.css" />},
-        public_javascript_include_tag: %r{<script src="/javascripts/#{ contents }.js">},
-        public_audio_tag:              %r{<audio src="/audios/#{ contents }"></audio>},
-        public_video_tag:              %r{<video src="/videos/#{ contents }"></video>}
+        asset_path:             %r{/#{ contents }},
+        image_path:             %r{/images/#{ contents }},
+        video_path:             %r{/videos/#{ contents }},
+        audio_path:             %r{/audios/#{ contents }},
+        font_path:              %r{/fonts/#{ contents }},
+        javascript_path:        %r{/javascripts/#{ contents }},
+        stylesheet_path:        %r{/stylesheets/#{ contents }},
+        image_tag:              %r{<img src="/images/#{ contents }"},
+        favicon_link_tag:       %r{<link rel="shortcut icon" type="image/x-icon" href="/images/#{ contents }" />},
+        stylesheet_link_tag:    %r{<link rel="stylesheet" media="screen" href="/stylesheets/#{ contents }.css" />},
+        javascript_include_tag: %r{<script src="/javascripts/#{ contents }.js">},
+        audio_tag:              %r{<audio src="/audios/#{ contents }"></audio>},
+        video_tag:              %r{<video src="/videos/#{ contents }"></video>}
       }
 
       cases.each do |(view_method, tag_match)|
-        app_file "app/views/posts/index.html.erb", "<%= #{ view_method } '#{contents}' %>"
+        app_file "app/views/posts/index.html.erb", "<%= #{ view_method } '#{contents}', public_folder: true %>"
 
         app "development"
 
@@ -104,17 +104,17 @@ module ApplicationTests
     test "public url methods are not over-written by the asset pipeline" do
       contents = "doesnotexist"
       cases = {
-        public_asset_url:       %r{http://example.org/#{ contents }},
-        public_image_url:       %r{http://example.org/images/#{ contents }},
-        public_video_url:       %r{http://example.org/videos/#{ contents }},
-        public_audio_url:       %r{http://example.org/audios/#{ contents }},
-        public_font_url:        %r{http://example.org/fonts/#{ contents }},
-        public_javascript_url:  %r{http://example.org/javascripts/#{ contents }},
-        public_stylesheet_url:  %r{http://example.org/stylesheets/#{ contents }},
+        asset_url:       %r{http://example.org/#{ contents }},
+        image_url:       %r{http://example.org/images/#{ contents }},
+        video_url:       %r{http://example.org/videos/#{ contents }},
+        audio_url:       %r{http://example.org/audios/#{ contents }},
+        font_url:        %r{http://example.org/fonts/#{ contents }},
+        javascript_url:  %r{http://example.org/javascripts/#{ contents }},
+        stylesheet_url:  %r{http://example.org/stylesheets/#{ contents }},
       }
 
       cases.each do |(view_method, tag_match)|
-        app_file "app/views/posts/index.html.erb", "<%= #{ view_method } '#{contents}' %>"
+        app_file "app/views/posts/index.html.erb", "<%= #{ view_method } '#{contents}', public_folder: true %>"
 
         app "development"
 
@@ -127,10 +127,29 @@ module ApplicationTests
       end
     end
 
-    test "public path methods do not use the asset pipeline" do
+    test "{ public_folder: true } does not use the asset pipeline" do
       cases = {
-        asset_path:        /\/assets\/application-.*.\.js/,
-        public_asset_path: /application.js/,
+        /\/assets\/application-.*.\.js/ => {},
+        /application.js/                => { public_folder: true},
+      }
+      cases.each do |(tag_match, options_hash)|
+        app_file "app/views/posts/index.html.erb", "<%= asset_path('application.js', #{ options_hash }) %>"
+
+        app "development"
+
+        class ::PostsController < ActionController::Base ; end
+
+        get "/posts?debug_assets=true"
+
+        body = last_response.body.strip
+        assert_match(tag_match, body, "Expected `asset_path` with `#{ options_hash}` to produce a match to #{ tag_match }, but did not: #{ body }")
+      end
+    end
+
+    test "public_compute_asset_path does not use the asset pipeline" do
+      cases = {
+        compute_asset_path:        /\/assets\/application-.*.\.js/,
+        public_compute_asset_path: /application.js/,
       }
 
       cases.each do |(view_method, tag_match)|
-- 
cgit v1.2.3


From 85f142019ff172ff8518535ceb878bfe205aef14 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Mon, 22 Aug 2016 12:50:15 -0500
Subject: Missed 2 public_* methods in cleanup

---
 actionview/lib/action_view/helpers/asset_tag_helper.rb | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb
index 4ff2b8c872..92bf132fbc 100644
--- a/actionview/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_tag_helper.rb
@@ -65,14 +65,6 @@ module ActionView
         }.join("\n").html_safe
       end
 
-      # Computes the path to a series of javascript assets in the public
-      # folder. This uses +javascript_include_tag+ and skips any asset
-      # lookups by assuming any assets are in the `public` folder.
-      def public_javascript_include_tag(*sources)
-        options = sources.extract_options!
-        javascript_include_tag(*sources, { public_folder: true }.merge!(options))
-      end
-
       # Returns a stylesheet link tag for the sources specified as arguments. If
       # you don't specify an extension, <tt>.css</tt> will be appended automatically.
       # You can modify the link attributes by passing a hash as the last argument.
@@ -111,14 +103,6 @@ module ActionView
         }.join("\n").html_safe
       end
 
-      # Computes the path to a series of stylesheet assets in the public
-      # folder. This uses +stylesheet_link_tag+ and skips any asset
-      # lookups by assuming any assets are in the `public` folder.
-      def public_stylesheet_link_tag(*sources)
-        options = sources.extract_options!
-        stylesheet_link_tag(*sources, { public_folder: true }.merge!(options))
-      end
-
       # Returns a link tag that browsers and feed readers can use to auto-detect
       # an RSS or Atom feed. The +type+ can either be <tt>:rss</tt> (default) or
       # <tt>:atom</tt>. Control the link options in url_for format using the
-- 
cgit v1.2.3


From fc16af47ba941ce8c0125653fa3bf399d68a586c Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 23 Aug 2016 12:20:36 -0500
Subject: Default assets.unknown_asset_fallback to false

---
 .../generators/rails/app/templates/config/initializers/assets.rb.tt   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
index 2318cf59ff..2393fecc12 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
@@ -6,6 +6,10 @@ Rails.application.config.assets.version = '1.0'
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path
 
+# Unknown asset fallback will return the path passed in when the given
+# asset is not present in the asset pipeline.
+# Rails.application.config.assets.unknown_asset_fallback = false
+
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.
-- 
cgit v1.2.3


From 44840cc85aaadd81b248cbce655155b6d259e596 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 23 Aug 2016 12:20:48 -0500
Subject: Do not deprecate using assets with leading slash

---
 actionview/lib/action_view/helpers/asset_url_helper.rb | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb
index 50b13c0271..ba695791b1 100644
--- a/actionview/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -141,16 +141,11 @@ module ActionView
           source = "#{source}#{extname}"
         end
 
-        if options[:public_folder]
-          source = public_compute_asset_path(source, options) unless options[:raw]
-        else
-          if source[0] != ?/
-            source = compute_asset_path(source, options) unless options[:raw]
-          elsif !options[:raw]
-            message =  "Skipping computing asset path since asset #{ source.inspect } starts with a slash `/`.\n"
-            message << "This behavior is deprecated and will be removed. Instead explicitly\n"
-            message << "use a `public_*` helper instead. Optionally pass in `raw: true` to get the exact same behavior."
-            ActiveSupport::Deprecation.warn(message)
+        if source[0] != ?/
+          if options[:public_folder]
+            source = public_compute_asset_path(source, options)
+          else
+            source = compute_asset_path(source, options)
           end
         end
 
-- 
cgit v1.2.3


From 53152dccd205564d23c643c492818ff405e40ebf Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 23 Aug 2016 12:56:58 -0500
Subject: Fully document asset_path.

---
 .../lib/action_view/helpers/asset_url_helper.rb    | 65 +++++++++++++++++++---
 1 file changed, 58 insertions(+), 7 deletions(-)

diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb
index ba695791b1..c5b5e77178 100644
--- a/actionview/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -118,16 +118,67 @@ module ActionView
     module AssetUrlHelper
       URI_REGEXP = %r{^[-a-z]+://|^(?:cid|data):|^//}i
 
-      # Computes the path to asset in public directory. If :type
-      # options is set, a file extension will be appended and scoped
-      # to the corresponding public directory.
+      # This is the entry point for all assets.
+      # When using the asset pipeline (i.e. sprockets and sprockets-rails), the
+      # behavior is "enhanced". You can bypass the asset pipeline by passing in
+      # `public_folder: true` to the options.
       #
       # All other asset *_path helpers delegate through this method.
       #
-      #   asset_path "application.js"                     # => /assets/application.js
-      #   asset_path "application", type: :javascript     # => /assets/application.js
-      #   asset_path "application", type: :stylesheet     # => /assets/application.css
-      #   asset_path "http://www.example.com/js/xmlhr.js" # => http://www.example.com/js/xmlhr.js
+      # === With the asset pipeline
+      #
+      # All options passed to asset_path will be passed to `compute_asset_path
+      # which is implemented by sprockets-rails.
+      #
+      #      asset_path("application.js") # => "/assets/application-60aa4fdc5cea14baf5400fba1abf4f2a46a5166bad4772b1effe341570f07de9.js"
+      #
+      # === Without the asset pipeline (`public_folder: true`)
+      #
+      # Accepts a `type` option that can specify the asset's extension. No error
+      # checking is done to verify the source passed into `asset_path` is valid
+      # and that the file exists on disk.
+      #
+      #      asset_path("application.js", public_folder: true)                 # => "application.js"
+      #      asset_path("filedoesnotexist.png", public_folder: true)           # => "filedoesnotexist.png"
+      #      asset_path("application", type: :javascript, public_folder: true) # => "/javascripts/application.js"
+      #      asset_path("application", type: :stylesheet, public_folder: true) # => "/stylesheets/application.css"
+      #
+      # === Options applying to all assets
+      #
+      # Below lists scenarios that apply to `asset_path` whether or not you're
+      # using the asset pipeline.
+      #
+      # - All fully qualified urls are returned immediately. This bypasses the
+      #   asset pipeline and all other behavior described.
+      #
+      #     asset_path("http://www.example.com/js/xmlhr.js") # => "http://www.example.com/js/xmlhr.js"
+      #
+      # - All assets that begin with a forward slash are assumed to be full
+      #   urls and will not be expanded. This will bypass the asset pipeline.
+      #
+      #     asset_path("/foo.png") # => "/foo.png"
+      #
+      # - All blank strings will be returned immediately. This bypasses the
+      #   asset pipeline and all other behavior described.
+      #
+      #     asset_path("") # => ""
+      #
+      # - If `config.relative_url_root` is specified, all assets will have that
+      #   root prepended.
+      #
+      #     Rails.application.config.relative_url_root = "bar"
+      #     asset_path("foo.js", public_folder: true) # => "bar/foo.js"
+      #
+      # - A different asset host can be specified via `config.action_controller.asset_host`
+      #   this is commonly used in conjunction with a CDN.
+      #
+      #     Rails.application.config.action_controller.asset_host = "assets.example.com"
+      #     asset_path("foo.js", public_folder: true) # => "http://assets.example.com/foo.js"
+      #
+      # - An extension name can be specified manually with `extname`.
+      #
+      #     asset_path("foo", public_folder: true, extname: ".js")     # => "/foo.js"
+      #     asset_path("foo.css", public_folder: true, extname: ".js") # => "/foo.css.js"
       def asset_path(source, options = {})
         raise ArgumentError, "nil is not a valid asset source" if source.nil?
 
-- 
cgit v1.2.3


From 129e6ead3e7931121da792d0eaa42ca3a2934c94 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 23 Aug 2016 13:02:32 -0500
Subject: Fix initializer

---
 .../generators/rails/app/templates/config/initializers/assets.rb.tt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
index 2393fecc12..41f0fbf262 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
@@ -8,7 +8,7 @@ Rails.application.config.assets.version = '1.0'
 
 # Unknown asset fallback will return the path passed in when the given
 # asset is not present in the asset pipeline.
-# Rails.application.config.assets.unknown_asset_fallback = false
+Rails.application.config.assets.unknown_asset_fallback = false
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
-- 
cgit v1.2.3


From 3105642a5ca5648337a4142e35995c06fd37557e Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 23 Aug 2016 13:03:11 -0500
Subject: [ci skip] Upgrading assets.unknown_asset_fallback

---
 guides/source/upgrading_ruby_on_rails.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 2372590cec..4530990280 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -1444,6 +1444,18 @@ config.public_file_server.headers = {
 }
 ```
 
+### config/initializers/assets.rb
+
+In the most recent verison of sprockets-rails there is a flag available to configure what happens when
+an asset lookup is performed and no asset is found. By setting this value to false, an error will be
+raised so the asset lookup does not fail silently.
+
+```ruby
+# Unknown asset fallback will return the path passed in when the given
+# asset is not present in the asset pipeline.
+Rails.application.config.assets.unknown_asset_fallback = false
+```
+
 ### config/initializers/wrap_parameters.rb
 
 Add this file with the following contents, if you wish to wrap parameters into a nested hash. This is on by default in new applications.
-- 
cgit v1.2.3


From 8126c7c2f7ebacf928f1323d711f0155a770a8bf Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 23 Aug 2016 13:09:29 -0500
Subject: [ci skip] asset_pipeline.md assets.unknown_asset_fallback

---
 guides/source/asset_pipeline.md | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index 701304acde..de48da6e9d 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -485,7 +485,7 @@ which contains these lines:
 
 Rails creates both `app/assets/javascripts/application.js` and
 `app/assets/stylesheets/application.css` regardless of whether the
---skip-sprockets option is used when creating a new Rails application. This is
+--skip-sprockets option is used when creating a new rails application. This is
 so you can easily add asset pipelining later if you like.
 
 The directives that work in JavaScript files also work in stylesheets
@@ -586,6 +586,19 @@ in your application are included in the `config.assets.precompile` list.
 If `config.assets.digest` is also true, the asset pipeline will require that
 all requests for assets include digests.
 
+### Raise an Error When an Asset is Not Found
+
+If you are using a recent version of sprockets-rails you can configure what happens
+when an asset lookup is performed and nothing is found. If you turn off "asset fallback"
+then an error will be raised when an asset cannot be found.
+
+```ruby
+config.assets.unknown_asset_fallback = false
+```
+
+If "asset fallback" is enabled then when an asset cannot be found the path will be
+output instead and no error raised.
+
 ### Turning Digests Off
 
 You can turn off digests by updating `config/environments/development.rb` to
@@ -724,7 +737,7 @@ If you have other manifests or individual stylesheets and JavaScript files to
 include, you can add them to the `precompile` array in `config/initializers/assets.rb`:
 
 ```ruby
-Rails.application.config.assets.precompile += %w( admin.js admin.css )
+Rails.application.config.assets.precompile += ['admin.js', 'admin.css', 'swfObject.js']
 ```
 
 NOTE. Always specify an expected compiled filename that ends with .js or .css,
@@ -1024,7 +1037,7 @@ to tell our CDN (and browser) that the asset is "public", that means any cache
 can store the request. Also we commonly want to set `max-age` which is how long
 the cache will store the object before invalidating the cache. The `max-age`
 value is set to seconds with a maximum possible value of `31536000` which is one
-year. You can do this in your Rails application by setting
+year. You can do this in your rails application by setting
 
 ```
 config.public_file_server.headers = {
@@ -1109,9 +1122,9 @@ Windows you have a JavaScript runtime installed in your operating system.
 
 ### Serving GZipped version of assets
 
-By default, gzipped version of compiled assets will be generated, along with
-the non-gzipped version of assets. Gzipped assets help reduce the transmission
-of data over the wire. You can configure this by setting the `gzip` flag.
+By default, gzipped version of compiled assets will be generated, along
+with the non-gzipped version of assets. Gzipped assets help reduce the transmission of
+data over the wire. You can configure this by setting the `gzip` flag.
 
 ```ruby
 config.assets.gzip = false # disable gzipped assets generation
@@ -1291,7 +1304,7 @@ config.assets.digest = true
 
 # Precompile additional assets (application.js, application.css, and all
 # non-JS/CSS are already added)
-# config.assets.precompile += %w( admin.js admin.css )
+# config.assets.precompile += %w( search.js )
 ```
 
 Rails 4 and above no longer set default config values for Sprockets in `test.rb`, so
-- 
cgit v1.2.3


From e1bd2f59dde8a3ac1dafc529aa0470a5ae2a60e2 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 23 Aug 2016 13:09:43 -0500
Subject: [ci skip] configuring.md assets.unknown_asset_fallback

---
 guides/source/configuring.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index c938edd8f7..1ca66f66a5 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -169,6 +169,8 @@ pipeline is enabled. It is set to `true` by default.
 
 * `config.assets.precompile` allows you to specify additional assets (other than `application.css` and `application.js`) which are to be precompiled when `rake assets:precompile` is run.
 
+* `config.assets.unknown_asset_fallback` allows you to modify the behavior of the asset pipeline when an asset is not in the pipeline with recent verisons of sprockets-rails.
+
 * `config.assets.prefix` defines the prefix where assets are served from. Defaults to `/assets`.
 
 * `config.assets.manifest` defines the full path to be used for the asset precompiler's manifest file. Defaults to a file named `manifest-<random>.json` in the `config.assets.prefix` directory within the public folder.
-- 
cgit v1.2.3


From a7256c30ae9fdbfc336f1556cccce2e0866cc1ad Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 23 Aug 2016 13:15:28 -0500
Subject: Thanks rubocop

---
 railties/test/application/asset_debugging_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index e6a660cf25..ac42cbcec9 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -130,7 +130,7 @@ module ApplicationTests
     test "{ public_folder: true } does not use the asset pipeline" do
       cases = {
         /\/assets\/application-.*.\.js/ => {},
-        /application.js/                => { public_folder: true},
+        /application.js/                => { public_folder: true },
       }
       cases.each do |(tag_match, options_hash)|
         app_file "app/views/posts/index.html.erb", "<%= asset_path('application.js', #{ options_hash }) %>"
-- 
cgit v1.2.3


From 58bd1124cf333f0e980dfbb31b38240d1004aa77 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Thu, 25 Aug 2016 12:29:54 -0500
Subject: Move default to different initializer

Is this usage correct? cc/ @prathamesh-sonpatki
---
 guides/source/upgrading_ruby_on_rails.md                     | 12 ------------
 .../rails/app/templates/config/initializers/assets.rb.tt     |  4 ----
 .../config/initializers/new_framework_defaults.rb.tt         |  4 ++++
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 4530990280..2372590cec 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -1444,18 +1444,6 @@ config.public_file_server.headers = {
 }
 ```
 
-### config/initializers/assets.rb
-
-In the most recent verison of sprockets-rails there is a flag available to configure what happens when
-an asset lookup is performed and no asset is found. By setting this value to false, an error will be
-raised so the asset lookup does not fail silently.
-
-```ruby
-# Unknown asset fallback will return the path passed in when the given
-# asset is not present in the asset pipeline.
-Rails.application.config.assets.unknown_asset_fallback = false
-```
-
 ### config/initializers/wrap_parameters.rb
 
 Add this file with the following contents, if you wish to wrap parameters into a nested hash. This is on by default in new applications.
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
index 41f0fbf262..2318cf59ff 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt
@@ -6,10 +6,6 @@ Rails.application.config.assets.version = '1.0'
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path
 
-# Unknown asset fallback will return the path passed in when the given
-# asset is not present in the asset pipeline.
-Rails.application.config.assets.unknown_asset_fallback = false
-
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt
index e539f4c457..4dbc3e771b 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt
@@ -32,3 +32,7 @@ ActiveSupport.halt_callback_chains_on_return_false = <%= options[:update] ? true
 # Configure SSL options to enable HSTS with subdomains. Previous versions had false.
 Rails.application.config.ssl_options = { hsts: { subdomains: true } }
 <%- end -%>
+
+# Unknown asset fallback will return the path passed in when the given
+# asset is not present in the asset pipeline.
+Rails.application.config.assets.unknown_asset_fallback = false
-- 
cgit v1.2.3


From 893035782d427b1fea3d1299417b507220752c3e Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Thu, 25 Aug 2016 20:27:10 -0500
Subject: Set unknown_asset_fallback false only new apps

---
 .../app/templates/config/initializers/new_framework_defaults.rb.tt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt
index 4dbc3e771b..5ad18cc5ad 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt
@@ -35,4 +35,4 @@ Rails.application.config.ssl_options = { hsts: { subdomains: true } }
 
 # Unknown asset fallback will return the path passed in when the given
 # asset is not present in the asset pipeline.
-Rails.application.config.assets.unknown_asset_fallback = false
+Rails.application.config.assets.unknown_asset_fallback = <%= options[:update] ? true : false %>
-- 
cgit v1.2.3


From b6b4d6980b815555ae17da5a8006590eb53ec264 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Thu, 25 Aug 2016 20:27:51 -0500
Subject: Specify version of Sprockets-rails this will be in

---
 guides/source/asset_pipeline.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index de48da6e9d..b549cef47d 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -588,7 +588,7 @@ all requests for assets include digests.
 
 ### Raise an Error When an Asset is Not Found
 
-If you are using a recent version of sprockets-rails you can configure what happens
+If you are using sprockets-rails >= 3.2.0 you can configure what happens
 when an asset lookup is performed and nothing is found. If you turn off "asset fallback"
 then an error will be raised when an asset cannot be found.
 
-- 
cgit v1.2.3


From 581d9685ea3ab1e3669c66f4b873a1840d7cd6fe Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Mon, 29 Aug 2016 10:42:27 -0500
Subject: Fix asset_pipeline.md miss-merge

---
 guides/source/asset_pipeline.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index b549cef47d..c3ceb9c790 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -485,7 +485,7 @@ which contains these lines:
 
 Rails creates both `app/assets/javascripts/application.js` and
 `app/assets/stylesheets/application.css` regardless of whether the
---skip-sprockets option is used when creating a new rails application. This is
+--skip-sprockets option is used when creating a new Rails application. This is
 so you can easily add asset pipelining later if you like.
 
 The directives that work in JavaScript files also work in stylesheets
@@ -737,7 +737,7 @@ If you have other manifests or individual stylesheets and JavaScript files to
 include, you can add them to the `precompile` array in `config/initializers/assets.rb`:
 
 ```ruby
-Rails.application.config.assets.precompile += ['admin.js', 'admin.css', 'swfObject.js']
+Rails.application.config.assets.precompile += %w( admin.js admin.css )
 ```
 
 NOTE. Always specify an expected compiled filename that ends with .js or .css,
@@ -1037,7 +1037,7 @@ to tell our CDN (and browser) that the asset is "public", that means any cache
 can store the request. Also we commonly want to set `max-age` which is how long
 the cache will store the object before invalidating the cache. The `max-age`
 value is set to seconds with a maximum possible value of `31536000` which is one
-year. You can do this in your rails application by setting
+year. You can do this in your Rails application by setting
 
 ```
 config.public_file_server.headers = {
@@ -1122,9 +1122,9 @@ Windows you have a JavaScript runtime installed in your operating system.
 
 ### Serving GZipped version of assets
 
-By default, gzipped version of compiled assets will be generated, along
-with the non-gzipped version of assets. Gzipped assets help reduce the transmission of
-data over the wire. You can configure this by setting the `gzip` flag.
+By default, gzipped version of compiled assets will be generated, along with
+the non-gzipped version of assets. Gzipped assets help reduce the transmission
+of data over the wire. You can configure this by setting the `gzip` flag.
 
 ```ruby
 config.assets.gzip = false # disable gzipped assets generation
@@ -1304,7 +1304,7 @@ config.assets.digest = true
 
 # Precompile additional assets (application.js, application.css, and all
 # non-JS/CSS are already added)
-# config.assets.precompile += %w( search.js )
+# config.assets.precompile += %w( admin.js admin.css )
 ```
 
 Rails 4 and above no longer set default config values for Sprockets in `test.rb`, so
-- 
cgit v1.2.3


From 8bcf42c4b36caaf835e8312c11eccb830049855b Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Mon, 29 Aug 2016 10:48:25 -0500
Subject: Address doc style comments from @robin850

---
 actionview/lib/action_view/helpers/asset_url_helper.rb | 18 +++++++++---------
 guides/source/configuring.md                           |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb
index c5b5e77178..dc46cad410 100644
--- a/actionview/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -121,21 +121,21 @@ module ActionView
       # This is the entry point for all assets.
       # When using the asset pipeline (i.e. sprockets and sprockets-rails), the
       # behavior is "enhanced". You can bypass the asset pipeline by passing in
-      # `public_folder: true` to the options.
+      # <tt>public_folder: true</tt> to the options.
       #
       # All other asset *_path helpers delegate through this method.
       #
       # === With the asset pipeline
       #
-      # All options passed to asset_path will be passed to `compute_asset_path
+      # All options passed to +asset_path+ will be passed to +compute_asset_path+
       # which is implemented by sprockets-rails.
       #
       #      asset_path("application.js") # => "/assets/application-60aa4fdc5cea14baf5400fba1abf4f2a46a5166bad4772b1effe341570f07de9.js"
       #
-      # === Without the asset pipeline (`public_folder: true`)
+      # === Without the asset pipeline (<tt>public_folder: true</tt>)
       #
-      # Accepts a `type` option that can specify the asset's extension. No error
-      # checking is done to verify the source passed into `asset_path` is valid
+      # Accepts a <tt>type</tt> option that can specify the asset's extension. No error
+      # checking is done to verify the source passed into +asset_path+ is valid
       # and that the file exists on disk.
       #
       #      asset_path("application.js", public_folder: true)                 # => "application.js"
@@ -145,7 +145,7 @@ module ActionView
       #
       # === Options applying to all assets
       #
-      # Below lists scenarios that apply to `asset_path` whether or not you're
+      # Below lists scenarios that apply to +asset_path+ whether or not you're
       # using the asset pipeline.
       #
       # - All fully qualified urls are returned immediately. This bypasses the
@@ -163,19 +163,19 @@ module ActionView
       #
       #     asset_path("") # => ""
       #
-      # - If `config.relative_url_root` is specified, all assets will have that
+      # - If <tt>config.relative_url_root</tt> is specified, all assets will have that
       #   root prepended.
       #
       #     Rails.application.config.relative_url_root = "bar"
       #     asset_path("foo.js", public_folder: true) # => "bar/foo.js"
       #
-      # - A different asset host can be specified via `config.action_controller.asset_host`
+      # - A different asset host can be specified via <tt>config.action_controller.asset_host</tt>
       #   this is commonly used in conjunction with a CDN.
       #
       #     Rails.application.config.action_controller.asset_host = "assets.example.com"
       #     asset_path("foo.js", public_folder: true) # => "http://assets.example.com/foo.js"
       #
-      # - An extension name can be specified manually with `extname`.
+      # - An extension name can be specified manually with <tt>extname</tt>.
       #
       #     asset_path("foo", public_folder: true, extname: ".js")     # => "/foo.js"
       #     asset_path("foo.css", public_folder: true, extname: ".js") # => "/foo.css.js"
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 1ca66f66a5..283aae8178 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -169,7 +169,7 @@ pipeline is enabled. It is set to `true` by default.
 
 * `config.assets.precompile` allows you to specify additional assets (other than `application.css` and `application.js`) which are to be precompiled when `rake assets:precompile` is run.
 
-* `config.assets.unknown_asset_fallback` allows you to modify the behavior of the asset pipeline when an asset is not in the pipeline with recent verisons of sprockets-rails.
+* `config.assets.unknown_asset_fallback` allows you to modify the behavior of the asset pipeline when an asset is not in the pipeline, if you use sprockets-rails 3.2.0 or newer.
 
 * `config.assets.prefix` defines the prefix where assets are served from. Defaults to `/assets`.
 
-- 
cgit v1.2.3


From 981ac09332b8c5210408bbc2f5fa4a99fead6a26 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Mon, 29 Aug 2016 12:40:02 -0500
Subject: Document public_poster_folder option

---
 actionview/lib/action_view/helpers/asset_tag_helper.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb
index 92bf132fbc..8dc879611c 100644
--- a/actionview/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_tag_helper.rb
@@ -257,6 +257,8 @@ module ActionView
       # * <tt>:size</tt> - Supplied as "{Width}x{Height}" or "{Number}", so "30x45" becomes
       #   width="30" and height="45", and "50" becomes width="50" and height="50".
       #   <tt>:size</tt> will be ignored if the value is not in the correct format.
+      # * <tt>:public_poster_folder</tt> will bypass the asset pipeline when using
+      #   the <tt>:poster</tt> option instead using an asset in the public folder.
       #
       # ==== Examples
       #
@@ -268,6 +270,8 @@ module ActionView
       #   # => <video preload="none" controls="controls" src="/videos/trailer.ogg" ></video>
       #   video_tag("trailer.m4v", size: "16x10", poster: "screenshot.png")
       #   # => <video src="/videos/trailer.m4v" width="16" height="10" poster="/assets/screenshot.png"></video>
+      #   video_tag("trailer.m4v", size: "16x10", poster: "screenshot.png", public_poster_folder: true)
+      #   # => <video src="/videos/trailer.m4v" width="16" height="10" poster="screenshot.png"></video>
       #   video_tag("/trailers/hd.avi", size: "16x16")
       #   # => <video src="/trailers/hd.avi" width="16" height="16"></video>
       #   video_tag("/trailers/hd.avi", size: "16")
-- 
cgit v1.2.3


From e1791d1dd4820157654e59d2e9315b4975e3c36a Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Mon, 29 Aug 2016 12:42:20 -0500
Subject: Explicitly mention defaults.

---
 guides/source/asset_pipeline.md | 2 +-
 guides/source/configuring.md    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index c3ceb9c790..41dfeea84d 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -597,7 +597,7 @@ config.assets.unknown_asset_fallback = false
 ```
 
 If "asset fallback" is enabled then when an asset cannot be found the path will be
-output instead and no error raised.
+output instead and no error raised. The asset fallback behavior is enabled by default.
 
 ### Turning Digests Off
 
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 283aae8178..a115683134 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -169,7 +169,7 @@ pipeline is enabled. It is set to `true` by default.
 
 * `config.assets.precompile` allows you to specify additional assets (other than `application.css` and `application.js`) which are to be precompiled when `rake assets:precompile` is run.
 
-* `config.assets.unknown_asset_fallback` allows you to modify the behavior of the asset pipeline when an asset is not in the pipeline, if you use sprockets-rails 3.2.0 or newer.
+* `config.assets.unknown_asset_fallback` allows you to modify the behavior of the asset pipeline when an asset is not in the pipeline, if you use sprockets-rails 3.2.0 or newer. Defaults to `true`.
 
 * `config.assets.prefix` defines the prefix where assets are served from. Defaults to `/assets`.
 
-- 
cgit v1.2.3


From 3ee9d0061fa042a9fcffa864ffa1492a00d0d179 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 30 Aug 2016 10:26:13 -0500
Subject: Address comment via @dhh, better option naming

---
 .../lib/action_view/helpers/asset_tag_helper.rb    | 16 ++++++++--------
 .../lib/action_view/helpers/asset_url_helper.rb    | 22 +++++++++++-----------
 railties/test/application/asset_debugging_test.rb  |  8 ++++----
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb
index 8dc879611c..9c22fb0bde 100644
--- a/actionview/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_tag_helper.rb
@@ -56,7 +56,7 @@ module ActionView
       #   # => <script src="http://www.example.com/xmlhr.js"></script>
       def javascript_include_tag(*sources)
         options = sources.extract_options!.stringify_keys
-        path_options = options.extract!("protocol", "extname", "host", "public_folder").symbolize_keys
+        path_options = options.extract!("protocol", "extname", "host", "skip_pipeline").symbolize_keys
         sources.uniq.map { |source|
           tag_options = {
             "src" => path_to_javascript(source, path_options)
@@ -92,7 +92,7 @@ module ActionView
       #   #    <link href="/css/stylish.css" media="screen" rel="stylesheet" />
       def stylesheet_link_tag(*sources)
         options = sources.extract_options!.stringify_keys
-        path_options = options.extract!("protocol", "host", "public_folder").symbolize_keys
+        path_options = options.extract!("protocol", "host", "skip_pipeline").symbolize_keys
         sources.uniq.map { |source|
           tag_options = {
             "rel" => "stylesheet",
@@ -173,7 +173,7 @@ module ActionView
         tag("link", {
           rel: "shortcut icon",
           type: "image/x-icon",
-          href: path_to_image(source, public_folder: options.delete(:public_folder))
+          href: path_to_image(source, skip_pipeline: options.delete(:skip_pipeline))
         }.merge!(options.symbolize_keys))
       end
 
@@ -211,7 +211,7 @@ module ActionView
         options = options.symbolize_keys
         check_for_image_tag_errors(options)
 
-        src = options[:src] = path_to_image(source, public_folder: options.delete(:public_folder))
+        src = options[:src] = path_to_image(source, skip_pipeline: options.delete(:skip_pipeline))
 
         unless src.start_with?("cid:") || src.start_with?("data:") || src.blank?
           options[:alt] = options.fetch(:alt) { image_alt(src) }
@@ -289,7 +289,7 @@ module ActionView
         public_poster_folder = options.delete(:public_poster_folder)
         sources << options
         multiple_sources_tag_builder("video", sources) do |options|
-          options[:poster] = path_to_image(options[:poster], public_folder: public_poster_folder) if options[:poster]
+          options[:poster] = path_to_image(options[:poster], skip_pipeline: public_poster_folder) if options[:poster]
           options[:width], options[:height] = extract_dimensions(options.delete(:size)) if options[:size]
         end
       end
@@ -313,17 +313,17 @@ module ActionView
       private
         def multiple_sources_tag_builder(type, sources)
           options       = sources.extract_options!.symbolize_keys
-          public_folder = options.delete(:public_folder)
+          skip_pipeline = options.delete(:skip_pipeline)
           sources.flatten!
 
           yield options if block_given?
 
           if sources.size > 1
             content_tag(type, options) do
-              safe_join sources.map { |source| tag("source", src: send("path_to_#{type}", source, public_folder: public_folder)) }
+              safe_join sources.map { |source| tag("source", src: send("path_to_#{type}", source, skip_pipeline: skip_pipeline)) }
             end
           else
-            options[:src] = send("path_to_#{type}", sources.first, public_folder: public_folder)
+            options[:src] = send("path_to_#{type}", sources.first, skip_pipeline: skip_pipeline)
             content_tag(type, nil, options)
           end
         end
diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb
index dc46cad410..d1f85d3319 100644
--- a/actionview/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -121,7 +121,7 @@ module ActionView
       # This is the entry point for all assets.
       # When using the asset pipeline (i.e. sprockets and sprockets-rails), the
       # behavior is "enhanced". You can bypass the asset pipeline by passing in
-      # <tt>public_folder: true</tt> to the options.
+      # <tt>skip_pipeline: true</tt> to the options.
       #
       # All other asset *_path helpers delegate through this method.
       #
@@ -132,16 +132,16 @@ module ActionView
       #
       #      asset_path("application.js") # => "/assets/application-60aa4fdc5cea14baf5400fba1abf4f2a46a5166bad4772b1effe341570f07de9.js"
       #
-      # === Without the asset pipeline (<tt>public_folder: true</tt>)
+      # === Without the asset pipeline (<tt>skip_pipeline: true</tt>)
       #
       # Accepts a <tt>type</tt> option that can specify the asset's extension. No error
       # checking is done to verify the source passed into +asset_path+ is valid
       # and that the file exists on disk.
       #
-      #      asset_path("application.js", public_folder: true)                 # => "application.js"
-      #      asset_path("filedoesnotexist.png", public_folder: true)           # => "filedoesnotexist.png"
-      #      asset_path("application", type: :javascript, public_folder: true) # => "/javascripts/application.js"
-      #      asset_path("application", type: :stylesheet, public_folder: true) # => "/stylesheets/application.css"
+      #      asset_path("application.js", skip_pipeline: true)                 # => "application.js"
+      #      asset_path("filedoesnotexist.png", skip_pipeline: true)           # => "filedoesnotexist.png"
+      #      asset_path("application", type: :javascript, skip_pipeline: true) # => "/javascripts/application.js"
+      #      asset_path("application", type: :stylesheet, skip_pipeline: true) # => "/stylesheets/application.css"
       #
       # === Options applying to all assets
       #
@@ -167,18 +167,18 @@ module ActionView
       #   root prepended.
       #
       #     Rails.application.config.relative_url_root = "bar"
-      #     asset_path("foo.js", public_folder: true) # => "bar/foo.js"
+      #     asset_path("foo.js", skip_pipeline: true) # => "bar/foo.js"
       #
       # - A different asset host can be specified via <tt>config.action_controller.asset_host</tt>
       #   this is commonly used in conjunction with a CDN.
       #
       #     Rails.application.config.action_controller.asset_host = "assets.example.com"
-      #     asset_path("foo.js", public_folder: true) # => "http://assets.example.com/foo.js"
+      #     asset_path("foo.js", skip_pipeline: true) # => "http://assets.example.com/foo.js"
       #
       # - An extension name can be specified manually with <tt>extname</tt>.
       #
-      #     asset_path("foo", public_folder: true, extname: ".js")     # => "/foo.js"
-      #     asset_path("foo.css", public_folder: true, extname: ".js") # => "/foo.css.js"
+      #     asset_path("foo", skip_pipeline: true, extname: ".js")     # => "/foo.js"
+      #     asset_path("foo.css", skip_pipeline: true, extname: ".js") # => "/foo.css.js"
       def asset_path(source, options = {})
         raise ArgumentError, "nil is not a valid asset source" if source.nil?
 
@@ -193,7 +193,7 @@ module ActionView
         end
 
         if source[0] != ?/
-          if options[:public_folder]
+          if options[:skip_pipeline]
             source = public_compute_asset_path(source, options)
           else
             source = compute_asset_path(source, options)
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index ac42cbcec9..06d170fa4a 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -88,7 +88,7 @@ module ApplicationTests
       }
 
       cases.each do |(view_method, tag_match)|
-        app_file "app/views/posts/index.html.erb", "<%= #{ view_method } '#{contents}', public_folder: true %>"
+        app_file "app/views/posts/index.html.erb", "<%= #{ view_method } '#{contents}', skip_pipeline: true %>"
 
         app "development"
 
@@ -114,7 +114,7 @@ module ApplicationTests
       }
 
       cases.each do |(view_method, tag_match)|
-        app_file "app/views/posts/index.html.erb", "<%= #{ view_method } '#{contents}', public_folder: true %>"
+        app_file "app/views/posts/index.html.erb", "<%= #{ view_method } '#{contents}', skip_pipeline: true %>"
 
         app "development"
 
@@ -127,10 +127,10 @@ module ApplicationTests
       end
     end
 
-    test "{ public_folder: true } does not use the asset pipeline" do
+    test "{ skip_pipeline: true } does not use the asset pipeline" do
       cases = {
         /\/assets\/application-.*.\.js/ => {},
-        /application.js/                => { public_folder: true },
+        /application.js/                => { skip_pipeline: true },
       }
       cases.each do |(tag_match, options_hash)|
         app_file "app/views/posts/index.html.erb", "<%= asset_path('application.js', #{ options_hash }) %>"
-- 
cgit v1.2.3


From ab5857a53a50cf9de0a8b869c5f43b1acdb90aa5 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 30 Aug 2016 15:02:56 -0500
Subject: Better keyword argument name

---
 actionview/lib/action_view/helpers/asset_tag_helper.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb
index 9c22fb0bde..2b9c1a8ceb 100644
--- a/actionview/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_tag_helper.rb
@@ -257,7 +257,7 @@ module ActionView
       # * <tt>:size</tt> - Supplied as "{Width}x{Height}" or "{Number}", so "30x45" becomes
       #   width="30" and height="45", and "50" becomes width="50" and height="50".
       #   <tt>:size</tt> will be ignored if the value is not in the correct format.
-      # * <tt>:public_poster_folder</tt> will bypass the asset pipeline when using
+      # * <tt>:poster_skip_pipeline</tt> will bypass the asset pipeline when using
       #   the <tt>:poster</tt> option instead using an asset in the public folder.
       #
       # ==== Examples
@@ -270,7 +270,7 @@ module ActionView
       #   # => <video preload="none" controls="controls" src="/videos/trailer.ogg" ></video>
       #   video_tag("trailer.m4v", size: "16x10", poster: "screenshot.png")
       #   # => <video src="/videos/trailer.m4v" width="16" height="10" poster="/assets/screenshot.png"></video>
-      #   video_tag("trailer.m4v", size: "16x10", poster: "screenshot.png", public_poster_folder: true)
+      #   video_tag("trailer.m4v", size: "16x10", poster: "screenshot.png", poster_skip_pipeline: true)
       #   # => <video src="/videos/trailer.m4v" width="16" height="10" poster="screenshot.png"></video>
       #   video_tag("/trailers/hd.avi", size: "16x16")
       #   # => <video src="/trailers/hd.avi" width="16" height="16"></video>
@@ -286,7 +286,7 @@ module ActionView
       #   # => <video height="120" width="160"><source src="/videos/trailer.ogg" /><source src="/videos/trailer.flv" /></video>
       def video_tag(*sources)
         options = sources.extract_options!.symbolize_keys
-        public_poster_folder = options.delete(:public_poster_folder)
+        public_poster_folder = options.delete(:poster_skip_pipeline)
         sources << options
         multiple_sources_tag_builder("video", sources) do |options|
           options[:poster] = path_to_image(options[:poster], skip_pipeline: public_poster_folder) if options[:poster]
-- 
cgit v1.2.3


From 70dd041f354dfc71b7e516d5ba5725c769ef06d9 Mon Sep 17 00:00:00 2001
From: schneems <richard.schneeman@gmail.com>
Date: Tue, 30 Aug 2016 15:04:23 -0500
Subject: Fix style

---
 .../lib/action_view/helpers/asset_url_helper.rb    | 10 ++---
 railties/test/application/asset_debugging_test.rb  | 52 +++++++++++-----------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb
index d1f85d3319..0967245855 100644
--- a/actionview/lib/action_view/helpers/asset_url_helper.rb
+++ b/actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -130,7 +130,7 @@ module ActionView
       # All options passed to +asset_path+ will be passed to +compute_asset_path+
       # which is implemented by sprockets-rails.
       #
-      #      asset_path("application.js") # => "/assets/application-60aa4fdc5cea14baf5400fba1abf4f2a46a5166bad4772b1effe341570f07de9.js"
+      #   asset_path("application.js") # => "/assets/application-60aa4fdc5cea14baf5400fba1abf4f2a46a5166bad4772b1effe341570f07de9.js"
       #
       # === Without the asset pipeline (<tt>skip_pipeline: true</tt>)
       #
@@ -138,10 +138,10 @@ module ActionView
       # checking is done to verify the source passed into +asset_path+ is valid
       # and that the file exists on disk.
       #
-      #      asset_path("application.js", skip_pipeline: true)                 # => "application.js"
-      #      asset_path("filedoesnotexist.png", skip_pipeline: true)           # => "filedoesnotexist.png"
-      #      asset_path("application", type: :javascript, skip_pipeline: true) # => "/javascripts/application.js"
-      #      asset_path("application", type: :stylesheet, skip_pipeline: true) # => "/stylesheets/application.css"
+      #   asset_path("application.js", skip_pipeline: true)                 # => "application.js"
+      #   asset_path("filedoesnotexist.png", skip_pipeline: true)           # => "filedoesnotexist.png"
+      #   asset_path("application", type: :javascript, skip_pipeline: true) # => "/javascripts/application.js"
+      #   asset_path("application", type: :stylesheet, skip_pipeline: true) # => "/stylesheets/application.css"
       #
       # === Options applying to all assets
       #
diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index 06d170fa4a..3e17a1efa5 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -72,23 +72,23 @@ module ApplicationTests
     test "public path and tag methods are not over-written by the asset pipeline" do
       contents = "doesnotexist"
       cases = {
-        asset_path:             %r{/#{ contents }},
-        image_path:             %r{/images/#{ contents }},
-        video_path:             %r{/videos/#{ contents }},
-        audio_path:             %r{/audios/#{ contents }},
-        font_path:              %r{/fonts/#{ contents }},
-        javascript_path:        %r{/javascripts/#{ contents }},
-        stylesheet_path:        %r{/stylesheets/#{ contents }},
-        image_tag:              %r{<img src="/images/#{ contents }"},
-        favicon_link_tag:       %r{<link rel="shortcut icon" type="image/x-icon" href="/images/#{ contents }" />},
-        stylesheet_link_tag:    %r{<link rel="stylesheet" media="screen" href="/stylesheets/#{ contents }.css" />},
-        javascript_include_tag: %r{<script src="/javascripts/#{ contents }.js">},
-        audio_tag:              %r{<audio src="/audios/#{ contents }"></audio>},
-        video_tag:              %r{<video src="/videos/#{ contents }"></video>}
+        asset_path:             %r{/#{contents}},
+        image_path:             %r{/images/#{contents}},
+        video_path:             %r{/videos/#{contents}},
+        audio_path:             %r{/audios/#{contents}},
+        font_path:              %r{/fonts/#{contents}},
+        javascript_path:        %r{/javascripts/#{contents}},
+        stylesheet_path:        %r{/stylesheets/#{contents}},
+        image_tag:              %r{<img src="/images/#{contents}"},
+        favicon_link_tag:       %r{<link rel="shortcut icon" type="image/x-icon" href="/images/#{contents}" />},
+        stylesheet_link_tag:    %r{<link rel="stylesheet" media="screen" href="/stylesheets/#{contents}.css" />},
+        javascript_include_tag: %r{<script src="/javascripts/#{contents}.js">},
+        audio_tag:              %r{<audio src="/audios/#{contents}"></audio>},
+        video_tag:              %r{<video src="/videos/#{contents}"></video>}
       }
 
       cases.each do |(view_method, tag_match)|
-        app_file "app/views/posts/index.html.erb", "<%= #{ view_method } '#{contents}', skip_pipeline: true %>"
+        app_file "app/views/posts/index.html.erb", "<%= #{view_method} '#{contents}', skip_pipeline: true %>"
 
         app "development"
 
@@ -97,24 +97,24 @@ module ApplicationTests
         get "/posts?debug_assets=true"
 
         body = last_response.body
-        assert_match(tag_match, body, "Expected `#{view_method}` to produce a match to #{ tag_match }, but did not: #{ body }")
+        assert_match(tag_match, body, "Expected `#{view_method}` to produce a match to #{tag_match}, but did not: #{body}")
       end
     end
 
     test "public url methods are not over-written by the asset pipeline" do
       contents = "doesnotexist"
       cases = {
-        asset_url:       %r{http://example.org/#{ contents }},
-        image_url:       %r{http://example.org/images/#{ contents }},
-        video_url:       %r{http://example.org/videos/#{ contents }},
-        audio_url:       %r{http://example.org/audios/#{ contents }},
-        font_url:        %r{http://example.org/fonts/#{ contents }},
-        javascript_url:  %r{http://example.org/javascripts/#{ contents }},
-        stylesheet_url:  %r{http://example.org/stylesheets/#{ contents }},
+        asset_url:       %r{http://example.org/#{contents}},
+        image_url:       %r{http://example.org/images/#{contents}},
+        video_url:       %r{http://example.org/videos/#{contents}},
+        audio_url:       %r{http://example.org/audios/#{contents}},
+        font_url:        %r{http://example.org/fonts/#{contents}},
+        javascript_url:  %r{http://example.org/javascripts/#{contents}},
+        stylesheet_url:  %r{http://example.org/stylesheets/#{contents}},
       }
 
       cases.each do |(view_method, tag_match)|
-        app_file "app/views/posts/index.html.erb", "<%= #{ view_method } '#{contents}', skip_pipeline: true %>"
+        app_file "app/views/posts/index.html.erb", "<%= #{view_method} '#{contents}', skip_pipeline: true %>"
 
         app "development"
 
@@ -123,7 +123,7 @@ module ApplicationTests
         get "/posts?debug_assets=true"
 
         body = last_response.body
-        assert_match(tag_match, body, "Expected `#{view_method}` to produce a match to #{ tag_match }, but did not: #{ body }")
+        assert_match(tag_match, body, "Expected `#{view_method}` to produce a match to #{tag_match}, but did not: #{body}")
       end
     end
 
@@ -133,7 +133,7 @@ module ApplicationTests
         /application.js/                => { skip_pipeline: true },
       }
       cases.each do |(tag_match, options_hash)|
-        app_file "app/views/posts/index.html.erb", "<%= asset_path('application.js', #{ options_hash }) %>"
+        app_file "app/views/posts/index.html.erb", "<%= asset_path('application.js', #{options_hash}) %>"
 
         app "development"
 
@@ -142,7 +142,7 @@ module ApplicationTests
         get "/posts?debug_assets=true"
 
         body = last_response.body.strip
-        assert_match(tag_match, body, "Expected `asset_path` with `#{ options_hash}` to produce a match to #{ tag_match }, but did not: #{ body }")
+        assert_match(tag_match, body, "Expected `asset_path` with `#{options_hash}` to produce a match to #{tag_match}, but did not: #{body}")
       end
     end
 
-- 
cgit v1.2.3