hamlit 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89d7cfad07da030166e5964134abf59d18e44865
-  data.tar.gz: 441d90d73df696acc1348d3f8ce755d43aa30c1c
+  metadata.gz: 1688e256cfeb017819cd1ea62ba2a083a9347224
+  data.tar.gz: 77978ed4df48aa09950e3462ea3e00914d1da7e8
 SHA512:
-  metadata.gz: f87e5a80a46d4b9d092c6788d5debb783281cb59bc4c50b43141ebc7bf0041835b4097784819023c207b013665aced148855c16d71b0c450eccb037ac7e22c07
-  data.tar.gz: d493776d47975894589784a773c1f003b10227b20a3e2e086ce55431fa1b016d5f1290d0218fc5ec7c6241fe8a4501a18e010a6c0a6c7d7ade8d2c5d66911a41
+  metadata.gz: cb9bdcb4facccdb71d92e5e80014797326ac2c1e118b61a137b203ec4f145ad4d2529a58a0450beb340f623909f035cdf824e91fed50e2708bac1ec582a22840
+  data.tar.gz: 3e1a31ea12ab7ab547e7b38516cf80b95f48a29ef3c7cf20d4a8c128eeb0dd1f5499cbd59cf4ff86e8df6bf453487b0f8fcd7a1d4d6efd54e1df3070d391a17a

data/.travis.yml

@@ -13,22 +13,22 @@ gemfile:
 env:
   - TASK=spec
   - TASK=rails:spec
-  - TASK=bench TIME=10
+  - TASK=bench TIME=20
 matrix:
   allow_failures:
-    - env: TASK=bench TIME=10
+    - env: TASK=bench TIME=20
   exclude:
     - env: TASK=spec
       gemfile: spec/rails/Gemfile
     - env: TASK=rails:spec
       gemfile: Gemfile
-    - env: TASK=bench TIME=10
+    - env: TASK=bench TIME=20
       gemfile: spec/rails/Gemfile
     - rvm: 2.1
       env: TASK=rails:spec
     - rvm: 2.1
-      env: TASK=bench TIME=10
+      env: TASK=bench TIME=20
     - rvm: 2.0.0
       env: TASK=rails:spec
     - rvm: 2.0.0
-      env: TASK=bench TIME=10
+      env: TASK=bench TIME=20

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v0.4.3
+
+- Allow empty else statement
+  - https://github.com/k0kubun/hamlit/issues/14
+  - Thanks to @jeffblake
+- Accept comment-only script
+  - https://github.com/k0kubun/hamlit/issues/13
+  - Thanks to @jeffblake
+
 ## v0.4.2
 
 - Bugfix about parsing nested attributes
@@ -18,41 +27,41 @@
 
 ## v0.3.4
 
-- Allow tab indentation.
+- Allow tab indentation
   - https://github.com/k0kubun/hamlit/issues/9
   - Thanks to @tdtds
 
 ## v0.3.3
 
-- Accept multi byte parsing.
+- Accept multi byte parsing
   - https://github.com/k0kubun/hamlit/issues/8
   - Thanks to @machu
 
 ## v0.3.2
 
-- Bugfix for compiling old attributes.
+- Bugfix for compiling old attributes
   - https://github.com/k0kubun/hamlit/issues/7
   - Thanks to @creasty
 
 ## v0.3.1
 
-- Hyphenate data attributes.
+- Hyphenate data attributes
   - https://github.com/k0kubun/hamlit/issues/5
   - Thanks to @os0x
 
 ## v0.3.0
 
-- Specify a version in dependency of temple.
+- Specify a version in dependency of temple
 
 ## v0.2.0
 
-- Allow comments in script.
+- Allow comments in script
   - https://github.com/k0kubun/hamlit/issues/3
   - Thanks to @eagletmt
 
 ## v0.1.3
 
-- Bugfix for attribute nesting on runtime.
+- Bugfix for attribute nesting on runtime
   - https://github.com/k0kubun/hamlit/issues/1
   - Thanks to @eagletmt
 
@@ -64,10 +73,10 @@
 
 ## v0.1.1
 
-- Drop obsolete `--ugly` option for CLI.
+- Drop obsolete `--ugly` option for CLI
   - Currently pretty mode is not implemented.
 
 ## v0.1.0
 
-- Initial release.
+- Initial release
   - Passing haml-spec with ugly mode.

data/README.md

@@ -15,21 +15,22 @@ or just replace `gem "haml"` with `gem "hamlit"`.
 ## Features
 ### Fast rendering
 
-Hamlit's rendering is **8.47x times faster** than original haml.
-
-![](http://i.gyazo.com/57b726102a4a169d4b85cc22fcbb3ff3.png)
+Hamlit's rendering is **7.24x times faster** than original haml.
 
 ```
-    hamlit:   133922.9 i/s
-    erubis:   123464.1 i/s - 1.08x slower
-      slim:   110404.3 i/s - 1.21x slower
-      faml:    92009.3 i/s - 1.46x slower
-      haml:    15810.4 i/s - 8.47x slower
+    erubis:   114417.8 i/s
+    hamlit:   107367.5 i/s - 1.07x slower
+      slim:   104728.0 i/s - 1.09x slower
+      faml:    87624.2 i/s - 1.31x slower
+      haml:    15796.0 i/s - 7.24x slower
 ```
 
-[This benchmark](https://github.com/k0kubun/hamlit/blob/74ede1101f228828e343ceb1af481c45eaf0a1dd/benchmarks/benchmark.rb)
+[This benchmark](https://github.com/k0kubun/hamlit/blob/b6f112aa1f51816ab9a3a81bd7810ed9cffd26aa/benchmarks/benchmark.rb)
 is the same as [slim-template/slim](https://github.com/slim-template/slim)'s one for fairness.
-([The result on travis CI](https://travis-ci.org/k0kubun/hamlit/jobs/56403724))
+([The result on travis CI](https://travis-ci.org/k0kubun/hamlit/jobs/57333515))
+
+Note that there are [some incompatibilities](https://github.com/k0kubun/hamlit/issues) related to performance.
+You may want [faml](https://github.com/eagletmt/faml) for a better compatibility.
 
 ### Better parser
 
@@ -59,9 +60,7 @@ For compatibility with Haml, Hamlit does not escape html automatically in sinatr
 You can enable html escaping manually:
 
 ```ruby
-configure do
-  Hamlit::Engine.set_default_options(escape_html: true)
-end
+set :haml, { escape_html: true }
 ```
 
 ## Why high performance?
@@ -81,6 +80,13 @@ code by Hamlit is very fast.
 Not only relying on temple optimizers, but also Hamlit's compiler cares about many cases
 to optimize performance such as string interpolation.
 
+## TODO
+
+Currently there are some important incompatibilities that should be fixed.
+
+- Remove falsy attributes [#2](https://github.com/k0kubun/hamlit/issues/2)
+- Escape attribute values [#10](https://github.com/k0kubun/hamlit/issues/10)
+
 ## License
 
 MIT License

data/benchmarks/benchmark.rb

@@ -34,6 +34,7 @@ class Benchmarks
     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)
+    hamlit      = Hamlit::Engine.new(escape_html: true)
 
     context = Context.new
 
@@ -46,7 +47,7 @@ class Benchmarks
       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
+      def run_hamlit; #{hamlit.call @haml_code}; end
     }
 
     bench('hamlit', Hamlit::VERSION) { context.run_hamlit }

data/lib/hamlit/parsers/script.rb

@@ -21,8 +21,8 @@ module Hamlit
         assert_scan!(scanner, /=|&=|!=/)
         options = DEFAULT_SCRIPT_OPTIONS.merge(options)
 
-        code = scan_code(scanner)
-        return syntax_error("There's no Ruby code for = to evaluate.") if code.empty?
+        code, with_comment = scan_code(scanner, comment_check: true)
+        return syntax_error("There's no Ruby code for = to evaluate.") if code.empty? && !with_comment
         unless has_block?
           return [:dynamic, code] if options[:disable_escape]
           return escape_html([:dynamic, code], options[:force_escape])
@@ -48,11 +48,12 @@ module Hamlit
           return [:multi]
         end
 
-        ast = [:code]
-        ast << scan_code(scanner)
-        return ast unless has_block?
+        ast = [:multi, [:code, scan_code(scanner)]]
+        unless has_block?
+          ast << [:code, 'end'] if @current_indent > next_indent
+          return ast
+        end
 
-        ast = [:multi, ast]
         ast += with_indented { parse_lines }
         ast << [:code, 'end'] unless same_indent?(next_line) && internal_statement?(next_line)
         ast
@@ -60,7 +61,7 @@ module Hamlit
 
       private
 
-      def scan_code(scanner)
+      def scan_code(scanner, comment_check: false)
         code = ''
         loop do
           code += (scanner.scan(/.+/) || '').strip
@@ -70,15 +71,21 @@ module Hamlit
           scanner = StringScanner.new(current_line)
           code += ' '
         end
-        remove_comment(code)
+        remove_comment(code, comment_check: comment_check)
       end
 
-      def remove_comment(code)
+      def remove_comment(code, comment_check: false)
         result = ''
+        with_comment = false
         Ripper.lex(code).each do |(row, col), type, str|
-          next if type == :on_comment
+          if type == :on_comment
+            with_comment = true
+            next
+          end
           result += str
         end
+
+        return [result, with_comment] if comment_check
         result
       end
 

data/lib/hamlit/version.rb

@@ -1,3 +1,3 @@
 module Hamlit
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/hamlit/engine/script_spec.rb

@@ -12,10 +12,12 @@ describe Hamlit::Engine do
 
     it 'renders one-line script with comment' do
       assert_render(<<-HAML, <<-HTML)
+        = # comment_only
         = '#' + "#" # = 3 #
         = ['#',
           "#"]  # comment
       HAML
+
         ##
         ["#", "#"]
       HTML

data/spec/hamlit/engine/silent_script_spec.rb

@@ -67,6 +67,18 @@ describe Hamlit::Engine do
       HTML
     end
 
+    it 'renders empty else statement' do
+      assert_render(<<-'HAML', <<-HTML)
+        %span
+          - if false
+            ng
+          - else
+      HAML
+        <span>
+        </span>
+      HTML
+    end
+
     it 'accept if inside if-else' do
       assert_render(<<-'HAML', <<-HTML)
         - if false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple