slimi 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69032d72b1695bfe2afc7a11dbb965e4abf252a7c42caab252e972bcb45c13f8
-  data.tar.gz: af3822a5d2375300d4b07f0114c30c933eb215c88bfcee1bd6cc4938d769d76e
+  metadata.gz: 05cfa3a429ac2da0e1241e65e69a40f9171079cddb9451a6d7186726a5cb498c
+  data.tar.gz: 68826c3fe78dc87bfd704cc38a9222da1adeed36a8c0d0e903bb4f3077ed698d
 SHA512:
-  metadata.gz: b59318e78f3c7c83e67334326992babdc60d3d299ed8973778f7c3c463b1eaaaacbefafe20ee8f7072eff13db72c3a88c5a0cae7f4ecd18629bc9e8a35645599
-  data.tar.gz: 173fdc474e985a89ead0c473d25bcb2bb4deb586679d17bee18d5384b29e21900e79e03567ed302bce9ac37b81dc4ad29ed3b837eeeac5027d7db57ed3879c4b
+  metadata.gz: 9c729933bc060a21df2e55db525d28a8e519526995ec5b7fb3defd17ecb11c71fc7e6ec664c162396f6a8be9175549dd842c7c5f9be76c68afadadc9e3e442be
+  data.tar.gz: 60b3b1ad54a01bcbc2154e83b11efe3ac1b3fb5723773f04aabff9d1957dec60cb8afd431630b78dc8e13fa86d109d86a78c66005bafb10c23e0965368d9bd80

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Unreleased
 
+## 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

data/Gemfile.lock

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

data/lib/slimi/errors.rb

@@ -57,7 +57,7 @@ module Slimi
     class UnexpectedTextAfterClosedTagError < SlimSyntaxError
     end
 
-    class UnknownLineIndicator < SlimSyntaxError
+    class UnknownLineIndicatorError < SlimSyntaxError
     end
   end
 end

data/lib/slimi/parser.rb

@@ -6,6 +6,7 @@ require 'temple'
 module Slimi
   class Parser < ::Temple::Parser
     define_options(
+      :file,
       attr_list_delims: {
         '(' => ')',
         '[' => ']',
@@ -22,8 +23,9 @@ module Slimi
       }
     )
 
-    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',
@@ -69,7 +71,7 @@ module Slimi
         parse_embedded_template ||
         parse_doctype ||
         parse_tag ||
-        raise(Errors::UnknownLineIndicatorError)
+        syntax_error!(Errors::UnknownLineIndicatorError)
     end
 
     # Parse blank line.
@@ -198,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
@@ -556,7 +556,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
       )

data/lib/slimi/version.rb

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

metadata

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