fmt 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed2f5a4d3984f777c398dfe2efeba95883d1474165b0831cea8b045c9d1bc3d3
-  data.tar.gz: 3ae71397daf558b9d32b5377d29f40a2b307a650fc53d08f4faa3cc69759eedb
+  metadata.gz: c00b656522d9a8a4623d577bc7c0740bb5c6a7f81a4cbc0d6459b844b8177107
+  data.tar.gz: 54c8d23268fb964d2c75af86a55e2011d08699ffd1d004672563abf837833c26
 SHA512:
-  metadata.gz: e87abb12eb2ff4373ec7f13ecd1ac236b01914296a9d2b854f8bb60dd1aef5ee1e834ba45601a9997fe53168260c5ac33f70c78c694c45c1bc49f5c958cb8e61
-  data.tar.gz: d26316457a56992b65d8b9c2d2478b36fc9cdd378a454748a2016dfb2c388de91098f73a5cdce23d3d9dc6d8f0d4d47ac8774c66038c39fdcca10adfedec83bb
+  metadata.gz: de078ce04f2abd8f67b25a5625d0cf96b418f804bf50e882d9029ae808dba9fa35255bb428e9410b6da120eab9fe3045c66b50555bc50b923822c9af4d40793a
+  data.tar.gz: abf3571f4aa30568112c55ca4861e2526c5aabbe1bd373309f0d86bfa65529ed453eb500c1d80694f8716b67200b016bc3eff51d4c460929061850064907ee43

data/lib/fmt/parsers/embed_parser.rb

@@ -10,7 +10,7 @@ module Fmt
     # @rbs key: Symbol -- key for embed
     # @rbs placeholder: String -- placeholder for embed
     def initialize(urtext = "", key:, placeholder:)
-      @urtext = urtext.to_s
+      @urtext = urtext.to_s.encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: "?")
       @key = key
       @placeholder = placeholder
     end

data/lib/fmt/parsers/macro_parser.rb

@@ -8,7 +8,7 @@ module Fmt
     # Constructor
     # @rbs urtext: String -- original source code
     def initialize(urtext = "")
-      @urtext = urtext.to_s
+      @urtext = urtext.to_s.encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: "?")
     end
 
     attr_reader :urtext # : String -- original source code

data/lib/fmt/parsers/pipeline_parser.rb

@@ -8,7 +8,7 @@ module Fmt
     # Constructor
     # @rbs urtext: String -- original source code
     def initialize(urtext = "")
-      @urtext = urtext.to_s
+      @urtext = urtext.to_s.encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: "?")
     end
 
     attr_reader :urtext  # : String -- original source code

data/lib/fmt/parsers/template_parser.rb

@@ -5,15 +5,15 @@
 module Fmt
   # Parses a template from a string and builds an AST (Abstract Syntax Tree)
   class TemplateParser < Parser
-    EMBED_PEEK = %r{(?=#{esc Sigils::EMBED_PREFIX})}o # : Regexp -- detects start of an embed prefix (look ahead)
-    PIPELINE_PEEK = %r{(?=[#{Sigils::FORMAT_PREFIX}][^#{Sigils::FORMAT_PREFIX}])}o # : Regexp -- detects start of a pipeline (look ahead)
-    PERCENT_LITERAL = %r{[#{Sigils::FORMAT_PREFIX}]{2}}o # : Regexp -- detects a percent literal
-    WHITESPACE = %r{\s}o # : Regexp -- detects whitespace
+    EMBED_PEEK = %r{(?=#{esc Sigils::EMBED_PREFIX})}ou # : Regexp -- detects start of an embed prefix (look ahead)
+    PIPELINE_PEEK = %r{(?=[#{Sigils::FORMAT_PREFIX}][^#{Sigils::FORMAT_PREFIX}])}ou # : Regexp -- detects start of a pipeline (look ahead)
+    PERCENT_LITERAL = %r{[#{Sigils::FORMAT_PREFIX}]{2}}ou # : Regexp -- detects a percent literal
+    WHITESPACE = %r{\s}ou # : Regexp -- detects whitespace
 
     # Constructor
     # @rbs urtext: String -- original source code
     def initialize(urtext = "")
-      @urtext = urtext.to_s
+      @urtext = urtext.to_s.encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: "?")
     end
 
     attr_reader :urtext  # : String -- original source code
@@ -118,23 +118,29 @@ module Fmt
     def extract_next_pipeline(scanner)
       return nil unless scanner.skip_until(PIPELINE_PEEK)
 
-      index = scanner.pos
+      index = scanner.charpos
 
       until scanner.eos?
-        if scanner.peek(2).match?(PERCENT_LITERAL)
-          scanner.pos += 2
+        len = 1
+        val = nil
+        val = scanner.peek(len += 1) until val&.valid_encoding?
+        if val&.match? PERCENT_LITERAL
+          scanner.pos += len
           next
         end
 
-        case [index, scanner.pos, scanner.peek(1)]
-        in [i, pos, Sigils::FORMAT_PREFIX] if i == pos then scanner.pos += 1
+        len = 0
+        val = nil
+        val = scanner.peek(len += 1) until val&.valid_encoding?
+        case [index, scanner.charpos, val]
+        in [i, pos, Sigils::FORMAT_PREFIX] if i == pos then scanner.getch
         in [i, pos, Sigils::FORMAT_PREFIX] if i != pos then break
         in [i, pos, WHITESPACE] if arguments_balanced?(scanner.string[i...pos]) then break
-        else scanner.pos += 1
+        else scanner.getch
         end
       end
 
-      scanner.string[index...scanner.pos]
+      scanner.string[index...scanner.charpos]
     end
 
     # Extracts pipelines from the source

data/lib/fmt/version.rb

@@ -3,5 +3,5 @@
 # rbs_inline: enabled
 
 module Fmt
-  VERSION = "0.3.3"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fmt
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Nate Hopkins (hopsoft)
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2024-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast