ember-es6_template 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42edda08f0f4c6a3f5fdf6484094568146f9717e
-  data.tar.gz: 2d764e7c029fd1ffb91ad2030496f5894ce09459
+  metadata.gz: 4767d51dcfca91109c78fb8a1cb11e75fdb9675f
+  data.tar.gz: 3969bc707633b3ce5a2a2623967f0a5330863542
 SHA512:
-  metadata.gz: 3d76ccf711685a6245d14f53c4fdf4771309aee6191e2ceb7b645de1889bc2323c73b60bdf4eb7d8dcd1ce412caef5eb55545d68ff2ef9da17d30be93104250f
-  data.tar.gz: 9f8853546eaddc91656d11eb4e1c5dbf7699c132a9fe8b64c5548593beab67062e4dae029ed9067364d7b85ffe4a5d098864685a3c9503780fbbed992b18f606
+  metadata.gz: 80700526177a4185c7e81918f06924e26adf8bdcc12947fa3fdf47a87c9411004632c9fcedb2f0cf5362db74540dbdea33c9cfccbca4b03f7be9d811ed8118f5
+  data.tar.gz: ca3af93e133d8e124b42c3eb543cef4d0c0643780e275e26ee808615c7c1d2d3caa7afd258c6e9a075910afd467d460c139f87035569f0a1411b1e7d2fd08797

data/.travis.yml

@@ -3,7 +3,6 @@ cache: bundler
 sudo: false
 
 rvm:
-  - 2.0.0
   - 2.1
   - 2.2.4
   - 2.3.0

data/lib/ember/es6_template.rb

@@ -7,9 +7,9 @@ module Ember
   module ES6Template
     case Sprockets::VERSION
     when /^2\./
-      require 'ember/es6_template/sprockets2'
+      require 'ember/es6_template/sprockets-legacy'
     when /^[34]\./
-      require 'ember/es6_template/sprockets3'
+      require 'ember/es6_template/sprockets'
     else
       raise "Unsupported sprockets version: #{Sprockets::VERSION}"
     end

data/lib/ember/es6_template/{sprockets2.rb → sprockets-legacy.rb}

@@ -6,9 +6,9 @@ end
 
 module Ember
   module ES6Template
-    autoload :ES6, 'ember/es6_template/sprockets2/es6'
-    autoload :ES6Module, 'ember/es6_template/sprockets2/es6module'
-    autoload :CoffeeScript, 'ember/es6_template/sprockets2/coffee_script'
+    autoload :ES6, 'ember/es6_template/sprockets-legacy/es6'
+    autoload :ES6Module, 'ember/es6_template/sprockets-legacy/es6module'
+    autoload :CoffeeScript, 'ember/es6_template/sprockets-legacy/coffee_script'
 
     def self.setup(env)
       env.register_engine '.es6', ES6

data/lib/ember/es6_template/{sprockets2 → sprockets-legacy}/coffee_script.rb

@@ -1,14 +1,17 @@
 module Ember
   module ES6Template
     class CoffeeScript < Tilt::CoffeeScriptTemplate
+      self.default_mime_type = 'application/javascript'
+
       def evaluate(scope, locals, &block)
         filename = scope.pathname.to_s
 
-        if es6?(filename)
-          ::CoffeeScript.compile(data, bare: true)
-        else
-          super
-        end
+        @output ||=
+          if es6?(filename)
+            ::CoffeeScript.compile(data, options.merge(bare: true))
+          else
+            ::CoffeeScript.compile(data, options)
+          end
       end
 
       private

data/lib/ember/es6_template/{sprockets3.rb → sprockets.rb}

@@ -1,10 +1,10 @@
 module Ember
   module ES6Template
-    autoload :ES6, 'ember/es6_template/sprockets3/es6'
-    autoload :ES6Module, 'ember/es6_template/sprockets3/es6module'
-    autoload :CoffeeScript, 'ember/es6_template/sprockets3/coffee_script'
-    autoload :CoffeeScriptModule, 'ember/es6_template/sprockets3/coffee_script_module'
-    autoload :CoffeeScriptHelper, 'ember/es6_template/sprockets3/coffee_script_helper'
+    autoload :ES6, 'ember/es6_template/sprockets/es6'
+    autoload :ES6Module, 'ember/es6_template/sprockets/es6module'
+    autoload :CoffeeScript, 'ember/es6_template/sprockets/coffee_script'
+    autoload :CoffeeScriptModule, 'ember/es6_template/sprockets/coffee_script_module'
+    autoload :CoffeeScriptHelper, 'ember/es6_template/sprockets/coffee_script_helper'
 
     def self.setup(env)
       env.register_mime_type 'application/ecmascript-6', extensions: %w(.es6)

data/lib/ember/es6_template/{sprockets3 → sprockets}/coffee_script_helper.rb

@@ -5,10 +5,16 @@ module Ember
         data = input[:data]
 
         result = input[:cache].fetch(_cache_key + [data]) do
-          transform(
-            Sprockets::Autoload::CoffeeScript.compile(data, bare: true),
-            input
-          )
+          if es6?(input[:filename])
+            transform(
+              Sprockets::Autoload::CoffeeScript.compile(data, bare: true),
+              input
+            )
+          else
+            code = Sprockets::Autoload::CoffeeScript.compile(data, bare: false)
+
+            {'code' => code}
+          end
         end
 
         result['code']
@@ -25,6 +31,10 @@ module Ember
           Sprockets::Autoload::CoffeeScript.version
         ]
       end
+
+      def es6?(filename)
+        File.basename(filename) =~ /\.(?:es6|module)\./
+      end
     end
   end
 end

data/lib/ember/es6_template/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module ES6Template
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-es6_template
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ryunosuke SATO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -138,16 +138,16 @@ files:
 - ember-es6_template.gemspec
 - lib/ember/es6_template.rb
 - lib/ember/es6_template/config.rb
-- lib/ember/es6_template/sprockets2.rb
-- lib/ember/es6_template/sprockets2/coffee_script.rb
-- lib/ember/es6_template/sprockets2/es6.rb
-- lib/ember/es6_template/sprockets2/es6module.rb
-- lib/ember/es6_template/sprockets3.rb
-- lib/ember/es6_template/sprockets3/coffee_script.rb
-- lib/ember/es6_template/sprockets3/coffee_script_helper.rb
-- lib/ember/es6_template/sprockets3/coffee_script_module.rb
-- lib/ember/es6_template/sprockets3/es6.rb
-- lib/ember/es6_template/sprockets3/es6module.rb
+- lib/ember/es6_template/sprockets-legacy.rb
+- lib/ember/es6_template/sprockets-legacy/coffee_script.rb
+- lib/ember/es6_template/sprockets-legacy/es6.rb
+- lib/ember/es6_template/sprockets-legacy/es6module.rb
+- lib/ember/es6_template/sprockets.rb
+- lib/ember/es6_template/sprockets/coffee_script.rb
+- lib/ember/es6_template/sprockets/coffee_script_helper.rb
+- lib/ember/es6_template/sprockets/coffee_script_module.rb
+- lib/ember/es6_template/sprockets/es6.rb
+- lib/ember/es6_template/sprockets/es6module.rb
 - lib/ember/es6_template/version.rb
 homepage: https://github.com/tricknotes/ember-es6_template
 licenses: