template-ruby 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e1de5aacb6227032062253398346bdf048b54c60a8ca8c4a38e4ee9f6acb6f2
-  data.tar.gz: 132127967a371ccc8581aa68571337762874c34080fac445edc948800df1c2a5
+  metadata.gz: 665b3ed31b59ab356649bb8722c2f974dfa632682cfeaea79614208514dbce58
+  data.tar.gz: a08beddc4e3f614c99838d5a23bba7ad398206ae4035eba2981b2c2c8c844260
 SHA512:
-  metadata.gz: b55376fd43886d3e939d48c34e0f1406b2b471cffb287b0534e77287ad6140f40b49e2d1f1064053aa443c40a9a9876e6595ab8246e34b5df5e4e025eb135e1f
-  data.tar.gz: 464558243762247e67c7260f68587affd7349e8d53f3dd2bb9116a4dc4043552307b32c6aa6e8801fba541cba7d8a3a42ef0de5496816adccda2f217934e22ed
+  metadata.gz: 0d4f04517728011c40fba3d9044a6974309e6936f71b9e2a92416b78eeff3bc7a8a5e38cd1300641c9ca6dee0d74211aa36a62931666f1780a9a76a57f7d0610
+  data.tar.gz: 0d64e9391461bc48fcef190e1c7559d7bdb03eb6f9c1a9bd93e502343e12b49849ce2d31cfb0728903818985d8ad2a6f829a20da8c4fe0cd788d409d1a6ed862

data/.rubocop.yml

@@ -143,7 +143,6 @@ Style/StringLiterals:
 Style/StringLiteralsInInterpolation:
   Enabled: false
 plugins:
-- rubocop-factory_bot
 - rubocop-performance
 - rubocop-rails
 - rubocop-rake

data/Gemfile

@@ -10,7 +10,6 @@ gem "bundler-audit"
 gem "dorian"
 gem "rspec"
 gem "rubocop-capybara"
-gem "rubocop-factory_bot"
 gem "rubocop-performance"
 gem "rubocop-rails"
 gem "rubocop-rake"

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    template-ruby (2.0.0)
-      code-ruby
-      dorian-arguments
-      language-ruby
-      zeitwerk
+    template-ruby (2.0.2)
+      code-ruby (>= 5.0.10, < 6)
+      dorian-arguments (>= 2.0.1, < 3)
+      language-ruby (>= 2.0.2, < 3)
+      zeitwerk (>= 2.8.3, < 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.1.3)
+    activesupport (8.1.3.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -23,8 +23,6 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.9.0)
-      public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     base64 (0.3.0)
     bigdecimal (4.1.2)
@@ -32,107 +30,103 @@ GEM
       bundler (>= 1.2.0)
       thor (~> 1.0)
     cmdparse (3.0.7)
-    code-ruby (4.0.3)
-      activesupport (>= 8.1, < 9)
-      base64 (>= 0.3, < 1)
-      bigdecimal (>= 4.0, < 5)
-      did-you-mean (>= 0.1, < 1)
-      dorian-arguments (>= 1.2, < 2)
-      icalendar (>= 2.12, < 3)
-      json (>= 2.19, < 3)
-      language-ruby (>= 1.2, < 2)
-      mail (>= 2.9, < 3)
-      net-http (>= 0.9, < 1)
-      net-smtp (>= 0.5, < 1)
-      nokogiri (>= 1.19, < 2)
-      uri (>= 1.1, < 2)
-      zeitwerk (>= 2.7, < 3)
-    concurrent-ruby (1.3.7)
+    code-ruby (5.0.10)
+      activesupport (>= 7.1.6, < 9)
+      base64 (>= 0.3.0, < 1)
+      bigdecimal (>= 4.1.2, < 5)
+      did-you-mean (>= 0.1.1, < 1)
+      dorian-arguments (>= 2.0.1, < 3)
+      icalendar (>= 2.12.4, < 3)
+      json (>= 2.21.2, < 3)
+      language-ruby (>= 2.0.2, < 3)
+      mail (>= 2.9.1, < 3)
+      net-http (>= 0.9.1, < 1)
+      net-smtp (>= 0.5.1, < 1)
+      nokogiri (>= 1.19.4, < 2)
+      uri (>= 1.1.1, < 2)
+      zeitwerk (>= 2.8.3, < 3)
+    concurrent-ruby (1.3.8)
     connection_pool (3.0.2)
-    csv (3.3.5)
+    csv (3.3.6)
     date (3.5.1)
     did-you-mean (0.1.1)
       levenshtein (>= 0.2.0)
     diff-lcs (1.6.2)
-    dorian (2.6.8)
-      csv
-      dorian-arguments
-      dorian-eval
-      dorian-progress
-      dorian-to_struct
-      git
-      hexapdf
-      json
-      mini_racer
-      ostruct
-      parallel
-      syntax_tree
-      syntax_tree-haml
-      syntax_tree-xml
-      terminal-table
-      w_syntax_tree-erb
-      yaml
-    dorian-arguments (1.2.3)
+    dorian (3.0.2)
+      csv (>= 3.3.6, < 4)
+      dorian-arguments (>= 2.0.1, < 3)
+      dorian-eval (>= 2.0.1, < 3)
+      dorian-progress (>= 2.0.1, < 3)
+      dorian-to_struct (>= 3.0.1, < 4)
+      haml (>= 7.5.1, < 8.0)
+      hexapdf (>= 1.10.0, < 2)
+      json (>= 2.21.2, < 3)
+      mini_racer (>= 0.22.1, < 1)
+      ostruct (>= 0.6.3, < 1)
+      parallel (>= 2.1.0, < 3.0)
+      syntax_tree (>= 6.3.0, < 7)
+      syntax_tree-haml (>= 4.0.3, < 5)
+      syntax_tree-xml (>= 0.1.0, < 1)
+      terminal-table (>= 4.0.0, < 5)
+      w_syntax_tree-erb (>= 0.12.0, < 1)
+      yaml (>= 0.4.0, < 1)
+    dorian-arguments (2.0.1)
       bigdecimal (>= 3.1, < 5)
-    dorian-eval (1.5.1)
+    dorian-eval (2.0.1)
       yaml (>= 0.3, < 1)
-    dorian-progress (1.1.3)
+    dorian-progress (2.0.1)
       ruby-progressbar (>= 1.13, < 2)
-    dorian-to_struct (2.0.3)
+    dorian-to_struct (3.0.1)
     drb (2.2.3)
     geom2d (0.4.1)
-    git (4.3.2)
-      activesupport (>= 5.0)
-      addressable (~> 2.8)
-      process_executer (~> 4.0)
-      rchardet (~> 1.9)
-    haml (7.2.0)
+    haml (7.5.1)
+      prism (>= 1.1.0)
       temple (>= 0.8.2)
       thor
       tilt
-    hexapdf (1.9.1)
+    hexapdf (1.10.0)
       cmdparse (~> 3.0, >= 3.0.3)
       geom2d (~> 0.4, >= 0.4.1)
       openssl (>= 2.2.1)
       strscan (>= 3.1.2)
     i18n (1.15.2)
       concurrent-ruby (~> 1.0)
-    icalendar (2.12.3)
+    icalendar (2.12.4)
       base64
       ice_cube (~> 0.16)
       logger
       ostruct
     ice_cube (0.17.0)
-    json (2.20.0)
-    language-ruby (1.2.0)
-      dorian-arguments
-      zeitwerk
-    language_server-protocol (3.17.0.5)
+    json (2.21.2)
+    language-ruby (2.0.2)
+      dorian-arguments (>= 2.0.1, < 3)
+      zeitwerk (>= 2.8.3, < 3)
+    language_server-protocol (3.17.0.6)
     levenshtein (0.2.2)
     libv8-node (24.12.0.1-arm64-darwin)
     libv8-node (24.12.0.1-x86_64-linux)
     lint_roller (1.1.0)
     logger (1.7.0)
-    mail (2.9.0)
+    mail (2.9.1)
       logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
     mini_mime (1.1.5)
-    mini_racer (0.21.4)
+    mini_racer (0.22.1)
       libv8-node (~> 24.12.0.1)
     minitest (6.0.6)
       drb (~> 2.0)
       prism (~> 1.5)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-imap (0.6.4.1)
+    net-imap (0.6.6)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.2)
+    net-protocol (0.3.0)
       timeout
     net-smtp (0.5.1)
       net-protocol
@@ -143,18 +137,14 @@ GEM
     openssl (4.0.2)
     ostruct (0.6.3)
     parallel (2.1.0)
-    parser (3.3.11.1)
+    parser (3.3.12.0)
       ast (~> 2.4.1)
       racc
     prettier_print (1.2.1)
     prism (1.9.0)
-    process_executer (4.0.4)
-      track_open_instances (~> 0.1)
-    public_suffix (7.0.5)
     racc (1.8.1)
-    rack (3.2.6)
+    rack (3.2.7)
     rainbow (3.1.1)
-    rchardet (1.10.2)
     regexp_parser (2.12.0)
     rspec (3.13.2)
       rspec-core (~> 3.13.0)
@@ -169,8 +159,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.7)
-    rubocop (1.88.0)
-      json (~> 2.3)
+    rubocop (1.90.0)
+      json (>= 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (>= 1.10)
@@ -180,24 +170,21 @@ GEM
       rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.1)
+    rubocop-ast (1.50.0)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
     rubocop-capybara (3.0.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.81)
-    rubocop-factory_bot (2.28.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-performance (1.26.1)
+    rubocop-performance (1.27.0)
       lint_roller (~> 1.1)
-      rubocop (>= 1.75.0, < 2.0)
+      rubocop (>= 1.89.0, < 2.0)
       rubocop-ast (>= 1.47.1, < 2.0)
-    rubocop-rails (2.35.5)
+    rubocop-rails (2.37.0)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.75.0, < 2.0)
+      rubocop (>= 1.89.0, < 2.0)
       rubocop-ast (>= 1.44.0, < 2.0)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
@@ -225,13 +212,12 @@ GEM
     syntax_tree-xml (0.1.0)
       prettier_print
       syntax_tree (>= 2.0.1)
-    temple (0.10.4)
+    temple (0.10.7)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
     thor (1.5.0)
-    tilt (2.7.0)
+    tilt (2.9.0)
     timeout (0.6.1)
-    track_open_instances (0.1.15)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.2.0)
@@ -242,7 +228,7 @@ GEM
       prettier_print (~> 1.2, >= 1.2.0)
       syntax_tree (~> 6.1, >= 6.1.1)
     yaml (0.4.0)
-    zeitwerk (2.8.2)
+    zeitwerk (2.8.3)
 
 PLATFORMS
   arm64-darwin-22
@@ -256,7 +242,6 @@ DEPENDENCIES
   dorian
   rspec
   rubocop-capybara
-  rubocop-factory_bot
   rubocop-performance
   rubocop-rails
   rubocop-rake

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.2

data/lib/template/parser.rb

@@ -11,11 +11,65 @@ class Template
     end
 
     def parse
-      ::Template::Parser::Template.parse(input)
+      parts = []
+      text = +""
+      cursor = 0
+
+      while cursor < input.length
+        if input[cursor, 2] == '\\{'
+          text << "{"
+          cursor += 2
+        elsif input[cursor] == "{"
+          parts << { text: text } unless text.empty?
+          text = +""
+
+          closing_cursor = closing_curly_bracket(cursor + 1)
+          code = input[(cursor + 1)...closing_cursor]
+          parts << { code: ::Code::Parser.parse(code).to_raw }
+          cursor = closing_cursor + (closing_cursor < input.length ? 1 : 0)
+        else
+          text << input[cursor]
+          cursor += 1
+        end
+      end
+
+      parts << { text: text } unless text.empty?
+      parts << { text: "" } if parts.empty?
+      Language::Output.from_raw(parts)
     end
 
     private
 
     attr_reader :input
+
+    def closing_curly_bracket(cursor)
+      depth = 0
+      quote = nil
+
+      while cursor < input.length
+        character = input[cursor]
+
+        if quote
+          if character == "\\"
+            cursor += 2
+            next
+          end
+
+          quote = nil if character == quote
+        elsif ["'", '"'].include?(character)
+          quote = character
+        elsif character == "{"
+          depth += 1
+        elsif character == "}"
+          return cursor if depth.zero?
+
+          depth -= 1
+        end
+
+        cursor += 1
+      end
+
+      cursor
+    end
   end
 end

data/lib/template.rb

@@ -15,6 +15,7 @@ class Template
     @error = error
     @timeout = timeout || DEFAULT_TIMEOUT
     @context = ::Code::Object::Context.new
+    @object = ::Code::Object::Global.new
   end
 
   def self.parse(input, timeout: DEFAULT_TIMEOUT)
@@ -33,7 +34,17 @@ class Template
   def evaluate
     Timeout.timeout(timeout) do
       parsed = Template.parse(input)
-      Node::Template.new(parsed).evaluate(context:, output:, error:)
+      Node::Template.new(parsed).evaluate(
+        context:,
+        error:,
+        global_control_flow_root: true,
+        input: StringIO.new,
+        object:,
+        output:,
+        previous_object: object,
+        source: input,
+        timeout:
+      )
 
       output.is_a?(StringIO) ? output.string : ""
     end
@@ -41,5 +52,5 @@ class Template
 
   private
 
-  attr_reader :input, :timeout, :output, :error, :context
+  attr_reader :input, :timeout, :output, :error, :context, :object
 end

data/spec/template_spec.rb

@@ -4,7 +4,10 @@ require "spec_helper"
 
 RSpec.describe Template do
   [
-    ["{name = :Dorian nothing}Hello {name}", "Hello Dorian"]
+    ["{name = :Dorian nothing}Hello {name}", "Hello Dorian"],
+    ['{"}"}', "}"],
+    ["\\{name}", "{name}"],
+    ["", ""]
   ].each do |input, expected|
     it "#{input} == #{expected}" do
       expect(described_class.evaluate(input)).to eq(expected)

data/template-ruby.gemspec

@@ -12,10 +12,10 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/dorianmariecom/template-ruby"
   s.license = "MIT"
   s.executables = "template"
-  s.add_dependency "code-ruby"
-  s.add_dependency "dorian-arguments"
-  s.add_dependency "language-ruby"
-  s.add_dependency "zeitwerk"
+  s.add_dependency "code-ruby", ">= 5.0.10", "< 6"
+  s.add_dependency "dorian-arguments", ">= 2.0.1", "< 3"
+  s.add_dependency "language-ruby", ">= 2.0.2", "< 3"
+  s.add_dependency "zeitwerk", ">= 2.8.3", "< 3"
   s.metadata["rubygems_mfa_required"] = "true"
   s.required_ruby_version = ">= 4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: template-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Dorian Marié
@@ -15,56 +15,80 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: dorian-arguments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: language-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: templating language
 email: dorian@dorianmarie.fr
 executables:
@@ -129,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 4.0.17
 specification_version: 4
 summary: templating language
 test_files: []