hamli 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f1faa1d3b9fa40c999ab475131a1cdf13a0cf97ad348b57a4d3fcbd2028e915
-  data.tar.gz: 33b020dd8ee73741bc3e262e48c0cab0e7d7be24eb1df90deecd322c6ae4237f
+  metadata.gz: ff0371e95f3c87b4519036500b8ff6b5a7de3a91f9509f05240a9a23d53105ff
+  data.tar.gz: f96c2b0b84ad2d546433934ebe40e6973effe559896e0bacda88a0d769e462fc
 SHA512:
-  metadata.gz: 6ad5489d23376861eecd2b6de81ef2c9e9fd97cd57a81cc0679a59ae7e7500a4c4ddeba8831281f02c2e110657aaccf7751c89f5497f2dfc8c153daf86e17082
-  data.tar.gz: eceab6eadc445020e237eaa39f8b34a4b9007cc261327dc011ec97e00420532d51fd237c1614bc830874aad87cad520a3642dda41cb518dc1f1cc7f8303d9d9a
+  metadata.gz: 60c15036fe01fc5c4716cf49f8969dca86055628c42ba7c299a66de3102f08b7520d1c296f58b032840bfd925b5fcefaae068add96cc9f7d9370a68667d27c1e
+  data.tar.gz: a6c1a3d3b777ef1fd46f4928d2c045f57051169d84d2643050e1b917cb49cc0db0b9a20f9dee049a9fed8a1ad172ed74bae20fa4b94ab6616405d66d814970b2

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 0.5.0 - 2022-01-30
+
+### Added
+
+- Support escaped output line.
+- Support non-escaped output line.
+
 ## 0.4.0 - 2022-01-26
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hamli (0.4.0)
+    hamli (0.5.0)
       temple
 
 GEM

data/README.md

@@ -5,6 +5,8 @@
 
 Yet another implementation for [Haml](https://github.com/haml/haml) template language.
 
+Hamli is used by [Hamlcop](https://github.com/r7kamura/hamlcop).
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/hamli/parser.rb

@@ -44,6 +44,10 @@ module Hamli
         parse_control_line
       elsif @scanner.match?(/=/)
         parse_output_line
+      elsif @scanner.match?(/&=/)
+        parse_escaped_output_line
+      elsif @scanner.match?(/!=/)
+        parse_non_escaped_output_line
       else
         parse_text_line
       end
@@ -138,7 +142,7 @@ module Hamli
         content = parse_broken_lines
         end_ = @scanner.charpos
         block = [:multi]
-        tag << [:hamli, :position, begin_, end_, [:hamli, :output, content, block]]
+        tag << [:hamli, :position, begin_, end_, [:hamli, :output, false, content, block]]
         @stacks << block
       elsif @scanner.scan(%r{[ \t]*/[ \t]*})
         # Does nothing.
@@ -406,24 +410,51 @@ module Hamli
       [:hamli, :interpolate, begin_, end_, value]
     end
 
+    # Parse escaped output line part.
+    #   e.g. != abc
+    #        ^^^^^^
+    # @todo Support :escape_html option on this parser, then rethink about escaping.
+    def parse_non_escaped_output_line
+      @scanner.pos += 1
+      parse_output_line
+    end
+
+    # Parse escaped output line part.
+    #   e.g. &= abc
+    #        ^^^^^^
+    def parse_escaped_output_line
+      @scanner.pos += 2
+      @scanner.scan(/[ \t]*/)
+      parse_ruby_line(escaped: true, name: :output)
+    end
+
     # Parse output line part.
     #   e.g. = abc
     #        ^^^^^
     def parse_output_line
-      parse_control_line(name: :output)
+      @scanner.pos += 1
+      @scanner.scan(/[ \t]*/)
+      parse_ruby_line(escaped: false, name: :output)
     end
 
     # Parse control line part.
     #   e.g. - abc
     #        ^^^^^
-    def parse_control_line(name: :control)
+    def parse_control_line
       @scanner.pos += 1
+      @scanner.scan(/[ \t]*/)
+      parse_ruby_line(escaped: false, name: :control)
+    end
+
+    # @param [Boolean] escaped
+    # @param [Symbol] name
+    def parse_ruby_line(escaped:, name:)
       @scanner.scan(/[ \t]*/)
       block = [:multi]
       begin_ = @scanner.charpos
       content = parse_broken_lines
       end_ = @scanner.charpos
-      @stacks.last << [:hamli, :position, begin_, end_, [:hamli, name, content, block]]
+      @stacks.last << [:hamli, :position, begin_, end_, [:hamli, name, escaped, content, block]]
       @stacks << block
     end
 
@@ -439,9 +470,7 @@ module Hamli
         result << @scanner.scan(/[^\r\n]*/)
       end
       lines = result.lines
-      if lines.length >= 2 && lines.all? { |line| line.end_with?("|\n") }
-        result.gsub!(/\|$/, '')
-      end
+      result.gsub!(/\|$/, '') if lines.length >= 2 && lines.all? { |line| line.end_with?("|\n") }
       result.delete_suffix("\n")
     end
 

data/lib/hamli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hamli
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple