change how sprocket registers, we need an engine

leshill · Sep 21, 2013 · 78064e1 · jimsynz · Oct 1, 2013 · AlexRiedler
1 parent 6ff4c2f
commit 78064e1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/lib/handlebars_assets.rb b/lib/handlebars_assets.rb
@@ -8,20 +8,17 @@ 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')
   autoload(:Handlebars, 'handlebars_assets/handlebars')
   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
@@ -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