Merge pull request #120 from schneems/schneems/fix-configurable

[fixes #119] Remove Configurable usage

Author: rafaelfranca

lib/sprockets/rails/helper.rb

@@ -5,10 +5,21 @@
 module Sprockets
   module Rails
     module Helper
-      # support for Ruby 1.9.3 && Rails 3.0.x
-      @_config = ActiveSupport::InheritableOptions.new({}) unless defined?(ActiveSupport::Configurable::Configuration)
-      include ActiveSupport::Configurable
-      config_accessor :precompile, :assets, :raise_runtime_errors
+      class << self
+        attr_accessor :precompile, :assets, :raise_runtime_errors
+      end
+
+      def precompile
+        Sprockets::Rails::Helper.precompile
+      end
+
+      def assets
+        Sprockets::Rails::Helper.assets
+      end
+
+      def raise_runtime_errors
+        Sprockets::Rails::Helper.raise_runtime_errors
+      end
 
       class DependencyError < StandardError
         def initialize(path, dep)

test/test_helper.rb

@@ -373,8 +373,8 @@ def test_stylesheet_path
   end
 
   def test_public_folder_fallback_works_correctly
-    @view.raise_runtime_errors = true
-    @view.debug_assets       = true
+    Sprockets::Rails::Helper.raise_runtime_errors = true
+    @view.debug_assets = true
 
     @view.asset_path("asset-does-not-exist-foo.js")
     @view.asset_url("asset-does-not-exist-foo.js")
@@ -383,8 +383,8 @@ def test_public_folder_fallback_works_correctly
   end
 
   def test_asset_not_precompiled_error
-    @view.raise_runtime_errors = true
-    @view.precompile         = [ lambda {|logical_path| false } ]
+    Sprockets::Rails::Helper.raise_runtime_errors = true
+    Sprockets::Rails::Helper.precompile           = [ lambda {|logical_path| false } ]
     @view.assets_environment = @assets
     @view.debug_assets       = true
 
@@ -412,7 +412,7 @@ def test_asset_not_precompiled_error
       @view.stylesheet_link_tag("foo.js")
     end
 
-    @view.precompile  = [ lambda {|logical_path| true } ]
+    Sprockets::Rails::Helper.precompile = [ lambda {|logical_path| true } ]
 
     @view.asset_path("foo.js")
     @view.asset_url("foo.js")
@@ -436,15 +436,15 @@ def test_asset_digest
 class ErrorsInHelpersTest < HelperTest
 
   def test_dependency_error
-    @view.raise_runtime_errors = true
-    @view.precompile           = [ lambda {|logical_path| true } ]
-    @view.assets_environment   = @assets
+    Sprockets::Rails::Helper.raise_runtime_errors = true
+    Sprockets::Rails::Helper.precompile           = [ lambda {|logical_path| true } ]
+    @view.assets_environment                      = @assets
 
     assert_raise Sprockets::Rails::Helper::DependencyError do
       @view.asset_path("error/dependency.js")
     end
 
-    @view.raise_runtime_errors = false
+    Sprockets::Rails::Helper.raise_runtime_errors = false
     @view.asset_path("error/dependency.js")
   end
 end