From 4cea4ee6b54fee897b984a3c0288d12ce2d1efe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Wed, 5 Oct 2011 09:35:27 +0200
Subject: Fix regression when calling helpers inside sprockets.

---
 actionpack/lib/sprockets/assets.rake                  |  6 ++----
 actionpack/lib/sprockets/helpers.rb                   |  4 ++--
 actionpack/lib/sprockets/helpers/isolated_helper.rb   | 13 +++++++++++++
 actionpack/lib/sprockets/helpers/precompile_helper.rb | 13 -------------
 actionpack/lib/sprockets/railtie.rb                   |  5 ++++-
 5 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 actionpack/lib/sprockets/helpers/isolated_helper.rb
 delete mode 100644 actionpack/lib/sprockets/helpers/precompile_helper.rb

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake
index 80c3d4d0b8..a5145080c2 100644
--- a/actionpack/lib/sprockets/assets.rake
+++ b/actionpack/lib/sprockets/assets.rake
@@ -41,10 +41,8 @@ namespace :assets do
       config.assets.digest  = digest unless digest.nil?
       config.assets.digests = {}
 
-      env = Rails.application.assets
-      env.context_class.send :include, ::Sprockets::Helpers::PrecompileHelper
-
-      target = File.join(Rails.public_path, config.assets.prefix)
+      env      = Rails.application.assets
+      target   = File.join(Rails.public_path, config.assets.prefix)
       compiler = Sprockets::StaticCompiler.new(env,
                                                target,
                                                config.assets.precompile,
diff --git a/actionpack/lib/sprockets/helpers.rb b/actionpack/lib/sprockets/helpers.rb
index cd9c8f62e6..fee48386e0 100644
--- a/actionpack/lib/sprockets/helpers.rb
+++ b/actionpack/lib/sprockets/helpers.rb
@@ -1,6 +1,6 @@
 module Sprockets
   module Helpers
-    autoload :RailsHelper,      "sprockets/helpers/rails_helper"
-    autoload :PrecompileHelper, "sprockets/helpers/precompile_helper"
+    autoload :RailsHelper,    "sprockets/helpers/rails_helper"
+    autoload :IsolatedHelper, "sprockets/helpers/isolated_helper"
   end
 end
diff --git a/actionpack/lib/sprockets/helpers/isolated_helper.rb b/actionpack/lib/sprockets/helpers/isolated_helper.rb
new file mode 100644
index 0000000000..3adb928c45
--- /dev/null
+++ b/actionpack/lib/sprockets/helpers/isolated_helper.rb
@@ -0,0 +1,13 @@
+module Sprockets
+  module Helpers
+    module IsolatedHelper
+      def controller
+        nil
+      end
+
+      def config
+        Rails.application.config.action_controller
+      end
+    end
+  end
+end
diff --git a/actionpack/lib/sprockets/helpers/precompile_helper.rb b/actionpack/lib/sprockets/helpers/precompile_helper.rb
deleted file mode 100644
index ca7927f6fb..0000000000
--- a/actionpack/lib/sprockets/helpers/precompile_helper.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Sprockets
-  module Helpers
-    module PrecompileHelper
-      def controller
-        nil
-      end
-
-      def config
-        Rails.application.config.action_controller
-      end
-    end
-  end
-end
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index e29612d320..3d330bd91a 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -43,7 +43,10 @@ module Sprockets
 
       ActiveSupport.on_load(:action_view) do
         include ::Sprockets::Helpers::RailsHelper
-        app.assets.context_class.send :include, ::Sprockets::Helpers::RailsHelper
+        app.assets.context_class.instance_eval do
+          include ::Sprockets::Helpers::IsolatedHelper
+          include ::Sprockets::Helpers::RailsHelper
+        end
       end
     end
 
-- 
cgit v1.2.3