hamlit 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4848cd3ee1ccb8ba77acac4389eaadeca802b145
-  data.tar.gz: 13c163d9c67e46d506686337b09979a65020cf62
+  metadata.gz: 3f85fe19ae942cdfef4ed10ea87a021b5603d915
+  data.tar.gz: cec640d9203032acf294e118fa737724d89c0952
 SHA512:
-  metadata.gz: babb6f83c927734400646d758cf9c2e412ceeb416e77613031b97465b93cf71158d5f0549c940e81c58bec086634e7968d23b3d2b8649bb6b1f32cc48b3a6e94
-  data.tar.gz: a7afb822afce6b75d1fffd69d292146c3d2b86edc0b66a57ff3b865a9847d8f1eab291fe733f9216a8e39ce6fa5ec18b819244eef8234852b858ca9377a931c4
+  metadata.gz: c668671bcbea79462a605a52b934fa1ec86c81f2ba665abcdc5a1f1667a8b18548896f0069646a8318713d708a2cd241aa10dc28db0b03e4aa167110d679672a
+  data.tar.gz: 5879b98703b9a549bee394304a1d34c3686c72a84bc7bb0b4d8da135e0674d3077e753009770da9a72d033ee3417970ef150200d1b362807b4c999c79025c628

data/.travis.yml

@@ -14,9 +14,11 @@ env:
   - TASK=spec
   - TASK=rails:spec
   - TASK=bench TIME=20
+  - TASK=bench TIME=20 HTML_ESCAPE=1
 matrix:
   allow_failures:
     - env: TASK=bench TIME=20
+    - env: TASK=bench TIME=20 HTML_ESCAPE=1
   exclude:
     - env: TASK=spec
       gemfile: spec/rails/Gemfile
@@ -24,11 +26,17 @@ matrix:
       gemfile: Gemfile
     - env: TASK=bench TIME=20
       gemfile: spec/rails/Gemfile
+    - env: TASK=bench TIME=20 HTML_ESCAPE=1
+      gemfile: spec/rails/Gemfile
     - rvm: 2.1
       env: TASK=rails:spec
     - rvm: 2.1
       env: TASK=bench TIME=20
+    - rvm: 2.1
+      env: TASK=bench TIME=20 HTML_ESCAPE=1
     - rvm: 2.0.0
       env: TASK=rails:spec
     - rvm: 2.0.0
       env: TASK=bench TIME=20
+    - rvm: 2.0.0
+      env: TASK=bench TIME=20 HTML_ESCAPE=1

data/CHANGELOG.md

@@ -1,6 +1,13 @@
+## v1.6.2
+
+- Reject a content for self-closing tags
+- Reject nesing within self-closing tags
+
 ## v1.6.1
 
 - Parse N-space indentation
+  - https://github.com/k0kubun/hamlit/issues/26
+  - Thanks to @eagletmt
 
 ## v1.6.0
 

data/benchmarks/benchmark.rb

@@ -16,15 +16,38 @@ class Benchmarks
     @time     = time
     @benches  = []
     @versions = {}
+  end
 
-    @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')
+  def init_compiled_benches(escape_enabled)
+    if escape_enabled
+      @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.escaped.slim')
+      init_escaped_benches
+    else
+      @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_plain_benches
+    end
+  end
 
-    init_compiled_benches
+  def run
+    show_versions
+    result = Benchmark.ips do |x|
+      x.config(time: @time, warmup: 2)
+      @benches.each do |name, block|
+        x.report(name, &block)
+      end
+      x.compare!
+    end
   end
 
-  def init_compiled_benches
+  private
+
+  # Totally the same as slim-template/slim's compiled bench.
+  def init_plain_benches
+    puts 'Compiled rendering benchmarks without HTML escape'
     context = Context.new
 
     haml_ugly = Haml::Engine.new(@haml_code, format: :html5, ugly: true)
@@ -32,29 +55,36 @@ class Benchmarks
     context.instance_eval %{
       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_hamlit; #{Hamlit::Engine.new.call @haml_code}; end
+      def run_hamlit; #{Hamlit::Engine.new(escape_html: false).call @haml_code}; end
     }
 
     bench('hamlit', Hamlit::VERSION) { context.run_hamlit }
     bench('erubis', Erubis::VERSION) { context.run_erubis }
     bench('slim', Slim::VERSION)     { context.run_slim_ugly }
-    bench('faml', Faml::VERSION)     { context.run_faml }
     bench('haml', Haml::VERSION)     { context.run_haml_ugly }
   end
 
-  def run
-    show_versions
-    result = Benchmark.ips do |x|
-      x.config(time: @time, warmup: 2)
-      @benches.each do |name, block|
-        x.report(name, &block)
-      end
-      x.compare!
-    end
-  end
+  # slim-template/slim's compiled bench with HTML escaping.
+  def init_escaped_benches
+    puts 'Compiled rendering benchmarks with HTML escape'
+    context = Context.new
+    context.instance_eval("def header; '<script>'; end")
 
-  private
+    haml_ugly = Haml::Engine.new(@haml_code, format: :html5, ugly: true, escape_html: true)
+    haml_ugly.def_method(context, :run_haml_ugly)
+    context.instance_eval %{
+      def run_erubis; #{Erubis::EscapedEruby.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_hamlit; #{Hamlit::Engine.new.call @haml_code}; end
+    }
+
+    bench('hamlit', Hamlit::VERSION) { context.run_hamlit }
+    bench('slim', Slim::VERSION)     { context.run_slim_ugly }
+    bench('faml', Faml::VERSION)     { context.run_faml }
+    bench('erubis', Erubis::VERSION) { context.run_erubis }
+    bench('haml', Haml::VERSION)     { context.run_haml_ugly }
+  end
 
   def bench(name, version, &block)
     @benches.push([name, block])
@@ -70,4 +100,6 @@ class Benchmarks
 end
 
 time = (ENV['TIME'] || 5).to_i
-Benchmarks.new(time).run
+bench = Benchmarks.new(time)
+bench.init_compiled_benches(ENV['HTML_ESCAPE'])
+bench.run

data/benchmarks/view.escaped.slim

@@ -0,0 +1,17 @@
+doctype html
+html
+  head
+    title Simple Benchmark
+  body
+    h1 = header
+    - unless item.empty?
+      ul
+        - for i in item
+          - if i[:current]
+            li
+              strong = i[:name]
+          - else
+            li
+              a href==i[:url] = i[:name]
+    - else
+      p The list is empty.

data/doc/engine/indent.md

@@ -17,9 +17,7 @@
 
 ### Faml
 ```html
-<p></p>
-%a
-
+Faml::IndentTracker::HardTabNotAllowed: Indentation with hard tabs are not allowed :-p
 ```
 
 
@@ -45,9 +43,6 @@ foo
 
 ### Faml
 ```html
-<p></p>
-%span
-foo
-
+Faml::IndentTracker::HardTabNotAllowed: Indentation with hard tabs are not allowed :-p
 ```
 

data/doc/faml/engine/indent.md

@@ -9,9 +9,7 @@
 ## Output
 ### Faml
 ```html
-<p></p>
-%a
-
+Faml::IndentTracker::HardTabNotAllowed: Indentation with hard tabs are not allowed :-p
 ```
 
 ### Hamlit
@@ -35,10 +33,7 @@
 ## Output
 ### Faml
 ```html
-<p></p>
-%span
-foo
-
+Faml::IndentTracker::HardTabNotAllowed: Indentation with hard tabs are not allowed :-p
 ```
 
 ### Hamlit

data/lib/hamlit/concerns/indentable.rb

@@ -19,10 +19,6 @@ module Hamlit
         count_indent(next_line)
       end
 
-      def next_width
-        count_width(next_line)
-      end
-
       def with_indented(&block)
         @current_indent += 1
         block.call
@@ -37,11 +33,6 @@ module Hamlit
         line.match(/\A[ \t]+/).to_s.length / indent_rule
       end
 
-      def count_width(line)
-        return EOF unless line
-        line[/\A[ \t]+/].to_s.length
-      end
-
       def same_indent?(line)
         return false unless line
         count_indent(line) == @current_indent
@@ -65,6 +56,15 @@ module Hamlit
         next_indent != @current_indent
       end
 
+      def has_block?
+        return false unless next_line
+        return fetch_indent(next_line).length > 0 unless @indent_space
+
+        next_indent > @current_indent
+      end
+
+      private
+
       # Validate the template is using consitent indentation, 2 spaces or a tab.
       def validate_indentation_consistency!(indent)
         return false if indent.empty?
@@ -85,37 +85,6 @@ module Hamlit
         "#{length} #{label}#{'s' if length > 1}"
       end
 
-      def has_block?
-        return false unless next_line
-        return fetch_indent(next_line).length > 0 unless @indent_space
-
-        next_indent > @current_indent
-      end
-
-      private
-
-      def indent_label(indent)
-        return %Q{"#{indent}"} if indent.include?(' ') && indent.include?("\t")
-
-        label  = indent.include?(' ') ? 'space' : 'tab'
-        length = indent.match(/[ \t]+/).to_s.length
-
-        "#{length} #{label}#{'s' if length > 1}"
-      end
-
-      def count_width(line)
-        return EOF unless line
-        line[/\A +/].to_s.length
-      end
-
-      def next_space
-        next_line[/\A +/].to_s
-      end
-
-      def next_width
-        count_width(next_line)
-      end
-
       def indent_rule
         (@indent_space || '').length
       end

data/lib/hamlit/parsers/tag.rb

@@ -26,8 +26,11 @@ module Hamlit
         inner_removal = parse_whitespace_removal(scanner)
 
         if !has_block? || scanner.match?(/=|&=|!=/)
+          return syntax_error("Self-closing tags can't have content.") if scanner.scan(/\/ *[^ ]/)
           return ast if scanner.scan(/\//)
           return ast << parse_line(scanner, inline: true)
+        elsif scanner.match?(/\//)
+          return syntax_error("Illegal nesting: nesting within a self-closing tag is illegal.")
         end
 
         content = [:multi, [:static, "\n"]]

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

data/spec/hamlit/engine/error_spec.rb

@@ -69,5 +69,20 @@ describe Hamlit::Engine do
       HAML
         to raise_error(Hamlit::SyntaxError, "Indentation can't use both tabs and spaces.")
     end
+
+    it 'raises syntax error for an inconsistent indentation' do
+      expect { render_string(<<-HAML.unindent) }.
+        %div/ foo
+      HAML
+        to raise_error(Hamlit::SyntaxError, "Self-closing tags can't have content.")
+    end
+
+    it 'raises syntax error for an inconsistent indentation' do
+      expect { render_string(<<-HAML.unindent) }.
+        %div/
+          foo
+      HAML
+        to raise_error(Hamlit::SyntaxError, "Illegal nesting: nesting within a self-closing tag is illegal.")
+    end
   end
 end

data/spec/hamlit/engine/indent_spec.rb

@@ -1,7 +1,7 @@
 describe Hamlit::Engine do
   describe 'tab indent' do
     it 'accepts tab indentation' do
-      assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
+      assert_render(<<-HAML, <<-HTML, compatible_only: :haml, error_with: :faml)
         %p
         \t%a
       HAML
@@ -26,7 +26,7 @@ describe Hamlit::Engine do
     end
 
     it 'accepts N-tab indentation' do
-      assert_render(<<-HAML, <<-HTML, compatible_only: :haml)
+      assert_render(<<-HAML, <<-HTML, compatible_only: :haml, error_with: :faml)
         %p
         \t%span
         \t\tfoo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -295,6 +295,7 @@ files:
 - benchmarks/benchmark.rb
 - benchmarks/context.rb
 - benchmarks/view.erb
+- benchmarks/view.escaped.slim
 - benchmarks/view.haml
 - benchmarks/view.slim
 - bin/hamlit
@@ -603,4 +604,3 @@ test_files:
 - spec/spec_helper/document_generator.rb
 - spec/spec_helper/render_helper.rb
 - spec/spec_helper/test_case.rb
-has_rdoc: