rename option and consolidate conditional

Author: sbfaulkner

README.md

@@ -121,7 +121,7 @@ is not enabled, then we check the environment if compiling is enabled:
 ```
 If the resolver list is empty (e.g. if debug is true and compile is false), the standard rails public path resolution will be used.
 
-**`config.assets.raise_unless_precompiled_asset`**
+**`config.assets.check_precompiled_asset`**
 
 When enabled, an exception is raised for missing assets. This option is enabled by default.
 

lib/sprockets/rails/helper.rb

@@ -33,7 +33,7 @@ def initialize(source)
         :assets_environment, :assets_manifest,
         :assets_precompile, :precompiled_asset_checker,
         :assets_prefix, :digest_assets, :debug_assets,
-        :resolve_assets_with, :raise_unless_precompiled_asset
+        :resolve_assets_with, :check_precompiled_asset
       ]
 
       def self.included(klass)
@@ -299,7 +299,7 @@ def initialize(view)
           raise ArgumentError, 'config.assets.resolve_with includes :environment, but app.assets is nil' unless view.assets_environment
           @env = view.assets_environment
           @precompiled_asset_checker = view.precompiled_asset_checker
-          @raise_unless_precompiled_asset = view.raise_unless_precompiled_asset
+          @check_precompiled_asset = view.check_precompiled_asset
         end
 
         def asset_path(path, digest, allow_non_precompiled = false)
@@ -343,8 +343,7 @@ def precompiled?(path)
           end
 
           def raise_unless_precompiled_asset(path)
-            return unless @raise_unless_precompiled_asset
-            raise Helper::AssetNotPrecompiled.new(path) unless precompiled?(path)
+            raise Helper::AssetNotPrecompiled.new(path) if @check_precompiled_asset && !precompiled?(path)
           end
       end
     end

lib/sprockets/railtie.rb

@@ -113,7 +113,7 @@ def configure(&block)
     config.assets.digest      = true
     config.assets.cache_limit = 50.megabytes
     config.assets.gzip        = true
-    config.assets.raise_unless_precompiled_asset = true
+    config.assets.check_precompiled_asset = true
 
     config.assets.configure do |env|
       config.assets.paths.each { |path| env.append_path(path) }
@@ -236,7 +236,7 @@ def self.build_manifest(app)
 
         self.resolve_assets_with = config.assets.resolve_with
 
-        self.raise_unless_precompiled_asset = config.assets.raise_unless_precompiled_asset
+        self.check_precompiled_asset = config.assets.check_precompiled_asset
 
         # Expose the app precompiled asset check to the view
         self.precompiled_asset_checker = -> logical_path { app.asset_precompiled? logical_path }

test/test_helper.rb

@@ -27,7 +27,7 @@ def setup
     @view.assets_prefix       = "/assets"
     @view.assets_precompile   = %w( manifest.js )
     precompiled_assets = @manifest.find(@view.assets_precompile).map(&:logical_path)
-    @view.raise_unless_precompiled_asset = true
+    @view.check_precompiled_asset = true
     @view.precompiled_asset_checker = -> logical_path { precompiled_assets.include? logical_path }
     @view.request = ActionDispatch::Request.new({
       "rack.url_scheme" => "https"
@@ -828,15 +828,15 @@ def test_index_files
 end
 
 class RaiseUnlessPrecompiledAssetDisabledTest < HelperTest
-  def test_raise_unless_precompiled_asset_enabled
-    @view.raise_unless_precompiled_asset = true
+  def test_check_precompiled_asset_enabled
+    @view.check_precompiled_asset = true
     assert_raises(Sprockets::Rails::Helper::AssetNotPrecompiled) do
       @view.asset_path("not_precompiled.css")
     end
   end
 
-  def test_raise_unless_precompiled_asset_disabled
-    @view.raise_unless_precompiled_asset = false
+  def test_check_precompiled_asset_disabled
+    @view.check_precompiled_asset = false
     assert @view.asset_path("not_precompiled.css")
   end
 end

test/test_railtie.rb

@@ -182,20 +182,20 @@ def test_gzip_config
     assert_equal false, env.gzip?
   end
 
-  def test_default_raise_unless_precompiled_assets
-    assert app.config.assets.raise_unless_precompiled_asset
+  def test_default_check_precompiled_assets
+    assert app.config.assets.check_precompiled_asset
     app.initialize!
     @view = ActionView::Base.new
-    assert @view.raise_unless_precompiled_asset
+    assert @view.check_precompiled_asset
   end
 
-  def test_configure_raise_unless_precompiled_assets
+  def test_configure_check_precompiled_assets
     app.configure do
-      config.assets.raise_unless_precompiled_asset = false
+      config.assets.check_precompiled_asset = false
     end
     app.initialize!
     @view = ActionView::Base.new
-    refute @view.raise_unless_precompiled_asset
+    refute @view.check_precompiled_asset
   end
 
   def test_version