hamlit 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09c67291b717aed2f4abdb969b241ad01c2b4a86
-  data.tar.gz: 967a7bbec042fc5cf64d38ee1ddb875cd3924db6
+  metadata.gz: 77be0fc87affead60a2cc9cf21fd59b2983cc06c
+  data.tar.gz: 88ee1131ab3ab0e9d48ab26389342dd878c41952
 SHA512:
-  metadata.gz: 53ff948040ff7cd703fe6ece4553784dd2c27688e4d9d0916bb2b926bbf7f571d82d807887bbc723b700effa0f37f242a2d5704567f0ee70402571378735f00f
-  data.tar.gz: 2f543243ba2104ae0de56b2d3f17ff4f07fe0364655dead47d0ef4ff79b5d2aff6f87cb585f73c1dd1afdc9a72ec2a4563e703e78894f6002eb1d165b8c7f25f
+  metadata.gz: 59c87b3d65976a804e11a4cd297321a528c4bd65c33a49258bd25f4669a49bffb72a251c3b50e908f46b5c7ddc7fbb6297da3825f3f2c8bb604b1883f908c250
+  data.tar.gz: 429b1fb44e55ee9f1732d0c4af1e8a7bd8b96e69cd04dc8a16d2cbb8ad0c43a46a8ff3e301bff9d9c8365a5fce83ff9a45bfff51638652253d010aff5468f314

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.5.6
+
+- Raise error for unbalanced brackets
+- Don't render newline after block script
+
 ## v1.5.5
 
 - Support &, &== operator

data/benchmarks/benchmark.rb

@@ -5,13 +5,10 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__
 require_relative './context'
 require 'benchmark/ips'
 
-require 'erb'
 require 'erubis'
 require 'faml'
 require 'haml'
 require 'slim'
-require 'tenjin'
-require 'tilt'
 require 'hamlit'
 
 class Benchmarks
@@ -20,32 +17,22 @@ class Benchmarks
     @benches  = []
     @versions = {}
 
-    @erb_code    = File.read(File.dirname(__FILE__) + '/view.erb')
-    @haml_code   = File.read(File.dirname(__FILE__) + '/view.haml')
-    @slim_code   = File.read(File.dirname(__FILE__) + '/view.slim')
-    @rbhtml_path = File.dirname(__FILE__) + '/view.rbhtml'
+    @erb_code  = File.read(File.dirname(__FILE__) + '/view.erb')
+    @haml_code = File.read(File.dirname(__FILE__) + '/view.haml')
+    @slim_code = File.read(File.dirname(__FILE__) + '/view.slim')
 
     init_compiled_benches
   end
 
   def init_compiled_benches
-    erb         = ERB.new(@erb_code)
-    erubis      = Erubis::Eruby.new(@erb_code)
-    fast_erubis = Erubis::FastEruby.new(@erb_code)
-    haml_ugly   = Haml::Engine.new(@haml_code, format: :html5, ugly: true)
-    tenjin      = Tenjin::Engine.new.get_template(@rbhtml_path)
-
     context = Context.new
 
+    haml_ugly = Haml::Engine.new(@haml_code, format: :html5, ugly: true)
     haml_ugly.def_method(context, :run_haml_ugly)
     context.instance_eval %{
-      def run_erb; #{erb.src}; end
-      def run_erubis; #{erubis.src}; end
-      def run_temple_erb; #{Temple::ERB::Engine.new.call @erb_code}; end
-      def run_fast_erubis; #{fast_erubis.src}; end
+      def run_erubis; #{Erubis::Eruby.new(@erb_code).src}; end
       def run_slim_ugly; #{Slim::Engine.new.call @slim_code}; end
       def run_faml; #{Faml::Engine.new.call @haml_code}; end
-      def run_tenjin; _buf = ''; #{tenjin.script}; end
       def run_hamlit; #{Hamlit::Engine.new.call @haml_code}; end
     }
 
@@ -54,14 +41,6 @@ class Benchmarks
     bench('slim', Slim::VERSION)     { context.run_slim_ugly }
     bench('faml', Faml::VERSION)     { context.run_faml }
     bench('haml', Haml::VERSION)     { context.run_haml_ugly }
-
-    if ENV['ALL']
-      erb_version = ERB.version.match(/\[([^ ]+)/)[1]
-      bench('tenjin', Tenjin::RELEASE)      { context.run_tenjin }
-      bench('fast erubis', Erubis::VERSION) { context.run_fast_erubis }
-      bench('temple erb', Temple::VERSION)  { context.run_temple_erb }
-      bench('erb', erb_version)             { context.run_erb }
-    end
   end
 
   def run

data/doc/README.md

@@ -5,6 +5,5 @@ Showing incompatibilities against [Haml](https://github.com/haml/haml) and [Faml
 
 ## engine
 
-- [engine/old\_attributes\_spec.rb](https://github.com/k0kubun/hamlit/blob/master/doc/engine/old_attributes.md)
-- [engine/script\_spec.rb](https://github.com/k0kubun/hamlit/blob/master/doc/engine/script.md)
-- [engine/text\_spec.rb](https://github.com/k0kubun/hamlit/blob/master/doc/engine/text.md)
+- [engine/old\_attributes\_spec.rb](engine/old_attributes.md)
+- [engine/text\_spec.rb](engine/text.md)

data/doc/engine/old_attributes.md

@@ -1,4 +1,4 @@
-# [old\_attributes\_spec.rb:43](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/engine/old_attributes_spec.rb#L43)
+# [old\_attributes\_spec.rb:43](/spec/hamlit/engine/old_attributes_spec.rb#L43)
 ## Input
 ```haml
 %span{ class: '}}}', id: '{}}' } }{
@@ -26,7 +26,7 @@ Faml::Compiler::UnparsableRubyCode: Unparsable Ruby code is given to attributes:
 ```
 
 
-# [old\_attributes\_spec.rb:201](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/engine/old_attributes_spec.rb#L201)
+# [old\_attributes\_spec.rb:201](/spec/hamlit/engine/old_attributes_spec.rb#L201)
 ## Input
 ```haml
 / wontfix: Non-boolean attributes are not escaped for optimization.

data/doc/engine/text.md

@@ -1,4 +1,4 @@
-# [text\_spec.rb:15](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/engine/text_spec.rb#L15)
+# [text\_spec.rb:15](/spec/hamlit/engine/text_spec.rb#L15)
 ## Input
 ```haml
 .
@@ -33,7 +33,7 @@ Haml::SyntaxError: Illegal element: classes and ids must have values.
 ```
 
 
-# [text\_spec.rb:99](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/engine/text_spec.rb#L99)
+# [text\_spec.rb:99](/spec/hamlit/engine/text_spec.rb#L99)
 ## Input
 ```haml
  
@@ -62,27 +62,3 @@ hello
 
 ```
 
-
-# [text\_spec.rb:175](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/engine/text_spec.rb#L175)
-## Input
-```haml
-1#{2
-```
-
-## Output
-### Haml
-```html
-Haml::SyntaxError: Unbalanced brackets.
-```
-
-### Faml
-```html
-Faml::TextCompiler::InvalidInterpolation: 1#{2
-```
-
-### Hamlit
-```html
-1#{2
-
-```
-

data/doc/filters/coffee.md

@@ -1,4 +1,4 @@
-# [coffee\_spec.rb:3](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/coffee_spec.rb#L3)
+# [coffee\_spec.rb:3](/spec/hamlit/filters/coffee_spec.rb#L3)
 ## Input
 ```haml
 :coffee
@@ -40,7 +40,7 @@
 ```
 
 
-# [coffee\_spec.rb:22](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/coffee_spec.rb#L22)
+# [coffee\_spec.rb:22](/spec/hamlit/filters/coffee_spec.rb#L22)
 ## Input
 ```haml
 :coffee
@@ -82,7 +82,7 @@
 ```
 
 
-# [coffee\_spec.rb:41](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/coffee_spec.rb#L41)
+# [coffee\_spec.rb:41](/spec/hamlit/filters/coffee_spec.rb#L41)
 ## Input
 ```haml
 :coffee

data/doc/filters/erb.md

@@ -1,4 +1,4 @@
-# [erb\_spec.rb:3](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/erb_spec.rb#L3)
+# [erb\_spec.rb:3](/spec/hamlit/filters/erb_spec.rb#L3)
 ## Input
 ```haml
 :erb

data/doc/filters/javascript.md

@@ -1,4 +1,4 @@
-# [javascript\_spec.rb:3](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/javascript_spec.rb#L3)
+# [javascript\_spec.rb:3](/spec/hamlit/filters/javascript_spec.rb#L3)
 ## Input
 ```haml
 before
@@ -36,7 +36,7 @@ after
 ```
 
 
-# [javascript\_spec.rb:32](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/javascript_spec.rb#L32)
+# [javascript\_spec.rb:32](/spec/hamlit/filters/javascript_spec.rb#L32)
 ## Input
 ```haml
 :javascript

data/doc/filters/less.md

@@ -1,4 +1,4 @@
-# [less\_spec.rb:3](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/less_spec.rb#L3)
+# [less\_spec.rb:3](/spec/hamlit/filters/less_spec.rb#L3)
 ## Input
 ```haml
 :less
@@ -29,7 +29,7 @@ Faml::FilterCompilers::NotFound: Unable to find compiler for less
 ```
 
 
-# [less\_spec.rb:22](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/less_spec.rb#L22)
+# [less\_spec.rb:22](/spec/hamlit/filters/less_spec.rb#L22)
 ## Input
 ```haml
 :less

data/doc/filters/markdown.md

@@ -1,4 +1,4 @@
-# [markdown\_spec.rb:15](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/markdown_spec.rb#L15)
+# [markdown\_spec.rb:15](/spec/hamlit/filters/markdown_spec.rb#L15)
 ## Input
 ```haml
 - project = '<Hamlit>'

data/doc/filters/plain.md

@@ -1,4 +1,4 @@
-# [plain\_spec.rb:3](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/plain_spec.rb#L3)
+# [plain\_spec.rb:3](/spec/hamlit/filters/plain_spec.rb#L3)
 ## Input
 ```haml
 :plain

data/doc/filters/sass.md

@@ -1,4 +1,4 @@
-# [sass\_spec.rb:3](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/sass_spec.rb#L3)
+# [sass\_spec.rb:3](/spec/hamlit/filters/sass_spec.rb#L3)
 ## Input
 ```haml
 :sass
@@ -31,7 +31,7 @@
 ```
 
 
-# [sass\_spec.rb:19](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/sass_spec.rb#L19)
+# [sass\_spec.rb:19](/spec/hamlit/filters/sass_spec.rb#L19)
 ## Input
 ```haml
 :sass

data/doc/filters/scss.md

@@ -1,4 +1,4 @@
-# [scss\_spec.rb:3](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/scss_spec.rb#L3)
+# [scss\_spec.rb:3](/spec/hamlit/filters/scss_spec.rb#L3)
 ## Input
 ```haml
 :scss
@@ -34,7 +34,7 @@
 ```
 
 
-# [scss\_spec.rb:21](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/filters/scss_spec.rb#L21)
+# [scss\_spec.rb:21](/spec/hamlit/filters/scss_spec.rb#L21)
 ## Input
 ```haml
 :scss

data/hamlit.gemspec

@@ -36,7 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", ">= 3"
   spec.add_development_dependency "sass"
   spec.add_development_dependency "slim"
-  spec.add_development_dependency "tenjin"
   spec.add_development_dependency "therubyracer"
   spec.add_development_dependency "unindent"
 end

data/lib/hamlit/compilers/text.rb

@@ -1,3 +1,4 @@
+require 'hamlit/concerns/error'
 require 'hamlit/concerns/escapable'
 require 'hamlit/concerns/included'
 require 'hamlit/concerns/string_interpolation'
@@ -6,6 +7,7 @@ module Hamlit
   module Compilers
     module Text
       extend Concerns::Included
+      include Concerns::Error
       include Concerns::StringInterpolation
 
       included do
@@ -20,6 +22,7 @@ module Hamlit
       # Return static and dynamic temple ast.
       # It splits expression to optimize because string interpolation is slow.
       def on_haml_text(exp, escape_html = true)
+        return syntax_error('Unbalanced brackets.') unless valid_interpolation?(exp)
         return static_text(exp) unless contains_interpolation?(exp)
 
         marker = find_string_marker(exp)
@@ -62,6 +65,24 @@ module Hamlit
 
       private
 
+      def valid_interpolation?(exp)
+        marker = find_string_marker(exp)
+        return true unless marker # give up checking
+
+        literal = literalify_string(exp, marker)
+        open_count = 0
+
+        Ripper.lex(literal).each do |(row, col), type, str|
+          case type
+          when :on_embexpr_beg
+            open_count += 1
+          when :on_embexpr_end
+            open_count -= 1
+          end
+        end
+        open_count == 0
+      end
+
       # :static can't treat backslash properly
       def static_text(exp)
         return [:dynamic, string_literal(exp)] if exp.include?('\\')

data/lib/hamlit/parser.rb

@@ -121,8 +121,9 @@ module Hamlit
 
     def skip_newline?(ast)
       SKIP_NEWLINE_EXPS.include?(ast.first) ||
-        (ast[0..1] == [:haml, :doctype]) ||
         newline_skip_filter?(ast) ||
+        doctype?(ast) ||
+        block_script?(ast) ||
         outer_remove?
     end
 
@@ -134,5 +135,13 @@ module Hamlit
       return str if str.is_a?(StringScanner)
       StringScanner.new(str)
     end
+
+    def doctype?(ast)
+      ast[0..1] == [:haml, :doctype]
+    end
+
+    def block_script?(ast)
+      ast[0..1] == [:haml, :script]
+    end
   end
 end

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.5.5"
+  VERSION = "1.5.6"
 end

data/spec/hamlit/engine/error_spec.rb

@@ -52,5 +52,12 @@ describe Hamlit::Engine do
       HAML
         to raise_error(Hamlit::SyntaxError, 'Inconsistent indentation: 2 tabs used for indentation, but the rest of the document was indented using 2 spaces.')
     end
+
+    it 'raises syntax error for an inconsistent indentation' do
+      expect { render_string(<<-'HAML'.unindent) }.
+        1#{2
+      HAML
+        to raise_error(Hamlit::SyntaxError, 'Unbalanced brackets.')
+    end
   end
 end

data/spec/hamlit/engine/script_spec.rb

@@ -39,7 +39,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders block script' do
-      assert_render(<<-HAML, <<-HTML, compatible_only: [])
+      assert_render(<<-HAML, <<-HTML)
         = 3.times do |i|
           = i
         4
@@ -47,21 +47,19 @@ describe Hamlit::Engine do
         0
         1
         2
-        3
-        4
+        34
       HTML
     end
 
     it 'renders tag internal block script' do
-      assert_render(<<-HAML, <<-HTML, compatible_only: [])
+      assert_render(<<-HAML, <<-HTML)
         %span
           = 1.times do |i|
             = i
       HAML
         <span>
         0
-        1
-        </span>
+        1</span>
       HTML
     end
 
@@ -85,7 +83,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders !=' do
-      assert_render(<<-HAML, <<-HTML, escape_html: true, compatible_only: [])
+      assert_render(<<-HAML, <<-HTML.rstrip, escape_html: true)
         != '<"&>'
         != '<"&>'.tap do |str|
           -# no operation
@@ -96,7 +94,7 @@ describe Hamlit::Engine do
     end
 
     it 'renders &=' do
-      assert_render(<<-HAML, <<-HTML, escape_html: false, compatible_only: [])
+      assert_render(<<-HAML, <<-HTML.rstrip, escape_html: false)
         &= '<"&>'
         &= '<"&>'.tap do |str|
           -# no operation

data/spec/hamlit/engine/tag_spec.rb

@@ -237,7 +237,7 @@ describe Hamlit::Engine do
       end
 
       it 'removes whitespace inside script inside silent script' do
-        assert_render(<<-HAML, <<-HTML, compatible_only: [:haml, :faml])
+        assert_render(<<-HAML, <<-HTML)
           .bar<
             - 3.times do
               = 'foo'
@@ -247,7 +247,7 @@ describe Hamlit::Engine do
       end
 
       it 'removes whitespace inside script recursively' do
-        assert_render(<<-HAML, <<-HTML, compatible_only: [:haml, :faml])
+        assert_render(<<-HAML, <<-HTML)
           .foo<
             - 1.times do
               = 2.times do

data/spec/hamlit/engine/text_spec.rb

@@ -173,7 +173,6 @@ describe Hamlit::Engine do
       specify { assert_render('#{}', "\n") }
       specify { assert_render('1#{}', "1\n") }
       specify { assert_render('1#{2}', "12\n") }
-      specify { assert_render('1#{2', "1\#{2\n", error_with: [:haml, :faml]) }
       specify { assert_render('}#{1}', "}1\n") }
       specify { assert_render('#{1}2', "12\n") }
       specify { assert_render('1#{ "2#{3}4" }5', "12345\n") }

data/spec/rails/spec/hamlit_spec.rb

@@ -46,8 +46,7 @@ describe 'Hamlit rails integration', type: :request do
       expect(response.body).to include(<<-HTML.strip_heredoc)
         <i>
         &lt;&gt;
-        &lt;&gt;
-        </i>
+        &lt;&gt;</i>
       HTML
     end
   end

data/spec/spec_helper.rb

@@ -165,8 +165,7 @@ class TestCase < Struct.new(:file, :dir, :lineno, :src_haml, :haml_html, :faml_h
         tests.group_by(&:doc_path).each do |path, tests|
           test = tests.first
           file_path = File.join(test.dir, test.file)
-          base_url  = 'https://github.com/k0kubun/hamlit/blob/master/doc/'
-          table_of_contents << "\n- [#{escape_markdown(file_path)}](#{File.join(base_url, path)})"
+          table_of_contents << "\n- [#{escape_markdown(file_path)}](#{path})"
         end
         table_of_contents << "\n"
       end
@@ -192,10 +191,10 @@ class TestCase < Struct.new(:file, :dir, :lineno, :src_haml, :haml_html, :faml_h
   end
 
   def document
-    base_url = 'https://github.com/k0kubun/hamlit/blob/master/spec/hamlit'
-    url = File.join(base_url, dir, file)
+    base_path = '/spec/hamlit'
+    path = File.join(base_path, dir, file)
     doc = <<-DOC
-# [#{escape_markdown("#{file}:#{lineno}")}](#{url}#L#{lineno})
+# [#{escape_markdown("#{file}:#{lineno}")}](#{path}#L#{lineno})
 ## Input
 ```haml
 #{src_haml}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -248,20 +248,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: tenjin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
@@ -310,12 +296,10 @@ files:
 - benchmarks/context.rb
 - benchmarks/view.erb
 - benchmarks/view.haml
-- benchmarks/view.rbhtml
 - benchmarks/view.slim
 - bin/hamlit
 - doc/README.md
 - doc/engine/old_attributes.md
-- doc/engine/script.md
 - doc/engine/text.md
 - doc/filters/coffee.md
 - doc/filters/erb.md

data/benchmarks/view.rbhtml

@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-
-<html>
-  <head>
-    <title>Simple Benchmark</title>
-  </head>
-  <body>
-    <h1>#{ header }</h1>
-    <?rb unless item.empty? ?>
-      <ul>
-      <?rb for i in item ?>
-        <?rb if i[:current] ?>
-          <li><strong>#{ i[:name] }</strong></li>
-        <?rb else ?>
-          <li><a href="#{ i[:url] }">#{ i[:name] }</a></li>
-        <?rb end ?>
-      <?rb end ?>
-      </ul>
-    <?rb else ?>
-      <p>The list is empty.</p>
-    <?rb end ?>
-  </body>
-</html>

data/doc/engine/script.md

@@ -1,105 +0,0 @@
-# [script\_spec.rb:41](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/engine/script_spec.rb#L41)
-## Input
-```haml
-= 3.times do |i|
-  = i
-4
-
-```
-
-## Output
-### Haml, Faml
-```html
-0
-1
-2
-34
-
-```
-
-### Hamlit
-```html
-0
-1
-2
-3
-4
-
-```
-
-
-# [script\_spec.rb:55](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/engine/script_spec.rb#L55)
-## Input
-```haml
-%span
-  = 1.times do |i|
-    = i
-
-```
-
-## Output
-### Haml, Faml
-```html
-<span>
-0
-1</span>
-
-```
-
-### Hamlit
-```html
-<span>
-0
-1
-</span>
-
-```
-
-
-# [script\_spec.rb:87](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/engine/script_spec.rb#L87)
-## Input
-```haml
-!= '<"&>'
-!= '<"&>'.tap do |str|
-  -# no operation
-
-```
-
-## Output
-### Haml, Faml
-```html
-<"&>
-<"&>
-```
-
-### Hamlit
-```html
-<"&>
-<"&>
-
-```
-
-
-# [script\_spec.rb:98](https://github.com/k0kubun/hamlit/blob/master/spec/hamlit/engine/script_spec.rb#L98)
-## Input
-```haml
-&= '<"&>'
-&= '<"&>'.tap do |str|
-  -# no operation
-
-```
-
-## Output
-### Haml, Faml
-```html
-&lt;&quot;&amp;&gt;
-&lt;&quot;&amp;&gt;
-```
-
-### Hamlit
-```html
-&lt;&quot;&amp;&gt;
-&lt;&quot;&amp;&gt;
-
-```
-