luoma 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f24da19a06edd7781345b3b0e4d9aa73c616404472c24e50e068d9acb0a8e463
-  data.tar.gz: 97b49239b9ac0de992568860034dd7f8a5735739b3ee42f345508377a3c38eea
+  metadata.gz: 9fc9f4fa3b7794116a4de61966341ef712606e0c97b5834cc5c115701471bea2
+  data.tar.gz: d6b462a7b470daca6feb3df50e43867404e2e3e50ae10810c3883e9e8e32065d
 SHA512:
-  metadata.gz: '09c958eadecea8638b9fe6ce31907e83640f44342b78978696564bf3128e625f7604d09db53d2f62a1831ca238811eee9baf98e505d5be968cd7a3467479f5bf'
-  data.tar.gz: 19ce9bc9c86d34a65a1044803ec1627a916d92ad37bb9246166a2b4841f28dcfb53ebaf11e60eee9eff812dfda3854894a941e57ac0341c377f8bb3cf605c8ba
+  metadata.gz: 40a51ce357387f02f253e454d20b3523d1373916ae067e5ece624f4abcef3195a68711c54080f899aea74af2f02180b47e28dbf30243d6ba68f7eef748240ac4
+  data.tar.gz: '03938e09549fbab02058a08fd8678d6845a08174eee1f9865fd3fdadd4e8b13790e21456d91825bd5f22d3bb4c5cca0da1454f06e631dcefa9b817be1d98de7e'

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.3.0] - 2026-08-04
+
+- Added the `escape_js` filter ([docs](https://jg-rp.github.io/luoma-ruby/filter_reference/#escape_js)).
+- Removed the `sort_natural` filter. Use `a | sort: i -> (i | upcase)` instead.
+
 ## [0.2.0] - 2026-07-29
 
 - Added the `take` filter. `a | take: 5` is equivalent to `a | slice: stop=6`.

data/README.md

@@ -1,6 +1,6 @@
 <h1 align="center">Luoma - Ruby</h1>
 
-<p align="center">A modern template engine with a well-defined, composable, implementation agnostic expression language.</p>
+<p align="center">A modern template engine with a well-defined, composable expression language.</p>
 
 <p align="center">
   <a href="https://github.com/jg-rp/luoma-ruby/blob/main/LICENSE.txt">
@@ -30,7 +30,7 @@
 Add `'luoma'` to your Gemfile:
 
 ```
-gem 'luoma', '~> 0.1.0'
+gem 'luoma', '~> 0.3.0'
 ```
 
 Or

data/lib/luoma/context.rb

@@ -105,7 +105,8 @@ module Luoma
                 :nothing
               end
 
-        return [:nothing, segment_index] if obj == :nothing
+        # We must keep going in case we find a predicate.
+        # return [:nothing, segment_index] if obj == :nothing
       end
 
       [obj, segment_index]

data/lib/luoma/drop.rb

@@ -51,9 +51,8 @@ module Luoma
       0
     end
 
-    # TODO: pass context
-    #: (Integer, Integer, Integer) -> Enumerable[untyped]
-    def slice(start, stop, step)
+    #: (Integer, Integer, Integer, RenderContext) -> Enumerable[untyped]
+    def slice(start, stop, step, context)
       self
     end
 

data/lib/luoma/drops/range.rb

@@ -48,7 +48,7 @@ module Luoma
       @range.size
     end
 
-    def slice(start, stop, step)
+    def slice(start, stop, step, context)
       @range.to_a[(start...stop).step(step)] # steep:ignore
     end
 

data/lib/luoma/drops/undefined.rb

@@ -73,7 +73,7 @@ module Luoma
       error
     end
 
-    def slice(start, stop, step)
+    def slice(start, stop, step, context)
       error
     end
 

data/lib/luoma/environment.rb

@@ -3,6 +3,7 @@
 require "json"
 
 module Luoma
+  # Luoma template parsing and render configuration.
   class Environment
     attr_reader :persistent_registers
 
@@ -164,6 +165,7 @@ module Luoma
       register_filter("default", Luoma::Filters.method(:default))
       register_filter("divided_by", Luoma::Filters.method(:divided_by))
       register_filter("downcase", Luoma::Filters.method(:downcase))
+      register_filter("escape_js", Luoma::Filters.method(:escape_js))
       register_filter("escape_once", Luoma::Filters.method(:escape_once))
       register_filter("escape", Luoma::Filters.method(:escape))
       register_filter("find_index", Luoma::Filters.method(:find_index))
@@ -198,7 +200,6 @@ module Luoma
       register_filter("size", Luoma::Filters.method(:size))
       register_filter("slice", Luoma::Filters.method(:slice))
       register_filter("sort", Luoma::Filters.method(:sort))
-      register_filter("sort_natural", Luoma::Filters.method(:sort_natural))
       register_filter("sort_numeric", Luoma::Filters.method(:sort_numeric))
       register_filter("split", Luoma::Filters.method(:split))
       register_filter("strip_html", Luoma::Filters.method(:strip_html))
@@ -228,8 +229,8 @@ module Luoma
       register_predicate("string", Luoma::Predicates.method(:string?))
     end
 
-    #: (untyped, untyped, RenderContext, t_token) -> bool
-    def contains?(left, right, context, token)
+    #: (untyped, untyped, RenderContext) -> bool
+    def contains?(left, right, context)
       return left.contains?(right, context) if left.is_a?(Drop)
 
       right = right.to_primitive(:data, context) if right.is_a?(Drop)
@@ -241,18 +242,16 @@ module Luoma
       end
     end
 
-    #: (untyped, untyped, RenderContext, t_token) -> bool
-    def eq?(left, right, context, token)
-      # TODO: Don't accepts token
+    #: (untyped, untyped, RenderContext) -> bool
+    def eq?(left, right, context)
       return left.eq?(right, context) if left.is_a?(Drop)
       return right.eq?(left, context) if right.is_a?(Drop)
 
       left == right
     end
 
-    #: (untyped, untyped, RenderContext, t_token) -> bool?
-    def lt?(left, right, context, token)
-      # TODO: Don't accepts token
+    #: (untyped, untyped, RenderContext) -> bool?
+    def lt?(left, right, context)
       return left.lt?(right, context) if left.is_a?(Drop)
       return right.gt?(left, context) if right.is_a?(Drop)
 
@@ -261,11 +260,11 @@ module Luoma
       nil
     end
 
-    #: (untyped, untyped, RenderContext, t_token) -> (-1 | 1 | 0 | nil)
-    def cmp(left, right, context, token)
-      return -1 if lt?(left, right, context, token)
-      return  1 if lt?(right, left, context, token)
-      return  0 if eq?(left, right, context, token)
+    #: (untyped, untyped, RenderContext) -> (-1 | 1 | 0 | nil)
+    def cmp(left, right, context)
+      return -1 if lt?(left, right, context)
+      return  1 if lt?(right, left, context)
+      return  0 if eq?(left, right, context)
 
       if left.nil? || nothing?(left)
         1

data/lib/luoma/escape.rb

@@ -23,6 +23,55 @@ module Luoma
     "`" => "`"
   }.freeze #: Hash[String, String]
 
+  ESCAPE_JS_MAP = {
+    "\\" => "\\u005C",
+    "'" => "\\u0027",
+    "\"" => "\\u0022",
+    ">" => "\\u003E",
+    "<" => "\\u003C",
+    "&" => "\\u0026",
+    "=" => "\\u003D",
+    "-" => "\\u002D",
+    ";" => "\\u003B",
+    "`" => "\\u0060",
+    "\u2028" => "\\u2028",
+    "\u2029" => "\\u2029",
+    "\x00" => "\\u0000",
+    "\x01" => "\\u0001",
+    "\x02" => "\\u0002",
+    "\x03" => "\\u0003",
+    "\x04" => "\\u0004",
+    "\x05" => "\\u0005",
+    "\x06" => "\\u0006",
+    "\x07" => "\\u0007",
+    "\x08" => "\\u0008",
+    "\t" => "\\u0009",
+    "\n" => "\\u000A",
+    "\x0b" => "\\u000B",
+    "\x0c" => "\\u000C",
+    "\r" => "\\u000D",
+    "\x0e" => "\\u000E",
+    "\x0f" => "\\u000F",
+    "\x10" => "\\u0010",
+    "\x11" => "\\u0011",
+    "\x12" => "\\u0012",
+    "\x13" => "\\u0013",
+    "\x14" => "\\u0014",
+    "\x15" => "\\u0015",
+    "\x16" => "\\u0016",
+    "\x17" => "\\u0017",
+    "\x18" => "\\u0018",
+    "\x19" => "\\u0019",
+    "\x1a" => "\\u001A",
+    "\x1b" => "\\u001B",
+    "\x1c" => "\\u001C",
+    "\x1d" => "\\u001D",
+    "\x1e" => "\\u001E",
+    "\x1f" => "\\u001F"
+  }.freeze #: Hash[String, String]
+
+  RE_ESCAPE_JS = Regexp.new(ESCAPE_JS_MAP.keys.map { |k| Regexp.escape(k) }.join("|"))
+
   #: (String) -> String
   def self.escape(s)
     s.gsub(RE_ESCAPE) { |m| ESCAPE_MAP[m] }
@@ -32,4 +81,8 @@ module Luoma
   def self.unescape(s)
     s.gsub(RE_UNESCAPE) { |m| UNESCAPE_MAP[m] }
   end
+
+  def self.escape_js(s)
+    s.gsub(RE_ESCAPE_JS) { |m| ESCAPE_JS_MAP[m] }
+  end
 end

data/lib/luoma/expression.rb

@@ -450,7 +450,7 @@ module Luoma
   class EqExpression < InfixExpression
     #: (RenderContext) -> untyped
     def evaluate(context)
-      context.env.eq?(@left.evaluate(context), @right.evaluate(context), context, @span)
+      context.env.eq?(@left.evaluate(context), @right.evaluate(context), context)
     end
 
     #: () -> String
@@ -462,7 +462,7 @@ module Luoma
   class NeExpression < InfixExpression
     #: (RenderContext) -> untyped
     def evaluate(context)
-      !context.env.eq?(@left.evaluate(context), @right.evaluate(context), context, @span)
+      !context.env.eq?(@left.evaluate(context), @right.evaluate(context), context)
     end
 
     #: () -> String
@@ -474,7 +474,7 @@ module Luoma
   class LtExpression < InfixExpression
     #: (RenderContext) -> untyped
     def evaluate(context)
-      context.env.lt?(@left.evaluate(context), @right.evaluate(context), context, @span)
+      context.env.lt?(@left.evaluate(context), @right.evaluate(context), context)
     end
 
     #: () -> String
@@ -488,7 +488,7 @@ module Luoma
     def evaluate(context)
       left = @left.evaluate(context)
       right = @right.evaluate(context)
-      context.env.lt?(left, right, context, @span) || context.env.eq?(left, right, context, @span)
+      context.env.lt?(left, right, context) || context.env.eq?(left, right, context)
     end
 
     #: () -> String
@@ -500,7 +500,7 @@ module Luoma
   class GtExpression < InfixExpression
     #: (RenderContext) -> untyped
     def evaluate(context)
-      context.env.lt?(@right.evaluate(context), @left.evaluate(context), context, @span)
+      context.env.lt?(@right.evaluate(context), @left.evaluate(context), context)
     end
 
     #: () -> String
@@ -514,7 +514,7 @@ module Luoma
     def evaluate(context)
       left = @left.evaluate(context)
       right = @right.evaluate(context)
-      context.env.lt?(right, left, context, @span) || context.env.eq?(left, right, context, @span)
+      context.env.lt?(right, left, context) || context.env.eq?(left, right, context)
     end
 
     #: () -> String
@@ -526,7 +526,7 @@ module Luoma
   class ContainsExpression < InfixExpression
     #: (RenderContext) -> untyped
     def evaluate(context)
-      context.env.contains?(@left.evaluate(context), @right.evaluate(context), context, @span)
+      context.env.contains?(@left.evaluate(context), @right.evaluate(context), context)
     end
 
     #: () -> String
@@ -538,7 +538,7 @@ module Luoma
   class InExpression < InfixExpression
     #: (RenderContext) -> untyped
     def evaluate(context)
-      context.env.contains?(@right.evaluate(context), @left.evaluate(context), context, @span)
+      context.env.contains?(@right.evaluate(context), @left.evaluate(context), context)
     end
 
     #: () -> String

data/lib/luoma/filter.rb

@@ -71,17 +71,17 @@ module Luoma
 
     #: (untyped, untyped) -> bool
     def eq?(obj, other)
-      @env.eq?(obj, other, @render_context, @token)
+      @env.eq?(obj, other, @render_context)
     end
 
     #: (untyped, untyped) -> bool
     def lt?(obj, other)
-      @env.lt?(obj, other, @render_context, @token)
+      @env.lt?(obj, other, @render_context)
     end
 
     #: (untyped, untyped) -> (-1 | 1 | 0 | nil)
     def cmp(left, right)
-      @env.cmp(left, right, @render_context, @token)
+      @env.cmp(left, right, @render_context)
     end
 
     #: (untyped) -> bool

data/lib/luoma/filters/escape_js.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "cgi/escape"
+
+module Luoma
+  module Filters
+    # Escape characters for safe use in JavaScript string literals.
+    def self.escape_js(context, left)
+      Luoma.escape_js(context.to_string(left))
+    end
+  end
+end

data/lib/luoma/filters/slice.rb

@@ -39,7 +39,7 @@ module Luoma
                         end
 
       if left.is_a?(Drop)
-        left.slice(normalized_start, normalized_stop, step)
+        left.slice(normalized_start, normalized_stop, step, context.render_context)
       else
         # This does not work for strings.
         # left[(normalized_start...normalized_stop).step(step)]

data/lib/luoma/filters/sort.rb

@@ -54,21 +54,6 @@ module Luoma
       end
     end
 
-    def self.sort_natural(context, left, key = :nothing)
-      left = context.to_enumerable(left)
-
-      if key.nil? || context.nothing?(key)
-        left.sort { |a, b| nil_safe_casecmp(a, b) }
-      elsif key.is_a?(ExpressionDrop)
-        key.expr.broadcast_with_index(left).zip(left).sort do |a, b|
-          nil_safe_casecmp(a.first, b.first)
-        end.map(&:last)
-      else
-        key = context.to_string(key)
-        left.sort { |a, b| nil_safe_casecmp(context.fetch(a, key), context.fetch(b, key)) }
-      end
-    end
-
     def self.sort_numeric(context, left, key = :nothing)
       left = context.to_enumerable(left)
 
@@ -84,16 +69,6 @@ module Luoma
       end
     end
 
-    def self.nil_safe_casecmp(left, right)
-      if !left.nil? && !right.nil?
-        left.to_s.casecmp(right.to_s)
-      elsif left.nil? && right.nil?
-        0
-      else
-        left.nil? ? 1 : -1
-      end
-    end
-
     def self.numeric_compare(left, right, context)
       res = ints(left, context) <=> ints(right, context)
       res || -1

data/lib/luoma/filters/string.rb

@@ -31,7 +31,7 @@ module Luoma
     # Return _left_ with special HTML characters replaced with their HTML-safe escape sequences.
     # Coerce _left_ to a string if it is not one already.
     def self.escape(context, left)
-      CGI.escape_html(context.to_string(left)) unless left.nil?
+      CGI.escapeHTML(context.to_string(left)) unless left.nil?
     end
 
     # Return _left_ with special HTML characters replaced with their HTML-safe escape sequences.
@@ -39,7 +39,7 @@ module Luoma
     #
     # It is safe to use `escape_once` on string values that already contain HTML-escape sequences.
     def self.escape_once(context, left)
-      CGI.escape_html(CGI.unescape_html(context.to_string(left)))
+      CGI.escapeHTML(CGI.unescapeHTML(context.to_string(left)))
     end
 
     # Return _left_ with leading whitespace removed.

data/lib/luoma/loaders/file_system_loader.rb

@@ -31,23 +31,24 @@ module Luoma
         template_path = template_path.sub_ext(@default_extension || raise)
       end
 
-      # TODO: better relative path check
-
-      # Don't alow template names to escape the search path with "../".
-      template_path.each_filename do |part|
-        next unless part == ".."
-
-        raise TemplateNotFoundError.new("template not found #{template_name}")
-      end
-
       # Search each path in turn.
       @search_path.each do |path|
         source_path = path.join(template_path)
+        next unless child_path?(source_path, path)
         return source_path if source_path.file?
       end
 
       raise TemplateNotFoundError.new("template not found #{template_name}")
     end
+
+    private
+
+    #: (Pathname, Pathname) -> bool
+    def child_path?(child, parent)
+      child_ = child.expand_path
+      parent_ = parent.expand_path
+      child_.ascend.drop(1).include?(parent_)
+    end
   end
 
   # A file system template loader that caches parsed templates.

data/lib/luoma/parser_unified.rb

@@ -770,7 +770,8 @@ module Luoma
     #: () -> Expression
     def parse_int_literal
       token = self.next
-      IntegerLiteral.new(token, Luoma.get_token_value(token, @source).to_i)
+      # Float first for scientific notation
+      IntegerLiteral.new(token, Float(Luoma.get_token_value(token, @source)).to_i)
     end
 
     #: () -> Expression

data/lib/luoma/tags/assign.rb

@@ -18,6 +18,10 @@ module Luoma
 
       until parser.kind != :token_comma
         parser.next
+
+        # Trailing commas are OK.
+        break unless parser.kind == :token_ident
+
         name = parser.parse_ident
         assign_token = parser.eat(
           :token_assign,

data/lib/luoma/tags/case.rb

@@ -51,7 +51,7 @@ module Luoma
           block.right.each do |expr|
             right = expr.evaluate(context)
             if (right.is_a?(PredicateFunction) && context.env.truthy?(right.call(context, left), context)) ||
-               context.env.eq?(left, right, context, expr.span)
+               context.env.eq?(left, right, context)
               return Luoma.render_block(block.block, context, buffer)
             end
           end

data/lib/luoma/template.rb

@@ -67,8 +67,6 @@ module Luoma
       @up_to_date&.call
     end
 
-    # TODO: static analysis methods
-
     # Statically analyze this template and report variable, tag and filter usage.
     #
     #: (?include_partials: bool) -> Luoma::StaticAnalysis::Result

data/lib/luoma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Luoma
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/luoma.rb

@@ -7,6 +7,7 @@ require_relative "luoma/context"
 require_relative "luoma/drop"
 require_relative "luoma/environment"
 require_relative "luoma/errors"
+require_relative "luoma/escape"
 require_relative "luoma/expression"
 require_relative "luoma/filter"
 require_relative "luoma/fnv"
@@ -29,6 +30,7 @@ require_relative "luoma/drops/undefined"
 require_relative "luoma/filters/array"
 require_relative "luoma/filters/date"
 require_relative "luoma/filters/default"
+require_relative "luoma/filters/escape_js"
 require_relative "luoma/filters/json"
 require_relative "luoma/filters/math"
 require_relative "luoma/filters/size"

data/sig/luoma/drop.rbs

@@ -29,8 +29,8 @@ module Luoma
     #  (RenderContext) -> Integer
     def length: (Luoma::RenderContext context) -> Integer
 
-    #  (Integer, Integer, Integer) -> Enumerable[untyped]
-    def slice: (Integer start, Integer stop, Integer step) -> untyped
+    #  (Integer, Integer, Integer, RenderContext) -> Enumerable[untyped]
+    def slice: (Integer start, Integer stop, Integer step, RenderContext context) -> untyped
 
     #  (:data | :numeric | :string | :boolean, RenderContext) -> untyped
     def to_primitive: (:data | :numeric | :string | :boolean hint, Luoma::RenderContext context) -> untyped

data/sig/luoma/environment.rbs

@@ -157,17 +157,17 @@ module Luoma
     #  () -> void
     def setup_tags_filters_and_predicates: () -> void
 
-    #  (untyped, untyped, RenderContext, t_token) -> bool
-    def contains?: (untyped left, untyped right, RenderContext context, t_token token) -> bool
+    #  (untyped, untyped, RenderContext) -> bool
+    def contains?: (untyped left, untyped right, RenderContext context) -> bool
 
-    #  (untyped, untyped, RenderContext, t_token) -> bool
-    def eq?: (untyped left, untyped right, RenderContext context, t_token token) -> bool
+    #  (untyped, untyped, RenderContext) -> bool
+    def eq?: (untyped left, untyped right, RenderContext context) -> bool
 
-    #  (untyped, untyped, RenderContext, t_token) -> bool?
-    def lt?: (untyped left, untyped right, RenderContext context, t_token token) -> bool?
+    #  (untyped, untyped, RenderContext) -> bool?
+    def lt?: (untyped left, untyped right, RenderContext context) -> bool?
 
-    #  (untyped, untyped, RenderContext, t_token) -> (-1 | 1 | 0 | nil)
-    def cmp: (untyped left, untyped right, RenderContext context, t_token token) -> (-1 | 1 | 0 | nil)
+    #  (untyped, untyped, RenderContext) -> (-1 | 1 | 0 | nil)
+    def cmp: (untyped left, untyped right, RenderContext context) -> (-1 | 1 | 0 | nil)
 
     #  (untyped) -> bool
     def nothing?: (untyped obj) -> bool

data/sig/luoma/escape.rbs

@@ -7,9 +7,16 @@ module Luoma
 
   UNESCAPE_MAP: Hash[String, String]
 
+  RE_ESCAPE_JS: ::Regexp
+
+  ESCAPE_JS_MAP: Hash[String, String]
+
   #  (String) -> String
   def self.escape: (String s) -> String
 
   #  (String) -> String
   def self.unescape: (String s) -> String
+                   
+  #  (String) -> String
+  def self.escape_js: (String s) -> String
 end

data/sig/luoma/filters/escape_js.rbs

@@ -0,0 +1,6 @@
+module Luoma
+  module Filters
+    # Escape characters for safe use in JavaScript string literals.
+    def self.escape_js: (FilterContext context, untyped left) -> untyped
+  end
+end

data/sig/luoma/filters/sort.rbs

@@ -4,12 +4,8 @@ module Luoma
 
     def self.sort: (FilterContext context, untyped left, ?untyped? key) -> untyped
 
-    def self.sort_natural: (FilterContext context, untyped left, ?untyped? key) -> untyped
-
     def self.sort_numeric: (FilterContext context, untyped left, ?untyped? key) -> untyped
 
-    def self.nil_safe_casecmp: (untyped left, untyped right) -> (untyped | 0 | 1 | -1)
-
     def self.numeric_compare: (untyped left, untyped right, FilterContext context) -> untyped
 
     def self.ints: (untyped obj, FilterContext context) -> (::Array[untyped] | untyped)

data/sig/luoma/loaders/file_system_loader.rbs

@@ -8,6 +8,10 @@ module Luoma
     def initialize: (String | Array[String] search_path, ?default_extension: String?) -> void
 
     def resolve_path: (String template_name) -> Pathname
+                    
+    private
+
+    def child_path?: (Pathname child, Pathname parent) -> bool
   end
 
   # A file system template loader that caches parsed templates.

data.tar.gz.sig

@@ -1,2 +1 @@
-2���h;�c	
-�p��O�I+�Һ]D,K��	;�&"��@��W�h��寴R�V�,d��t�r��5�8����f/�8�)%|�Anv?����+���#�D��_��~W>����K�C㄂>2��
��Έ?�*$H��E��0_�P����<Q�αi���@�Gq��h����ｮۓ�c�˕]=!�|���}G�3&]g�+������6��;��Ÿh�<�a����+�M���f�E�8_nٍ�'l`EY��f���'i�#��ǂ���଴Vx�)��_��{�M��w
+V��!Y�D�Ã́eZb
�*t\�G&J���0�@��B�����)x��*�C����������Ҳ�`��	���Q|:��g����'Bsd��ʪ�w�͌6NB��F����W�˜�J	u7��±�`���c�ö`���d*�e<�('#�����Np�d+o�2�1-��	��7)��"6�Y�N��n�!�F��ǀjՅ�����%��ٖ	?�������Nk�Qe6wqqͅM���Ǐ�aV`����ɻ���s��:a��J*�*Z�3��.�Ey�X�s�:*�m�� ��o"7=���dO��K�ɣ��̱.ɶ�:��&���U�2�����#	Be���R;�u9q�]pgB�}�5~AD��Q����aD{귌;�x