slimi 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b30b237b1d1e68744ac90e65d148397a5099a4702482286768afd6db8409a484
-  data.tar.gz: 055a9e297a5467e35c01d7468ab5d5083df89ef8762bb8c92d3074956751675b
+  metadata.gz: e7aed4b0083f7ec850df87f869b5687873dcf98fd6f80ab93854c101e0d03098
+  data.tar.gz: bfa813fce529081b2eb876e00a9b722feecf914a5741c9ca341ec2aa8d1463ac
 SHA512:
-  metadata.gz: 43d27cd7dc20e1de1d744ae87110bec52727d30786c252cd02de8f31cdc7f86fe4d7cc08d005b5c430c73d1ab68176dc0a73e5ae2376722febfb12f4193dfd68
-  data.tar.gz: 4ab35e06cb00a9b50cbca0dd34797ad281777fba885141cf41709c6e15f24c8c87a99b55d466ce8c31546a464d507e1a476a3b1d6aa5345a770572a9151b5cd0
+  metadata.gz: bcd9e3abde25cca87e45eb7244658ed6a99d56e458d2b0b3e1199252eb5621480fb7afc12f6246f3760e13a07a2efaabd80f45e5deb868212228cbf96b582a01
+  data.tar.gz: 9fd6030053873163c81f12646461cb502a4d3632e9de4bd8ec77081546081e50fd7e088ad93f23b15666d54007ca1b298f44dd63eeb74b2f5778e716e5e3d6fc

data/.rubocop.yml

@@ -6,6 +6,9 @@ AllCops:
 Layout/LineLength:
   Enabled: false
 
+Lint/InterpolationCheck:
+  Enabled: false
+
 Metrics:
   Enabled: false
 

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 0.1.1 - 2021-12-21
+
+### Fixed
+
+- Fix bug that Slimi::Interpolation was not working.
+
 ## 0.1.0 - 2021-12-20
 
+### Added
+
 - Initial release.

data/README.md

@@ -1,6 +1,7 @@
 # Slimi
 
 [![test](https://github.com/r7kamura/slimi/actions/workflows/test.yml/badge.svg)](https://github.com/r7kamura/slimi/actions/workflows/test.yml)
+[![](https://badge.fury.io/rb/slimi.svg)](https://rubygems.org/gems/slimi)
 
 Yet another implementation for [Slim](https://github.com/slim-template/slim) template language.
 

data/lib/slimi/filters/interpolation.rb

@@ -1,34 +1,55 @@
 # frozen_string_literal: true
 
 require 'strscan'
-require 'temple'
 
 module Slimi
   module Filters
-    class Interpolation < ::Temple::Filter
+    class Interpolation
+      def initialize(*); end
+
+      def call(node)
+        convert(node)
+      end
+
+      private
+
+      def convert(value)
+        if value.instance_of?(::Array)
+          if value[0] == :slimi && value[1] == :interpolate
+            on_slimi_interpolate(value[2], value[3], value[4])
+          else
+            value.map do |element|
+              call(element)
+            end
+          end
+        else
+          value
+        end
+      end
+
       # @param [Integer] begin_
       # @param [Integer] end_
       # @return [Array] S-expression.
-      def on_slimi_interpolate(begin_, end_, string)
+      def on_slimi_interpolate(begin_, _end_, string)
         block = [:multi]
         scanner = ::StringScanner.new(string)
         until scanner.eos?
           charpos = scanner.charpos
-          if (value = scanner.scan(/\\#\{/) || scanner.scan(/([#\\]?[^#\\]*([#\\][^\\\#{][^#\\]*)*)/))
+          if (value = scanner.scan(/\\#\{/))
             block << [:static, value]
           elsif scanner.scan(/#\{((?>[^{}]|(\{(?>[^{}]|\g<1>)*\}))*)\}/)
             code = scanner[1]
             begin2 = begin_ + charpos + 2
-            end2 = end_ + scanner.charpos - 1
             if code.start_with?('{') && code.end_with?('}')
               escape = true
               code = code[1..-2]
               begin2 -= 1
-              end2 -= 1
             else
               escape = false
             end
-            block << [:slimi, :position, begin2, end2, [:slim, :output, escape, code, [:multi]]]
+            block << [:slimi, :position, begin2, begin2 + code.length, [:slim, :output, escape, code, [:multi]]]
+          elsif (value = scanner.scan(/([#\\]?[^#\\]*([#\\][^\\\#{][^#\\]*)*)/)) # rubocop:disable Lint/DuplicateBranch
+            block << [:static, value]
           end
         end
         block

data/lib/slimi/version.rb

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

metadata

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