slimi 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c151d108a263b740aa9cf7f7ac6dba84741a722b1fdffcb1b6078c63a55a911
-  data.tar.gz: fe127168b410730d5303deff0d50b43d42d805b9fcb16bce17c09fb00549c149
+  metadata.gz: 2cc9114044b4d54f8daace833fec2cf54c4da2658d21f8f141392ba72a0f430e
+  data.tar.gz: '0087a0cd279c8ab0e8783f3a417db243c921fb3da567215d25c9159f2c15b0ae'
 SHA512:
-  metadata.gz: fbffeb9d9bd5dd13b085503bc439a85b4832ae44bd8839d07fd879faf5e158b7f5b41f72f051e3963a73086e302a5f9f3cc2541c6a404b7acbed66dd225824d3
-  data.tar.gz: 945f20409900cdd7fb7cff7a2517aae58a334d9528b6092d1a212b4715bc2dbf713650a25201b2bf8ba28f3f181d4e5cc635b1c759f9b0420e3c9dc6b4742ec2
+  metadata.gz: 43a8877ef682c297b553bf4f6f9e23bc975dc96d897927fa6aeade79642e18078d2a09445b1c2f7107b3237d4e0582d4abe31bc908b9b81dd390e3397197bf3a
+  data.tar.gz: d43773236ca49650e702ffddaa1a29f4397f7b7485010ac4088fae84eaf89d15768033390faecec1c386612afef9d893d0d0cb0b526bbdb58b6afed8d01c7f11

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## 0.7.3 - 2023-02-27
+
+### Fixed
+
+- Fix parser bug that CR is included in some unrelated token.
+- Fix wrong signature error on embedded filter.
+
 ## 0.7.2 - 2022-01-24
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slimi (0.7.2)
+    slimi (0.7.3)
       temple
       thor
       tilt
@@ -9,77 +9,82 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (7.0.0)
-      activesupport (= 7.0.0)
+    actionview (7.0.4.2)
+      activesupport (= 7.0.4.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (7.0.0)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.0)
     crass (1.0.6)
-    diff-lcs (1.4.4)
-    erubi (1.10.0)
-    i18n (1.8.11)
+    diff-lcs (1.5.0)
+    erubi (1.12.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.13.0)
+    json (2.6.3)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    minitest (5.15.0)
-    nokogiri (1.12.5-x86_64-linux)
+    minitest (5.17.0)
+    nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.21.0)
-    parser (3.0.3.2)
+    parallel (1.22.1)
+    parser (3.2.1.0)
       ast (~> 2.4.1)
-    racc (1.6.0)
+    racc (1.6.2)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    rainbow (3.0.0)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.0)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.23.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.45.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.0)
-      parser (>= 3.0.1.1)
-    rubocop-rspec (2.6.0)
-      rubocop (~> 1.19)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.26.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.17.1)
+      rubocop (~> 1.41)
+    rubocop-rspec (2.18.1)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
     ruby-progressbar (1.11.0)
-    temple (0.8.2)
+    temple (0.10.0)
     thor (1.2.1)
-    tilt (2.0.10)
-    tzinfo (2.0.4)
+    tilt (2.1.0)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   x86_64-linux

data/lib/slimi/cli.rb

@@ -23,7 +23,7 @@ module Slimi
     def parse
       slim = $stdin.read
       expression = Parser.new.call(slim)
-      pp expression
+      pp expression # rubocop:disable Lint/Debugger
     end
 
     desc 'render', 'Convert Slim into HTML'

data/lib/slimi/filters/embedded.rb

@@ -12,7 +12,7 @@ module Slimi
         @collected
       end
 
-      def on_slimi_interpolate(text)
+      def on_slimi_interpolate(_, _, text)
         @collected << text
         nil
       end

data/lib/slimi/parser.rb

@@ -138,7 +138,7 @@ module Slimi
         @stacks.last << tag
         @stacks.last << [:static, ' '] if with_trailing_white_space
 
-        if @scanner.skip(/[ \t]*$/)
+        if @scanner.skip(/[ \t]*(?=\R|$)/)
           content = [:multi]
           tag << content
           @stacks << content
@@ -255,7 +255,7 @@ module Slimi
         attribute_delimiter_opening = @scanner[1]
         attribute_delimiter_closing = @attribute_delimiters[attribute_delimiter_opening]
         attribute_delimiter_closing_regexp = ::Regexp.escape(attribute_delimiter_closing)
-        boolean_attribute_regexp = /#{@attribute_name_regexp}(?=(?:[ \t]|#{attribute_delimiter_closing_regexp}|$))/
+        boolean_attribute_regexp = /#{@attribute_name_regexp}(?=(?:[ \t]|#{attribute_delimiter_closing_regexp}|(?=\R|$)))/
         attribute_delimiter_closing_part_regexp = /[ \t]*#{attribute_delimiter_closing_regexp}/
       end
 
@@ -320,7 +320,7 @@ module Slimi
             opening_delimiter = @scanner.matched
             closing_delimiter = @ruby_attribute_delimiters[opening_delimiter]
           end
-          if (character = @scanner.scan(/./))
+          if (character = @scanner.scan(/[^\r\n]/))
             attribute_value << character
           end
         end
@@ -361,9 +361,9 @@ module Slimi
 
     # @return [Boolean]
     def parse_slim_comment_block
-      if @scanner.skip(%r{/.*})
-        while !@scanner.eos? && (@scanner.match?(/[ \t]*$/) || peek_indent > @indents.last)
-          @scanner.skip(/.*/)
+      if @scanner.skip(%r{/[^\r\n]*})
+        while !@scanner.eos? && (@scanner.match?(/[ \t]*(?=\R|$)/) || peek_indent > @indents.last)
+          @scanner.skip(/[^\r\n]*/)
           parse_line_ending
         end
         true
@@ -396,7 +396,7 @@ module Slimi
 
     # @return [Boolean]
     def parse_inline_html_inner
-      if @scanner.match?(/<.*/)
+      if @scanner.match?(/<[^\r\n]*/)
         begin_ = @scanner.charpos
         value = @scanner.matched
         @scanner.pos += @scanner.matched_size
@@ -493,7 +493,7 @@ module Slimi
         else
           0
         end
-      end.sum(0)
+      end.sum
     end
 
     # @return [Boolean]
@@ -533,7 +533,7 @@ module Slimi
 
     # @return [Array, nil] S-expression if found.
     def parse_interpolate_line
-      return unless @scanner.match?(/.+/)
+      return unless @scanner.match?(/[^\r\n]+/)
 
       begin_ = @scanner.charpos
       value = @scanner.matched
@@ -546,12 +546,12 @@ module Slimi
     # @return [String]
     def parse_broken_lines
       result = +''
-      result << @scanner.scan(/.*/)
+      result << @scanner.scan(/[^\r\n]*/)
       while result.end_with?(',') || result.end_with?('\\')
         syntax_error!(Errors::UnexpectedEosError) unless @scanner.scan(/\r?\n/)
 
         result << "\n"
-        result << @scanner.scan(/.*/)
+        result << @scanner.scan(/[^\r\n]*/)
       end
       result
     end

data/lib/slimi/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slimi
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - r7kamura@gmail.com
 executables:
@@ -103,7 +103,7 @@ metadata:
   source_code_uri: https://github.com/r7kamura/slimi
   changelog_uri: https://github.com/r7kamura/slimi/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,8 +118,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.26
+signing_key:
 specification_version: 4
 summary: Yet another implementation for Slim template language.
 test_files: []