serbea 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c69f1aa7916899c197489290d683afad319c66bccff8bd32d3e9a0e943bfa41
-  data.tar.gz: 267760c9cbbc3cbde6af0a3479b905c4bd8eca6e601dee2d1bb43cb0a819aabd
+  metadata.gz: c5b809ec2d2de960b954c9d12d4bdfaaf1f910ff1f1e5aa7ac217db968cd1ac7
+  data.tar.gz: e819b84c2c0a33767f4d3736de70e916bfdd41fe354ba89a9f551172b22bdb41
 SHA512:
-  metadata.gz: c50177a140769d470f500446902009faac98bb390ef44f7930ed28b3c1cb92ac0a499e15ee2c66384ef0c7a52e55dca892ff2c17fe3f85bc8022b92c2f1c6a6a
-  data.tar.gz: 330296668991421be44b92b1a4a87470dc93ffd78e4b00530e26003fff1af293a9b4d51ee46fbcac2b541379a6e4c2a0179ec6365fafce14c219905ee8b73617
+  metadata.gz: 71b3ab77eed51511959586f271ff814e094c6ef4fb4278dc60d85b92dafec4a328a084e27359c7626b661dea18e4e4f6007bceb40b4780557e1454752ed95d27
+  data.tar.gz: ff277d2b7471f668586248e0524429c8380ca30322f5b698bdf44b094a4cd7a202dfdfd3a87a7d1de3b652140eaf5d9e285f1addeb632e79e4be96b83e2e415b

data/README.md

@@ -1,6 +1,6 @@
-👑 Serbea: Similar to ERB, Except Awesomer
+# 👑 Serbea: Similar to ERB, Except Awesomer
 
-The Ruby template language you always dreamed of is here. Le roi est mort, vive le roi!
+The Ruby template language you've always dreamed of is finally here. _Le roi est mort, vive le roi!_
 
 Serbea combines the best ideas from "brace-style" template languages such as Liquid, Nunjucks, Twig, Jinja, Mustache, etc.—and applies them to the world of ERB. You can use Serbea in Rails application, Bridgetown static sites, or pretty much any Ruby scenario you could imagine.
 

data/lib/serbea.rb

@@ -4,7 +4,6 @@ require "tilt/erubi"
 require "serbea/helpers"
 require "serbea/pipeline"
 require "serbea/template_engine"
-require "serbea/component_renderer"
 
 module Tilt
   class SerbeaTemplate < ErubiTemplate

data/lib/serbea/rails_support.rb

@@ -2,7 +2,6 @@
 
 # inspired by https://github.com/haml/haml/blob/main/lib/haml/plugin.rb
 module Serbea
-
   # This module makes Serbea work with Rails using the template handler API.
   class Plugin
     def handles_encoding?; true; end

data/lib/serbea/template_engine.rb

@@ -66,13 +66,11 @@ module Serbea
   
       # Ensure the raw "tag" will strip out all ERB-style processing
       until string.empty?
-        text, code, string = string.partition(/{% raw %}.*?{% endraw %}/m)
+        text, code, string = string.partition(/{% raw %}(.*?){% endraw %}/m)
   
         buff << text
         if code.length > 0
-          buff << code.
-            sub("{% raw %}", "").
-            sub("{% endraw %}", "").
+          buff << $1.
             gsub("{{", "__RAW_START_PRINT__").
             gsub("}}", "__RAW_END_PRINT__").
             gsub("{%", "__RAW_START_EVAL__").
@@ -84,17 +82,16 @@ module Serbea
       string = buff
       buff = ""
       until string.empty?
-        text, code, string = string.partition(/{{.*?}}/m)
+        text, code, string = string.partition(/{{(.*?)}}/m)
   
         buff << text
         if code.length > 0
           original_line_length = code.lines.size
 
-          s = StringScanner.new(code[2...-2])
-          done = false
+          s = StringScanner.new($1)
           escaped_segment = ""
           segments = []
-          while !done
+          until s.eos?
             portion = s.scan_until(/\|>?/)
             if portion
               if portion.end_with?('\|')
@@ -124,7 +121,7 @@ module Serbea
                 # or just the rest will do
                 segments << s.rest
               end
-              done = true
+              s.terminate
             end
           end
 
@@ -148,24 +145,15 @@ module Serbea
         end
       end
 
-      # Process any directives
-      #
-      # TODO: allow custom directives! aka
-      # {%@something whatever %}
-      # {%@script
-      #   const foo = "really? #{really}!"
-      #   alert(foo.toLowerCase())
-      # %}
-      # {%@preact AwesomeChart data={#{ruby_data.to_json}} %}
+      # Process any render directives
       string = buff
       buff = ""
       until string.empty?
-        text, code, string = string.partition(/{%@.*?%}/m)
+        text, code, string = string.partition(/{%@(.*?)%}/m)
   
         buff << text
         if code.length > 0
-          code.sub!(/^\{%@/, "")
-          code.sub!(/%}$/, "")
+          code = $1
           unless ["end", ""].include? code.strip
             original_line_length = code.lines.size
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-31 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -78,7 +78,6 @@ files:
 - Rakefile
 - lib/serbea.rb
 - lib/serbea/bridgetown_support.rb
-- lib/serbea/component_renderer.rb
 - lib/serbea/helpers.rb
 - lib/serbea/pipeline.rb
 - lib/serbea/rails_support.rb

data/lib/serbea/component_renderer.rb

@@ -1,19 +0,0 @@
-module Serbea
-  class ComponentRenderer
-    include Helpers
-
-    def initialize(variables = {})
-      @variables = variables
-    end
-
-    def respond_to_missing?(key, include_private = false)
-      @variables.key?(key)
-    end
-
-    def method_missing(key)
-      return @variables[key] if respond_to_missing?(key)
-      
-      super
-    end
-  end
-end