slimi 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 299f0ea50391c15aed1b99b4fb2cb1a8eae63a3ba97e2abc31cf676472a38cd8
-  data.tar.gz: 6119285d8a753ab001bf29eff8df574dfab52636fc092d324db50ec7d094e7eb
+  metadata.gz: a503c590465e63f43b6d9ef8047700ff415bfea923df65be323f2d37f5d94b71
+  data.tar.gz: 4ad486738d38c81b670cb693afa31c9c7f8acb92ab05a844d47cf3df1d0219c8
 SHA512:
-  metadata.gz: 9269ec0c3c35efd6665a3f7aff882737479b72998b28cc067a80823885316a267958f3bf2a62107c7d56fd31bb12675f17b77053f7372c40fe768e3865775c13
-  data.tar.gz: 7c03ac659b980eb512c87c0fa8a3bc2b991faac079f71426e67a3ede722455677b3647d7ceb8af286aae3a38730b4e42c40ac07a62662c2db7d34339060a6055
+  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,14 @@
 
 ## 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
@@ -24,7 +32,7 @@
 
 ### Added
 
-- Support unquoted attributes.
+- Support Ruby attributes.
 
 ### Fixed
 

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.4.1)
+    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,6 +36,9 @@ module Slimi
       end
     end
 
+    class AttributeClosingDelimiterNotFoundError < SlimSyntaxError
+    end
+
     class InvalidEmptyAttributeError < SlimSyntaxError
     end
 

data/lib/slimi/parser.rb

@@ -220,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
@@ -273,7 +279,10 @@ 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
 

data/lib/slimi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimi
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Ryo Nakamura