slimi 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce4329befc9d19fb756c5609a28a3169c4f5a5aa2698771df14541b88b792da1
-  data.tar.gz: d99512e7191942f2fabb8667cb4de369dcad5d773c1e162cc039f2911b4b1dc9
+  metadata.gz: 69032d72b1695bfe2afc7a11dbb965e4abf252a7c42caab252e972bcb45c13f8
+  data.tar.gz: af3822a5d2375300d4b07f0114c30c933eb215c88bfcee1bd6cc4938d769d76e
 SHA512:
-  metadata.gz: 6c1b46a4afdfc4ce2a8ce816898a17e6bd448e0e76a001efbebfe7fc498375a2c1c71aaa5f40cce11012f28e7e87f5c7eef06b70b6dbcd560a6343d5494ee71c
-  data.tar.gz: 7554a443efa9d30952d3446b92c494dd6ecf1caeb78d77aea347eef1ab862e64c35e93d4ef76c1423728734eb3b23913e75497c3358b0df2543229e05b177c07
+  metadata.gz: b59318e78f3c7c83e67334326992babdc60d3d299ed8973778f7c3c463b1eaaaacbefafe20ee8f7072eff13db72c3a88c5a0cae7f4ecd18629bc9e8a35645599
+  data.tar.gz: 173fdc474e985a89ead0c473d25bcb2bb4deb586679d17bee18d5384b29e21900e79e03567ed302bce9ac37b81dc4ad29ed3b837eeeac5027d7db57ed3879c4b

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## 0.3.0 - 2021-12-24
+
+### Added
+
+- Support unquoted attributes.
+
+### Fixed
+
+- Fix bug about blank line handling.
+
 ## 0.2.0 - 2021-12-23
 
 ### Added

data/Gemfile.lock

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

data/lib/slimi/errors.rb

@@ -36,12 +36,18 @@ module Slimi
       end
     end
 
+    class InvalidEmptyAttributeError < SlimSyntaxError
+    end
+
     class LineEndingNotFoundError < SlimSyntaxError
     end
 
     class MalformedIndentationError < SlimSyntaxError
     end
 
+    class RubyAttributeClosingDelimiterNotFoundError < SlimSyntaxError
+    end
+
     class UnexpectedEosError < SlimSyntaxError
     end
 

data/lib/slimi/parser.rb

@@ -11,6 +11,11 @@ module Slimi
         '[' => ']',
         '{' => '}'
       },
+      code_attr_delims: {
+        '(' => ')',
+        '[' => ']',
+        '{' => '}'
+      },
       shortcut: {
         '#' => { attr: 'id' },
         '.' => { attr: 'class' }
@@ -22,6 +27,7 @@ module Slimi
       factory = Factory.new(
         attribute_delimiters: options[:attr_list_delims] || {},
         default_tag: options[:default_tag] || 'div',
+        ruby_attribute_delimiters: options[:code_attr_delims] || {},
         shortcut: options[:shortcut] || {}
       )
       @attribute_delimiters = factory.attribute_delimiters
@@ -32,6 +38,9 @@ module Slimi
       @quoted_attribute_regexp = factory.quoted_attribute_regexp
       @tag_name_regexp = factory.tag_name_regexp
       @attribute_name_regexp = factory.attribute_name_regexp
+      @ruby_attribute_regexp = factory.ruby_attribute_regexp
+      @ruby_attribute_delimiter_regexp = factory.ruby_attribute_delimiter_regexp
+      @ruby_attribute_delimiters = factory.ruby_attribute_delimiters
       @embedded_template_regexp = factory.embedded_template_regexp
     end
 
@@ -46,10 +55,11 @@ module Slimi
     private
 
     def parse_block
+      return if parse_blank_line
+
       parse_indent
 
-      parse_line_ending ||
-        parse_html_comment ||
+      parse_html_comment ||
         parse_html_conditional_comment ||
         parse_slim_comment_block ||
         parse_verbatim_text_block ||
@@ -62,6 +72,17 @@ module Slimi
         raise(Errors::UnknownLineIndicatorError)
     end
 
+    # Parse blank line.
+    # @return [Boolean] True if it could parse a blank line.
+    def parse_blank_line
+      if @scanner.skip(/[ \t]*$/)
+        parse_line_ending
+        true
+      else
+        false
+      end
+    end
+
     def parse_indent
       @scanner.skip(/[ \t]*/)
       indent = indent_from_last_match
@@ -232,12 +253,19 @@ 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)
           attribute_name = @scanner[1]
           escape = @scanner[2].empty?
           quote = @scanner[3]
           attributes << [:html, :attr, attribute_name, [:escape, escape, parse_quoted_attribute_value(quote)]]
+        elsif @scanner.skip(@ruby_attribute_regexp)
+          attribute_name = @scanner[1]
+          escape = @scanner[2].empty?
+          attribute_value = parse_ruby_attribute_value(attribute_delimiter_closing)
+          syntax_error!(Errors::InvalidEmptyAttributeError) if attribute_value.empty?
+          attributes << [:html, :attr, attribute_name, [:slim, :attrvalue, escape, attribute_value]]
         elsif !attribute_delimiter_closing_part_regexp
           break
         elsif @scanner.skip(boolean_attribute_regexp)
@@ -252,6 +280,46 @@ module Slimi
       attributes
     end
 
+    # Parse Ruby attribute value part.
+    #   e.g. div class=foo
+    #                  ^^^
+    #                     `- Ruby attribute value
+    # @param [String] attribute_delimiter_closing
+    # @return [String]
+    def parse_ruby_attribute_value(attribute_delimiter_closing)
+      ending_regexp = /\s/
+      ending_regexp = ::Regexp.union(ending_regexp, attribute_delimiter_closing) if attribute_delimiter_closing
+      count = 0
+      attribute_value = +''
+      opening_delimiter = nil
+      closing_delimiter = nil
+      loop do
+        break if count.zero? && @scanner.match?(ending_regexp)
+
+        if @scanner.skip(/([,\\])\r?\n/)
+          attribute_value << @scanner[1] << "\n"
+        else
+          if count.positive?
+            if opening_delimiter && @scanner.skip(::Regexp.escape(opening_delimiter))
+              count += 1
+            elsif closing_delimiter && @scanner.skip(::Regexp.escape(closing_delimiter))
+              count -= 1
+            end
+          elsif @scanner.skip(@ruby_attribute_delimiter_regexp)
+            count = 1
+            opening_delimiter = @scanner.matched
+            closing_delimiter = @ruby_attribute_delimiters[opening_delimiter]
+          end
+          if (character = @scanner.scan(/./))
+            attribute_value << character
+          end
+        end
+      end
+      syntax_error!(Errors::RubyAttributeClosingDelimiterNotFoundError) if count != 0
+
+      attribute_value
+    end
+
     # @return [Boolean]
     def parse_html_comment
       if @scanner.skip(%r{/!})
@@ -512,12 +580,17 @@ module Slimi
       # @return [Hash]
       attr_reader :attribute_delimiters
 
+      # @return [Hash]
+      attr_reader :ruby_attribute_delimiters
+
       # @param [Hash] attribute_delimiters
       # @param [String] default_tag
+      # @param [Hash] ruby_attribute_delimiters
       # @param [Hash] shortcut
-      def initialize(attribute_delimiters:, default_tag:, shortcut:)
+      def initialize(attribute_delimiters:, default_tag:, ruby_attribute_delimiters:, shortcut:)
         @attribute_delimiters = attribute_delimiters
         @default_tag = default_tag
+        @ruby_attribute_delimiters = ruby_attribute_delimiters
         @shortcut = shortcut
       end
 
@@ -573,6 +646,11 @@ module Slimi
         %r{(#{markers_regexp}+)((?:\p{Word}|-|/\d+|:(\w|-)+)*)}
       end
 
+      # @return [Regexp]
+      def ruby_attribute_regexp
+        /#{attribute_name_regexp}[ \t]*=(=?)[ \t]*/
+      end
+
       # @return [Regexp]
       def embedded_template_regexp
         /(#{::Regexp.union(EMBEDDED_TEMPLAE_ENGINE_NAMES)})(?:[ \t]*(?:(.*)))?:([ \t]*)/
@@ -583,6 +661,11 @@ module Slimi
         /#{attribute_name_regexp}[ \t]*=(=?)[ \t]*("|')/
       end
 
+      # @return [Regexp]
+      def ruby_attribute_delimiter_regexp
+        ::Regexp.union(@ruby_attribute_delimiters.keys)
+      end
+
       # @return [Regexp] Pattern that matches to tag header part.
       def tag_name_regexp
         markers = tag_shortcuts.keys.sort_by { |marker| -marker.size }

data/lib/slimi/version.rb

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

metadata

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