From 78064e19f02000352c5a12561151cdc8b707deb4 Mon Sep 17 00:00:00 2001
From: Alex Riedler <alex@riedler.ca>
Date: Fri, 20 Sep 2013 21:47:03 -0700
Subject: [PATCH] change how sprocket registers, we need an engine

---
 lib/handlebars_assets.rb         | 17 +++++++----------
 lib/handlebars_assets/engine.rb  |  5 +++++
 lib/handlebars_assets/railtie.rb |  7 -------
 3 files changed, 12 insertions(+), 17 deletions(-)
 create mode 100644 lib/handlebars_assets/engine.rb
 delete mode 100644 lib/handlebars_assets/railtie.rb

diff --git a/lib/handlebars_assets.rb b/lib/handlebars_assets.rb
index 9894531..43f45fe 100644
--- a/lib/handlebars_assets.rb
+++ b/lib/handlebars_assets.rb
@@ -8,11 +8,11 @@ def self.path
     PATH
   end
 
-  def register_extensions(sprockets_environment)
-      sprockets_environment.register_engine('.hbs', TiltHandlebars)
-      sprockets_environment.register_engine('.handlebars', TiltHandlebars)
-      sprockets_environment.register_engine('.hamlbars', TiltHandlebars) if HandlebarsAssets::Config.haml_available?
-      sprockets_environment.register_engine('.slimbars', TiltHandlebars) if HandlebarsAssets::Config.slim_available?
+  def self.register_extensions(sprockets_environment)
+      Sprockets.register_engine('.hbs', TiltHandlebars)
+      Sprockets.register_engine('.handlebars', TiltHandlebars)
+      Sprockets.register_engine('.hamlbars', TiltHandlebars) if HandlebarsAssets::Config.haml_available?
+      Sprockets.register_engine('.slimbars', TiltHandlebars) if HandlebarsAssets::Config.slim_available?
   end
 
   autoload(:Config, 'handlebars_assets/config')
@@ -20,8 +20,5 @@ def register_extensions(sprockets_environment)
   autoload(:TiltHandlebars, 'handlebars_assets/tilt_handlebars')
 end
 
-if defined?(Rails)
-  require 'handlebar_assets/railtie'
-else
-  register_extensions(Sprockets)
-end
+HandlebarsAssets.register_extensions(Sprockets)
+require 'handlebars_assets/engine' if defined?(Rails)
diff --git a/lib/handlebars_assets/engine.rb b/lib/handlebars_assets/engine.rb
new file mode 100644
index 0000000..7a8fef0
--- /dev/null
+++ b/lib/handlebars_assets/engine.rb
@@ -0,0 +1,5 @@
+module HandlebarsAssets
+  # NOTE: must be an engine because we are including assets in the gem
+  class Engine < ::Rails::Engine
+  end
+end
diff --git a/lib/handlebars_assets/railtie.rb b/lib/handlebars_assets/railtie.rb
deleted file mode 100644
index 858450a..0000000
--- a/lib/handlebars_assets/railtie.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module HandlebarsAssets
-  class Railtie < ::Rails::Railtie
-    initializer "sprockets.handlebars", :after => "sprockets.environment", :group => :all do |app|
-      HandlebarsAssets.register_extensions(app.assets)
-    end
-  end
-end