template-ruby 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc096165f8db9f20877bbd67a8d326ecdcaa546bcf9fda19479a267d9e559504
-  data.tar.gz: ae616ed093aded9378204f0231c2b4be787c3d62d0f9859d8971ea01c4fc8a8f
+  metadata.gz: 5e240c31089e37775df02ba1ea0646922413b26860318456d19ed5d2b38ed077
+  data.tar.gz: 25f45bb4ef78e1f62e63a960ce3fa46245b60dfab8fd96a273caf823ee2b016f
 SHA512:
-  metadata.gz: 317b2f1d710abef57552f540fe756fcd7d8761d485d93332f091672b354cc9339d6f3ce1d2da009807ef0093944fa1ed41b4f4cdce3e666730d1632b88d056dc
-  data.tar.gz: ffa81e7c9700f6dd30a9d09f18cfc17769446770364ab8dddfdcc8f90fd4ffd9caf35d5c0402106d45af3e9531a0d487a8d9b35a62f3c0f5abf26f290c24df7b
+  metadata.gz: a2870be4d39f138c269946c935985d2de54c4364307630011b8de8095d50dd7a72de3a71f401414c64e416832c2d4f6e9a8e92d7e6038855725e35c7e0cbbdd9
+  data.tar.gz: 77fd004c7464e2715726dfec039925e8c4653d6a78993cf6d1c6cecb717f08fcb5e04f9cebf7acf130bb3ed7fcac7891e65ef8fe0db37ab9c66724ef9b2cd923

data/CHANGELOG.md

@@ -5,9 +5,13 @@ 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.2 / 2022-08-31
+
+- Fix parsing error when the template is empty, e.g. ""
+
 ## 0.2.1 / 2022-08-31
 
-- Fix error on empty code like `Hello {`
+- Fix parsing error on empty code like `Hello {`
 
 ## 0.2.0 / 2022-08-30
 
@@ -16,4 +20,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?.ignore >> statement >> whitespace?.ignore).repeat(1) | whitespace?.ignore
+        (whitespace?.ignore >> statement >> whitespace?.ignore).repeat(1) |
+          whitespace?.ignore
       end
 
       root(:code)

data/lib/template/parser/template.rb

@@ -15,10 +15,14 @@ class Template
       end
 
       rule(:code_part) do
-        left_curly_bracket.ignore >> code >> (right_curly_bracket.ignore | 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.rb

@@ -1,5 +1,5 @@
 class Template
-  VERSION = Gem::Version.new("0.2.1")
+  VERSION = Gem::Version.new("0.2.2")
 
   def initialize(input, io: StringIO.new)
     @input = input

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,9 +12,8 @@ RSpec.describe Template do
       '{ user: { first_name: "Dorian" } }',
       "Hello Dorian",
     ],
-    [<<~TEMPLATE, "", "Hello "]
-      Hello {
-      TEMPLATE
+    ["Hello {", "", "Hello "],
+    ["", "", ""],
   ].each do |(input, input_context, expected)|
     context "#{input.inspect} #{input_context.inspect}" do
       let(:input) { input }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: template-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Dorian Marié