template-ruby 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72b96f298f1e9c119b40155f321d12379b866b17b3d7ab79440282ace987a2b0
-  data.tar.gz: 6ef450e127b76928322cf25738c11172b825d292165d3b8589371c5d095787bf
+  metadata.gz: ec20f7b682a83a2c029fcaf5c5270439a4975f0eb76f18f44656548c5e753799
+  data.tar.gz: b3c010695b9257056998fb515f4f52e30f5df1ded3ec27736dc8db5f8c9e3950
 SHA512:
-  metadata.gz: 7521e557ee7d88ef6f59d0efb3471aead4bc78380a6e07fbe65a2ed3922068db4bf686946d73d1c8a76b31658e2cec6db90b307733962ef8a324852c02699d23
-  data.tar.gz: eaf00c79e4c4a8a455a3518dd296b15fc047407d7dd38fd3c81bacb6daa7edb7cef60c1c733e1bce576fb6c1edf658023b274b3e637bd1e722c077cbfcc93398
+  metadata.gz: 77e4ce2e75c5e2f6cd8ad77777c491e2f62521fa5c061e213485d86e86dbc6780dd0669a5680992ad009ec86935781a2bf2cf9c806b73994e37b06ae192fab41
+  data.tar.gz: eac7a3063cd150e8d206fa6aa49e3f7637735cae5e78b99b416a7422bcd28978d3e5b212b0efd840f64ad839c1f2b61ac010af235995bbe9ab0c311ffbc7cdcc

data/.github/dependabot.yml

@@ -0,0 +1,15 @@
+---
+version: 2
+updates:
+  - directory: "/"
+    package-ecosystem: github-actions
+    schedule:
+      interval: daily
+  - directory: "/"
+    package-ecosystem: npm
+    schedule:
+      interval: daily
+  - directory: "/"
+    package-ecosystem: bundler
+    schedule:
+      interval: daily

data/.github/workflows/ci.yml

@@ -0,0 +1,38 @@
+name: CI
+on: push
+jobs:
+  bundler-audit:
+    name: Bundler Audit
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - run: bin/bundler-audit check --update
+  rspec:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3.0
+          bundler-cache: true
+      - run: bin/test
+  rubocop:
+    name: Rubocop
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - run: bin/rubocop
+  yarn-audit:
+    name: Yarn Audit
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+      - run: yarn audit

data/Gemfile

@@ -8,3 +8,4 @@ ruby "3.3.0"
 
 gem "rspec"
 gem "ruby-prof"
+gem "rubocop-rails-omakase"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    template-ruby (0.6.6)
+    template-ruby (0.6.7)
       code-ruby (~> 0)
       language-ruby (~> 0)
       zeitwerk (~> 2)
@@ -19,25 +19,40 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
+    ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
-    code-ruby (0.13.0)
+    bigdecimal (3.1.7)
+    code-ruby (0.14.3)
       activesupport (~> 7)
       bigdecimal (~> 3)
+      did-you-mean (~> 0)
       json (~> 2)
       language-ruby (~> 0)
       zeitwerk (~> 2)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
+    did-you-mean (0.1.1)
+      levenshtein (>= 0.2.0)
     diff-lcs (1.5.1)
     drb (2.2.1)
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     json (2.7.1)
-    language-ruby (0.8.0)
+    language-ruby (0.8.1)
       zeitwerk (~> 2)
-    minitest (5.22.2)
+    language_server-protocol (3.17.0.3)
+    levenshtein (0.2.2)
+    minitest (5.22.3)
     mutex_m (0.2.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
+      ast (~> 2.4.1)
+      racc
+    racc (1.7.3)
+    rack (3.0.10)
+    rainbow (3.1.1)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -51,9 +66,40 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
+    rubocop (1.62.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
+    rubocop-minitest (0.35.0)
+      rubocop (>= 1.61, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-performance (1.21.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rails (2.24.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rails-omakase (1.0.0)
+      rubocop
+      rubocop-minitest
+      rubocop-performance
+      rubocop-rails
     ruby-prof (1.7.0)
+    ruby-progressbar (1.13.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    unicode-display_width (2.5.0)
     zeitwerk (2.6.13)
 
 PLATFORMS
@@ -62,6 +108,7 @@ PLATFORMS
 
 DEPENDENCIES
   rspec
+  rubocop-rails-omakase
   ruby-prof
   template-ruby!
 
@@ -69,4 +116,4 @@ RUBY VERSION
    ruby 3.3.0p0
 
 BUNDLED WITH
-   2.5.6
+   2.5.7

data/bin/rspec

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?(
+       "This file was generated by Bundler"
+     )
+    load(bundle_binstub)
+  else
+    abort(
+      "Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again."
+    )
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/bin/template

@@ -4,76 +4,95 @@
 require "optparse"
 require_relative "../lib/template-ruby"
 
-options = { timeout: 0, profile: false, profiler: "text" }
-
-OptionParser
-  .new do |opts|
-    opts.banner = "Usage: template [options]"
-
-    opts.on("-v", "--version", "Version of template") do |_input|
-      puts Template::Version
-      exit
-    end
-
-    opts.on(
-      "-i INPUT",
-      "--input=INPUT",
-      "Input in the template language (String or File)"
-    ) do |input|
-      input = File.read(input) if File.exist?(input)
-
-      options[:input] = input
+options = {
+  timeout: 0,
+  profile: false,
+  profiler: "text",
+  input: "",
+  parse: false
+}
+
+argv =
+  OptionParser
+    .new do |opts|
+      opts.banner = "Usage: template INPUT\n\n"
+
+      opts.on("-v", "--version", "Version of Template") do |_input|
+        puts Code::Version
+        exit
+      end
+
+      opts.on(
+        "-i INPUT",
+        "--input INPUT",
+        "Input in the Template language (String or File)"
+      ) do |input|
+        input = File.read(input) if File.exist?(input)
+
+        options[:input] = input
+      end
+
+      opts.on("-p", "--parse", "Parser tree for input") do |parse|
+        options[:parse] = parse
+      end
+
+      opts.on(
+        "-t TIMEOUT",
+        "--timeout TIMEOUT",
+        "Set timeout in seconds"
+      ) { |timeout| options[:timeout] = timeout.to_f }
+
+      opts.on(
+        "-z TIME_ZONE",
+        "--time-zone TIME_ZONE",
+        "Set time zone"
+      ) { |time_zone| Time.zone = time_zone }
+
+      opts.on("--profile", "Profile Ruby code") do |_timeout|
+        require "ruby-prof"
+        options[:profile] = true
+      end
+
+      opts.on(
+        "--profiler TYPE",
+        "Profiler output type (text (default) or html)"
+      ) do |profiler|
+        require "ruby-prof"
+        options[:profile] = true
+        options[:profiler] = profiler
+      end
     end
+    .parse!
 
-    opts.on(
-      "-c CONTEXT",
-      "--context=CONTEXT",
-      "Context in the code language (String or File)"
-    ) do |context|
-      context = File.read(context) if File.exist?(context)
-
-      options[:context] = context
-    end
+options[:input] = argv.join(" ") if options[:input].empty?
 
-    opts.on("-p", "--parse", "Get parser results for input") do |parse|
-      options[:parse] = parse
-    end
+abort <<~HELP if options[:input].empty?
+  Usage: template INPUT
 
-    opts.on(
-      "-t TIMEOUT",
-      "--timeout=TIMEOUT",
-      "Set timeout in seconds"
-    ) { |timeout| options[:timeout] = timeout.to_f }
-
-    opts.on("--profile", "Profile Ruby code") do |_timeout|
-      require "ruby-prof"
-      options[:profile] = true
-    end
-
-    opts.on(
-      "--profiler TYPE",
-      "Profiler output type (text (default) or html)"
-    ) do |profiler|
-      require "ruby-prof"
-      options[:profile] = true
-      options[:profiler] = profiler
-    end
-  end
-  .parse!
-
-input = options.fetch(:input, "")
-context = options.fetch(:context, "")
+    -v, --version                    Version of Template
+    -i, --input INPUT                Input in the Template language (String or File)
+    -p, --parse                      Parser tree for input
+    -t, --timeout TIMEOUT            Set timeout in seconds
+        --profile                    Profile Ruby code
+        --profiler TYPE              Profiler output type (text (default) or html)
+HELP
 
 RubyProf.start if options[:profile]
 
 if options[:parse]
-  pp ::Template::Parser.parse(input).to_raw
+  pp Template::Parser.parse(options[:input]).to_raw
 else
-  Template.evaluate(input, context, io: $stdout, timeout: options[:timeout])
+  print Template.evaluate(
+          options[:input],
+          output: $stdout,
+          error: $stderr,
+          timeout: options[:timeout]
+        )
 end
 
 if options[:profile]
   result = RubyProf.stop
+
   if options[:profiler] == "text"
     printer = RubyProf::FlatPrinter.new(result)
     printer.print($stdout)

data/bin/test

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+bin/rspec

data/lib/template/node/template.rb

@@ -8,9 +8,9 @@ class Template
       end
 
       def evaluate(**args)
-        io = args.fetch(:io)
-
-        @parts.each { |part| io.print(part.evaluate(**args)) }
+        output = args.fetch(:output)
+        @parts.each { |part| output.print(part.evaluate(**args)) }
+        ::Code::Object::Nothing.new
       end
     end
   end

data/lib/template/version.rb

@@ -2,4 +2,4 @@
 
 require_relative "../template"
 
-Template::Version = Gem::Version.new("0.6.6")
+Template::Version = Gem::Version.new("0.6.7")

data/lib/template.rb

@@ -1,54 +1,45 @@
 # frozen_string_literal: true
 
 class Template
-  EMPTY_STRING = ""
-  GLOBALS = %i[io context object].freeze
+  GLOBALS = %i[output error context object].freeze
   DEFAULT_TIMEOUT = 0
 
-  def initialize(input, io: ::StringIO.new, timeout: DEFAULT_TIMEOUT, ruby: {})
+  def initialize(
+    input,
+    output: StringIO.new,
+    error: StringIO.new,
+    timeout: DEFAULT_TIMEOUT
+  )
     @input = input
-    @parsed =
-      Timeout.timeout(timeout) { ::Template::Parser.parse(@input).to_raw }
-    @io = io
+    @output = output
+    @error = error
     @timeout = timeout || DEFAULT_TIMEOUT
-    @ruby =
-      Timeout.timeout(timeout) do
-        ::Code::Ruby.to_code(ruby || {}).code_to_context
-      end
+    @context = ::Code::Object::Context.new
+  end
+
+  def self.parse(input, timeout: DEFAULT_TIMEOUT)
+    Timeout.timeout(timeout) { Parser.parse(input).to_raw }
   end
 
   def self.evaluate(
     input,
-    context = "",
-    io: ::StringIO.new,
-    timeout: DEFAULT_TIMEOUT,
-    ruby: {}
+    output: StringIO.new,
+    error: StringIO.new,
+    timeout: DEFAULT_TIMEOUT
   )
-    new(input, io:, timeout:, ruby:).evaluate(context)
+    new(input, output:, error:, timeout:).evaluate
   end
 
-  def evaluate(context = "")
+  def evaluate
     Timeout.timeout(timeout) do
-      context =
-        if context == EMPTY_STRING
-          ::Code::Object::Context.new
-        else
-          ::Code.evaluate(context, timeout:, io:, ruby:).code_to_context
-        end
-
-      unless context.is_a?(::Code::Object::Context)
-        raise(Error::IncompatibleContext)
-      end
-
-      context = context.merge(ruby)
-
-      ::Template::Node::Template.new(parsed).evaluate(context:, io:)
+      parsed = Template.parse(input)
+      Node::Template.new(parsed).evaluate(context:, output:, error:)
 
-      io.is_a?(::StringIO) ? io.string : nil
+      output.is_a?(StringIO) ? output.string : ""
     end
   end
 
   private
 
-  attr_reader :input, :parsed, :timeout, :io, :ruby
+  attr_reader :input, :timeout, :output, :error, :context
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
+require "rspec"
 require_relative "../lib/template-ruby"

data/spec/template_spec.rb

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

data/yarn.lock

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: template-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-09 00:00:00.000000000 Z
+date: 2024-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: code-ruby
@@ -60,13 +60,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".rspec"
 - ".ruby-version"
 - ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - README.md
+- bin/rspec
 - bin/template
+- bin/test
 - lib/template-ruby.rb
 - lib/template.rb
 - lib/template/node.rb
@@ -80,6 +84,7 @@ files:
 - spec/spec_helper.rb
 - spec/template_spec.rb
 - template-ruby.gemspec
+- yarn.lock
 homepage: https://github.com/dorianmariecom/template-ruby
 licenses:
 - MIT