slimi 0.2.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce4329befc9d19fb756c5609a28a3169c4f5a5aa2698771df14541b88b792da1
-  data.tar.gz: d99512e7191942f2fabb8667cb4de369dcad5d773c1e162cc039f2911b4b1dc9
+  metadata.gz: a503c590465e63f43b6d9ef8047700ff415bfea923df65be323f2d37f5d94b71
+  data.tar.gz: 4ad486738d38c81b670cb693afa31c9c7f8acb92ab05a844d47cf3df1d0219c8
 SHA512:
-  metadata.gz: 6c1b46a4afdfc4ce2a8ce816898a17e6bd448e0e76a001efbebfe7fc498375a2c1c71aaa5f40cce11012f28e7e87f5c7eef06b70b6dbcd560a6343d5494ee71c
-  data.tar.gz: 7554a443efa9d30952d3446b92c494dd6ecf1caeb78d77aea347eef1ab862e64c35e93d4ef76c1423728734eb3b23913e75497c3358b0df2543229e05b177c07
+  metadata.gz: '08dc1c84baa6a338564757e6c28143a77f1ecc03eb4ba7f72bf2af82ce673eb2c573debbbbf5eaf16673b53e07a49dd3493888875e6b9e5016557ab7f8373368'
+  data.tar.gz: dd3bb74308363284ff648f80d2dcc37fe9b7faa75df2b31210ca4567fa088debca11b5831bb8ec745800bd15e9886e5ff5bf6074bcb6aa673ca826421e10bc31

data/.rubocop.yml

@@ -1,3 +1,6 @@
+require:
+  - rubocop-rspec
+
 AllCops:
   NewCops: enable
   SuggestExtensions: false
@@ -12,5 +15,17 @@ Lint/InterpolationCheck:
 Metrics:
   Enabled: false
 
+RSpec/AnyInstance:
+  Enabled: false
+
+RSpec/ImplicitSubject:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/NamedSubject:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -2,6 +2,42 @@
 
 ## Unreleased
 
+## 0.4.2 - 2021-12-27
+
+### Fixed
+
+- Fix bug on quoted attribute parser.
+- Remove trailing line-ending from source line of syntax error message.
+- Support multi-line attributes.
+
+## 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
+
+- Support :file option on parser for showing correct file path on syntax error.
+
+### Fixed
+
+- Fix NameError on unknown line indicator.
+- Fix bug that default parser options are not used.
+
+## 0.3.0 - 2021-12-24
+
+### Added
+
+- Support Ruby attributes.
+
+### Fixed
+
+- Fix bug about blank line handling.
+
 ## 0.2.0 - 2021-12-23
 
 ### Added

data/Gemfile

@@ -6,6 +6,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake', '~> 13.0'
-gem 'rspec', '~> 3.0'
-gem 'rubocop', '~> 1.21'
+gem 'rspec'
+gem 'rubocop'
+gem 'rubocop-rspec'
 gem 'slim'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    slimi (0.2.0)
+    slimi (0.4.2)
       temple
 
 GEM
@@ -40,6 +40,8 @@ GEM
       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)
     ruby-progressbar (1.11.0)
     slim (4.1.0)
       temple (>= 0.7.6, < 0.9)
@@ -53,8 +55,9 @@ PLATFORMS
 
 DEPENDENCIES
   rake (~> 13.0)
-  rspec (~> 3.0)
-  rubocop (~> 1.21)
+  rspec
+  rubocop
+  rubocop-rspec
   slim
   slimi!
 

data/lib/slimi/errors.rb

@@ -23,7 +23,7 @@ module Slimi
       def to_s
         <<~TEXT
           #{error_type} at #{@file_path}:#{@line_number}:#{@column}
-          #{@line}
+          #{@line.rstrip}
           #{' ' * (@column - 1)}^
         TEXT
       end
@@ -36,12 +36,21 @@ module Slimi
       end
     end
 
+    class AttributeClosingDelimiterNotFoundError < SlimSyntaxError
+    end
+
+    class InvalidEmptyAttributeError < SlimSyntaxError
+    end
+
     class LineEndingNotFoundError < SlimSyntaxError
     end
 
     class MalformedIndentationError < SlimSyntaxError
     end
 
+    class RubyAttributeClosingDelimiterNotFoundError < SlimSyntaxError
+    end
+
     class UnexpectedEosError < SlimSyntaxError
     end
 
@@ -51,7 +60,7 @@ module Slimi
     class UnexpectedTextAfterClosedTagError < SlimSyntaxError
     end
 
-    class UnknownLineIndicator < SlimSyntaxError
+    class UnknownLineIndicatorError < SlimSyntaxError
     end
   end
 end

data/lib/slimi/parser.rb

@@ -6,22 +6,30 @@ require 'temple'
 module Slimi
   class Parser < ::Temple::Parser
     define_options(
+      :file,
       attr_list_delims: {
         '(' => ')',
         '[' => ']',
         '{' => '}'
       },
+      code_attr_delims: {
+        '(' => ')',
+        '[' => ']',
+        '{' => '}'
+      },
       shortcut: {
         '#' => { attr: 'id' },
         '.' => { attr: 'class' }
       }
     )
 
-    def initialize(options = {})
+    def initialize(_options = {})
       super
+      @file_path = options[:file] || '(__TEMPLATE__)'
       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 +40,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 +57,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 ||
@@ -59,7 +71,18 @@ module Slimi
         parse_embedded_template ||
         parse_doctype ||
         parse_tag ||
-        raise(Errors::UnknownLineIndicatorError)
+        syntax_error!(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
@@ -177,8 +200,6 @@ module Slimi
         marker = @scanner[1]
         attribute_value = @scanner[2]
         attribute_names = @attribute_shortcuts[marker]
-        raise 'Illegal shortcut' unless attribute_names
-
         attribute_names.map do |attribute_name|
           result << [:html, :attr, attribute_name.to_s, [:static, attribute_value]]
         end
@@ -199,18 +220,24 @@ module Slimi
       value = +''
       count = 0
       loop do
-        if @scanner.match?(/#{quote}/) && count.zero?
-          end_ = @scanner.charpos
-          @scanner.pos += @scanner.matched_size
-          break
-        end
-
-        if @scanner.skip(/\{/)
+        if @scanner.match?(/#{quote}/)
+          if count.zero?
+            end_ = @scanner.charpos
+            @scanner.pos += @scanner.matched_size
+            break
+          else
+            @scanner.pos += @scanner.matched_size
+            value << @scanner.matched
+          end
+        elsif @scanner.skip(/\{/)
           count += 1
+          value << @scanner.matched
         elsif @scanner.skip(/\}/)
           count -= 1
+          value << @scanner.matched
+        else
+          value << @scanner.scan(/[^{}#{quote}]*/)
         end
-        value << @scanner.scan(/[^{}#{quote}]*/)
       end
       [:slimi, :interpolate, begin_, end_, value]
     end
@@ -232,12 +259,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)
@@ -245,13 +279,56 @@ module Slimi
         elsif @scanner.skip(attribute_delimiter_closing_part_regexp) # rubocop:disable Lint/DuplicateBranch
           break
         else
-          raise ::NotImplementedError
+          @scanner.skip(/[ \t]+/)
+          expect_line_ending
+
+          syntax_error!(Errors::AttributeClosingDelimiterNotFoundError) if @scanner.eos?
         end
       end
 
       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.match?(/#{::Regexp.escape(opening_delimiter)}/)
+              count += 1
+            elsif closing_delimiter && @scanner.match?(/#{::Regexp.escape(closing_delimiter)}/)
+              count -= 1
+            end
+          elsif @scanner.match?(@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{/!})
@@ -435,9 +512,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
 
@@ -488,7 +569,7 @@ module Slimi
       range = Range.new(index: @scanner.charpos, source: @scanner.string)
       raise syntax_error_class.new(
         column: range.column,
-        file_path: '(__TEMPLATE__)',
+        file_path: @file_path,
         line: range.line,
         line_number: range.line_number
       )
@@ -512,12 +593,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 +659,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 +674,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.4.2'
 end

metadata

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