slimi 0.7.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29937913d2bf6ac3b92dcb1e94964655b79ee48d8e891890ca53618afb3f63db
-  data.tar.gz: b15a369b677fe16bb18b837cd523dd01f317a05b0135b3f1c690bbc8f2d389fc
+  metadata.gz: df7564efc95dcfc968f262e77fff5be0daa2c779c43f8da3ee858a9508264685
+  data.tar.gz: 414c5620fb99766908c117ef3ae49d14df04206d6121714fb167ec4a4773678b
 SHA512:
-  metadata.gz: 45fe23fedad4989d7b0241a28ef46de56dca448f9e67fa68cfb47058dfc73055a891c84775e53e0ca89f6dd8e6efe5ce381ad3e5df31d8d0e04300a25ca89e5c
-  data.tar.gz: 859ee454f3ec3712540981e1ea315b9049aeda13473d42b0f5a0edeba8f186a44ad266925441f354e9c78e2414d6cbaf3cd2e9614f17b2c4c56876998bf60e32
+  metadata.gz: 12999b7675a1e9aa480cc32c8380a4a09f906376ce34e545db48f481991e1edb6d10bd3b8d6c0f1e09596d357b084b2f92d9958bee66149c27eacb50d0c76991
+  data.tar.gz: 037a95dd6470e185b63c6c145706cf27c9271aa2d1017c8ab5806dd87f96a8a05d0f779d5dcb279c7bd242043f80d9af43e2da2515997f0fcbb4b33aa303defd

data/.rubocop.yml

@@ -4,7 +4,6 @@ require:
 AllCops:
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 2.6
 
 Layout/LineLength:
   Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+- Change required ruby version from 2.6+ to 3.3+.
+
+## 0.8.0 - 2026-06-13
+
+- Support splat attributes.
+
 ## 0.7.5 - 2024-07-25
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slimi (0.7.8)
+    slimi (0.9.0)
       temple
       thor
       tilt
@@ -9,22 +9,25 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (7.1.3.4)
-      activesupport (= 7.1.3.4)
+    actionview (8.1.3)
+      activesupport (= 8.1.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activesupport (7.1.3.4)
+    activesupport (8.1.3)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     ast (2.4.2)
     base64 (0.2.0)
     bigdecimal (3.1.8)
@@ -39,17 +42,20 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
+    logger (1.7.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    minitest (5.24.1)
-    mutex_m (0.2.0)
-    nokogiri (1.18.10-x86_64-linux-gnu)
+    minitest (6.0.6)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    nokogiri (1.19.3-x86_64-linux-gnu)
       racc (~> 1.4)
     parallel (1.25.1)
     parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
+    prism (1.9.0)
     racc (1.8.0)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
@@ -92,6 +98,7 @@ GEM
     rubocop-rspec (3.0.3)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
     strscan (3.1.0)
     temple (0.10.3)
     thor (1.3.2)
@@ -99,6 +106,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
+    uri (1.1.1)
 
 PLATFORMS
   x86_64-linux

data/README.md

@@ -62,7 +62,7 @@ Commands:
     - [x] Boolean attributes
     - [x] Attribute merging
     - [x] Attribute shortcuts
-    - [ ] Splat attributes
+    - [x] Splat attributes
 - Plugins
     - [ ] Include partials
     - [ ] Translator/I18n

data/lib/slimi/engine.rb

@@ -24,6 +24,7 @@ module Slimi
     use Filters::Control
     use Filters::Output
     use Filters::Text
+    use Filters::Splat
     html :AttributeSorter
     html :AttributeMerger
     use Filters::Attribute

data/lib/slimi/errors.rb

@@ -62,5 +62,14 @@ module Slimi
 
     class UnknownLineIndicatorError < SlimSyntaxError
     end
+
+    class RenderError < BaseError
+    end
+
+    class InvalidAttributeNameError < RenderError
+    end
+
+    class MultipleAttributesError < RenderError
+    end
   end
 end

data/lib/slimi/filters/do_inserter.rb

@@ -4,7 +4,7 @@ module Slimi
   module Filters
     # Append missing `do` to embedded Ruby code.
     class DoInserter < Base
-      VALID_RUBY_LINE_REGEXP = /(\A(if|unless|else|elsif|when|begin|rescue|ensure|case)\b)|\bdo\s*(\|[^|]*\|\s*)?\Z/.freeze
+      VALID_RUBY_LINE_REGEXP = /(\A(if|unless|else|elsif|when|begin|rescue|ensure|case)\b)|\bdo\s*(\|[^|]*\|\s*)?\Z/
 
       # @param [String] code
       # @param [Array] expressio

data/lib/slimi/filters/end_inserter.rb

@@ -36,11 +36,11 @@ module Slimi
       end
 
       class Expression
-        IF_REGEXP = /\A(if|begin|unless|else|elsif|when|rescue|ensure)\b|\bdo\s*(\|[^|]*\|)?\s*$/.freeze
+        IF_REGEXP = /\A(if|begin|unless|else|elsif|when|rescue|ensure)\b|\bdo\s*(\|[^|]*\|)?\s*$/
 
-        ELSE_REGEXP = /\A(else|elsif|when|rescue|ensure)\b/.freeze
+        ELSE_REGEXP = /\A(else|elsif|when|rescue|ensure)\b/
 
-        END_REGEXP = /\Aend\b/.freeze
+        END_REGEXP = /\Aend\b/
 
         # @param [Array] expression
         def initialize(expression)

data/lib/slimi/filters/output.rb

@@ -6,7 +6,7 @@ module Slimi
     class Output < Base
       define_options :disable_capture
 
-      IF_REGEXP = /\A(if|unless)\b|\bdo\s*(\|[^|]*\|)?\s*$/.freeze
+      IF_REGEXP = /\A(if|unless)\b|\bdo\s*(\|[^|]*\|)?\s*$/
 
       # @param [Boolean] escape
       # @param [String] code

data/lib/slimi/filters/splat.rb

@@ -0,0 +1,176 @@
+# frozen_string_literal: true
+
+module Slimi
+  module Filters
+    class Splat < Base
+      define_options :attr_quote, :format, :merge_attrs, :sort_attrs, use_html_safe: ''.respond_to?(:html_safe?)
+
+      # @param [Array] exp
+      # @return [Array]
+      def call(exp)
+        @splat_options = nil
+        exp = compile(exp)
+        if @splat_options
+          [:multi, [:code, "#{@splat_options} = #{splat_builder_options.inspect}"], exp]
+        else
+          exp
+        end
+      end
+
+      # @param [Array<Array>] attrs
+      # @return [Array]
+      def on_html_attrs(*attrs)
+        return super unless attrs.any? { |attr| splat?(attr) }
+
+        @splat_options ||= unique_name
+        builder = unique_name
+        result = [:multi]
+        result << [:code, "#{builder} = ::#{Builder.name}.new(#{@splat_options})"]
+        attrs.each do |attr|
+          result << compile_attribute(builder, attr)
+        end
+        result << [:dynamic, "#{builder}.to_s"]
+      end
+
+      private
+
+      # @param [String] builder
+      # @param [Array] attr
+      # @return [Array]
+      def compile_attribute(builder, attr)
+        return [:code, "#{builder}.splat((#{attr[2]}))"] if splat?(attr)
+
+        _, _, name, value = attr
+        if value[0] == :slimi && value[1] == :attrvalue
+          # Pass the raw expression and escape flag through, so that the Builder can
+          # apply the same merge / boolean / nil / escape rules as Filters::Attribute.
+          [:code, "#{builder}.code_attribute(#{name.to_s.inspect}, #{value[2]}, (#{value[3]}))"]
+        elsif value == [:multi]
+          # Boolean attribute, e.g. `div(*foo disabled)`.
+          [:code, "#{builder}.code_attribute(#{name.to_s.inspect}, false, true)"]
+        else
+          # Static or interpolated value whose escaping is compiled into the capture,
+          # so the Builder must not escape it again.
+          tmp = unique_name
+          [:multi,
+           [:capture, tmp, compile(value)],
+           [:code, "#{builder}.attribute(#{name.to_s.inspect}, #{tmp})"]]
+        end
+      end
+
+      # @param [Array] attr
+      # @return [Boolean]
+      def splat?(attr)
+        attr[0] == :slimi && attr[1] == :splat
+      end
+
+      # @return [Hash]
+      def splat_builder_options
+        {
+          attr_quote: options[:attr_quote],
+          format: options[:format],
+          merge_attrs: options[:merge_attrs],
+          sort_attrs: options[:sort_attrs],
+          use_html_safe: options[:use_html_safe]
+        }
+      end
+
+      class Builder
+        # https://html.spec.whatwg.org/multipage/syntax.html#attributes-2
+        INVALID_ATTRIBUTE_NAME_REGEXP = %r{[ \0"'>/=]}
+
+        # @param [Hash] options
+        def initialize(options)
+          @attr_quote = options[:attr_quote]
+          @format = options[:format]
+          @merge_attrs = options[:merge_attrs] || {}
+          @sort_attrs = options.fetch(:sort_attrs, true)
+          @use_html_safe = options[:use_html_safe]
+          @attributes = {}
+        end
+
+        # Add an attribute value already rendered and escaped by the compiled template.
+        # @param [String] name
+        # @param [String] value
+        def attribute(name, value)
+          store(name, value)
+        end
+
+        # Add an attribute value, applying merge / boolean / nil / escape rules.
+        # @param [String] name
+        # @param [Boolean] escape
+        # @param [Object] value
+        def code_attribute(name, escape, value)
+          if (delimiter = @merge_attrs[name])
+            value = value.is_a?(::Array) ? value.flatten.map(&:to_s).reject(&:empty?).join(delimiter) : value.to_s
+            store(name, escape_html(escape, value)) unless value.empty?
+          elsif value.is_a?(::Hash)
+            value.each do |key, nested_value|
+              code_attribute("#{name}-#{key}", escape, nested_value)
+            end
+          elsif value != false && !value.nil?
+            store(name, value == true ? true : escape_html(escape, value.to_s))
+          end
+        end
+
+        # @param [Hash] hash
+        def splat(hash)
+          hash.each do |name, value|
+            code_attribute(name.to_s, true, value)
+          end
+        end
+
+        # @return [String]
+        def to_s
+          attributes = @sort_attrs ? @attributes.sort_by(&:first) : @attributes
+          attributes.map { |name, value| render(name, value) }.join
+        end
+
+        private
+
+        # @param [String] name
+        # @param [String, true] value
+        def store(name, value)
+          raise Errors::InvalidAttributeNameError, "Invalid attribute name '#{name}' was rendered" if INVALID_ATTRIBUTE_NAME_REGEXP.match?(name)
+
+          if @attributes.key?(name)
+            delimiter = @merge_attrs[name]
+            raise Errors::MultipleAttributesError, "Multiple #{name} attributes specified" unless delimiter
+
+            @attributes[name] = "#{@attributes[name]}#{delimiter}#{value}"
+          else
+            @attributes[name] = value
+          end
+        end
+
+        # @param [String] name
+        # @param [String, true] value
+        # @return [String]
+        def render(name, value)
+          if value == true
+            if @format == :xhtml
+              " #{name}=#{@attr_quote}#{@attr_quote}"
+            else
+              " #{name}"
+            end
+          else
+            " #{name}=#{@attr_quote}#{value}#{@attr_quote}"
+          end
+        end
+
+        # @param [Boolean] escape
+        # @param [String] string
+        # @return [String]
+        def escape_html(escape, string)
+          return string unless escape
+
+          if @use_html_safe
+            ::Temple::Utils.escape_html_safe(string)
+          else
+            ::Temple::Utils.escape_html(string)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/slimi/filters.rb

@@ -11,6 +11,7 @@ module Slimi
     autoload :EndInserter, 'slimi/filters/end_inserter'
     autoload :Interpolation, 'slimi/filters/interpolation'
     autoload :Output, 'slimi/filters/output'
+    autoload :Splat, 'slimi/filters/splat'
     autoload :Text, 'slimi/filters/text'
     autoload :Unposition, 'slimi/filters/unposition'
   end

data/lib/slimi/parser.rb

@@ -38,6 +38,7 @@ module Slimi
       @attribute_shortcut_regexp = factory.attribute_shortcut_regexp
       @attribute_delimiter_regexp = factory.attribute_delimiter_regexp
       @quoted_attribute_regexp = factory.quoted_attribute_regexp
+      @splat_attribute_regexp = factory.splat_attribute_regexp
       @tag_name_regexp = factory.tag_name_regexp
       @attribute_name_regexp = factory.attribute_name_regexp
       @ruby_attribute_regexp = factory.ruby_attribute_regexp
@@ -259,9 +260,13 @@ module Slimi
         attribute_delimiter_closing_part_regexp = /[ \t]*#{attribute_delimiter_closing_regexp}/
       end
 
-      # TODO: Support splat attributes.
       loop do
-        if @scanner.skip(@quoted_attribute_regexp)
+        if @scanner.skip(@splat_attribute_regexp)
+          charpos = @scanner.charpos
+          code = parse_ruby_attribute_value(attribute_delimiter_closing)
+          syntax_error!(Errors::InvalidEmptyAttributeError) if code.empty?
+          attributes << [:slimi, :position, charpos, charpos + code.length, [:slimi, :splat, code]]
+        elsif @scanner.skip(@quoted_attribute_regexp)
           attribute_name = @scanner[1]
           escape = @scanner[2].empty?
           quote = @scanner[3]
@@ -676,6 +681,11 @@ module Slimi
         /#{attribute_name_regexp}[ \t]*=(=?)[ \t]*("|')/
       end
 
+      # @return [Regexp]
+      def splat_attribute_regexp
+        /[ \t]*\*(?=[^\s])/
+      end
+
       # @return [Regexp]
       def ruby_attribute_delimiter_regexp
         ::Regexp.union(@ruby_attribute_delimiters.keys)

data/lib/slimi/rails_template_handler.rb

@@ -8,8 +8,8 @@ module Slimi
     # @return [String]
     def call(template, source = nil)
       Renderer.new(
-        source: source,
-        template: template
+        source:,
+        template:
       ).call
     end
 

data/lib/slimi/version.rb

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

data/slimi.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimi
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.9.0
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -85,6 +85,7 @@ files:
 - lib/slimi/filters/end_inserter.rb
 - lib/slimi/filters/interpolation.rb
 - lib/slimi/filters/output.rb
+- lib/slimi/filters/splat.rb
 - lib/slimi/filters/text.rb
 - lib/slimi/filters/unposition.rb
 - lib/slimi/parser.rb
@@ -108,14 +109,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Yet another implementation for Slim template language.
 test_files: []