hamli 0.3.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfe5c703b08f1580b7b3bf603b45984d68c1ccaff5675b0243a838a190597366
-  data.tar.gz: b5af88cc968267fdbc9ae35806a0d6fef3fb749b1939ce42a19d635b00f0c767
+  metadata.gz: 9eacc83b48fa8d222c61141db82359b6ca0ab26d0920af27ec2aa23f62737a77
+  data.tar.gz: ce7a4299a5b7159d8bf710c56d209c8befca34e69e8f9283026708fd29fdc1e6
 SHA512:
-  metadata.gz: a29fe320a9c23065a6d897eab4acaf1e97b2303c11e0ec28854eb37bd50507a95247edee7a315dfa8b1e91af0be39ec79a1e4ec996220905084e9efa051fc285
-  data.tar.gz: cfcee2c4310365319915007a790d2962a88913180f21baae95857db5493c911fb09da9d152ac0993e01de4f684e141c73646466d1b31181fde85a8dbcde5196e
+  metadata.gz: ed57274d0f03e3cead46b164436245c3d20d1d8c162f96db507f6b6277b18d6f984f97ae03277a83696e5b9779021da712e90ae27646a1767b629d9e38b7bcc1
+  data.tar.gz: 699de4de959019ac943f2b15f151f196253b045f2781519ba645175b66a0b4b8b8dbbdfe7c8098bd652dbaf890282c15697954fd345a7346082516496a3458e7

data/CHANGELOG.md

@@ -2,6 +2,33 @@
 
 ## Unreleased
 
+## 0.5.1 - 2022-06-29
+
+### Fixed
+
+- Fix Ruby blocks parsing.
+
+## 0.5.0 - 2022-01-30
+
+### Added
+
+- Support escaped output line.
+- Support non-escaped output line.
+
+## 0.4.0 - 2022-01-26
+
+### Added
+
+- Add :file option for better error report.
+
+### Fixed
+
+- Fix error from parse_text_block on some case.
+- Fix filter bug on :text node.
+- Fix parse_interpolate_line bug.
+- Fix haml comment parser bug.
+- Fix pipe multi-line handling.
+
 ## 0.3.0 - 2022-01-26
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hamli (0.3.0)
+    hamli (0.5.1)
       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/filters/base.rb

@@ -14,11 +14,10 @@ module Hamli
         [:hamli, :position, begin_, end_, compile(expression)]
       end
 
-      # @param [String] type
       # @param [Array] expression
       # @return [Array]
-      def on_hamli_text(type, expression)
-        [:hamli, :text, type, compile(expression)]
+      def on_hamli_text(expression)
+        [:hamli, :text, compile(expression)]
       end
     end
   end

data/lib/hamli/parser.rb

@@ -4,6 +4,15 @@ require 'temple'
 
 module Hamli
   class Parser < ::Temple::Parser
+    define_options(
+      :file
+    )
+
+    def initialize(_options = {})
+      super
+      @file_path = options[:file] || '(__TEMPLATE__)'
+    end
+
     # @param [String] source Haml template source.
     # @return [Array]
     def call(source)
@@ -35,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
@@ -129,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.
@@ -351,8 +364,9 @@ module Hamli
     #        ^^^^^^
     def parse_haml_comment_line
       @scanner.pos += 2
+      @scanner.scan(/[^\r\n]*/)
       while !@scanner.eos? && (@scanner.match?(/[ \t]*(?=\r|$)/) || peek_indent > @indents.last)
-        @scanner.skip(/[^\r\n]*/)
+        @scanner.scan(/[^\r\n]*/)
         parse_line_ending
       end
     end
@@ -387,7 +401,7 @@ module Hamli
 
     # @return [Array, nil]
     def parse_interpolate_line
-      return unless @scanner.match?(/[^\r\n]/)
+      return unless @scanner.match?(/[^\r\n]+/)
 
       begin_ = @scanner.charpos
       value = @scanner.matched
@@ -396,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
 
@@ -422,14 +463,15 @@ module Hamli
     def parse_broken_lines
       result = +''
       result << @scanner.scan(/[^\r\n]*/)
-      while result.end_with?(',') || result.end_with?('|')
+      while result.end_with?(',') || (result.end_with?('|') && (result !~ /\bdo\s*\|[^|]*\|\z/))
         syntax_error!(Errors::UnexpectedEosError) unless @scanner.scan(/\r?\n/)
 
-        result.delete_suffix('|')
         result << "\n"
         result << @scanner.scan(/[^\r\n]*/)
       end
-      result
+      lines = result.lines
+      result.gsub!(/\|$/, '') if lines.length >= 2 && lines.all? { |line| line.end_with?("|\n") }
+      result.delete_suffix("\n")
     end
 
     # @param [Class] syntax_error_class A child class of Hamli::Errors::HamlSyntaxError.
@@ -446,7 +488,7 @@ module Hamli
 
     # @return [Integer]
     def indent_from_last_match
-      @scanner.matched.chars.map do |char|
+      (@scanner.matched || '').chars.map do |char|
         case char
         when "\t"
           4

data/lib/hamli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -24,7 +24,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - r7kamura@gmail.com
 executables: []
@@ -57,7 +57,7 @@ metadata:
   source_code_uri: https://github.com/r7kamura/hamli
   changelog_uri: https://github.com/r7kamura/hamli/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -72,8 +72,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Yet another implementation for Haml template language.
 test_files: []