barber 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b6982650f0e407547593720b758f5a3660523e5
-  data.tar.gz: e1aa383254af343408bce509afcbf064fe37d13f
+  metadata.gz: c521fa1082b9333cc4cb2dac57a13bb871e63930
+  data.tar.gz: 10ca916a5301f5d23c0ed60b602aeda55b3d28e0
 SHA512:
-  metadata.gz: 21f1a28336d5526e1dbb121ac43d6f9794a1bd8e3d5ddcd50cd720c20fb27a31b546aa5ff2e21aafa99bc7ef4a6e22ce77503550fcc2b1d84b75d2af1fada509
-  data.tar.gz: 5fa2efda16f061b470ac3aca07654218e55195edb90a108cbdaa885b51dcafd63e096c9066cdf74b7b2da180e6c24d96d274113105d9208b646fe267c6cce337
+  metadata.gz: 36a842d2dd597e714fe545f7ed94c62e8292847eb45c92e73b950849aa8847a92e7f37503ad6ae914915bb043628fb4204e3148641f82197f91eb0381083efa0
+  data.tar.gz: a0f6f5d41e9ff059aa96b8739cfd0e4e7f7e8cbd34767a5f9577b8304f8a81d247b1a625f51f665644ae9973f7486fbd055cdf07ab9bd05a33eb8e8731380a86

data/.travis.yml

@@ -2,12 +2,11 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - "2.0.0"
-  - "2.1"
-  - "2.2"
-  - "2.3.0"
-  - jruby-19mode
-  - rbx-19mode
+  - "2.1.10"
+  - "2.2.5"
+  - "2.3.1"
+  - jruby-9.0.5.0
+  - rbx-2
 env:
   matrix:
     - EMBER_SOURCE_VERSION="~> 1.0.0" # Uses handlebars-source 1.0.12

data/Gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in handlebars-precompiler.gemspec
 gemspec
 
 gem 'therubyrhino', platform: :jruby

data/barber.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "handlebars-source", "< 4.1"
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "mocha", "~> 1.0"
-  gem.add_development_dependency "minitest", "~> 4.0"
+  gem.add_development_dependency "minitest", "~> 5.0"
 end

data/lib/barber/javascripts/ember_precompiler.js

@@ -3,13 +3,31 @@ var module = this.module || {exports: null};
 
 function require() {
   // ember-template-compiler only requires which 'handlebars' or 'htmlbars'.
-  return module.exports || Handlebars;
+
+  // Ember 1.9
+  if (exports.precompile) {
+    return exports;
+  }
+  // Ember 2.7 or later
+  if (typeof Ember !== 'undefined') {
+    return Ember.Handlebars;
+  }
+  // Ember >= 1.10, < 2.7
+  if (module.exports) {
+    return module.exports;
+  }
+  // Older Ember
+  if (typeof Handlebars !== 'undefined') {
+    return Handlebars;
+  }
+
+  throw '`ember-template-compiler` is missing.';
 }
 
 // Precompiler
 var Barber = {
   precompile: function(string, options) {
-    var Compiler = exports.precompile ? exports : require(/* ember-template-compiler */);
+    var Compiler = require(/* ember-template-compiler */);
 
     return Compiler.precompile(string, options).toString();
   }

data/lib/barber/version.rb

@@ -1,3 +1,3 @@
 module Barber
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

data/test/ember/precompiler_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
 
-class EmberPrecompilerTest < MiniTest::Unit::TestCase
+class EmberPrecompilerTest < Minitest::Test
   def test_calls_the_ember_handlebars_precompiler
     result = compile "Hello {{name}}"
     assert result
-    assert_match /data\.buffer|isHTMLBars: true|"revision": "Ember@/, result
+    assert_match %r{data\.buffer|isHTMLBars: true|"revision": "Ember@}, result
   end
 
   def test_is_a_precompiler
@@ -13,7 +13,7 @@ class EmberPrecompilerTest < MiniTest::Unit::TestCase
   end
 
   def test_compiler_version
-    assert_match /ember:/, Barber::Ember::Precompiler.compiler_version
+    assert_match %r{ember:}, Barber::Ember::Precompiler.compiler_version
   end
 
   def test_ember_template_compiler_path
@@ -25,7 +25,22 @@ class EmberPrecompilerTest < MiniTest::Unit::TestCase
 
     compiler.ember_template_compiler_path = File.expand_path('../../fixtures/ember-template-compiler.js', __FILE__)
 
-    assert_match /ember:1\.11\.0/, compiler.compiler_version
+    assert_match %r{ember:1\.11\.0}, compiler.compiler_version
+  end
+
+  def test_for_handlebars_anavailable
+    if  Gem::Version.new(Ember::VERSION) < Gem::Version.new('1.10')
+      skip "This ember-source (#{Ember::VERSION}) is too old to assert without Handlebars."
+    end
+
+    custom_compiler = Class.new Barber::Ember::Precompiler do
+      # Stub for non-handlebars environment
+      def self.handlebars_available?
+        false
+      end
+    end
+
+    assert_match %r{function\(\)}, custom_compiler.compile('{{hello}}')
   end
 
   private

data/test/ember/precompilers_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class EmberPrecompilersTest < MiniTest::Unit::TestCase
+class EmberPrecompilersTest < Minitest::Test
   def template ; "{{hello}}" ; end
   def compiled_template ; "function()" ; end
   def compile_option ; {moduleName: "hello"} ; end

data/test/precompiler_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'stringio'
 
-class PrecompilerTest < MiniTest::Unit::TestCase
+class PrecompilerTest < Minitest::Test
   def test_returns_a_template
     result = compile "Hello {{name}}"
     assert result
@@ -90,7 +90,7 @@ class PrecompilerTest < MiniTest::Unit::TestCase
     assert_equal "Foo", custom_compiler.compile("{{hello}}")
   end
 
-  def test_has_an_easy_to_customize_public_interface
+  def test_for_handlebars_anavailable
     custom_compiler = Class.new Barber::Precompiler do
       # Stub for non-handlebars environment
       def self.handlebars_available?
@@ -104,7 +104,7 @@ class PrecompilerTest < MiniTest::Unit::TestCase
   end
 
   def test_compiler_version
-    assert_match /handlebars:/, Barber::Precompiler.compiler_version
+    assert_match %r{handlebars:}, Barber::Precompiler.compiler_version
   end
 
   private

data/test/precompilers_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PrecompilersTest < MiniTest::Unit::TestCase
+class PrecompilersTest < Minitest::Test
   def template ; "{{hello}}" ; end
   def compiled_template ; "function()" ; end
   def compile_option ; {moduleName: "hello"} ; end

data/test/test_helper.rb

@@ -3,6 +3,7 @@ SimpleCov.start
 
 require 'barber'
 
+require 'minitest'
 require 'minitest/unit'
 require 'minitest/autorun'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barber
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - tchak
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2016-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -113,14 +113,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 description: Handlebars precompilation
 email:
 - paul@chavard.net