barber 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b161286814792680bb32b76fc78204223cd7b9c
-  data.tar.gz: 1ff091c2f4b109b41d5b6d3a02110e74c179734f
+  metadata.gz: 7bdca05df2d8ce7c39c863a2468049b9f34f9e0d
+  data.tar.gz: 2dbe50ca6ab5665a105e4813438ca2c59c2d46dd
 SHA512:
-  metadata.gz: 2e5d864ca502f27db60cdd529d987cd961ca7f1ed6a9ed2a9079756c621686332e954eea6b01b6a7a05c2fae1cc2aa278bfcaf15153cabbee82d7fa0376360b7
-  data.tar.gz: dd9fc53964221a9559f3ebac87ccedb557baa5e1977751bd530920efa8fb5ac22b9a29227fcc5f49f8928479369757b117b5c7015382ebd5f057309a68d696db
+  metadata.gz: 9b716fdc824e1d374274a8c0e8dd844a664ef01422471301d4007223c2ba7733a9737bdd8090b02025ea70a2e779b5c44c54326dde970b455a9a69d042a88aed
+  data.tar.gz: 722dd8299c6baac11c9589b1d90aafe7509cbc8de7f905a1af5eaa6fae368955c2cddd07b48e0c1fd6f5f6917243de24333ec7f2d9b7b610f1887e9c2292ebc2

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - "1.9.3"
   - "2.0.0"
   - "2.1"
   - "2.2"

data/lib/barber/ember/precompiler.rb

@@ -13,6 +13,22 @@ module Barber
       def sources
         super + [ember_template_precompiler]
       end
+
+      def compiler_version
+        cache_key = "ember-source:#{::Ember::VERSION}"
+
+        if handlebars_version
+          "handlebars:#{handlebars_version}/#{cache_key}"
+        else
+          cache_key
+        end
+      end
+
+      private
+
+      def handlebars_version
+        @handlebars_version ||= context.eval('typeof require !== "undefined" && require("handlebars") && require("handlebars").VERSION');
+      end
     end
   end
 end

data/lib/barber/precompiler.rb

@@ -5,7 +5,17 @@ module Barber
   class Precompiler
     class << self
       def compile(template)
-        new.compile(template)
+        instance.compile(template)
+      end
+
+      def compiler_version
+        instance.compiler_version
+      end
+
+      private
+
+      def instance
+        @instance ||= new
       end
     end
 
@@ -29,6 +39,10 @@ module Barber
       @handlebars ||= File.new(Handlebars::Source.bundled_path)
     end
 
+    def compiler_version
+      "handlebars:#{handlebars_version}"
+    end
+
     private
     # This method handles different types of user input. The precompiler
     # can be called from many different places which create interesting
@@ -88,10 +102,14 @@ if (typeof window === 'undefined') {
 
     def handlebars_available?
       require "handlebars/source" # handlebars precompilation is optional feature.
-    rescue LoadError
-      # noop
+    rescue LoadError => e
+      raise e unless e.message == 'cannot load such file -- handlebars/source'
     ensure
       return !!defined?(Handlebars::Source)
     end
+
+    def handlebars_version
+      @handlebars_version ||= context.eval('Handlebars.VERSION')
+    end
   end
 end

data/lib/barber/version.rb

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

data/test/ember/precompiler_test.rb

@@ -12,6 +12,12 @@ class EmberPrecompilerTest < MiniTest::Unit::TestCase
       "Ember precompile should inherit from Barber::Precompiler"
   end
 
+  def test_compiler_version
+    assert Barber::Ember::Precompiler.compiler_version
+  end
+
+  private
+
   def compile(template)
     Barber::Ember::Precompiler.compile template
   end

data/test/precompiler_test.rb

@@ -99,7 +99,12 @@ class PrecompilerTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_compiler_version
+    assert Barber::Precompiler.compiler_version
+  end
+
   private
+
   def compile(template)
     Barber::Precompiler.compile template
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barber
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - tchak
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs