handlebars_assets 0.16 → 0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db80ec041bb1a30fa034a7191da617510877dd1a
-  data.tar.gz: 591a444cbb3bdb7f71ee728c085b7912bf7769ce
+  metadata.gz: f8b59f300773aa0df84cd8569d3e7ae44bac3a0d
+  data.tar.gz: 85435577ad0029b162fd3bb7139131da0a930191
 SHA512:
-  metadata.gz: b79943a6ffe7c085e29907aeeb0ee2187710d379453cae0bbbe3dfb25aef0b61470b6e170ebb9f413a9d03d34f1f6f00984b6bc4b53592173aa53cdb262611bb
-  data.tar.gz: 0c91048ddb22913fccc4334d1f0a2c4d92b851b550710cb0d3660d2cd4366cda16f4a1038894b46ecf1196edfc3e709783b12c38e756cbf216706f1bd7f5f5df
+  metadata.gz: 95922af6d18e0966e7e17fc4c99bf70e2969a8c6d44f3a367455f842c3e704c9d09662fe1ca4ee809f900eb11d7386946a48b2b3a156cf18f4ce82141877e28e
+  data.tar.gz: e997c63c1bdca6278f653e1dbefd21bd759de896d07b1ecd7fd110cbacefc422d850f737da5b8fad6072576c1d6623dfc2b74a81c6b11ae0d2fbabc8e7702c3f

data/CHANGELOG.md

@@ -1,7 +1,14 @@
+## 0.17 (2014-06-22)
+
+* Massive revamp - @AlexRiedler
+* Changed how sprockets is registered - @AlexRiedler
+* AMD loading - @AlexRiedler, based on @pboling changes (THANKS!)
+* Fix extension being too liberal issues - @langalex
+
 ## 0.16 (2014-05-27)
 
 * README clarification - @jithugopal
-* Upgrade `handlebars` to 1.1.3 - @neodude
+* Upgrade `handlebars` to 1.3 - @neodude
 
 ## 0.15 (2013-12-06)
 

data/README.md

@@ -6,6 +6,12 @@ Yea, I think so too. That is why I wrote **handlebars_assets**. Give your Handle
 
 Using `sprockets` with Sinatra or another framework? **handlebars_assets** works outside of Rails too (as of v0.2.0)
 
+# BREAKING CHANGES AS OF OF v0.17
+
+@AlexRiedler has made some larger changes to this repository for going forward; If you have existing monkey patches they may not work, and the configuration schema has changed slightly to handle multiple extensions for the same compilation pipeline.
+
+If you have any problems, please post an issue! I will attempt to fix ASAP
+
 # BREAKING CHANGE AS OF v0.9.0
 
 My pull request to allow `/` in partials was pulled into Handlebars. The hack that converted partial names to underscored paths (`shared/_time` -> `_shared_time`) is no longer necessary and has been removed. You should change all the partial references in your app when upgrading from a version prior to v0.9.0.
@@ -286,6 +292,7 @@ Les Hill, follow me on [Github](https://github.com/leshill) and [Twitter](https:
 * Parker Selbert     (@sorentwo)       : README section for `multiple_frameworks`
 * Francisco QV       (@panchoqv)       : README clarification
 * Dylan Markow       (@dmarkow)        : README cleanup
+* Peter Boling       (@pboling)        : AMD Loading
 
 # Contributing
 

data/lib/handlebars_assets.rb

@@ -1,23 +1,43 @@
-require "handlebars_assets/version"
+require 'handlebars_assets/version'
 
 module HandlebarsAssets
-  PATH = File.expand_path("../../vendor/assets/javascripts", __FILE__)
+  autoload(:Config, 'handlebars_assets/config')
+  autoload(:Handlebars, 'handlebars_assets/handlebars')
+  autoload(:HandlebarsTemplate, 'handlebars_assets/handlebars_template')
+
+  PATH = File.expand_path('../../vendor/assets/javascripts', __FILE__)
 
   def self.path
     PATH
   end
 
-  autoload(:Config, 'handlebars_assets/config')
-  autoload(:Handlebars, 'handlebars_assets/handlebars')
-  autoload(:TiltHandlebars, 'handlebars_assets/tilt_handlebars')
+  def self.configure
+    yield Config
+  end
 
-  if defined?(Rails) && defined?(::Rails::Engine)
-    require 'handlebars_assets/engine'
-  else
-    require 'sprockets'
-    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?
+  def self.register_extensions(sprockets_environment)
+      Config.handlebars_extensions.each do |ext|
+        sprockets_environment.register_engine(ext, HandlebarsTemplate)
+      end
+      if Config.haml_enabled? && Config.haml_available?
+        Config.hamlbars_extensions.each do |ext|
+          sprockets_environment.register_engine(ext, HandlebarsTemplate)
+        end
+      end
+      if Config.slim_enabled? && Config.slim_available?
+        Config.slimbars_extensions.each do |ext|
+          sprockets_environment.register_engine(ext, HandlebarsTemplate)
+        end
+      end
   end
+
+end
+
+# Register the engine (which will register extension in the app)
+# or ASSUME using sprockets
+if defined?(Rails)
+  require 'handlebars_assets/engine'
+else
+  require 'sprockets'
+  ::HandlebarsAssets.register_extensions(Sprockets)
 end

data/lib/handlebars_assets/config.rb

@@ -2,27 +2,31 @@ module HandlebarsAssets
   # Change config options in an initializer:
   #
   # HandlebarsAssets::Config.path_prefix = 'app/templates'
+
   module Config
     extend self
 
     attr_writer :compiler, :compiler_path, :ember, :multiple_frameworks,
       :haml_options, :known_helpers, :known_helpers_only, :options,
-      :patch_files, :patch_path, :path_prefix, :slim_options, :template_namespace
-
-    def configure
-      yield self
-    end
+      :patch_files, :patch_path, :path_prefix, :slim_options, :template_namespace,
+      :precompile, :haml_enabled, :slim_enabled,
+      :handlebars_extensions, :hamlbars_extensions, :slimbars_extensions,
+      :amd, :handlebars_amd_path, :amd_with_template_namespace
 
     def compiler
       @compiler || 'handlebars.js'
     end
 
+    def self.configure
+      yield self
+    end
+
     def compiler_path
       @compiler_path || HandlebarsAssets.path
     end
 
     def ember?
-      @ember
+      @ember || false
     end
 
     def multiple_frameworks?
@@ -33,16 +37,35 @@ module HandlebarsAssets
       defined? ::Haml::Engine
     end
 
+    def haml_enabled?
+      @haml_enabled = true if @haml_enabled.nil?
+      @haml_enabled
+    end
+
     def haml_options
       @haml_options || {}
     end
 
+    def slim_available?
+      defined? ::Slim::Engine
+    end
+
+    def slim_enabled?
+      @slim_enabled = true if @slim_enabled.nil?
+      @slim_enabled
+    end
+
+    def slim_options
+      @slim_options || {}
+    end
+
     def known_helpers
       @known_helpers || []
     end
 
     def known_helpers_only
-      @known_helpers_only || false
+      @known_helpers_only = false if @known_helpers_only.nil?
+      @known_helpers_only
     end
 
     def options
@@ -58,21 +81,50 @@ module HandlebarsAssets
     end
 
     def path_prefix
-      @path_prefix || 'templates'
+      @path_prefix ||= 'templates'
     end
 
-    def slim_available?
-      defined? ::Slim::Engine
-    end
-
-    def slim_options
-      @slim_options || {}
+    def precompile
+      @precompile = true if @precompile.nil?
+      @precompile
     end
 
     def template_namespace
       @template_namespace || 'HandlebarsTemplates'
     end
 
+    def handlebars_extensions
+      @hbs_extensions ||= ['hbs', 'handlebars']
+    end
+
+    def hamlbars_extensions
+      @hamlbars_extensions ||= ['hamlbars']
+    end
+
+    def slimbars_extensions
+      @slimbars_extensions ||= ['slimbars']
+    end
+
+    def ember_extensions
+      @ember_extensions ||= ['ember']
+    end
+
+    def amd?
+      @amd || false
+    end
+
+    # indicate whether the template should
+    # be added to the global template namespace
+    def amd_with_template_namespace
+      @amd_with_template_namespace || false
+    end
+
+    # path specified by the require.js paths
+    # during configuration for the handlebars
+    def handlebars_amd_path
+      @handlebars_amd_path || 'handlebars'
+    end
+
     private
 
     def generate_known_helpers_hash

data/lib/handlebars_assets/engine.rb

@@ -1,11 +1,8 @@
 module HandlebarsAssets
+  # NOTE: must be an engine because we are including assets in the gem
   class Engine < ::Rails::Engine
-    initializer "sprockets.handlebars", :after => "sprockets.environment", :group => :all do |app|
-      next unless app.assets
-      app.assets.register_engine('.hbs', TiltHandlebars)
-      app.assets.register_engine('.handlebars', TiltHandlebars)
-      app.assets.register_engine('.hamlbars', TiltHandlebars) if HandlebarsAssets::Config.haml_available?
-      app.assets.register_engine('.slimbars', TiltHandlebars) if HandlebarsAssets::Config.slim_available?
+    initializer "handlebars_assets.assets.register" do |app|
+      ::HandlebarsAssets::register_extensions(app.assets)
     end
   end
 end

data/lib/handlebars_assets/handlebars_template.rb

@@ -0,0 +1,205 @@
+require 'tilt'
+require 'json'
+
+module HandlebarsAssets
+  module Unindent
+    # http://bit.ly/aze9FV
+    # Strip leading whitespace from each line that is the same as the
+    # amount of whitespace on the first line of the string.
+    # Leaves _additional_ indentation on later lines intact.
+    def unindent(heredoc)
+      heredoc.gsub(/^#{heredoc[/\A\s*/]}/, '')
+    end
+  end
+
+  class HandlebarsTemplate < Tilt::Template
+
+    include Unindent
+
+    def self.default_mime_type
+      'application/javascript'
+    end
+
+    def initialize_engine
+      begin
+        require 'haml'
+      rescue LoadError
+        # haml not available
+      end
+      begin
+        require 'slim'
+      rescue LoadError
+        # slim not available
+      end
+    end
+
+    def prepare
+      @template_path = TemplatePath.new(@file)
+      @engine =
+        if @template_path.is_haml?
+          Haml::Engine.new(data, HandlebarsAssets::Config.haml_options)
+        elsif @template_path.is_slim?
+          Slim::Template.new(HandlebarsAssets::Config.slim_options) { data }
+        else
+          nil
+        end
+    end
+
+    def evaluate(scope, locals, &block)
+      source =
+        if @engine
+          @engine.render(scope, locals, &block)
+        else
+          data
+        end
+
+      # remove trailing \n on file, for some reason the directives pipeline adds this
+      source.chomp!($/)
+
+      # handle the case of multiple frameworks combined with ember
+      # DEFER: use extension setup for ember
+      if (HandlebarsAssets::Config.multiple_frameworks? && @template_path.is_ember?) ||
+         (HandlebarsAssets::Config.ember? && !HandlebarsAssets::Config.multiple_frameworks?)
+        compile_ember(source)
+      else
+        compile_default(source)
+      end
+    end
+
+    def compile_ember(source)
+      "window.Ember.TEMPLATES[#{@template_path.name}] = Ember.Handlebars.compile(#{JSON.dump(source)});"
+    end
+
+    def compile_default(source)
+      template =
+        if HandlebarsAssets::Config.precompile
+          compiled_hbs = Handlebars.precompile(source, HandlebarsAssets::Config.options)
+          "Handlebars.template(#{compiled_hbs})"
+        else
+          "Handlebars.compile(#{JSON.dump(source)})"
+        end
+
+      template_namespace = HandlebarsAssets::Config.template_namespace
+
+      if HandlebarsAssets::Config.amd?
+        handlebars_amd_path = HandlebarsAssets::Config.handlebars_amd_path
+        if HandlebarsAssets::Config.amd_with_template_namespace
+          if @template_path.is_partial?
+            unindent <<-PARTIAL
+              define(['#{handlebars_amd_path}'],function(Handlebars){
+                var t = #{template};
+                Handlebars.registerPartial(#{@template_path.name}, t);
+                return t;
+              ;})
+            PARTIAL
+          else
+            unindent <<-TEMPLATE
+              define(['#{handlebars_amd_path}'],function(Handlebars){
+                return #{template};
+              });
+            TEMPLATE
+          end
+        else
+          if @template_path.is_partial?
+            unindent <<-PARTIAL
+              define(['#{handlebars_amd_path}'],function(Handlebars){
+                var t = #{template};
+                Handlebars.registerPartial(#{@template_path.name}, t);
+                return t;
+              ;})
+            PARTIAL
+          else
+            unindent <<-TEMPLATE
+              define(['#{handlebars_amd_path}'],function(Handlebars){
+                this.#{template_namespace} || (this.#{template_namespace} = {});
+                this.#{template_namespace}[#{@template_path.name}] = #{template};
+                return this.#{template_namespace}[#{@template_path.name}];
+              });
+            TEMPLATE
+          end
+        end
+      else
+        if @template_path.is_partial?
+          unindent <<-PARTIAL
+            (function() {
+              Handlebars.registerPartial(#{@template_path.name}, #{template});
+            }).call(this);
+          PARTIAL
+        else
+          unindent <<-TEMPLATE
+            (function() {
+              this.#{template_namespace} || (this.#{template_namespace} = {});
+              this.#{template_namespace}[#{@template_path.name}] = #{template};
+              return this.#{template_namespace}[#{@template_path.name}];
+            }).call(this);
+          TEMPLATE
+        end
+      end
+    end
+
+    protected
+
+    class TemplatePath
+      def initialize(path)
+        @full_path = path
+      end
+
+      def is_haml?
+        result = false
+        ::HandlebarsAssets::Config.hamlbars_extensions.each do |ext|
+          if ext.start_with? '.'
+            ext = '\\#{ext}'
+            result ||= !(@full_path =~ /#{ext}(\..*)*$/).nil?
+          else
+            result ||= !(@full_path =~ /\.#{ext}(\..*)*$/).nil?
+          end
+        end
+        result
+      end
+
+      def is_slim?
+        result = false
+        ::HandlebarsAssets::Config.slimbars_extensions.each do |ext|
+          if ext.start_with? '.'
+            ext = '\\#{ext}'
+            result ||= !(@full_path =~ /#{ext}(\..*)*$/).nil?
+          else
+            result ||= !(@full_path =~ /\.#{ext}(\..*)*$/).nil?
+          end
+        end
+        result
+      end
+
+      def is_partial?
+        @full_path.gsub(%r{.*/}, '').start_with?('_')
+      end
+
+      def is_ember?
+        result = false
+        ::HandlebarsAssets::Config.ember_extensions.each do |ext|
+          if ext.start_with? '.'
+            ext = '\\#{ext}'
+            result ||= !(@full_path =~ /#{ext}(\..*)*$/).nil?
+          else
+            result ||= !(@full_path =~ /\.#{ext}(\..*)*$/).nil?
+          end
+        end
+        result
+      end
+
+      def name
+        template_name
+      end
+
+      private
+
+      def relative_path
+        @full_path.match(/.*#{HandlebarsAssets::Config.path_prefix}\/((.*\/)*([^.]*)).*$/)[1]
+      end
+
+      def template_name
+        relative_path.dump
+      end
+    end
+  end
+end

data/lib/handlebars_assets/version.rb

@@ -1,3 +1,3 @@
 module HandlebarsAssets
-  VERSION = "0.16"
+  VERSION = "0.17"
 end

data/test/handlebars_assets/hamlbars_test.rb

@@ -6,7 +6,7 @@ module HandlebarsAssets
     include CompilerSupport
 
     def compile_haml(source)
-      Haml::Engine.new(source, HandlebarsAssets::Config.haml_options).render
+      (Haml::Engine.new(source, HandlebarsAssets::Config.haml_options).render).chomp
     end
 
     def teardown
@@ -20,7 +20,7 @@ module HandlebarsAssets
       scope = make_scope root, file
       source = "%p This is {{handlebars}}"
 
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
 
       assert_equal hbs_compiled('test_render', compile_haml(source)), template.render(scope, {})
     end

data/test/handlebars_assets/slimbars_test.rb

@@ -20,7 +20,7 @@ module HandlebarsAssets
       scope = make_scope root, file
       source = "p This is {{handlebars}}"
 
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
 
       assert_equal hbs_compiled('test_render', compile_slim(source)), template.render(scope, {})
     end

data/test/handlebars_assets/tilt_handlebars_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module HandlebarsAssets
-  class TiltHandlebarsTest < Test::Unit::TestCase
+  class HandlebarsTemplateTest < Test::Unit::TestCase
     include CompilerSupport
     include SprocketsScope
 
@@ -24,7 +24,7 @@ module HandlebarsAssets
       scope = make_scope root, file
       source = "This is {{handlebars}}"
 
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
 
       assert_equal hbs_compiled('test_render', source), template.render(scope, {})
     end
@@ -37,7 +37,7 @@ module HandlebarsAssets
       scope = make_scope root, file
       source = "This is {{handlebars}}"
 
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
 
       assert_equal hbs_compiled('test_template_misnaming', source), template.render(scope, {})
     end
@@ -50,7 +50,7 @@ module HandlebarsAssets
 
       HandlebarsAssets::Config.path_prefix = 'app/templates'
 
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
 
       assert_equal hbs_compiled('test_path_prefix', source), template.render(scope, {})
     end
@@ -65,11 +65,11 @@ module HandlebarsAssets
 
       HandlebarsAssets::Config.path_prefix = 'app/templates'
 
-      template1 = HandlebarsAssets::TiltHandlebars.new(scope1.pathname.to_s) { source }
+      template1 = HandlebarsAssets::HandlebarsTemplate.new(scope1.pathname.to_s) { source }
 
       assert_equal hbs_compiled_partial('_test_underscore', source), template1.render(scope1, {})
 
-      template2 = HandlebarsAssets::TiltHandlebars.new(scope2.pathname.to_s) { source }
+      template2 = HandlebarsAssets::HandlebarsTemplate.new(scope2.pathname.to_s) { source }
 
       assert_equal hbs_compiled_partial('some/thing/_test_underscore', source), template2.render(scope2, {})
     end
@@ -80,7 +80,7 @@ module HandlebarsAssets
       scope = make_scope root, file
       source = "{{#with author}}By {{first_name}} {{last_name}}{{/with}}"
 
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
 
       assert_equal hbs_compiled('test_without_known', source), template.render(scope, {})
     end
@@ -93,7 +93,7 @@ module HandlebarsAssets
 
       HandlebarsAssets::Config.known_helpers_only = true
 
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
 
       assert_equal hbs_compiled('test_known', source), template.render(scope, {})
     end
@@ -104,7 +104,7 @@ module HandlebarsAssets
       scope = make_scope root, file
       source = "{{#custom author}}By {{first_name}} {{last_name}}{{/custom}}"
 
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
 
       assert_equal hbs_compiled('test_custom_helper', source), template.render(scope, {})
     end
@@ -118,20 +118,20 @@ module HandlebarsAssets
       HandlebarsAssets::Config.known_helpers_only = true
       HandlebarsAssets::Config.known_helpers = %w(custom)
 
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
 
       assert_equal hbs_compiled('test_custom_known_helper', source), template.render(scope, {})
     end
 
     def test_template_namespace
-      root = '/myapp/app/assets/javascripts'
+      root = '/myapp/app/assets/javascripts/templates'
       file = 'test_template_namespace.hbs'
       scope = make_scope root, file
       source = "This is {{handlebars}}"
 
       HandlebarsAssets::Config.template_namespace = 'JST'
 
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
 
       assert_equal hbs_compiled('test_template_namespace', source), template.render(scope, {})
     end
@@ -143,7 +143,7 @@ module HandlebarsAssets
       source = "This is {{handlebars}}"
 
       HandlebarsAssets::Config.ember = true
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
 
       expected_compiled = %{window.Ember.TEMPLATES["test_render"] = Ember.Handlebars.compile("This is {{handlebars}}");};
       assert_equal expected_compiled, template.render(scope, {})
@@ -152,10 +152,12 @@ module HandlebarsAssets
     def test_multiple_frameworks_with_ember_render
       root = '/myapp/app/assets/templates'
       non_ember = 'test_render.hbs'
+      non_ember_but_with_ember = 'test_member.hbs'
       ember_ext_no_hbs = 'test_render.ember'
       ember_ext = 'test_render.ember.hbs'
       ember_with_haml = 'test_render.ember.hamlbars'
       ember_with_slim = 'test_render.ember.slimbars'
+      ember_ext_with_erb = 'test_render.ember.hbs.erb'
 
       HandlebarsAssets::Config.ember = true
       HandlebarsAssets::Config.multiple_frameworks = true
@@ -163,33 +165,45 @@ module HandlebarsAssets
       # File without ember extension should compile to default namespace
       scope = make_scope root, non_ember
       source = "This is {{handlebars}}"
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
       assert_equal hbs_compiled('test_render', source), template.render(scope, {})
 
+      # File without ember extension but with ember in it should compile to default namespace
+      scope = make_scope root, non_ember_but_with_ember
+      source = "This is {{handlebars}}"
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
+      assert_equal hbs_compiled('test_member', source), template.render(scope, {})
+
       # File with ember extension should compile to ember specific namespace
       expected_compiled = %{window.Ember.TEMPLATES["test_render"] = Ember.Handlebars.compile("This is {{handlebars}}");};
       scope = make_scope root, ember_ext_no_hbs
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
+      assert_equal expected_compiled, template.render(scope, {})
+
+      # File with ember and erb extension should compile to ember specific namespace
+      expected_compiled = %{window.Ember.TEMPLATES["test_render"] = Ember.Handlebars.compile("This is {{handlebars}}");};
+      scope = make_scope root, ember_ext_with_erb
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
       assert_equal expected_compiled, template.render(scope, {})
 
       # File with ember.hbs extension should compile to ember specific namespace
       expected_compiled = %{window.Ember.TEMPLATES["test_render"] = Ember.Handlebars.compile("This is {{handlebars}}");};
       scope = make_scope root, ember_ext
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { source }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { source }
       assert_equal expected_compiled, template.render(scope, {})
 
       # File with ember.hamlbars extension should compile to ember specific namespace
-      expected_compiled = %{window.Ember.TEMPLATES["test_render"] = Ember.Handlebars.compile("<p>This is {{handlebars}}</p>\\n");};
+      expected_compiled = %{window.Ember.TEMPLATES["test_render"] = Ember.Handlebars.compile("<p>This is {{handlebars}}</p>");};
       scope = make_scope root, ember_with_haml
       source = "%p This is {{handlebars}}"
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { compile_haml(source) }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { compile_haml(source) }
       assert_equal expected_compiled, template.render(scope, {})
 
       # File with ember.slimbars extension should compile to ember specific namespace
       expected_compiled = %{window.Ember.TEMPLATES["test_render"] = Ember.Handlebars.compile("<p>This is {{handlebars}}</p>");};
       source = "p This is {{handlebars}}"
       scope = make_scope root, ember_with_slim
-      template = HandlebarsAssets::TiltHandlebars.new(scope.pathname.to_s) { compile_slim(source) }
+      template = HandlebarsAssets::HandlebarsTemplate.new(scope.pathname.to_s) { compile_slim(source) }
       assert_equal expected_compiled, template.render(scope, {})
     end
   end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 require 'handlebars_assets'
 require 'handlebars_assets/config'
-require 'handlebars_assets/tilt_handlebars'
+require 'handlebars_assets/handlebars_template'
 require 'handlebars_assets/handlebars'
 
 require 'test/unit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: handlebars_assets
 version: !ruby/object:Gem::Version
-  version: '0.16'
+  version: '0.17'
 platform: ruby
 authors:
 - Les Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -155,7 +155,7 @@ files:
 - lib/handlebars_assets/config.rb
 - lib/handlebars_assets/engine.rb
 - lib/handlebars_assets/handlebars.rb
-- lib/handlebars_assets/tilt_handlebars.rb
+- lib/handlebars_assets/handlebars_template.rb
 - lib/handlebars_assets/version.rb
 - test/edge/handlebars.js
 - test/handlebars_assets/compiling_test.rb

data/lib/handlebars_assets/tilt_handlebars.rb

@@ -1,129 +0,0 @@
-require 'tilt'
-require 'multi_json'
-
-module HandlebarsAssets
-  module Unindent
-    # http://bit.ly/aze9FV
-    # Strip leading whitespace from each line that is the same as the
-    # amount of whitespace on the first line of the string.
-    # Leaves _additional_ indentation on later lines intact.
-    def unindent(heredoc)
-      heredoc.gsub /^#{heredoc[/\A\s*/]}/, ''
-    end
-  end
-
-  class TiltHandlebars < Tilt::Template
-
-    include Unindent
-
-    def self.default_mime_type
-      'application/javascript'
-    end
-
-    def evaluate(scope, locals, &block)
-      template_path = TemplatePath.new(scope)
-
-      source = if template_path.is_haml?
-                 Haml::Engine.new(data, HandlebarsAssets::Config.haml_options).render(scope, locals)
-               elsif template_path.is_slim?
-                 Slim::Template.new(HandlebarsAssets::Config.slim_options) { data }.render(scope, locals)
-               else
-                 data
-               end
-
-      if HandlebarsAssets::Config.multiple_frameworks? && HandlebarsAssets::Config.ember?
-        if template_path.is_ember?
-          compile_ember(source, template_path)
-        else
-          compile_default(source, template_path)
-        end
-      elsif HandlebarsAssets::Config.ember? && !HandlebarsAssets::Config.multiple_frameworks?
-        compile_ember(source, template_path)
-      else
-        compile_default(source, template_path)
-      end
-    end
-
-    def initialize_engine
-      begin
-        require 'haml'
-      rescue LoadError
-        # haml not available
-      end
-      begin
-        require 'slim'
-      rescue LoadError
-        # slim not available
-      end
-    end
-
-    def compile_ember(source, template_path)
-      "window.Ember.TEMPLATES[#{template_path.name}] = Ember.Handlebars.compile(#{::MultiJson.dump source});"
-    end
-
-    def compile_default(source, template_path)
-      compiled_hbs = Handlebars.precompile(source, HandlebarsAssets::Config.options)
-
-      template_namespace = HandlebarsAssets::Config.template_namespace
-
-      if template_path.is_partial?
-        unindent <<-PARTIAL
-          (function() {
-            Handlebars.registerPartial(#{template_path.name}, Handlebars.template(#{compiled_hbs}));
-          }).call(this);
-        PARTIAL
-      else
-        unindent <<-TEMPLATE
-          (function() {
-            this.#{template_namespace} || (this.#{template_namespace} = {});
-            this.#{template_namespace}[#{template_path.name}] = Handlebars.template(#{compiled_hbs});
-            return this.#{template_namespace}[#{template_path.name}];
-          }).call(this);
-        TEMPLATE
-      end
-    end
-
-    protected
-
-    def prepare; end
-
-    class TemplatePath
-      def initialize(scope)
-        self.full_path = scope.pathname
-        self.template_path = scope.logical_path
-      end
-
-      def is_haml?
-        full_path.to_s.end_with?('.hamlbars')
-      end
-
-      def is_slim?
-        full_path.to_s.end_with?('.slimbars')
-      end
-
-      def is_partial?
-        template_path.gsub(%r{.*/}, '').start_with?('_')
-      end
-
-      def is_ember?
-        full_path.to_s =~ %r{.ember(.hbs|.hamlbars|.slimbars)?$}
-      end
-
-      def name
-        template_name
-      end
-
-      private
-
-      attr_accessor :full_path, :template_path
-
-      def relative_path
-        template_path.gsub(/^#{HandlebarsAssets::Config.path_prefix}\/(.*)$/i, "\\1")
-      end
-
-      def template_name
-        relative_path.dump
-      end
-    end
-  end
-end