ember-handlebars-template 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16ecf940925fea527d60bf6f1589a49058f99a5c
-  data.tar.gz: f5d12ab8225fa4297ee82250a4a5da780c2ea42d
+  metadata.gz: 77319b803ef0bb86af75d3a3bf0b99995c7be108
+  data.tar.gz: 6e4ab11bd2addd353bf1e68f6373fef17c4b90f5
 SHA512:
-  metadata.gz: 9bf29f8634294e12fe36466edb5bcae1cc5356c66e9770f7545ab4971e12d06ce312eb5ef4c742f1401f5b7c5ffe4d9eb5446f4c1adcd4f1ab5e5fd5ced4c250
-  data.tar.gz: 704dda831fb06fb00c28c358abd9e22dca6c069596fd48533d1af5b5698a9c42aea2aadf8a1399969ec0d8c617c5621b17f6eb5bf4a0f7be97aa1ebf5cf1c662
+  metadata.gz: 510f0f567b9ce63fafb3fc9c1c90ea1913dc9586d3e25ab3d7e7ca38a6ee0caa2846bd4237c4a5af51af88bfddf0aba7d3202c8d5f29131c7b2a2f2bc50e2c9d
+  data.tar.gz: 046c0d6890e4ba6fa54dfe132442ae4aebf0672dd9719b41f82b86c0be66aa2042fff964c70018036effaeb12984d87da7e2786011c0e12042a388a8506616f0

data/.travis.yml

@@ -10,4 +10,5 @@ env:
     - SPROCKETS_VERSION="~> 3.3.0"
     - SPROCKETS_VERSION="~> 3.4.0"
     - SPROCKETS_VERSION="~> 3.5.0"
+    - SPROCKETS_VERSION="~> 3.6.0"
     - SPROCKETS_VERSION="~> 4.0.0.beta2"

data/lib/ember/handlebars/template.rb

@@ -1,15 +1,12 @@
 require 'sprockets'
 require 'barber'
 
+require 'ember/handlebars/version'
+require 'ember/handlebars/config'
+
 module Ember
   module Handlebars
-    autoload :VERSION, 'ember/handlebars/version'
-    autoload :Config, 'ember/handlebars/config'
-    autoload :Helper, 'ember/handlebars/helper'
-
     class Template
-      include Helper
-
       class << self
         def configure
           yield config
@@ -30,6 +27,10 @@ module Ember
           env.register_transformer 'text/x-ember-handlebars', 'application/javascript', self
         end
 
+        def setup_ember_template_compiler(path)
+          Barber::Ember::Precompiler.ember_template_compiler_path = path
+        end
+
         def instance
           @instance ||= new(config)
         end
@@ -67,7 +68,7 @@ module Ember
           template = mustache_to_handlebars(filename, data)
         end
 
-        template_name = actual_name(input)
+        template_name = input[:name]
 
         module_name =
           case config.output_type
@@ -110,6 +111,38 @@ module Ember
 
       private
 
+      def handlebars?(filename)
+        filename.to_s =~ /\.raw\.(handlebars|hjs|hbs)/
+      end
+
+      def mustache_to_handlebars(filename, template)
+        if filename =~ /\.mustache\.(handlebars|hjs|hbs)/
+          template.gsub(/\{\{(\w[^\}]+)\}\}/){ |x| "{{unbound #{$1}}}" }
+        else
+          template
+        end
+      end
+
+      def amd_template_target(namespace, module_name)
+        [namespace, module_name].compact.join('/')
+      end
+
+      def global_template_target(namespace, module_name, config)
+        "#{namespace}[#{template_path(module_name, config).inspect}]"
+      end
+
+      def template_path(path, config)
+        root = config.templates_root
+
+        unless root.empty?
+          Array(root).each.each do |r|
+            path = path.sub(/#{Regexp.quote(r)}\//, '')
+          end
+        end
+
+        path.split('/').join(config.templates_path_separator)
+      end
+
       def precompile_handlebars(template, input)
         dependencies = [
           Barber::Precompiler.compiler_version,
@@ -117,7 +150,7 @@ module Ember
         ]
 
         input[:cache].fetch(_cache_key + dependencies) do
-          super(template)
+          "Handlebars.template(#{Barber::Precompiler.compile(template)});"
         end
       end
 
@@ -130,10 +163,22 @@ module Ember
         ]
 
         input[:cache].fetch(_cache_key + dependencies) do
-          super(template, ember_template, options)
+          "Ember.#{ember_template}.template(#{Barber::Ember::Precompiler.compile(template, options)});"
         end
       end
 
+      def compile_handlebars(string)
+        "Handlebars.compile(#{indent(string).inspect});"
+      end
+
+      def compile_ember_handlebars(string, ember_template, options = nil)
+        "Ember.#{ember_template}.compile(#{indent(string).inspect}, #{options.to_json});"
+      end
+
+      def indent(string)
+        string.gsub(/$(.)/m, "\\1  ").strip
+      end
+
       def _cache_key
         [
           self.class.name,
@@ -141,20 +186,6 @@ module Ember
           Barber::VERSION
         ]
       end
-
-      def actual_name(input)
-        actual_name = input[:name]
-
-        if input[:filename][File.expand_path(input[:name] + '/index', input[:load_path])]
-          if actual_name == '.'
-            actual_name = 'index'
-          else
-            actual_name += '/index'
-          end
-        end
-
-        actual_name
-      end
     end
   end
 end

data/lib/ember/handlebars/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module Handlebars
-    VERSION = '0.7.3'
+    VERSION = '0.7.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-handlebars-template
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Ryunosuke SATO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -117,7 +117,6 @@ files:
 - bin/setup
 - ember-handlebars-template.gemspec
 - lib/ember/handlebars/config.rb
-- lib/ember/handlebars/helper.rb
 - lib/ember/handlebars/template.rb
 - lib/ember/handlebars/version.rb
 homepage: https://github.com/tricknotes/ember-handlebars-template

data/lib/ember/handlebars/helper.rb

@@ -1,69 +0,0 @@
-module Ember
-  module Handlebars
-    module Helper
-      def self.included(base)
-        base.extend ClassMethods
-      end
-
-      module ClassMethods
-        def setup_ember_template_compiler(path)
-          Barber::Ember::Precompiler.ember_template_compiler_path = path
-        end
-      end
-
-      private
-
-      def handlebars?(filename)
-        filename.to_s =~ /\.raw\.(handlebars|hjs|hbs)/
-      end
-
-      def mustache_to_handlebars(filename, template)
-        if filename =~ /\.mustache\.(handlebars|hjs|hbs)/
-          template.gsub(/\{\{(\w[^\}]+)\}\}/){ |x| "{{unbound #{$1}}}" }
-        else
-          template
-        end
-      end
-
-      def amd_template_target(namespace, module_name)
-        [namespace, module_name].compact.join('/')
-      end
-
-      def global_template_target(namespace, module_name, config)
-        "#{namespace}[#{template_path(module_name, config).inspect}]"
-      end
-
-      def template_path(path, config)
-        root = config.templates_root
-
-        unless root.empty?
-          Array(root).each.each do |r|
-            path = path.sub(/#{Regexp.quote(r)}\//, '')
-          end
-        end
-
-        path.split('/').join(config.templates_path_separator)
-      end
-
-      def compile_handlebars(string)
-        "Handlebars.compile(#{indent(string).inspect});"
-      end
-
-      def precompile_handlebars(string)
-        "Handlebars.template(#{Barber::Precompiler.compile(string)});"
-      end
-
-      def compile_ember_handlebars(string, ember_template = 'Handlebars', options = nil)
-        "Ember.#{ember_template}.compile(#{indent(string).inspect}, #{options.to_json});"
-      end
-
-      def precompile_ember_handlebars(string, ember_template = 'Handlebars', options = nil)
-        "Ember.#{ember_template}.template(#{Barber::Ember::Precompiler.compile(string, options)});"
-      end
-
-      def indent(string)
-        string.gsub(/$(.)/m, "\\1  ").strip
-      end
-    end
-  end
-end