barber 0.1.2 → 0.1.3

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - "1.9.3"
+  - "1.9.2"
+  - jruby-19mode
+  - rbx-19mode

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in handlebars-precompiler.gemspec
 gemspec
+
+platform :jruby do
+  gem 'therubyrhino'
+end

data/README.md

@@ -1,4 +1,4 @@
-# Barber
+# Barber [![Build Status](https://travis-ci.org/tchak/barber.png)](https://travis-ci.org/tchak/barber)
 
 Barber handles all your Handlebars precompilation needs. You can use
 Barber as part of your project build system or with someting like

data/lib/barber/precompiler.rb

@@ -39,6 +39,7 @@ module Barber
     #   break the compiler when \n are present in view helpers. Coffeescript block strings
     #   usually cause this problem.
     # Case 3: "Normal" input. Reading from a file or something like that.
+    # Case 4: Sanitize using a RegExp (edge cases with jRuby + Rhino)
     #
     # Each one of these cases is covered by a test case. If you find another breaking
     # use case please address it here with a regression test.
@@ -46,16 +47,35 @@ module Barber
       begin
         if template =~ /\A".+"\Z/m
           # Case 1
-          JSON.load(%Q|{"template":#{template}}|)['template']
+          sanitize_with_json(template)
         else
           # Case 2: evaluate a literal JS string in Ruby in the JS context
           # to get an equivalent Ruby string back. This will convert liternal \n's
           # to new lines. This is safer than trying to modify the string using regex.
-          context.eval("'#{template}'")
+          sanitize_with_execjs(template)
         end
       rescue JSON::ParserError, ExecJS::RuntimeError
         # Case 3
         template
+      rescue ExecJS::ProgramError
+        # Case 4
+        sanitize_with_regexp(template)
+      end
+    end
+
+    def sanitize_with_json(template)
+      JSON.load(%Q|{"template":#{template}}|)['template']
+    end
+
+    def sanitize_with_execjs(template)
+      context.eval("'#{template}'")
+    end
+
+    def sanitize_with_regexp(template)
+      if template.respond_to? :gsub
+        template.gsub(/\\n/,"\n")
+      else
+        template
       end
     end
 

data/lib/barber/version.rb

@@ -1,3 +1,3 @@
 module Barber
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/precompiler_test.rb

@@ -20,20 +20,63 @@ class PrecompilerTest < MiniTest::Unit::TestCase
     assert result
   end
 
-  def test_handles_multiline_coffeescript_strings
-    template = '<h2>{{unbound view.title}}</h2>\n<ul>\n  {{#each view.content}}\n    {{view view.resultItemView\n      contentBinding="this"\n      selectedItemBinding="view.selectedItem"}}\n  {{/each}}\n</ul>'
+  def test_handles_nil_template
+    result = compile nil
+    assert result
+  end
 
-    result = compile template
+  def test_handles_multiline_coffeescript_strings
+    result = compile template_with_multiline_coffeescript_strings
     assert result
   end
 
   def test_handles_prescaped_JSON_strings
-    template = '"<div class=\"comments\">\n  <div class=\"span5 offset1\">\n    {{#if view.comments.length}}\n    <ul class=\"comments-list unstyled\">\n      {{#each view.comments}}\n        {{view Radium.CommentView commentBinding=\"this\"}}\n      {{/each}}\n    </ul>\n    {{/if}}\n    {{#if view.isError}}\n      <p class=\"error\">Hmm, something wasn\'t done correctly. Try again?</p>\n    {{/if}}\n    <div style=\"clear: both\"></div>\n    {{view view.commentTextArea}}\n  </div>\n</div>\n"'
+    result = compile template_with_prescaped_JSON_strings
+    assert result
+  end
 
-    result = compile template
+  def test_handles_single_quoted_strings
+    result = compile template_with_single_quoted_strings
+    assert result
+  end
+
+  def test_sanitize_with_json_multiline_coffeescript_strings
+    assert_raises JSON::ParserError do
+      sanitize_with_json template_with_multiline_coffeescript_strings
+    end
+  end
+
+  def test_sanitize_multiline_coffeescript_strings
+    result = sanitize template_with_multiline_coffeescript_strings
+    assert_equal sanitized_template_with_multiline_coffeescript_strings, result
+  end
+
+  def test_sanitize_prescaped_JSON_strings
+    result = sanitize template_with_prescaped_JSON_strings
+    assert result
+  end
+
+  def test_sanitize_with_execjs_multiline_coffeescript_strings
+    result = sanitize_with_execjs template_with_multiline_coffeescript_strings
+    assert_equal sanitized_template_with_multiline_coffeescript_strings, result
+  end
+
+  def test_sanitize_with_regexp_multiline_coffeescript_strings
+    result = sanitize_with_regexp template_with_multiline_coffeescript_strings
+    assert_equal sanitized_template_with_multiline_coffeescript_strings, result
+  end
+
+  def test_sanitize_with_json_prescaped_JSON_strings
+    result = sanitize_with_json template_with_prescaped_JSON_strings
     assert result
   end
 
+  def test_sanitize_with_execjs_prescaped_JSON_strings
+    assert_raises ExecJS::RuntimeError, ExecJS::ProgramError do
+      sanitize_with_execjs template_with_prescaped_JSON_strings
+    end
+  end
+
   def test_raises_an_error_on_bad_templates
     assert_raises Barber::PrecompilerError do
       compile "Hello {{"
@@ -58,4 +101,36 @@ class PrecompilerTest < MiniTest::Unit::TestCase
   def compile(template)
     Barber::Precompiler.compile template
   end
+
+  def sanitize_with_json(template)
+    Barber::Precompiler.new.send :sanitize_with_json, template
+  end
+
+  def sanitize_with_execjs(template)
+    Barber::Precompiler.new.send :sanitize_with_execjs, template
+  end
+
+  def sanitize_with_regexp(template)
+    Barber::Precompiler.new.send :sanitize_with_regexp, template
+  end
+
+  def sanitize(template)
+    Barber::Precompiler.new.send :sanitize, template
+  end
+
+  def template_with_multiline_coffeescript_strings
+    '<h2>{{unbound view.title}}</h2>\n<ul>\n  {{#each view.content}}\n    {{view view.resultItemView\n      contentBinding="this"\n      selectedItemBinding="view.selectedItem"}}\n  {{/each}}\n</ul>'
+  end
+
+  def sanitized_template_with_multiline_coffeescript_strings
+    "<h2>{{unbound view.title}}</h2>\n<ul>\n  {{#each view.content}}\n    {{view view.resultItemView\n      contentBinding=\"this\"\n      selectedItemBinding=\"view.selectedItem\"}}\n  {{/each}}\n</ul>"
+  end
+
+  def template_with_prescaped_JSON_strings
+    '"<div class=\"comments\">\n  <div class=\"span5 offset1\">\n    {{#if view.comments.length}}\n    <ul class=\"comments-list unstyled\">\n      {{#each view.comments}}\n        {{view Radium.CommentView commentBinding=\"this\"}}\n      {{/each}}\n    </ul>\n    {{/if}}\n    {{#if view.isError}}\n      <p class=\"error\">Hmm, something wasn\'t done correctly. Try again?</p>\n    {{/if}}\n    <div style=\"clear: both\"></div>\n    {{view view.commentTextArea}}\n  </div>\n</div>\n"'
+  end
+
+  def template_with_single_quoted_strings
+    "<h2>{{unbound view.title}}</h2>\n<ul>\n  {{#each view.content}}\n    {{view view.resultItemView\n      contentBinding='this'\n      selectedItemBinding='view.selectedItem'}}\n  {{/each}}\n</ul>"
+  end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: barber
 version: !ruby/object:Gem::Version
-  version: 0.1.2
   prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - tchak
@@ -10,67 +10,67 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   name: execjs
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   name: rake
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   name: simplecov
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,6 +85,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -116,22 +117,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -2194861738178296462
+      hash: -4591227415054494269
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -2194861738178296462
+      hash: -4591227415054494269
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Handlebars precompilation toolkit