hamli 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff0371e95f3c87b4519036500b8ff6b5a7de3a91f9509f05240a9a23d53105ff
-  data.tar.gz: f96c2b0b84ad2d546433934ebe40e6973effe559896e0bacda88a0d769e462fc
+  metadata.gz: 158a375f1876300a8cb20661a8811b4eac41249852a3eb912cf5167de1b1754b
+  data.tar.gz: 0b4ecd49bac379cd6aeca136929a24659277dd6b65cae6d373eeede2add8946e
 SHA512:
-  metadata.gz: 60c15036fe01fc5c4716cf49f8969dca86055628c42ba7c299a66de3102f08b7520d1c296f58b032840bfd925b5fcefaae068add96cc9f7d9370a68667d27c1e
-  data.tar.gz: a6c1a3d3b777ef1fd46f4928d2c045f57051169d84d2643050e1b917cb49cc0db0b9a20f9dee049a9fed8a1ad172ed74bae20fa4b94ab6616405d66d814970b2
+  metadata.gz: 7d951547605c4156347968318742f3ffb60da981c21ee264d44c2e32b8a7c069aced50920c50e69e116ec34ad89d100fdc0ddd39ebd314fd2fef38ba95243c96
+  data.tar.gz: 96ad7007423345874e5a457246365692cad48f8d3eed187dfd8b9982d1353c085330e143e66d49b99bb281a31f16b5648e378fc8efc226e23c3b7bab07bebcc7

data/.rubocop.yml

@@ -1,10 +1,9 @@
-require:
+plugins:
   - rubocop-rspec
 
 AllCops:
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 2.6
 
 Layout/LineLength:
   Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## 0.6.0 - 2026-05-02
+
+- Drop support for Ruby versions earlier than 3.3.
+
+## 0.5.1 - 2022-06-29
+
+### Fixed
+
+- Fix Ruby blocks parsing.
+
 ## 0.5.0 - 2022-01-30
 
 ### Added

data/Gemfile

@@ -7,5 +7,5 @@ gemspec
 
 gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.0'
-gem 'rubocop', '~> 1.21'
+gem 'rubocop'
 gem 'rubocop-rspec'

data/Gemfile.lock

@@ -1,21 +1,26 @@
 PATH
   remote: .
   specs:
-    hamli (0.5.0)
+    hamli (0.6.0)
       temple
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
+    ast (2.4.3)
     diff-lcs (1.5.0)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    json (2.19.4)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    parallel (1.28.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
+      racc
+    prism (1.9.0)
+    racc (1.8.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.0)
-    rexml (3.2.5)
+    regexp_parser (2.12.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -29,22 +34,28 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
-    rubocop (1.25.0)
-      parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+    rubocop (1.86.1)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (>= 1.10)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
-    rubocop-rspec (2.7.0)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    rubocop-rspec (3.9.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.81)
+    ruby-progressbar (1.13.0)
     temple (0.8.2)
-    unicode-display_width (2.1.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
 
 PLATFORMS
   x86_64-linux
@@ -53,7 +64,7 @@ DEPENDENCIES
   hamli!
   rake (~> 13.0)
   rspec (~> 3.0)
-  rubocop (~> 1.21)
+  rubocop
   rubocop-rspec
 
 BUNDLED WITH

data/hamli.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = 'Yet another implementation for Haml template language.'
   spec.homepage = 'https://github.com/r7kamura/hamli'
   spec.license = 'MIT'
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.required_ruby_version = '>= 3.3.0'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage

data/lib/hamli/filters/interpolation.rb

@@ -13,7 +13,7 @@ module Hamli
         scanner = ::StringScanner.new(string)
         until scanner.eos?
           charpos = scanner.charpos
-          if (value = scanner.scan(/\\#\{/))
+          if (value = scanner.scan('\#{'))
             block << [:static, value]
           elsif scanner.scan(/#\{((?>[^{}]|(\{(?>[^{}]|\g<1>)*\}))*)\}/)
             code = scanner[1]

data/lib/hamli/parser.rb

@@ -54,7 +54,7 @@ module Hamli
     end
 
     # @return [Boolean]
-    def parse_blank_line
+    def parse_blank_line # rubocop:disable Naming/PredicateMethod
       if @scanner.scan(/[ \t]*$/)
         parse_line_ending
         true
@@ -64,7 +64,7 @@ module Hamli
     end
 
     # @return [Boolean]
-    def parse_line_ending
+    def parse_line_ending # rubocop:disable Naming/PredicateMethod
       if @scanner.scan(/\r?\n/)
         @stacks.last << [:newline]
         true
@@ -223,7 +223,7 @@ module Hamli
     def parse_html_style_attributes
       @scanner.pos += 1
       result = []
-      until @scanner.scan(/\)/)
+      until @scanner.scan(')')
         syntax_error!(Errors::UnexpectedEosError) if @scanner.eos?
 
         @scanner.scan(/[ \t\r\n]+/)
@@ -245,7 +245,7 @@ module Hamli
       name = @scanner[1]
 
       @scanner.scan(/[ \t]*/)
-      return [:html, :attr, name, [:static, true]] unless @scanner.scan(/=/)
+      return [:html, :attr, name, [:static, true]] unless @scanner.scan('=')
 
       @scanner.scan(/[ \t]*/)
       unless (quote = @scanner.scan(/["']/))
@@ -463,7 +463,7 @@ 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 << "\n"
@@ -497,7 +497,7 @@ module Hamli
         else
           0
         end
-      end.sum(0)
+      end.sum
     end
 
     # @return [Boolean]

data/lib/hamli/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hamli
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ryo Nakamura
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -24,7 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
 email:
 - r7kamura@gmail.com
 executables: []
@@ -57,7 +55,6 @@ 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: 
 rdoc_options: []
 require_paths:
 - lib
@@ -65,15 +62,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Yet another implementation for Haml template language.
 test_files: []