Merge pull request #517 from etiennebarrie/add-deprecator

Use a dedicated ActiveSupport::Deprecation

lib/sprockets/rails.rb

@@ -1,4 +1,13 @@
 require 'sprockets/rails/version'
+require 'active_support'
 if defined? Rails::Railtie
   require 'sprockets/railtie'
 end
+
+module Sprockets
+  module Rails
+    def self.deprecator
+      @deprecator ||= ActiveSupport::Deprecation.new("4.0", "Sprockets::Rails")
+    end
+  end
+end

lib/sprockets/rails/helper.rb

@@ -89,7 +89,7 @@ def compute_asset_path(path, options = {})
             message << "To bypass the asset pipeline and preserve this behavior,\n"
             message << "use the `skip_pipeline: true` option.\n"
 
-            ActiveSupport::Deprecation.warn(message, caller_locations)
+            Sprockets::Rails.deprecator.warn(message, caller_locations)
           end
           super
         end

lib/sprockets/railtie.rb

@@ -125,6 +125,10 @@ def configure(&block)
       Sprockets.register_postprocessor "application/javascript", ::Sprockets::Rails::SourcemappingUrlProcessor
     end
 
+    initializer "sprockets-rails.deprecator" do |app|
+      app.deprecators[:sprockets_rails] = Sprockets::Rails.deprecator if app.respond_to?(:deprecators)
+    end
+
     config.assets.version     = ""
     config.assets.debug       = false
     config.assets.compile     = true

test/test_helper.rb

@@ -2,6 +2,7 @@
 
 require 'action_view'
 require 'sprockets'
+require 'sprockets/rails'
 require 'sprockets/rails/context'
 require 'sprockets/rails/helper'
 require 'rails/version'
@@ -113,7 +114,7 @@ def assert_servable_asset_url(url)
 
 class NoHostHelperTest < HelperTest
   def test_javascript_include_tag
-    ActiveSupport::Deprecation.silence do
+    Sprockets::Rails.deprecator.silence do
       assert_dom_equal %(<script src="/javascripts/static.js"></script>),
         @view.javascript_include_tag("static")
       assert_dom_equal %(<script src="/javascripts/static.js"></script>),
@@ -141,7 +142,7 @@ def test_javascript_include_tag
   end
 
   def test_stylesheet_link_tag
-    ActiveSupport::Deprecation.silence do
+    Sprockets::Rails.deprecator.silence do
       assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" />),
         @view.stylesheet_link_tag("static")
       assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" />),
@@ -169,7 +170,7 @@ def test_stylesheet_link_tag
   end
 
   def test_javascript_include_tag_integrity
-    ActiveSupport::Deprecation.silence do
+    Sprockets::Rails.deprecator.silence do
       assert_dom_equal %(<script src="/javascripts/static.js" integrity="sha-256-TvVUHzSfftWg1rcfL6TIJ0XKEGrgLyEq6lEpcmrG9qs="></script>),
         @view.javascript_include_tag("static", integrity: "sha-256-TvVUHzSfftWg1rcfL6TIJ0XKEGrgLyEq6lEpcmrG9qs=")
 
@@ -183,7 +184,7 @@ def test_javascript_include_tag_integrity
   end
 
   def test_stylesheet_link_tag_integrity
-    ActiveSupport::Deprecation.silence do
+    Sprockets::Rails.deprecator.silence do
       assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" integrity="sha-256-5YzTQPuOJz/EpeXfN/+v1sxsjAj/dw8q26abiHZM3A4=" />),
         @view.stylesheet_link_tag("static", integrity: "sha-256-5YzTQPuOJz/EpeXfN/+v1sxsjAj/dw8q26abiHZM3A4=")
 
@@ -195,7 +196,7 @@ def test_stylesheet_link_tag_integrity
   end
 
   def test_javascript_path
-    ActiveSupport::Deprecation.silence do
+    Sprockets::Rails.deprecator.silence do
       assert_equal "/javascripts/xmlhr.js", @view.javascript_path("xmlhr")
       assert_equal "/javascripts/xmlhr.js", @view.javascript_path("xmlhr.js")
       assert_equal "/javascripts/super/xmlhr.js", @view.javascript_path("super/xmlhr")
@@ -210,7 +211,7 @@ def test_javascript_path
   end
 
   def test_stylesheet_path
-    ActiveSupport::Deprecation.silence do
+    Sprockets::Rails.deprecator.silence do
       assert_equal "/stylesheets/bank.css", @view.stylesheet_path("bank")
       assert_equal "/stylesheets/bank.css", @view.stylesheet_path("bank.css")
       assert_equal "/stylesheets/subdir/subdir.css", @view.stylesheet_path("subdir/subdir")
@@ -233,7 +234,7 @@ def setup
   end
 
   def test_javascript_include_tag_integrity
-    ActiveSupport::Deprecation.silence do
+    Sprockets::Rails.deprecator.silence do
       assert_dom_equal %(<script src="/javascripts/static.js"></script>),
         @view.javascript_include_tag("static", integrity: true)
       assert_dom_equal %(<script src="/javascripts/static.js"></script>),
@@ -250,7 +251,7 @@ def test_javascript_include_tag_integrity
   end
 
   def test_stylesheet_link_tag_integrity
-    ActiveSupport::Deprecation.silence do
+    Sprockets::Rails.deprecator.silence do
       assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" />),
         @view.stylesheet_link_tag("static", integrity: true)
       assert_dom_equal %(<link href="/stylesheets/static.css" #{append_media_attribute} rel="stylesheet" />),
@@ -324,7 +325,7 @@ def setup
   end
 
   def test_javascript_path
-    ActiveSupport::Deprecation.silence do
+    Sprockets::Rails.deprecator.silence do
       assert_equal "https://assets.example.com/javascripts/xmlhr.js", @view.javascript_path("xmlhr")
       assert_equal "https://assets.example.com/javascripts/xmlhr.js", @view.javascript_path("xmlhr.js")
       assert_equal "https://assets.example.com/javascripts/super/xmlhr.js", @view.javascript_path("super/xmlhr")
@@ -346,7 +347,7 @@ def test_javascript_path
   end
 
   def test_stylesheet_path
-    ActiveSupport::Deprecation.silence do
+    Sprockets::Rails.deprecator.silence do
       assert_equal "https://assets.example.com/stylesheets/bank.css", @view.stylesheet_path("bank")
       assert_equal "https://assets.example.com/stylesheets/bank.css", @view.stylesheet_path("bank.css")
       assert_equal "https://assets.example.com/stylesheets/subdir/subdir.css", @view.stylesheet_path("subdir/subdir")
@@ -914,7 +915,7 @@ def test_index_files
 class DeprecationTest < HelperTest
   def test_deprecations_for_asset_path
     @view.send(:define_singleton_method, :public_compute_asset_path, -> {})
-    assert_deprecated do
+    assert_deprecated("use the `skip_pipeline: true` option", Sprockets::Rails.deprecator) do
       @view.asset_path("does_not_exist.noextension")
     end
   ensure
@@ -924,7 +925,7 @@ def test_deprecations_for_asset_path
   def test_deprecations_for_asset_url
     @view.send(:define_singleton_method, :public_compute_asset_path, -> {})
 
-    assert_deprecated do
+    assert_deprecated("use the `skip_pipeline: true` option", Sprockets::Rails.deprecator) do
       @view.asset_url("does_not_exist.noextension")
     end
   ensure
@@ -934,7 +935,7 @@ def test_deprecations_for_asset_url
   def test_deprecations_for_image_tag
     @view.send(:define_singleton_method, :public_compute_asset_path, -> {})
 
-    assert_deprecated do
+    assert_deprecated("use the `skip_pipeline: true` option", Sprockets::Rails.deprecator) do
       @view.image_tag("does_not_exist.noextension")
     end
   ensure