Only include minimal amount in sprockets context helper

Author: josh

lib/sprockets/rails/context.rb

@@ -0,0 +1,35 @@
+require 'action_view'
+require 'sprockets'
+
+module Sprockets
+  module Rails
+    module Context
+      include ActionView::Helpers::AssetUrlHelper
+      include ActionView::Helpers::AssetTagHelper
+
+      def self.included(klass)
+        klass.class_eval do
+          class_attribute :config, :assets_prefix, :digest_assets
+        end
+      end
+
+      def compute_asset_path(path, options = {})
+        begin
+          asset_uri = locate(path)
+        rescue FileNotFound
+          # TODO: eh, we should be able to use a form of locate that returns
+          # nil instead of raising an exception.
+        end
+
+        if asset_uri
+          asset = link_asset(path)
+          digest_path = asset.digest_path
+          path = digest_path if digest_assets
+          File.join(assets_prefix || "/", path)
+        else
+          super
+        end
+      end
+    end
+  end
+end

lib/sprockets/rails/helper.rb

@@ -45,15 +45,7 @@ def initialize(bad_path, good_path, prefix)
                         :assets_prefix, :digest_assets, :debug_assets]
 
       def self.included(klass)
-        if klass < Sprockets::Context
-          klass.class_eval do
-            alias_method :assets_environment, :environment
-            def assets_manifest; end
-            class_attribute :config, :assets_prefix, :digest_assets, :debug_assets
-          end
-        else
-          klass.class_attribute(*VIEW_ACCESSORS)
-        end
+        klass.class_attribute(*VIEW_ACCESSORS)
       end
 
       def self.extended(obj)
@@ -64,8 +56,6 @@ def self.extended(obj)
 
       def compute_asset_path(path, options = {})
         if digest_path = asset_digest_path(path)
-          # Check if we are inside Sprockets context
-          link_asset(path) if defined?(link_asset)
           path = digest_path if digest_assets
           path += "?body=1" if options[:debug]
           File.join(assets_prefix || "/", path)

lib/sprockets/railtie.rb

@@ -3,6 +3,7 @@
 require 'action_controller/railtie'
 require 'active_support/core_ext/module/remove_method'
 require 'sprockets'
+require 'sprockets/rails/context'
 require 'sprockets/rails/helper'
 require 'sprockets/rails/version'
 
@@ -27,7 +28,7 @@ def assets
         env.cache = Sprockets::Cache::FileStore.new(path)
 
         env.context_class.class_eval do
-          include ::Sprockets::Rails::Helper
+          include ::Sprockets::Rails::Context
         end
       end
     end

test/test_helper.rb

@@ -2,6 +2,7 @@
 
 require 'action_view'
 require 'sprockets'
+require 'sprockets/rails/context'
 require 'sprockets/rails/helper'
 
 ActiveSupport::TestCase.test_order = :random if ActiveSupport::TestCase.respond_to?(:test_order=)
@@ -13,7 +14,7 @@ def setup
     assets = @assets = Sprockets::Environment.new
     @assets.append_path FIXTURES_PATH
     @assets.context_class.class_eval do
-      include ::Sprockets::Rails::Helper
+      include ::Sprockets::Rails::Context
     end
 
     @view = ActionView::Base.new