ember-es6_template 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 876adc28ef214a2ac6984b491f78613476cc7bde
-  data.tar.gz: 8700b61456b3a4da31930deb333ac95f23a8839b
+  metadata.gz: cc9281fed91e8debece31cf2ec7c7b1965daa2a1
+  data.tar.gz: b86c0e435c11fbcc23442ece9cb73d88b4251960
 SHA512:
-  metadata.gz: f4052077697251822e91890a8555648e8e2186f4b457be73f3147f2666986159197c387d2b2b3d45e5cbd81a6c63e172120de128dde19dff400596a516e0f03e
-  data.tar.gz: 509df12a1defad6b44394f4aa73f950077f2858956c347f18c0f988b24ceb4b2543be8e6a8a59678a21662cce66689950c437991799c2252348cf776f7ad9953
+  metadata.gz: 8f28cd28af9ea375004b9038ddf9c10d6a4a0bbe1901d440e60da8779dd6b1ab871e0c59368e40813eabfe0d04ea08066819d09ad4d23cba30fe90727b8de026
+  data.tar.gz: 501606377c77574127843bfe95b38d2a7c9fe0c96c1ec5fcb3fc93cec0de47dce95b2f1c17705bf4c49e1e39b01e478dd764268e70b60d136871451c9e505b87

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'
+  spec.add_dependency 'sprockets', '>= 2.1', '< 4'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/ember/es6_template.rb

@@ -7,28 +7,9 @@ module Ember
   module ES6Template
     case Sprockets::VERSION
     when /^2\./
-      autoload :ES6, 'ember/es6_template/es6_sprockets2'
-      autoload :ES6Module, 'ember/es6_template/es6module_sprockets2'
-      autoload :CoffeeScript, 'ember/es6_template/coffee_script_sprockets2'
-
-      def self.setup(env)
-        env.register_engine '.es6', ES6
-        env.register_engine '.module', ES6Module
-        env.register_engine '.coffee', CoffeeScript
-      end
+      require 'ember/es6_template/sprockets2'
     when /^3\./
-      autoload :ES6, 'ember/es6_template/es6'
-      autoload :ES6Module, 'ember/es6_template/es6module'
-      autoload :CoffeeScript, 'ember/es6_template/coffee_script'
-      autoload :CoffeeScriptModule, 'ember/es6_template/coffee_script_module'
-      autoload :CoffeeScriptHelper, 'ember/es6_template/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
-      end
+      require 'ember/es6_template/sprockets3'
     else
       raise "Unsupported sprockets version: #{Sprockets::VERSION}"
     end

data/lib/ember/es6_template/sprockets2.rb

@@ -0,0 +1,13 @@
+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'
+
+    def self.setup(env)
+      env.register_engine '.es6', ES6
+      env.register_engine '.module', ES6Module
+      env.register_engine '.coffee', CoffeeScript
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Ember
+  module ES6Template
+    class CoffeeScript < Tilt::CoffeeScriptTemplate
+      def evaluate(scope, locals, &block)
+        filename = scope.pathname.to_s
+
+        if es6?(filename)
+          ::CoffeeScript.compile(data, bare: true)
+        else
+          super
+        end
+      end
+
+      private
+
+      def es6?(filename)
+        filename =~ /\.(?:module|es6)\.coffee/
+      end
+    end
+  end
+end

data/lib/ember/es6_template/{es6_sprockets2.rb → sprockets2/es6.rb}

@@ -12,14 +12,21 @@ module Ember
       def evaluate(scope, locals, &block)
         env = scope.environment
 
+        return data if module?(scope.pathname.to_s)
+
         result = Babel::Transpiler.transform(data,
           'sourceRoot' => env.root,
           'moduleRoot' => '',
-          'filename' => scope.logical_path,
-          'blacklist' => ['es6.modules']
+          'filename' => scope.logical_path
         )
 
-        result['code']
+        return result['code']
+      end
+
+      private
+
+      def module?(filename)
+        filename =~ /\.module\.es6/
       end
     end
   end

data/lib/ember/es6_template/sprockets3.rb

@@ -0,0 +1,17 @@
+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'
+
+    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
+    end
+  end
+end
+

data/lib/ember/es6_template/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module ES6Template
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember-es6_template
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ryunosuke SATO
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -36,14 +36,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -131,14 +137,16 @@ files:
 - bin/setup
 - ember-es6_template.gemspec
 - lib/ember/es6_template.rb
-- lib/ember/es6_template/coffee_script.rb
-- lib/ember/es6_template/coffee_script_helper.rb
-- lib/ember/es6_template/coffee_script_module.rb
-- lib/ember/es6_template/coffee_script_sprockets2.rb
-- lib/ember/es6_template/es6.rb
-- lib/ember/es6_template/es6_sprockets2.rb
-- lib/ember/es6_template/es6module.rb
-- lib/ember/es6_template/es6module_sprockets2.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/version.rb
 homepage: https://github.com/tricknotes/ember-es6_template
 licenses:

data/lib/ember/es6_template/coffee_script_sprockets2.rb

@@ -1,37 +0,0 @@
-module Ember
-  module ES6Template
-    class CoffeeScript < Tilt::CoffeeScriptTemplate
-      def evaluate(scope, locals, &block)
-        env = scope.environment
-
-        filename = scope.pathname.to_s
-
-        if es6_module?(filename)
-          ::CoffeeScript.compile(data, bare: true)
-        elsif es6?(filename)
-          result = Babel::Transpiler.transform(
-            ::CoffeeScript.compile(data, bare: true),
-            'sourceRoot' => env.root,
-            'moduleRoot' => '',
-            'filename' => scope.logical_path
-          )
-
-          result['code']
-        else
-          super
-        end
-      end
-
-      private
-
-      def es6_module?(filename)
-        filename =~ /\.module\.(?:es6\.)?coffee/
-      end
-
-      def es6?(filename)
-        filename =~ /\.(?:es6\.)?coffee/
-      end
-    end
-  end
-end
-