hamli 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a825c4ad1a1e140b7c8020a0137a278c2844356c0f5ab166fcca716c0f21a88
-  data.tar.gz: e603ee2dd8d1698447bf4eb20729b0087b174f679171d2a4d94efd4f2117e580
+  metadata.gz: b8051356e999f363969f3ccd7c937b17e70ea6e58c283e5836e5ccc0f3163e2a
+  data.tar.gz: 6d08f7c25aa75ebd8fc5e64e009533bf02154521329e2de01789eee469462e86
 SHA512:
-  metadata.gz: 759e52536c4111473a6a46d22a44a027db0e96590d2367e9bbd64395bf91cd72c5984cc4341e457f493c99c27f878d5f2142a42f4a26c77175a245c1e242b269
-  data.tar.gz: 914d1aa219cba92b697455223ba65bd140336bb7e20fdc5378eaadf6825630d9d392f56e797b84b160a0d96ad84296042e74468b2a6c1b093c4898f05165ce7e
+  metadata.gz: e4c6d223febbf5aec1aaccaa30ef9599aebf32903a8de3afe9fe62ffd8b1b928bfb5eef519551952c6a41d43c0be8b325af4436ad95d69a429949950772cf454
+  data.tar.gz: a78ba804bc6b81fce03df6a85ea885ec809dba8f4c09ea5aed0d80007941149798dda64037ca3f68dbb3ea6d339fe362706ddfb530ada457b53a98a0a14dd6b5

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+## 0.2.0 - 2022-01-25
+
+### Added
+
+- Add Interpolation Filter.
+
+### Changed
+
+- Use :position node.
+
 ## 0.1.0 - 2022-01-25
 
 ### Added

data/Gemfile.lock

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

data/README.md

@@ -1,6 +1,7 @@
 # Hamli
 
 [![test](https://github.com/r7kamura/hamli/actions/workflows/test.yml/badge.svg)](https://github.com/r7kamura/hamli/actions/workflows/test.yml)
+[![Gem Version](https://badge.fury.io/rb/hamli.svg)](https://rubygems.org/gems/hamli)
 
 Yet another implementation for [Haml](https://github.com/haml/haml) template language.
 

data/lib/hamli/filters/base.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'temple'
+
+module Hamli
+  module Filters
+    # Pass-through some expressions which are unknown for Temple.
+    class Base < ::Temple::HTML::Filter
+      # @param [Integer] begin_
+      # @param [Integer] end_
+      # @param [Array] expression
+      # @return [Array]
+      def on_hamli_position(begin_, end_, expression)
+        [:hamli, :position, begin_, end_, compile(expression)]
+      end
+
+      # @param [String] type
+      # @param [Array] expression
+      # @return [Array]
+      def on_hamli_text(type, expression)
+        [:hamli, :text, type, compile(expression)]
+      end
+    end
+  end
+end

data/lib/hamli/filters/interpolation.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'strscan'
+
+module Hamli
+  module Filters
+    class Interpolation < Base
+      # @param [Integer] begin_
+      # @param [Integer] end_
+      # @return [Array] S-expression.
+      def on_hamli_interpolate(begin_, _end_, string)
+        block = [:multi]
+        scanner = ::StringScanner.new(string)
+        until scanner.eos?
+          charpos = scanner.charpos
+          if (value = scanner.scan(/\\#\{/))
+            block << [:static, value]
+          elsif scanner.scan(/#\{((?>[^{}]|(\{(?>[^{}]|\g<1>)*\}))*)\}/)
+            code = scanner[1]
+            begin2 = begin_ + charpos + 2
+            if code.start_with?('{') && code.end_with?('}')
+              escape = true
+              code = code[1..-2]
+              begin2 -= 1
+            else
+              escape = false
+            end
+            block << [:hamli, :position, begin2, begin2 + code.length, [:hamli, :output, escape, code, [:multi]]]
+          elsif (value = scanner.scan(/([#\\]?[^#\\]*([#\\][^\\\#{][^#\\]*)*)/)) # rubocop:disable Lint/DuplicateBranch
+            block << [:static, value]
+          end
+        end
+        block
+      end
+    end
+  end
+end

data/lib/hamli/filters.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Hamli
+  module Filters
+    autoload :Base, 'hamli/filters/base'
+    autoload :Interpolation, 'hamli/filters/interpolation'
+  end
+end

data/lib/hamli/parser.rb

@@ -274,7 +274,7 @@ module Hamli
           )
         /x
       )
-      [:hamli, :object_reference, begin_, @scanner.charpos, value]
+      [:hamli, :object_reference, [:hamli, :position, begin_, @scanner.charpos, value]]
     end
 
     # Parse ruby attributes part.
@@ -292,7 +292,7 @@ module Hamli
           )
         /x
       )
-      [:hamli, :ruby_attributes, begin_, @scanner.charpos, value]
+      [:hamli, :ruby_attributes, [:hamli, :position, begin_, @scanner.charpos, value]]
     end
 
     # Parse text block part.

data/lib/hamli/version.rb

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

data/lib/hamli.rb

@@ -4,6 +4,7 @@ require_relative 'hamli/version'
 
 module Hamli
   autoload :Errors, 'hamli/errors'
+  autoload :Filters, 'hamli/filters'
   autoload :Parser, 'hamli/parser'
   autoload :Range, 'hamli/range'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hamli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryo Nakamura
@@ -43,6 +43,9 @@ files:
 - hamli.gemspec
 - lib/hamli.rb
 - lib/hamli/errors.rb
+- lib/hamli/filters.rb
+- lib/hamli/filters/base.rb
+- lib/hamli/filters/interpolation.rb
 - lib/hamli/parser.rb
 - lib/hamli/range.rb
 - lib/hamli/version.rb