slimi 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05cfa3a429ac2da0e1241e65e69a40f9171079cddb9451a6d7186726a5cb498c
-  data.tar.gz: 68826c3fe78dc87bfd704cc38a9222da1adeed36a8c0d0e903bb4f3077ed698d
+  metadata.gz: 299f0ea50391c15aed1b99b4fb2cb1a8eae63a3ba97e2abc31cf676472a38cd8
+  data.tar.gz: 6119285d8a753ab001bf29eff8df574dfab52636fc092d324db50ec7d094e7eb
 SHA512:
-  metadata.gz: 9c729933bc060a21df2e55db525d28a8e519526995ec5b7fb3defd17ecb11c71fc7e6ec664c162396f6a8be9175549dd842c7c5f9be76c68afadadc9e3e442be
-  data.tar.gz: 60b3b1ad54a01bcbc2154e83b11efe3ac1b3fb5723773f04aabff9d1957dec60cb8afd431630b78dc8e13fa86d109d86a78c66005bafb10c23e0965368d9bd80
+  metadata.gz: 9269ec0c3c35efd6665a3f7aff882737479b72998b28cc067a80823885316a267958f3bf2a62107c7d56fd31bb12675f17b77053f7372c40fe768e3865775c13
+  data.tar.gz: 7c03ac659b980eb512c87c0fa8a3bc2b991faac079f71426e67a3ede722455677b3647d7ceb8af286aae3a38730b4e42c40ac07a62662c2db7d34339060a6055

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 0.4.1 - 2021-12-26
+
+### Fixed
+
+- Fix bug on parsing Ruby attribute value.
+- Fix bug on empty line in text block.
+
 ## 0.4.0 - 2021-12-25
 
 ### Added

data/Gemfile.lock

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

data/lib/slimi/parser.rb

@@ -300,12 +300,12 @@ module Slimi
           attribute_value << @scanner[1] << "\n"
         else
           if count.positive?
-            if opening_delimiter && @scanner.skip(::Regexp.escape(opening_delimiter))
+            if opening_delimiter && @scanner.match?(/#{::Regexp.escape(opening_delimiter)}/)
               count += 1
-            elsif closing_delimiter && @scanner.skip(::Regexp.escape(closing_delimiter))
+            elsif closing_delimiter && @scanner.match?(/#{::Regexp.escape(closing_delimiter)}/)
               count -= 1
             end
-          elsif @scanner.skip(@ruby_attribute_delimiter_regexp)
+          elsif @scanner.match?(@ruby_attribute_delimiter_regexp)
             count = 1
             opening_delimiter = @scanner.matched
             closing_delimiter = @ruby_attribute_delimiters[opening_delimiter]
@@ -503,9 +503,13 @@ module Slimi
       interpolate = parse_interpolate_line
       result << interpolate if interpolate
 
-      loop do
-        break unless @scanner.match?(/\r?\n[ \t]*/)
+      until @scanner.eos?
+        if @scanner.skip(/\r?\n[ \t]*(?=\r?\n)/)
+          result << [:newline]
+          next
+        end
 
+        @scanner.match?(/\r?\n[ \t]*/)
         indent = indent_from_last_match
         break if indent <= @indents.last
 

data/lib/slimi/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimi
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-24 00:00:00.000000000 Z
+date: 2021-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple