ember-middleman 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9656340e41e3c0ab228600296263977e05833ba8
-  data.tar.gz: 13faa7e3c56f597e9b58e44358d09bd6c97e9212
+  metadata.gz: 83d659e37f35a88aefd3948d2a5079e1b08f736b
+  data.tar.gz: d3d280962f34f7429725a7bd01c603dac83b2560
 SHA512:
-  metadata.gz: 06b03a7f985052c5231eceea9e843a53373ee9b7feee09a0ce23b1f0d76a63c14213c6b3f178f3ce5fab91a614c990a1d7a13b9e019080180a72a3588b43da46
-  data.tar.gz: 7d5b0aab24bda8fd3b576bc9a296af20cdbb08138ac1e9d1d9a278b037fe531419e34240199398260d0c07f041827d09216c5cf7106a709dddddfd087a3db0ea
+  metadata.gz: 81add419dd0ad90b4d1127fb7dacd763c0dad28583c41df2b859de56dbbf1e46dd789651d5b072622563185647978a5a15147014367acb5336e8c8f0c8ff7903
+  data.tar.gz: 7f119bc19ce8d65c3ab11cf742d65f2689284ea7da18e7d4218ed8be4b9e0e1e5d0ccf1eac8e3127a29c6d61cfbfbf8d1bccc01a2f4b328aeb8b84152776ab2c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Ember::Middleman Changelog
 
+## [v0.0.15](https://github.com/tricknotes/ember-middleman/tree/v0.0.15)
+
+* Use [ember-handlebars-template][] instead of barber.
+
+[ember-handlebars-template]: https://github.com/tricknotes/ember-middleman
+
 ## [v0.0.14](https://github.com/tricknotes/ember-middleman/tree/v0.0.14)
 
 * Ember < 1.10.0 support is back (handlebars related features are optional)

data/README.md

@@ -106,10 +106,6 @@ When you use Ember.js < 1.10, `handlebars` is required in your `application.js`.
 //= require handlebars
 ```
 
-## Known issues
-
-* Many code are duplicated with ember-rails
-
 ## Example Repository
 
 * [sapporojs.org](https://github.com/sapporojs/sapporojs.org)

data/ember-middleman.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'barber', '~> 0.7.0'
+  spec.add_dependency 'ember-handlebars-template', '~> 0.1.2'
   spec.add_dependency 'ember-source'
   spec.add_dependency 'ember-data-source', '>= 1.0.0.beta.8'
   spec.add_dependency 'sass'

data/lib/ember/middleman/extension.rb

@@ -1,6 +1,6 @@
 require 'active_support/ordered_options'
 
-require 'ember/middleman/handlebars/template'
+require 'ember/handlebars/template'
 
 require 'ember/source'
 require 'ember/data/source'
@@ -16,13 +16,13 @@ module Ember
     module Extension
       class << self
         def registered(app)
-          config = Ember::Middleman::Handlebars::Template.configuration
+          Ember::Handlebars::Template.configure do |config|
+            config.precompile = true
+            config.templates_root = 'templates'
+            config.templates_path_separator = '/'
 
-          config.precompile ||= true
-          config.templates_root ||= 'templates'
-          config.templates_path_separator ||= '/'
-
-          yield config if block_given?
+            yield config if block_given?
+          end
 
           app.before_configuration do
             template_extensions handlebars: :js,
@@ -35,14 +35,14 @@ module Ember
             sprockets.append_path ::Ember::Data::Source.bundled_path_for(nil)
             sprockets.append_path File.dirname(::Handlebars::Source.bundled_path) if defined?(::Handlebars)
 
-            sprockets.register_engine '.handlebars', Ember::Middleman::Handlebars::Template
-            sprockets.register_engine '.hbs', Ember::Middleman::Handlebars::Template
-            sprockets.register_engine '.hjs', Ember::Middleman::Handlebars::Template
+            sprockets.register_engine '.handlebars', Ember::Handlebars::Template
+            sprockets.register_engine '.hbs', Ember::Handlebars::Template
+            sprockets.register_engine '.hjs', Ember::Handlebars::Template
           end
 
-          ::Tilt.register '.handlebars', Ember::Middleman::Handlebars::Template
-          ::Tilt.register '.hbs', Ember::Middleman::Handlebars::Template
-          ::Tilt.register '.hjs', Ember::Middleman::Handlebars::Template
+          ::Tilt.register '.handlebars', Ember::Handlebars::Template
+          ::Tilt.register '.hbs', Ember::Handlebars::Template
+          ::Tilt.register '.hjs', Ember::Handlebars::Template
         end
       end
     end

data/lib/ember/middleman/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module Middleman
-    VERSION = '0.0.14'
+    VERSION = '0.0.15'
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ember-middleman
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Ryunosuke SATO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: barber
+  name: ember-handlebars-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: ember-source
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +177,6 @@ files:
 - fixtures/path-to-libraries/source/javascripts/application.js
 - lib/ember/middleman.rb
 - lib/ember/middleman/extension.rb
-- lib/ember/middleman/handlebars/template.rb
 - lib/ember/middleman/templates.rb
 - lib/ember/middleman/templates/config.tt
 - lib/ember/middleman/templates/gitkeep

data/lib/ember/middleman/handlebars/template.rb

@@ -1,112 +0,0 @@
-require 'ostruct'
-
-require 'sprockets'
-require 'sprockets/engines'
-require 'barber'
-
-module Ember
-  module Middleman
-    module Handlebars
-      class Template < Tilt::Template
-        self.default_mime_type = 'application/javascript'
-
-        def self.configuration
-          @configuration ||= OpenStruct.new
-        end
-
-        def prepare; end
-
-        def evaluate(scope, locals, &block)
-          target = template_target(scope)
-          raw = handlebars?(scope)
-
-          if raw
-            template = data
-          else
-            template = mustache_to_handlebars(scope, data)
-          end
-
-          if configuration.precompile
-            if raw
-              template = precompile_handlebars(template)
-            else
-              template = precompile_ember_handlebars(template)
-            end
-          else
-            if raw
-              template = compile_handlebars(data)
-            else
-              template = compile_ember_handlebars(template)
-            end
-          end
-
-          "#{target} = #{template}\n"
-        end
-
-        def configuration
-          self.class.configuration
-        end
-
-        def allows_script?
-          false
-        end
-
-        private
-
-        def handlebars?(scope)
-          scope.pathname.to_s =~ /\.raw\.(handlebars|hjs|hbs)/
-        end
-
-        def template_target(scope)
-          "Ember.TEMPLATES[#{template_path(scope.logical_path).inspect}]"
-        end
-
-        def compile_handlebars(string)
-          "Handlebars.compile(#{indent(string).inspect});"
-        end
-
-        def precompile_handlebars(string)
-          Barber::FilePrecompiler.call(string)
-        end
-
-        def compile_ember_handlebars(string)
-          "Ember.Handlebars.compile(#{indent(string).inspect});"
-        end
-
-        def precompile_ember_handlebars(string)
-          Barber::Ember::FilePrecompiler.call(string)
-        end
-
-        def mustache_to_handlebars(scope, template)
-          if scope.pathname.to_s =~ /\.mustache\.(handlebars|hjs|hbs)/
-            template.gsub(/\{\{(\w[^\}\}]+)\}\}/){ |x| "{{unbound #{$1}}}" }
-          else
-            template
-          end
-        end
-
-        def template_path(path)
-          root = configuration.templates_root
-
-          if root.kind_of? Array
-            root.each do |root|
-              path.sub!(/#{Regexp.quote(root)}\//, '')
-            end
-          else
-            unless root.empty?
-              path.sub!(/#{Regexp.quote(root)}\/?/, '')
-            end
-          end
-
-          path = path.split('/')
-
-          path.join(configuration.templates_path_separator)
-        end
-
-        def indent(string)
-          string.gsub(/$(.)/m, "\\1  ").strip
-        end
-      end
-    end
-  end
-end