fmt 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5cab8d0eef24b2446c187520bd8a8ac2b71cef4149ff6d0370ffd04d67120d1
-  data.tar.gz: 3e5b6dca4adf86661850769bd7ca0191fe7f9b62b7c7c8612765bb5c5fb54c0b
+  metadata.gz: ed2f5a4d3984f777c398dfe2efeba95883d1474165b0831cea8b045c9d1bc3d3
+  data.tar.gz: 3ae71397daf558b9d32b5377d29f40a2b307a650fc53d08f4faa3cc69759eedb
 SHA512:
-  metadata.gz: ceeb6ab3f6d47a8863a35b90addf52135d31905be200c402819a516fa2600bbc0672e03d813555031bee131c865d44a92f3ad431863a3a4efd72ebe7ed3b7cc3
-  data.tar.gz: cfdbbdb355a735235b7417bc5b96a636c7e4392d8911178fbaa80e16a7127db41d388101cbdb8e14aa15c1562846d83a8546b8137c35cca3ade24aa695e39435
+  metadata.gz: e87abb12eb2ff4373ec7f13ecd1ac236b01914296a9d2b854f8bb60dd1aef5ee1e834ba45601a9997fe53168260c5ac33f70c78c694c45c1bc49f5c958cb8e61
+  data.tar.gz: d26316457a56992b65d8b9c2d2478b36fc9cdd378a454748a2016dfb2c388de91098f73a5cdce23d3d9dc6d8f0d4d47ac8774c66038c39fdcca10adfedec83bb

data/README.md

@@ -1,6 +1,15 @@
 <p align="center">
   <a href="http://blog.codinghorror.com/the-best-code-is-no-code-at-all/">
-    <img alt="Lines of Code" src="https://img.shields.io/badge/loc-1042-47d299.svg" />
+    <img alt="Lines of Code" src="https://img.shields.io/badge/loc-1050-47d299.svg" />
+  </a>
+  <a href="https://rubygems.org/gems/fmt">
+    <img alt="GEM Version" src="https://img.shields.io/gem/v/fmt">
+  </a>
+  <a href="https://rubygems.org/gems/fmt">
+    <img alt="GEM Downloads" src="https://img.shields.io/gem/dt/fmt">
+  </a>
+  <a href="https://github.com/hopsoft/fmt/actions">
+    <img alt="Tests" src="https://github.com/hopsoft/fmt/actions/workflows/tests.yml/badge.svg" />
   </a>
   <a href="https://github.com/testdouble/standard">
     <img alt="Ruby Style" src="https://img.shields.io/badge/style-standard-168AFE?logo=ruby&logoColor=FE1616" />
@@ -21,21 +30,21 @@
 
 ## Table of Contents
 
-  - [Getting Started](#getting-started)
-  - [Usage](#usage)
-    - [Macros](#macros)
-    - [Pipelines](#pipelines)
-    - [Supported Methods](#supported-methods)
-      - [Rainbow GEM](#rainbow-gem)
-    - [Composition](#composition)
-      - [Embedded Templates](#embedded-templates)
-    - [Customizing Fmt](#customizing-fmt)
-  - [Kernel Refinement](#kernel-refinement)
-    - [`fmt(object, *pipeline)`](#fmtobject-pipeline)
-    - [`fmt_print(object, *pipeline)`](#fmt_printobject-pipeline)
-    - [`fmt_puts(object, *pipeline)`](#fmt_putsobject-pipeline)
-  - [Performance](#performance)
-  - [Sponsors](#sponsors)
+- [Getting Started](#getting-started)
+- [Usage](#usage)
+  - [Macros](#macros)
+  - [Pipelines](#pipelines)
+  - [Supported Methods](#supported-methods)
+    - [Rainbow GEM](#rainbow-gem)
+  - [Composition](#composition)
+    - [Embedded Templates](#embedded-templates)
+  - [Customizing Fmt](#customizing-fmt)
+- [Kernel Refinement](#kernel-refinement)
+  - [`fmt(object, *pipeline)`](#fmtobject-pipeline)
+  - [`fmt_print(object, *pipeline)`](#fmt_printobject-pipeline)
+  - [`fmt_puts(object, *pipeline)`](#fmt_putsobject-pipeline)
+- [Performance](#performance)
+- [Sponsors](#sponsors)
 
 <!-- Tocer[finish]: Auto-generated, don't remove. -->
 
@@ -133,7 +142,7 @@ Templates can include multiple format strings with distinct pipelines:
 ```ruby
 template = "Date: %<date>.10s|>magenta -- %{msg}|>titleize|>bold"
 Fmt(template, date: Time.now, msg: "this is cool")
-#=> "Date: \e[35m2024-09-20\e[0m \e[1mThis Is Cool\e[0m"
+#=> "Date: \e[35m2024-09-21\e[0m -- \e[1mThis Is Cool\e[0m"
 ```
 
 #### Embedded Templates
@@ -178,11 +187,11 @@ template = <<~T
   %{one}|>red {{
     %{two}|>blue {{
       %{three}|>green
-    }}
-  }}|>bold
+    }}|>bold
+  }}
 T
 Fmt(template, one: "Red", two: "Blue", three: "Green")
-#=> "Multiline:\n\e[31mRed\e[0m \e[1m\n  \e[34mBlue\e[0m \n    \e[32mGreen\e[0m"
+#=> "Multiline:\n\e[31mRed\e[0m \n  \e[34mBlue\e[0m \e[1m\n    \e[32mGreen\e[0m\n  \e[0m\n\n"
 ```
 
 ### Customizing Fmt

data/lib/fmt/parsers/template_parser.rb

@@ -6,9 +6,9 @@ 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_HEAD = %r{[#{Sigils::FORMAT_PREFIX}]}o # : Regexp -- detects start of a pipeline (i.e. Ruby format string)
-    PIPELINE_PEEK = %r{(?=[#{Sigils::FORMAT_PREFIX}][^#{Sigils::FORMAT_PREFIX}]|\z)}o # : Regexp -- detects start of a pipeline (look ahead)
-    PIPELINE_TAIL = %r{\s|\z}o # : Regexp -- detects end of a pipeline
+    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
 
     # Constructor
     # @rbs urtext: String -- original source code
@@ -66,48 +66,28 @@ module Fmt
     # Extracts the next embed with the scanner
     # @rbs scanner: StringScanner -- scanner to extract from
     # @rbs return: String? -- extracted embed
-    # def extract_next_embed(scanner)
-    #  return nil unless scanner.skip_until(EMBED_PEEK)
-
-    #  index = scanner.pos
-    #  rindex = index
-    #  stack = 0
-    #  string = scanner.string
-
-    #  while rindex < string.length
-    #    char = string.getbyte(rindex)
-
-    #    case char
-    #    when Sigils::EMBED_PREFIX.ord then stack += 1
-    #    when Sigils::EMBED_SUFFIX.ord then stack -= 1
-    #    end
-
-    #    rindex += 1
-    #    break if stack.zero?
-    #  end
-
-    #  stack.zero? ? string[index...rindex] : nil
-    # end
     def extract_next_embed(scanner)
       return nil unless scanner.skip_until(EMBED_PEEK)
 
-      string = scanner.string
+      head = Sigils::EMBED_PREFIX[0]
+      tail = Sigils::EMBED_SUFFIX[0]
       index = scanner.pos
-      rindex = index
       stack = 0
 
-      while rindex < string.length
-        case string[rindex]
-        in Sigils::EMBED_PREFIX[0] then break if (stack += 1).zero?
-        in Sigils::EMBED_SUFFIX[0] then break if (stack -= 1).zero?
+      until scanner.eos?
+        case scanner.getch
+        in ^head then stack += 1
+        in ^tail then stack -= 1
+        in nil then break
         else # noop
         end
 
-        rindex += 1
+        break if stack.zero?
       end
 
-      scanner.pos = rindex
-      stack.zero? ? string[index...rindex] : nil
+      return nil unless stack.zero?
+
+      scanner.string[index...scanner.pos]
     end
 
     # Extracts embed metadata from the source
@@ -136,12 +116,25 @@ module Fmt
     # @rbs scanner: StringScanner -- scanner to extract from
     # @rbs return: String? -- extracted pipeline
     def extract_next_pipeline(scanner)
-      return nil unless scanner.skip_until(PIPELINE_HEAD)
+      return nil unless scanner.skip_until(PIPELINE_PEEK)
 
       index = scanner.pos
-      rindex = scanner.skip_until(PIPELINE_PEEK) ? scanner.pos : scanner.terminate.pos
-      pipeline = scanner.string[index - 1...rindex].strip
-      pipeline.rpartition(PIPELINE_TAIL).first
+
+      until scanner.eos?
+        if scanner.peek(2).match?(PERCENT_LITERAL)
+          scanner.pos += 2
+          next
+        end
+
+        case [index, scanner.pos, scanner.peek(1)]
+        in [i, pos, Sigils::FORMAT_PREFIX] if i == pos then scanner.pos += 1
+        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
+        end
+      end
+
+      scanner.string[index...scanner.pos]
     end
 
     # Extracts pipelines from the source
@@ -158,5 +151,13 @@ module Fmt
 
       generator.to_a
     end
+
+    # Indicates if arguments are balances in the given list of chars
+    # @rbs value: String -- value to check
+    # @rbs return: bool
+    def arguments_balanced?(value)
+      return true if value.nil? || value.empty?
+      value.count(Sigils::ARGS_PREFIX) == value.count(Sigils::ARGS_SUFFIX)
+    end
   end
 end

data/lib/fmt/version.rb

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

data/sig/generated/fmt/parsers/template_parser.rbs

@@ -5,11 +5,11 @@ module Fmt
   class TemplateParser < Parser
     EMBED_PEEK: ::Regexp
 
-    PIPELINE_HEAD: ::Regexp
-
     PIPELINE_PEEK: ::Regexp
 
-    PIPELINE_TAIL: ::Regexp
+    PERCENT_LITERAL: ::Regexp
+
+    WHITESPACE: ::Regexp
 
     # Constructor
     # @rbs urtext: String -- original source code
@@ -35,9 +35,10 @@ module Fmt
 
     private
 
-    # stack.zero? ? string[index...rindex] : nil
-    # end
-    def extract_next_embed: (untyped scanner) -> untyped
+    # Extracts the next embed with the scanner
+    # @rbs scanner: StringScanner -- scanner to extract from
+    # @rbs return: String? -- extracted embed
+    def extract_next_embed: (StringScanner scanner) -> String?
 
     # Extracts embed metadata from the source
     # @rbs return: Array[Hash] -- extracted embeds
@@ -52,5 +53,10 @@ module Fmt
     # @rbs source: String -- source code to extract pipelines from
     # @rbs return: Array[String] -- extracted pipelines
     def extract_pipelines: (String source) -> Array[String]
+
+    # Indicates if arguments are balances in the given list of chars
+    # @rbs value: String -- value to check
+    # @rbs return: bool
+    def arguments_balanced?: (String value) -> bool
   end
 end

metadata

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