barber 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a38a106b33feac920e7c648fbad7bb24211cb156
-  data.tar.gz: 5d54053e5d0b0fd65804cc97b63130f6583fa475
+  metadata.gz: 3b161286814792680bb32b76fc78204223cd7b9c
+  data.tar.gz: 1ff091c2f4b109b41d5b6d3a02110e74c179734f
 SHA512:
-  metadata.gz: 793de24bc133c75fa6350078a240247884f20b8a0fad642f42988e9c4bc65a680fdf5d43a0428dc98672f3b255a63af761a40ab1714b0d0adc039910cafb53d8
-  data.tar.gz: d7ca65767cf9fbfc63d3fef071e0b03683367fa767ccd3bf15f6d53ffa819cf7d9252635e75b9e59a30e7997ba4d2588aae69a581783970304ffa10c3d3a8e84
+  metadata.gz: 2e5d864ca502f27db60cdd529d987cd961ca7f1ed6a9ed2a9079756c621686332e954eea6b01b6a7a05c2fae1cc2aa278bfcaf15153cabbee82d7fa0376360b7
+  data.tar.gz: dd9fc53964221a9559f3ebac87ccedb557baa5e1977751bd530920efa8fb5ac22b9a29227fcc5f49f8928479369757b117b5c7015382ebd5f057309a68d696db

data/.travis.yml

@@ -1,6 +1,8 @@
 rvm:
   - "1.9.3"
   - "2.0.0"
+  - "2.1"
+  - "2.2"
   - jruby-19mode
   - rbx-19mode
 before_script:

data/Appraisals

@@ -15,5 +15,10 @@ end
 
 appraise "ember-1.10" do
   # Uses HTMLBars
-  gem "ember-source", "~> 1.10.0.beta.2"
+  gem "ember-source", "~> 1.10.0"
+end
+
+appraise "handlebars-3.0" do
+  # Uses handlebars 3.0.x
+  gem "handlebars-source", "~> 3.0.0"
 end

data/barber.gemspec

@@ -16,11 +16,12 @@ Gem::Specification.new do |gem|
   gem.version       = Barber::VERSION
 
   gem.add_dependency "execjs"
-  gem.add_dependency "handlebars-source", [">= 1.0.0.rc.4"]
   gem.add_dependency "ember-source"
 
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "handlebars-source", [">= 1.0.0.rc.4", "< 3.1"]
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "mocha", "~> 1.0"
   gem.add_development_dependency "appraisal"
+  gem.add_development_dependency "minitest", "~> 4.0"
 end

data/gemfiles/ember_1.10.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "therubyrhino", :platform => :jruby
-gem "ember-source", "~> 1.10.0.beta.2"
+gem "ember-source", "~> 1.10.0"
 
 gemspec :path => "../"

data/gemfiles/ember_1.10.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: ../
   specs:
-    barber (0.5.0)
+    barber (0.6.0)
       ember-source
       execjs
-      handlebars-source (>= 1.0.0.rc.4)
+      handlebars-source (>= 1.0.0.rc.4, < 3.1)
 
 GEM
   remote: https://rubygems.org/
@@ -14,20 +14,20 @@ GEM
       rake
       thor (>= 0.14.0)
     docile (1.1.5)
-    ember-source (1.10.0.beta.2)
-      handlebars-source (~> 2.0)
-    execjs (2.2.2)
-    handlebars-source (2.0.0)
+    ember-source (1.10.0)
+    execjs (2.3.0)
+    handlebars-source (3.0.0)
     metaclass (0.0.4)
+    minitest (4.7.5)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
     rake (10.4.2)
-    simplecov (0.9.1)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
     thor (0.19.1)
 
 PLATFORMS
@@ -36,7 +36,8 @@ PLATFORMS
 DEPENDENCIES
   appraisal
   barber!
-  ember-source (~> 1.10.0.beta.2)
+  ember-source (~> 1.10.0)
+  minitest (~> 4.0)
   mocha (~> 1.0)
   rake
   simplecov

data/gemfiles/ember_1.8.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: ../
   specs:
-    barber (0.5.0)
+    barber (0.6.0)
       ember-source
       execjs
-      handlebars-source (>= 1.0.0.rc.4)
+      handlebars-source (>= 1.0.0.rc.4, < 3.1)
 
 GEM
   remote: https://rubygems.org/
@@ -16,18 +16,19 @@ GEM
     docile (1.1.5)
     ember-source (1.8.0)
       handlebars-source (~> 1.0)
-    execjs (2.2.2)
+    execjs (2.3.0)
     handlebars-source (1.3.0)
     metaclass (0.0.4)
+    minitest (4.7.5)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
     rake (10.4.2)
-    simplecov (0.9.1)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
     thor (0.19.1)
 
 PLATFORMS
@@ -37,6 +38,7 @@ DEPENDENCIES
   appraisal
   barber!
   ember-source (= 1.8.0)
+  minitest (~> 4.0)
   mocha (~> 1.0)
   rake
   simplecov

data/gemfiles/ember_1.9.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: ../
   specs:
-    barber (0.5.0)
+    barber (0.6.0)
       ember-source
       execjs
-      handlebars-source (>= 1.0.0.rc.4)
+      handlebars-source (>= 1.0.0.rc.4, < 3.1)
 
 GEM
   remote: https://rubygems.org/
@@ -16,18 +16,19 @@ GEM
     docile (1.1.5)
     ember-source (1.9.1)
       handlebars-source (~> 2.0)
-    execjs (2.2.2)
+    execjs (2.3.0)
     handlebars-source (2.0.0)
     metaclass (0.0.4)
+    minitest (4.7.5)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
     rake (10.4.2)
-    simplecov (0.9.1)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
     thor (0.19.1)
 
 PLATFORMS
@@ -37,6 +38,7 @@ DEPENDENCIES
   appraisal
   barber!
   ember-source (~> 1.9.0)
+  minitest (~> 4.0)
   mocha (~> 1.0)
   rake
   simplecov

data/gemfiles/ember_rc4.gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: ../
   specs:
-    barber (0.5.0)
+    barber (0.6.0)
       ember-source
       execjs
-      handlebars-source (>= 1.0.0.rc.4)
+      handlebars-source (>= 1.0.0.rc.4, < 3.1)
 
 GEM
   remote: https://rubygems.org/
@@ -16,18 +16,19 @@ GEM
     docile (1.1.5)
     ember-source (1.0.0.rc4)
       handlebars-source (= 1.0.0.rc4)
-    execjs (2.2.2)
+    execjs (2.3.0)
     handlebars-source (1.0.0.rc4)
     metaclass (0.0.4)
+    minitest (4.7.5)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
     rake (10.4.2)
-    simplecov (0.9.1)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
     thor (0.19.1)
 
 PLATFORMS
@@ -37,6 +38,7 @@ DEPENDENCIES
   appraisal
   barber!
   ember-source (= 1.0.0.rc4)
+  minitest (~> 4.0)
   mocha (~> 1.0)
   rake
   simplecov

data/gemfiles/handlebars_3.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "therubyrhino", :platform => :jruby
+gem "handlebars-source", "~> 3.0.0"
+
+gemspec :path => "../"

data/gemfiles/handlebars_3.0.gemfile.lock

@@ -0,0 +1,44 @@
+PATH
+  remote: ../
+  specs:
+    barber (0.6.0)
+      ember-source
+      execjs
+      handlebars-source (>= 1.0.0.rc.4, < 3.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (1.0.2)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    docile (1.1.5)
+    ember-source (1.10.0)
+    execjs (2.3.0)
+    handlebars-source (3.0.0)
+    metaclass (0.0.4)
+    minitest (4.7.5)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.10.1)
+    rake (10.4.2)
+    simplecov (0.9.2)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
+    thor (0.19.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  barber!
+  handlebars-source (~> 3.0.0)
+  minitest (~> 4.0)
+  mocha (~> 1.0)
+  rake
+  simplecov
+  therubyrhino

data/lib/barber.rb

@@ -1,6 +1,5 @@
 require "barber/version"
 
-require 'handlebars/source'
 require 'ember/source'
 
 require "barber/precompiler"

data/lib/barber/ember/precompiler.rb

@@ -11,7 +11,7 @@ module Barber
       end
 
       def sources
-        [precompiler, handlebars, ember_template_precompiler]
+        super + [ember_template_precompiler]
       end
     end
   end

data/lib/barber/javascripts/ember_precompiler.js

@@ -9,7 +9,7 @@ function require() {
 // Precompiler
 var Barber = {
   precompile: function(string) {
-    var Compiler = exports.precompile ? exports : require(/* htmlbars */);
+    var Compiler = exports.precompile ? exports : require(/* ember-template-compiler */);
 
     return Compiler.precompile(string, false).toString();
   }

data/lib/barber/javascripts/handlebars_precompiler.js

@@ -1,6 +1,9 @@
 // Precompiler
 var Barber = {
   precompile: function(string) {
+    if (typeof Handlebars === 'undefined') {
+      throw '`Handlebars` is missing. `gem "handlebars-source"` is required in your `Gemfile`.';
+    }
     return Handlebars.precompile(string).toString();
   }
 };

data/lib/barber/precompiler.rb

@@ -20,7 +20,9 @@ module Barber
     end
 
     def sources
-      [precompiler, handlebars]
+      sources = [precompiler]
+      sources << handlebars if handlebars_available?
+      sources
     end
 
     def handlebars
@@ -75,7 +77,21 @@ module Barber
     end
 
     def source
-      @source ||= sources.map(&:read).join("\n;\n")
+      # hbs 3 has no reference to `window`.
+      @source ||= <<-SOURCE
+if (typeof window === 'undefined') {
+  window = this;
+};
+#{sources.map(&:read).join("\n;\n")}
+      SOURCE
+    end
+
+    def handlebars_available?
+      require "handlebars/source" # handlebars precompilation is optional feature.
+    rescue LoadError
+      # noop
+    ensure
+      return !!defined?(Handlebars::Source)
     end
   end
 end

data/lib/barber/version.rb

@@ -1,3 +1,3 @@
 module Barber
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/test/precompiler_test.rb

@@ -86,6 +86,19 @@ class PrecompilerTest < MiniTest::Unit::TestCase
     assert_equal "Foo", custom_compiler.compile("{{hello}}")
   end
 
+  def test_has_an_easy_to_customize_public_interface
+    custom_compiler = Class.new Barber::Precompiler do
+      # Stub for non-handlebars environment
+      def handlebars_available?
+        false
+      end
+    end
+
+    assert_raises Barber::PrecompilerError do
+      custom_compiler.compile('{{hello}}')
+    end
+  end
+
   private
   def compile(template)
     Barber::Precompiler.compile template

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barber
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - tchak
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-28 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -26,27 +26,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: handlebars-source
+  name: ember-source
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ember-source
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -54,19 +54,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: handlebars-source
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.rc.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.rc.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +115,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: Handlebars precompilation
 email:
 - paul@chavard.net
@@ -133,6 +153,8 @@ files:
 - gemfiles/ember_1.9.gemfile.lock
 - gemfiles/ember_rc4.gemfile
 - gemfiles/ember_rc4.gemfile.lock
+- gemfiles/handlebars_3.0.gemfile
+- gemfiles/handlebars_3.0.gemfile.lock
 - lib/barber.rb
 - lib/barber/ember/precompiler.rb
 - lib/barber/ember/precompilers.rb
@@ -165,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Handlebars precompilation toolkit