handlebars_assets 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4384395fc4ee4197451cbc31b94b7dedbb4c0b06
-  data.tar.gz: c2d75643bbb557ff663e6193bfe22dc1e97e468c
+  metadata.gz: cdaf8b259b43089237a16471ec5b515ede063275
+  data.tar.gz: 1bd29b0c391be103666f66bcf1e3a44b29c21146
 SHA512:
-  metadata.gz: d70f5ee4ab2d923c0b3ba05b537dc131e75f8bf1845d3549ddfa6f70747b38897975b0e93313ea1071c4eb125cbe4e7f78790a0516fee937965e09e80f38706d
-  data.tar.gz: fbf7c27945ca12331c2bf023408c6ca13ab1d0aa6f7f96c785f2ab1fee3d8a8dea594c213eed3bc111a6cc362877219d590a1d3679e47a6a30b9dd9ab7e21715
+  metadata.gz: 4fbac5cbefececb37f4c1603cd99ad79533de8ff42e07df143816165f9f79fc4459b91eaa5b1f965432db89dcdd49dc0bcc6a842d3c082689407db57c1a5f7c6
+  data.tar.gz: 15032641cb9a08431e8fad9680c71f9bf70df9281ebdc82c395a9eabd627f719f892d27de5d80a39e1f3df2091ab8323aeae3ff1590dfd8586a4bed24c9b804c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.20.2 (2015-02-24)
+
+* Relax Sprockets Dependencies - @rounders
+* Add option to CHOMP underscores on partials - @GreyKn
+
 ## 0.20.1 (2015-02-24)
 
 * Actually revert to native HB.js

data/handlebars_assets.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "execjs", "~> 2.0"
   s.add_runtime_dependency "tilt", "~> 1.2"
   s.add_runtime_dependency "multi_json", "~> 1.0"
-  s.add_runtime_dependency "sprockets", "~> 2.0"
+  s.add_runtime_dependency "sprockets", ">= 2.0.0", "< 4.0"
 
   s.add_development_dependency "minitest", '~> 5.5'
   s.add_development_dependency "haml", '~> 4.0'

data/lib/handlebars_assets/config.rb

@@ -11,7 +11,8 @@ module HandlebarsAssets
       :patch_files, :patch_path, :path_prefix, :slim_options, :template_namespace,
       :precompile, :haml_enabled, :slim_enabled,
       :handlebars_extensions, :hamlbars_extensions, :slimbars_extensions,
-      :amd, :handlebars_amd_path, :amd_with_template_namespace
+      :amd, :handlebars_amd_path, :amd_with_template_namespace,
+      :chomp_underscore_for_partials
 
     def compiler
       @compiler || 'handlebars.js'
@@ -125,6 +126,14 @@ module HandlebarsAssets
       @handlebars_amd_path || 'handlebars'
     end
 
+    # Indicate if leading underscore should be allowed
+    # when creating partial definition.
+    # Allows compatibility with handlebars-rails
+    # https://github.com/cowboyd/handlebars-rails/blob/f73a2d11df8aa2c21d335b8f04a8c5b59ae6a790/lib/handlebars-rails/tilt.rb#L18
+    def chomp_underscore_for_partials?
+      @chomp_underscore_for_partials || false
+    end
+
     private
 
     def generate_known_helpers_hash

data/lib/handlebars_assets/handlebars_template.rb

@@ -190,7 +190,14 @@ module HandlebarsAssets
       private
 
       def relative_path
-        @full_path.match(/.*#{HandlebarsAssets::Config.path_prefix}\/((.*\/)*([^.]*)).*$/)[1]
+        path = @full_path.match(/.*#{HandlebarsAssets::Config.path_prefix}\/((.*\/)*([^.]*)).*$/)[1]
+        if is_partial? && ::HandlebarsAssets::Config.chomp_underscore_for_partials?
+          #handle case if partial is in root level of template folder
+          path.gsub!(%r~^_~, '')
+          #handle case if partial is in a subfolder within the template folder
+          path.gsub!(%r~/_~, '/')
+        end
+        path
       end
 
       def template_name

data/lib/handlebars_assets/version.rb

@@ -1,3 +1,3 @@
 module HandlebarsAssets
-  VERSION = "0.20.1"
+  VERSION = "0.20.2"
 end

data/test/handlebars_assets/tilt_handlebars_test.rb

@@ -74,6 +74,31 @@ module HandlebarsAssets
       assert_equal hbs_compiled_partial('some/thing/_test_underscore', source), template2.render(scope2, {})
     end
 
+    def test_chomped_underscore_partials
+      assert_equal HandlebarsAssets::Config.chomp_underscore_for_partials?, false
+
+      HandlebarsAssets::Config.chomp_underscore_for_partials = true
+      assert_equal HandlebarsAssets::Config.chomp_underscore_for_partials?, true
+
+      root = '/myapp/app/assets/javascripts'
+      file1 = 'app/templates/_test_underscore.hbs'
+      scope1 = make_scope root, file1
+      file2 = 'app/templates/some/thing/_test_underscore.hbs'
+      scope2 = make_scope root, file2
+      source = "This is {{handlebars}}"
+
+      HandlebarsAssets::Config.path_prefix = 'app/templates'
+
+      template1 = HandlebarsAssets::HandlebarsTemplate.new(scope1.pathname.to_s) { source }
+
+      assert_equal hbs_compiled_partial('test_underscore', source), template1.render(scope1, {})
+
+      template2 = HandlebarsAssets::HandlebarsTemplate.new(scope2.pathname.to_s) { source }
+
+      assert_equal hbs_compiled_partial('some/thing/test_underscore', source), template2.render(scope2, {})
+
+    end
+
     def test_without_known_helpers_opt
       root = '/myapp/app/assets/templates'
       file = 'test_without_known.hbs'

data/test/test_helper.rb

@@ -55,6 +55,7 @@ module HandlebarsAssets
     extend self
 
     def reset!
+      @chomp_underscore_for_partials = nil
       @compiler = nil
       @compiler_path = nil
       @haml_options = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: handlebars_assets
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
 platform: ruby
 authors:
 - Les Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -56,16 +56,22 @@ dependencies:
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement