template-ruby 0.5.6 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85a62b57a542b3efd227470d49473db796da2b091f9c827a637d1b877196dfc0
-  data.tar.gz: 3bebdecdd1017fb28756407d7c759739a92c7367d2da1c0184b2c992412b065f
+  metadata.gz: c2083870212319aa2d41c2e5b7f214fefd09aa04ff4676adc4c47f248047c12b
+  data.tar.gz: 8b789135855a027e8b5dccefdeae23e9898a887e57dd9657092f121f2bb2b22b
 SHA512:
-  metadata.gz: a6accd36def6ee891d77c5bc70e61aba6d945250fe26ecd004992a9eb9d8ddcb5eade880417436e8d088203366aa92757d1a2f6d76cffa6f39c9b906ac6da276
-  data.tar.gz: 28ed842cf8c9cbfbe624b2f4bfadaa256cbf3472210949d023a7e915a73e1ace1447d67d1c117ef403b94f5c0d76b24569105dc27753ac4777c79ed40d7a863a
+  metadata.gz: 8e520c56de87100229e627eee0d2103a8491481bbc2016a9df82efd828bc81e6f0441e2936764cbbcf02a4acdf48d111afb11667fa1b896a945ec6555f7db02e
+  data.tar.gz: 203c7404e3ba7e69583cacc3945d4a7209157bb1a6b21940ba0c6ce60e7edbecb47719164b7c142266faf645cb44da63c2e783cdc583416220e382af3f162ce6

data/Gemfile

@@ -1,8 +1,5 @@
 source "https://rubygems.org"
 
-gemspec name: "template-ruby"
-gemspec name: "code-ruby"
+gemspec
 
 gem "rspec"
-gem "syntax_tree", github: "dorianmariefr/syntax_tree"
-gem "ruby-prof"

data/Gemfile.lock

@@ -1,49 +1,42 @@
-GIT
-  remote: https://github.com/dorianmariefr/syntax_tree.git
-  revision: f7c9dc36a3d60c90a8d2411f123913b37319dc11
-  specs:
-    syntax_tree (5.0.1)
-      prettier_print (>= 1.1.0)
-
 PATH
   remote: .
   specs:
-    code-ruby (0.5.6)
-      zeitwerk (~> 2)
-    template-ruby (0.5.6)
+    template-ruby (0.6.0)
+      code-ruby (~> 0)
+      language (~> 0)
       zeitwerk (~> 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    code-ruby (0.6.0)
+      language-ruby (~> 0)
+      zeitwerk (~> 2)
     diff-lcs (1.5.0)
-    prettier_print (1.1.0)
+    language (0.6.0)
+    language-ruby (0.6.0)
+      zeitwerk (~> 2)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    ruby-prof (1.4.3)
-    zeitwerk (2.6.6)
+    rspec-support (3.12.1)
+    zeitwerk (2.6.12)
 
 PLATFORMS
-  arm64-darwin-21
   arm64-darwin-22
 
 DEPENDENCIES
-  code-ruby!
   rspec
-  ruby-prof
-  syntax_tree!
   template-ruby!
 
 BUNDLED WITH
-   2.3.18
+   2.4.22

data/bin/template

@@ -9,12 +9,21 @@ 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.exists?(input)
+      input = File.read(input) if File.exist?(input)
 
       options[:input] = input
     end
@@ -24,7 +33,7 @@ OptionParser
       "--context=CONTEXT",
       "Context in the code language (String or File)"
     ) do |context|
-      context = File.read(context) if File.exists?(context)
+      context = File.read(context) if File.exist?(context)
 
       options[:context] = context
     end
@@ -68,7 +77,7 @@ end
 if options[:parse]
   pp ::Template::Parser.parse(input).to_raw
 else
-  Template.render(input, context, io: $stdout, timeout: options[:timeout])
+  Template.evaluate(input, context, io: $stdout, timeout: options[:timeout])
 end
 
 if options[:profile]

data/lib/template/version.rb

@@ -1,3 +1,3 @@
 require_relative "../template"
 
-Template::Version = Gem::Version.new("0.5.6")
+Template::Version = Gem::Version.new("0.6.1")

data/lib/template-ruby.rb

@@ -1,10 +1,9 @@
-require "bigdecimal"
 require "stringio"
 require "timeout"
 require "zeitwerk"
+require "code-ruby"
+require "language-ruby"
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.ignore("#{__dir__}/template-ruby.rb")
-loader.ignore("#{__dir__}/code-ruby.rb")
-loader.ignore("#{__dir__}/language-ruby.rb")
 loader.setup

data/lib/template.rb

@@ -1,42 +1,40 @@
 class Template
-  DEFAULT_TIMEOUT = 10
+  EMPTY_STRING = ""
+  GLOBALS = %i[io context object].freeze
+  DEFAULT_TIMEOUT = 0
 
   def initialize(input, io: StringIO.new, timeout: DEFAULT_TIMEOUT, ruby: {})
     @input = input
-    @parsed =
-      Timeout.timeout(timeout) { ::Template::Parser.parse(@input).to_raw }
+    @parsed = Timeout.timeout(timeout) { ::Template::Parser.parse(@input).to_raw }
     @io = io
     @timeout = timeout || DEFAULT_TIMEOUT
-    @ruby = ::Code::Ruby.to_code(ruby || {})
+    @ruby = Timeout.timeout(timeout) { ::Code::Ruby.to_code(ruby || {}).code_to_context }
   end
 
-  def self.render(
+  def self.evaluate(
     input,
     context = "",
     io: StringIO.new,
     timeout: DEFAULT_TIMEOUT,
     ruby: {}
   )
-    new(input, io: io, timeout: timeout, ruby: ruby).render(context)
+    new(input, io:, timeout:, ruby:).evaluate(context)
   end
 
-  def render(context = "")
+  def evaluate(context = "")
     Timeout.timeout(timeout) do
-      if context != ""
-        context = ::Code.evaluate(context, timeout: timeout, io: io, ruby: ruby)
-      else
-        context = ::Code::Object::Dictionnary.new
-      end
-
-      if !context.is_a?(::Code::Object::Dictionnary)
-        raise ::Code::Template::IncompatibleContext.new(
-                "context must be a dictionnary"
-              )
-      end
+      context =
+        if context == EMPTY_STRING
+          Object::Context.new
+        else
+          Code.evaluate(context, timeout:, io:, ruby:).code_to_context
+        end
+
+      raise(Error::IncompatibleContext) unless context.is_a?(::Code::Object::Context)
 
       context = context.merge(ruby)
 
-      ::Template::Node::Template.new(parsed).evaluate(context: context, io: io)
+      ::Template::Node::Template.new(parsed).evaluate(context:, io:)
 
       io.is_a?(StringIO) ? io.string : nil
     end
@@ -44,7 +42,5 @@ class Template
 
   private
 
-  attr_reader :parsed, :io, :timeout, :ruby
+  attr_reader :input, :parsed, :timeout, :io, :ruby
 end
-
-require_relative "template/version"

data/spec/spec_helper.rb

@@ -1,6 +1 @@
 require_relative "../lib/template-ruby"
-require "json"
-
-RSpec.configure do |c|
-  c.example_status_persistence_file_path = "tmp/examples.txt"
-end

data/spec/template_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+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)
+    end
+  end
+end

data/template-ruby.gemspec

@@ -16,4 +16,6 @@ Gem::Specification.new do |s|
   s.executables = "template"
 
   s.add_dependency "zeitwerk", "~> 2"
+  s.add_dependency "code-ruby", "~> 0.6"
+  s.add_dependency "language-ruby", "~> 0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: template-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.1
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: code-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: language-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'A templating programming language, like "Hello {name}" with {name: "Dorian"}
   gives "Hello Dorian"'
 email: dorian@dorianmarie.fr
@@ -32,140 +60,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".cherry.js"
-- ".editorconfig"
-- ".github/workflows/rspec.yml"
-- ".gitignore"
-- ".prettierrc"
 - ".rspec"
-- ".tool-versions"
-- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
-- LICENSE
-- README.md
-- TODO
-- bin/code
-- bin/format
-- bin/publish
 - bin/template
-- bin/test
-- code-ruby.gemspec
-- docs/class.code
-- docs/euler/1.template
-- docs/euler/2.template
-- docs/euler/3.template
-- docs/euler/4.template
-- docs/euler/5.template
-- docs/fibonnaci.template
-- docs/meetup.code
-- docs/precedence.template
-- docs/rain.code
-- docs/slack.code
-- docs/stripe.code
-- docs/twitter.code
-- language-ruby.gemspec
-- lib/code-ruby.rb
-- lib/code.rb
-- lib/code/error.rb
-- lib/code/node.rb
-- lib/code/node/base_10.rb
-- lib/code/node/base_16.rb
-- lib/code/node/base_2.rb
-- lib/code/node/base_8.rb
-- lib/code/node/boolean.rb
-- lib/code/node/call.rb
-- lib/code/node/call_argument.rb
-- lib/code/node/chained_call.rb
-- lib/code/node/code.rb
-- lib/code/node/decimal.rb
-- lib/code/node/dictionnary.rb
-- lib/code/node/equal.rb
-- lib/code/node/function.rb
-- lib/code/node/function_parameter.rb
-- lib/code/node/if.rb
-- lib/code/node/if_modifier.rb
-- lib/code/node/list.rb
-- lib/code/node/negation.rb
-- lib/code/node/not.rb
-- lib/code/node/nothing.rb
-- lib/code/node/number.rb
-- lib/code/node/operation.rb
-- lib/code/node/power.rb
-- lib/code/node/rescue.rb
-- lib/code/node/splat.rb
-- lib/code/node/statement.rb
-- lib/code/node/string.rb
-- lib/code/node/ternary.rb
-- lib/code/node/unary_minus.rb
-- lib/code/node/while.rb
-- lib/code/object.rb
-- lib/code/object/argument.rb
-- lib/code/object/boolean.rb
-- lib/code/object/decimal.rb
-- lib/code/object/dictionnary.rb
-- lib/code/object/function.rb
-- lib/code/object/global.rb
-- lib/code/object/integer.rb
-- lib/code/object/list.rb
-- lib/code/object/nothing.rb
-- lib/code/object/number.rb
-- lib/code/object/range.rb
-- lib/code/object/ruby_function.rb
-- lib/code/object/string.rb
-- lib/code/parser.rb
-- lib/code/parser/addition.rb
-- lib/code/parser/and_operator.rb
-- lib/code/parser/bitwise_and.rb
-- lib/code/parser/bitwise_or.rb
-- lib/code/parser/boolean.rb
-- lib/code/parser/call.rb
-- lib/code/parser/chained_call.rb
-- lib/code/parser/class.rb
-- lib/code/parser/code.rb
-- lib/code/parser/dictionnary.rb
-- lib/code/parser/equal.rb
-- lib/code/parser/equality.rb
-- lib/code/parser/equality_lower.rb
-- lib/code/parser/function.rb
-- lib/code/parser/greater.rb
-- lib/code/parser/group.rb
-- lib/code/parser/if.rb
-- lib/code/parser/if_modifier.rb
-- lib/code/parser/list.rb
-- lib/code/parser/multiplication.rb
-- lib/code/parser/name.rb
-- lib/code/parser/negation.rb
-- lib/code/parser/not_keyword.rb
-- lib/code/parser/nothing.rb
-- lib/code/parser/number.rb
-- lib/code/parser/operation.rb
-- lib/code/parser/or_keyword.rb
-- lib/code/parser/or_operator.rb
-- lib/code/parser/power.rb
-- lib/code/parser/range.rb
-- lib/code/parser/rescue.rb
-- lib/code/parser/shift.rb
-- lib/code/parser/splat.rb
-- lib/code/parser/statement.rb
-- lib/code/parser/string.rb
-- lib/code/parser/ternary.rb
-- lib/code/parser/unary_minus.rb
-- lib/code/parser/while.rb
-- lib/code/parser/whitespace.rb
-- lib/code/ruby.rb
-- lib/language-ruby.rb
-- lib/language.rb
-- lib/language/atom.rb
-- lib/language/output.rb
-- lib/language/parser.rb
-- lib/language/parser/absent.rb
-- lib/language/parser/absent/present.rb
-- lib/language/parser/end_of_input.rb
-- lib/language/parser/interuption.rb
-- lib/language/parser/not_end_of_input.rb
-- lib/language/parser/str.rb
-- lib/language/parser/str/not_found.rb
 - lib/template-ruby.rb
 - lib/template.rb
 - lib/template/node.rb
@@ -176,50 +74,8 @@ files:
 - lib/template/parser.rb
 - lib/template/parser/template.rb
 - lib/template/version.rb
-- spec/code/addition_spec.rb
-- spec/code/and_operator_spec.rb
-- spec/code/bitwise_and_spec.rb
-- spec/code/bitwise_or_spec.rb
-- spec/code/boolean_spec.rb
-- spec/code/call_spec.rb
-- spec/code/chained_call_spec.rb
-- spec/code/code_spec.rb
-- spec/code/dictionnary_spec.rb
-- spec/code/equal_spec.rb
-- spec/code/equality_spec.rb
-- spec/code/function_spec.rb
-- spec/code/greater_spec.rb
-- spec/code/group_spec.rb
-- spec/code/if_modifier_spec.rb
-- spec/code/if_spec.rb
-- spec/code/list_spec.rb
-- spec/code/multiplication_spec.rb
-- spec/code/negation_spec.rb
-- spec/code/not_keyword_spec.rb
-- spec/code/nothing_spec.rb
-- spec/code/number_spec.rb
-- spec/code/or_keyword_spec.rb
-- spec/code/or_operator_spec.rb
-- spec/code/parser/boolean_spec.rb
-- spec/code/parser/call_spec.rb
-- spec/code/parser/chained_call.rb
-- spec/code/parser/dictionnary_spec.rb
-- spec/code/parser/function_spec.rb
-- spec/code/parser/group_spec.rb
-- spec/code/parser/list_spec.rb
-- spec/code/parser/number_spec.rb
-- spec/code/parser/string_spec.rb
-- spec/code/parser_spec.rb
-- spec/code/power_spec.rb
-- spec/code/range_spec.rb
-- spec/code/rescue_spec.rb
-- spec/code/shift_spec.rb
-- spec/code/splat_spec.rb
-- spec/code/string_spec.rb
-- spec/code/ternary_spec.rb
-- spec/code/unary_minus_spec.rb
-- spec/code/while_spec.rb
 - spec/spec_helper.rb
+- spec/template_spec.rb
 - template-ruby.gemspec
 homepage: https://github.com/dorianmariefr/template-ruby
 licenses:
@@ -240,52 +96,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: A templating programming language
 test_files:
-- spec/code/addition_spec.rb
-- spec/code/and_operator_spec.rb
-- spec/code/bitwise_and_spec.rb
-- spec/code/bitwise_or_spec.rb
-- spec/code/boolean_spec.rb
-- spec/code/call_spec.rb
-- spec/code/chained_call_spec.rb
-- spec/code/code_spec.rb
-- spec/code/dictionnary_spec.rb
-- spec/code/equal_spec.rb
-- spec/code/equality_spec.rb
-- spec/code/function_spec.rb
-- spec/code/greater_spec.rb
-- spec/code/group_spec.rb
-- spec/code/if_modifier_spec.rb
-- spec/code/if_spec.rb
-- spec/code/list_spec.rb
-- spec/code/multiplication_spec.rb
-- spec/code/negation_spec.rb
-- spec/code/not_keyword_spec.rb
-- spec/code/nothing_spec.rb
-- spec/code/number_spec.rb
-- spec/code/or_keyword_spec.rb
-- spec/code/or_operator_spec.rb
-- spec/code/parser/boolean_spec.rb
-- spec/code/parser/call_spec.rb
-- spec/code/parser/chained_call.rb
-- spec/code/parser/dictionnary_spec.rb
-- spec/code/parser/function_spec.rb
-- spec/code/parser/group_spec.rb
-- spec/code/parser/list_spec.rb
-- spec/code/parser/number_spec.rb
-- spec/code/parser/string_spec.rb
-- spec/code/parser_spec.rb
-- spec/code/power_spec.rb
-- spec/code/range_spec.rb
-- spec/code/rescue_spec.rb
-- spec/code/shift_spec.rb
-- spec/code/splat_spec.rb
-- spec/code/string_spec.rb
-- spec/code/ternary_spec.rb
-- spec/code/unary_minus_spec.rb
-- spec/code/while_spec.rb
 - spec/spec_helper.rb
+- spec/template_spec.rb

data/.cherry.js

@@ -1,21 +0,0 @@
-module.exports = {
-  project_name: 'dorianmariefr/template-ruby',
-  metrics: [
-    {
-      name: 'todo',
-      pattern: /TODO:/i,
-    },
-    {
-      name: 'fixme',
-      pattern: /FIXME:/i,
-    },
-    {
-      name: 'rubocop',
-      pattern: /rubocop:disable/,
-    },
-    {
-      name: 'eslint',
-      pattern: /eslint-disable/,
-    },
-  ],
-}

data/.editorconfig

@@ -1,9 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true

data/.github/workflows/rspec.yml

@@ -1,14 +0,0 @@
-name: RSpec
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: RSpec
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-ruby@v1
-      - run: bundle install
-      - run: bundle exec rspec

data/.gitignore

@@ -1,2 +0,0 @@
-*.gem
-tmp/

data/.prettierrc

@@ -1,3 +0,0 @@
-{
-  "rubyPlugins": "plugin/trailing_comma"
-}

data/.tool-versions

@@ -1 +0,0 @@
-ruby 3.1.3

data/CHANGELOG.md

@@ -1,55 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## 0.4.0 / 2022-10-21
-
-- Rewrite of how functions are called internally (no more `public_send`)
-- Call ruby functions from template/code
-
-## 0.3.1 / 2022-10-13
-
-- Fix Zeitwerk auto-loading issue
-
-## 0.3.0 / 2022-10-10
-
-- `bin/template` accepts `--timeout` (or `-t`) parameter
-- Adds `bin/code` with same options as `bin/template`
-- Prevent loose syntax like `{ a: }`, `[1,,,]` and `()`
-- Change precedence of defined? (to allow `defined?(name) ? name : nothing`)
-- Updates parsers to allow `while false end == nothing`
-- String interpolations like `"1 + 1 = {1 + 1}"`
-- `context(:name)` to get a function without calling it for instance
-- `.to_string` on all objects
-- `1 + "a"` and `"a" + 1.0` for instance now convert to strings
-- `Dictionnary#each` e.g. `{ a: 1 }.each { |k, v| print(k) }`
-- Fix context duplication issue that was preventing implementation of recursive
-  functions like Fibonacci
-
-## 0.2.4 / 2022-08-02
-
-- Add method `String#*`, e.g. `{"Dorian " \* 2}" -> "Dorian Dorian "
-- Add executable to gem, e.g. `template --help`
-
-## 0.2.3 / 2022-08-31
-
-- Add default timeout for code and template parsing and evaluation
-
-## 0.2.2 / 2022-08-31
-
-- Fix parsing error when the template is empty, e.g. ""
-
-## 0.2.1 / 2022-08-31
-
-- Fix parsing error on empty code like `Hello {`
-
-## 0.2.0 / 2022-08-30
-
-- Programming language capable of solving the first 5 Project Euler problems
-
-## 0.1.0 / 2022-07-28
-
-- Initial version with interpolation

data/LICENSE

@@ -1,7 +0,0 @@
-Copyright 2022 Dorian Marié <dorian@dorianmarie.fr>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.