From a19c260038a9b5b688a2e8d883b604983ac59eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 19 Apr 2011 21:49:28 +0200
Subject: Include modules to the context in the railtie.
---
actionpack/lib/action_view/helpers/sprockets_helper.rb | 7 +------
actionpack/lib/sprockets/railtie.rb | 6 ++++++
2 files changed, 7 insertions(+), 6 deletions(-)
(limited to 'actionpack/lib')
diff --git a/actionpack/lib/action_view/helpers/sprockets_helper.rb b/actionpack/lib/action_view/helpers/sprockets_helper.rb
index e2e844c74d..947c827f3c 100644
--- a/actionpack/lib/action_view/helpers/sprockets_helper.rb
+++ b/actionpack/lib/action_view/helpers/sprockets_helper.rb
@@ -66,9 +66,4 @@ module ActionView
end
end
end
-end
-
-# FIXME: Temp hack for extending Sprockets::Context so
-class Sprockets::Context
- include ActionView::Helpers::SprocketsHelper
-end if defined?(Sprockets)
\ No newline at end of file
+end
\ No newline at end of file
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index fe3c8c9783..2f7f95c44d 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -32,6 +32,12 @@ module Sprockets
next unless assets.enabled
app.assets = asset_environment(app)
+
+ # FIXME: Temp hack for extending Sprockets::Context so
+ ActiveSupport.on_load(:action_view) do
+ ::Sprockets::Context.send :include, ::ActionView::Helpers::SprocketsHelper
+ end
+
app.routes.append do
mount app.assets => assets.prefix
end
--
cgit v1.2.3