ember-es6_template 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3150df9a76eddaf0615b50a14e65f16a028496f4
-  data.tar.gz: 2d59611860fd0f8cce7355eaaddf565634399ea4
+  metadata.gz: 42edda08f0f4c6a3f5fdf6484094568146f9717e
+  data.tar.gz: 2d764e7c029fd1ffb91ad2030496f5894ce09459
 SHA512:
-  metadata.gz: 8074ff15eea7302a8c38e8291d204b7f6379ad4bedd3b946ab664a562ce86e7680a7fa3febea3c5c2f9ccd9f4922ccfe0b3ffc0d8627f4b96ddfa5d86a120b18
-  data.tar.gz: 9b4a6143562709424fff07bd617cafcf8b6173ea0f0e8d2101716081f1049e5c0a0b8f61e2f726a9972b4a9d18764be8775286d40e909ea33cd39ee112efc089
+  metadata.gz: 3d76ccf711685a6245d14f53c4fdf4771309aee6191e2ceb7b645de1889bc2323c73b60bdf4eb7d8dcd1ce412caef5eb55545d68ff2ef9da17d30be93104250f
+  data.tar.gz: 9f8853546eaddc91656d11eb4e1c5dbf7699c132a9fe8b64c5548593beab67062e4dae029ed9067364d7b85ffe4a5d098864685a3c9503780fbbed992b18f606

data/.travis.yml

@@ -5,13 +5,17 @@ sudo: false
 rvm:
   - 2.0.0
   - 2.1
-  - 2.2
+  - 2.2.4
+  - 2.3.0
 
 env:
   matrix:
-    - SPROCKETS_VERSION="~> 2.1.0"
+    - SPROCKETS_VERSION="~> 2.2.0"
     - SPROCKETS_VERSION="~> 2.12.0"
     - SPROCKETS_VERSION="~> 3.0.0"
     - SPROCKETS_VERSION="~> 3.1.0"
     - SPROCKETS_VERSION="~> 3.2.0"
     - SPROCKETS_VERSION="~> 3.3.0"
+    - SPROCKETS_VERSION="~> 3.4.0"
+    - SPROCKETS_VERSION="~> 3.5.0"
+    - SPROCKETS_VERSION="~> 4.0.0.beta1"

data/ember-es6_template.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'babel-transpiler', '>= 0.6.0', '< 0.8'
-  spec.add_dependency 'sprockets', '>= 2.1', '< 4'
+  spec.add_dependency 'sprockets', '>= 2.2', '< 4'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/ember/es6_template.rb

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

data/lib/ember/es6_template/sprockets2/coffee_script.rb

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

data/lib/ember/es6_template/sprockets3.rb

@@ -7,10 +7,29 @@ module Ember
     autoload :CoffeeScriptHelper, 'ember/es6_template/sprockets3/coffee_script_helper'
 
     def self.setup(env)
-      env.register_engine '.es6', ES6, mime_type: 'application/javascript'
-      env.register_engine '.module.es6', ES6Module, mime_type: 'application/javascript'
-      env.register_engine '.module.coffee', CoffeeScriptModule, mime_type: 'application/javascript'
-      env.register_engine '.coffee', CoffeeScript, mime_type: 'application/javascript' # Force parse as ES6
+      env.register_mime_type 'application/ecmascript-6', extensions: %w(.es6)
+      env.register_mime_type 'application/ecmascript-6+module', extensions: %w(.module.es6)
+      env.register_mime_type 'text/coffeescript', extensions: %w(.es6.coffee .coffee)
+      env.register_mime_type 'text/coffeescript+module', extensions: %w(.es6.module.coffee .module.coffee)
+
+      env.register_transformer 'application/ecmascript-6', 'application/javascript', ES6
+      env.register_transformer 'application/ecmascript-6+module', 'application/javascript', ES6Module
+      env.register_transformer 'text/coffeescript', 'application/javascript', CoffeeScript
+      env.register_transformer 'text/coffeescript+module', 'application/javascript', CoffeeScriptModule
+
+      env.register_preprocessor 'application/ecmascript-6', Sprockets::DirectiveProcessor.new(comments: ["//", ["/*", "*/"]])
+      env.register_preprocessor 'application/ecmascript-6+module', Sprockets::DirectiveProcessor.new(comments: ["//", ["/*", "*/"]])
+      env.register_preprocessor 'text/coffeescript', Sprockets::DirectiveProcessor.new(comments: ["#", ["###", "###"]])
+      env.register_preprocessor 'text/coffeescript+module', Sprockets::DirectiveProcessor.new(comments: ["#", ["###", "###"]])
+
+      if Sprockets::VERSION =~ /^4\./
+        env.register_transformer_suffix %w(
+          application/ecmascript-6
+          application/ecmascript-6+module
+          text/coffeescript
+          text/coffeescript+module
+        ), 'application/\2+ruby', '.erb', Sprockets::ERBProcessor
+      end
     end
   end
 end

data/lib/ember/es6_template/sprockets3/coffee_script_helper.rb

@@ -5,16 +5,10 @@ module Ember
         data = input[:data]
 
         result = input[:cache].fetch(_cache_key + [data]) do
-          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
+          transform(
+            Sprockets::Autoload::CoffeeScript.compile(data, bare: true),
+            input
+          )
         end
 
         result['code']
@@ -31,10 +25,6 @@ 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.4.4'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-es6_template
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Ryunosuke SATO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'