hamli 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfe5c703b08f1580b7b3bf603b45984d68c1ccaff5675b0243a838a190597366
-  data.tar.gz: b5af88cc968267fdbc9ae35806a0d6fef3fb749b1939ce42a19d635b00f0c767
+  metadata.gz: 9f1faa1d3b9fa40c999ab475131a1cdf13a0cf97ad348b57a4d3fcbd2028e915
+  data.tar.gz: 33b020dd8ee73741bc3e262e48c0cab0e7d7be24eb1df90deecd322c6ae4237f
 SHA512:
-  metadata.gz: a29fe320a9c23065a6d897eab4acaf1e97b2303c11e0ec28854eb37bd50507a95247edee7a315dfa8b1e91af0be39ec79a1e4ec996220905084e9efa051fc285
-  data.tar.gz: cfcee2c4310365319915007a790d2962a88913180f21baae95857db5493c911fb09da9d152ac0993e01de4f684e141c73646466d1b31181fde85a8dbcde5196e
+  metadata.gz: 6ad5489d23376861eecd2b6de81ef2c9e9fd97cd57a81cc0679a59ae7e7500a4c4ddeba8831281f02c2e110657aaccf7751c89f5497f2dfc8c153daf86e17082
+  data.tar.gz: eceab6eadc445020e237eaa39f8b34a4b9007cc261327dc011ec97e00420532d51fd237c1614bc830874aad87cad520a3642dda41cb518dc1f1cc7f8303d9d9a

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## Unreleased
 
+## 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.4.0)
       temple
 
 GEM

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)
@@ -351,8 +360,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 +397,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
@@ -425,11 +435,14 @@ module Hamli
       while result.end_with?(',') || result.end_with?('|')
         syntax_error!(Errors::UnexpectedEosError) unless @scanner.scan(/\r?\n/)
 
-        result.delete_suffix('|')
         result << "\n"
         result << @scanner.scan(/[^\r\n]*/)
       end
-      result
+      lines = result.lines
+      if lines.length >= 2 && lines.all? { |line| line.end_with?("|\n") }
+        result.gsub!(/\|$/, '')
+      end
+      result.delete_suffix("\n")
     end
 
     # @param [Class] syntax_error_class A child class of Hamli::Errors::HamlSyntaxError.
@@ -446,7 +459,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.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryo Nakamura