template-ruby 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f42cd4f03c1c1bacdfdcc9e454cdc19411220aa407698bc63024f59311d0a23f
-  data.tar.gz: 59da1aed5e7e8e729c1c4a44c36c62fcaacc47780229e61b8606708e1414e4c4
+  metadata.gz: d5e2a863316056d011b034cc0c819984d710899e8b51657dd15636e45db058b0
+  data.tar.gz: 47974cad2e705fb70706b68a496523f414b3027c6f57ec6d22344c588cdce143
 SHA512:
-  metadata.gz: 4e56e63c45fce924c3b62571a58be48846be2a0348565713a2e5de6f6a33f07d15ce4e37fc0d48a3ef964ff3d8cb8810bff55ae6f2cc5bba184df2b14182d85c
-  data.tar.gz: 26ba43eea5b6d61a99fd358bdcded3bfcc52e0b0b57910c62f0773380f3777a4b29b8ff355937c0d716cdd5f4e7d29561d17c642de1476a06a32fdd798c3d6ad
+  metadata.gz: 1ba52300910fb32458e115c200842c3a2ef18a19e8fddee92c38a961d60637d3c3c73906304184ef0ec5771ad85cc5dd19d8dbe0803a872a2c5c0dd69cc82a16
+  data.tar.gz: d526bbd95df4375aee06d4c9cc8bb8c6f2927b725514527dd9d3e29229223235bf0c8870d917eb61ae30cbce52e2c27a5f18ba31a2b1fcc94b0dfc574bf77bd1

data/CHANGELOG.md

@@ -5,6 +5,18 @@ 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.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
@@ -12,4 +24,3 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## 0.1.0 / 2022-07-28
 
 - Initial version with interpolation
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    template-ruby (0.1.0)
+    template-ruby (0.2.2)
       activesupport (~> 7)
       parslet (~> 2)
       zeitwerk (~> 2.6)
@@ -21,7 +21,7 @@ GEM
       tilt
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.16.2)
+    minitest (5.16.3)
     parslet (2.0.0)
     prettier (3.2.0)
       syntax_tree (>= 2.7.1)
@@ -42,9 +42,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    syntax_tree (3.2.1)
+    syntax_tree (3.5.0)
       prettier_print
-    syntax_tree-haml (1.3.0)
+    syntax_tree-haml (1.3.1)
       haml (>= 5.2)
       prettier_print
       syntax_tree (>= 2.0.1)

data/lib/code/node/call.rb

@@ -8,9 +8,10 @@ class Code
         @arguments.map! { |argument| ::Code::Node::CallArgument.new(argument) }
 
         if call.key?(:right)
-          @right = call.fetch(:right).map do |right|
-            ::Code::Node::ChainedCall.new(right)
-          end
+          @right =
+            call
+              .fetch(:right)
+              .map { |right| ::Code::Node::ChainedCall.new(right) }
         end
 
         if call.key?(:block)

data/lib/code/object/list.rb

@@ -59,7 +59,7 @@ class Code
             else
               acc + [element]
             end
-          end
+          end,
         )
       end
 
@@ -138,7 +138,7 @@ class Code
           argument.call(
             arguments: [
               ::Code::Object::Argument.new(acc),
-              ::Code::Object::Argument.new(element)
+              ::Code::Object::Argument.new(element),
             ],
             context: context,
             io: io,
@@ -169,7 +169,7 @@ class Code
               context: context,
               io: io,
             ).truthy?
-          end
+          end,
         )
       end
 
@@ -183,7 +183,7 @@ class Code
               context: context,
               io: io,
             )
-          end
+          end,
         )
       end
 

data/lib/code/object/range.rb

@@ -54,13 +54,11 @@ class Code
         argument = arguments.first.value
         ::Code::Object::Boolean.new(
           raw.any? do |element|
-            argument
-              .call(
-                arguments: [::Code::Object::Argument.new(element)],
-                context: context,
-                io: io,
-              )
-              .truthy?
+            argument.call(
+              arguments: [::Code::Object::Argument.new(element)],
+              context: context,
+              io: io,
+            ).truthy?
           end,
         )
       end
@@ -70,13 +68,11 @@ class Code
         argument = arguments.first.value
         ::Code::Object::Boolean.new(
           raw.all? do |element|
-            argument
-              .call(
-                arguments: [::Code::Object::Argument.new(element)],
-                context: context,
-                io: io,
-              )
-              .truthy?
+            argument.call(
+              arguments: [::Code::Object::Argument.new(element)],
+              context: context,
+              io: io,
+            ).truthy?
           end,
         )
       end
@@ -104,7 +100,7 @@ class Code
               context: context,
               io: io,
             ).truthy?
-          end
+          end,
         )
       end
 
@@ -118,7 +114,7 @@ class Code
               context: context,
               io: io,
             )
-          end
+          end,
         )
       end
 
@@ -131,9 +127,13 @@ class Code
         list << element
 
         if @exlucde_end
-          list << element while (element = element + argument) < @right
+          while (element = element + argument) < @right
+            list << element
+          end
         else
-          list << element while (element = element + argument) <= @right
+          while (element = element + argument) <= @right
+            list << element
+          end
         end
 
         list

data/lib/code/object.rb

@@ -45,11 +45,7 @@ class Code
 
     def <=>(other)
       if respond_to?(:raw)
-        if other.respond_to?(:raw)
-          raw <=> other.raw
-        else
-          raw <=> other
-        end
+        other.respond_to?(:raw) ? raw <=> other.raw : raw <=> other
       else
         other <=> self
       end
@@ -57,11 +53,7 @@ class Code
 
     def ==(other)
       if respond_to?(:raw)
-        if other.respond_to?(:raw)
-          raw == other.raw
-        else
-          raw == other
-        end
+        other.respond_to?(:raw) ? raw == other.raw : raw == other
       else
         other == self
       end

data/lib/code/parser/code.rb

@@ -9,7 +9,8 @@ class Code
       rule(:whitespace?) { whitespace.maybe }
 
       rule(:code) do
-        (whitespace? >> statement >> whitespace?).repeat(1) | whitespace?
+        (whitespace?.ignore >> statement >> whitespace?.ignore).repeat(1) |
+          whitespace?.ignore
       end
 
       root(:code)

data/lib/code.rb

@@ -1,22 +1,27 @@
 class Code
-  def initialize(input, io: $stdout)
+  def initialize(input, io: $stdout, timeout: 10)
     @input = input
-    @parsed = ::Code::Parser::Code.new.parse(@input)
+    @parsed = Timeout::timeout(timeout) do
+      ::Code::Parser::Code.new.parse(@input)
+    end
     @io = io
+    @timeout = timeout
   end
 
-  def self.evaluate(input, context = "", io: $stdout)
-    new(input, io: io).evaluate(context)
+  def self.evaluate(input, context = "", io: $stdout, timeout: 10)
+    new(input, io: io, timeout: timeout).evaluate(context)
   end
 
   def evaluate(context = "")
-    if context.present?
-      context = ::Code.evaluate(context)
-    else
-      context = ::Code::Object::Dictionnary.new
-    end
+    Timeout::timeout(@timeout) do
+      if context.present?
+        context = ::Code.evaluate(context, timeout: @timeout)
+      else
+        context = ::Code::Object::Dictionnary.new
+      end
 
-    ::Code::Node::Code.new(parsed).evaluate(context: context, io: @io)
+      ::Code::Node::Code.new(parsed).evaluate(context: context, io: @io)
+    end
   end
 
   private

data/lib/template/parser/template.rb

@@ -15,10 +15,14 @@ class Template
       end
 
       rule(:code_part) do
-        left_curly_bracket >> code >> (right_curly_bracket | any.absent?)
+        left_curly_bracket.ignore >> code >>
+          (right_curly_bracket.ignore | any.absent?)
       end
 
-      rule(:template) { (text_part.as(:text) | code_part.as(:code)).repeat(1) }
+      rule(:template) do
+        (text_part.as(:text) | code_part.as(:code)).repeat(1) |
+          str("").as(:text).repeat(1, 1)
+      end
 
       root(:template)
     end

data/lib/template-ruby.rb

@@ -4,6 +4,7 @@ require "bigdecimal"
 require "active_support"
 require "active_support/core_ext/object/blank"
 require "stringio"
+require "timeout"
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.ignore(__FILE__)

data/lib/template.rb

@@ -1,25 +1,30 @@
 class Template
-  VERSION = Gem::Version.new("0.2.0")
+  VERSION = Gem::Version.new("0.2.3")
 
-  def initialize(input, io: StringIO.new)
+  def initialize(input, io: StringIO.new, timeout: 10)
     @input = input
-    @parsed = ::Template::Parser::Template.new.parse(@input)
+    @parsed = Timeout::timeout(timeout) do
+      ::Template::Parser::Template.new.parse(@input)
+    end
     @io = io
+    @timeout = timeout
   end
 
-  def self.render(input, context = "", io: StringIO.new)
-    new(input, io: io).render(context)
+  def self.render(input, context = "", io: StringIO.new, timeout: 10)
+    new(input, io: io, timeout: timeout).render(context)
   end
 
   def render(context = "")
-    if context.present?
-      context = ::Code.evaluate(context)
-    else
-      context = ::Code::Object::Dictionnary.new
-    end
+    Timeout::timeout(@timeout) do
+      if context.present?
+        context = ::Code.evaluate(context, timeout: @timeout)
+      else
+        context = ::Code::Object::Dictionnary.new
+      end
 
-    ::Template::Node::Template.new(@parsed).evaluate(context: context, io: @io)
+      ::Template::Node::Template.new(@parsed).evaluate(context: context, io: @io)
 
-    @io.is_a?(StringIO) ? @io.string : nil
+      @io.is_a?(StringIO) ? @io.string : nil
+    end
   end
 end

data/spec/code/parser/call_spec.rb

@@ -21,9 +21,7 @@ RSpec.describe Code::Parser::Call do
               },
             },
           },
-          right: [{
-            name: "times",
-          }],
+          right: [{ name: "times" }],
         },
       },
     ],

data/spec/template_spec.rb

@@ -12,11 +12,8 @@ RSpec.describe Template do
       '{ user: { first_name: "Dorian" } }',
       "Hello Dorian",
     ],
-    [<<~TEMPLATE, "", ""]
-      {
-        until true
-        end
-      TEMPLATE
+    ["Hello {", "", "Hello "],
+    ["", "", ""],
   ].each do |(input, input_context, expected)|
     context "#{input.inspect} #{input_context.inspect}" do
       let(:input) { input }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: template-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Dorian Marié
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport