serbea 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 994c7c8ba16f125d6f006e9abeb0a076eb7591ff36232037135c75c79f7c0d1d
-  data.tar.gz: e5f2e543e4a0ea5f31e0ee53a2d170b9d4f7a0a6084be366b6d0f86f498708f3
+  metadata.gz: 212a077a67f1553dc07fc8dd1b989647e19803953fba03976ec9ef95e08a2321
+  data.tar.gz: feda65d983102a217bd8426a8404712f882f23d2c6c3fa4be1981518fb20aae4
 SHA512:
-  metadata.gz: 634dd9112de1516e8ca87830a8af55ebee81c3c2d42457238388867db8b774b7672f7efe7fc2606da9f727a851d4addebc314950d6162126344f73d1bcbc2c8c
-  data.tar.gz: aceefb2271b2bf7f653b79386f5842df7b688114a4766d202b66ed0f6307e794f073c191ad693e8962ea1682b2e948efc2bc638b898c16a673fb8454eeb8482f
+  metadata.gz: 94edc63cbeb21ce38db5ab1270c2b06f5479d5fd529ea12ccca68d69d6abe7fece8dc83cbfeeeba8e724b4fa7c165f831b23d6059bccd9aef022bc6d6545f16d
+  data.tar.gz: b10964bcc171ff4903ae5b98dea1db73b0f21f95a1bbb02027681a84e0834c7838ad3901e00a740586844fc4bf5be78d5d00fc5710e0c310f2bacf44026956db

data/lib/serbea/rails_support.rb

@@ -42,9 +42,17 @@ Serbea::TemplateEngine.directive :form, ->(code, buffer) do
   buffer << code
   buffer << " %}"
 end
+
 Serbea::TemplateEngine.directive :_, ->(code, buffer) do
-  buffer << "{%= tag."
-  buffer << code
+  tag_name, space, params = code.lstrip.partition(%r(\s)m)
+
+  if tag_name.end_with?(":")
+    tag_name.chomp!(":")
+    tag_name = ":#{tag_name}" unless tag_name.start_with?(":")
+  end
+
+  buffer << "{%= tag.tag_string "
+  buffer << tag_name << ", " << params
   buffer << " %}"
 end
 

data/lib/serbea/template_engine.rb

@@ -17,11 +17,10 @@ module Serbea
     def self.directive(new_directive, directive_resolution)
       directives[new_directive.to_s] = directive_resolution
     end
+
     def self.directives
       @directives ||= {
         "@" => ->(code, buffer) do
-          original_line_length = code.lines.size
-
           pieces = code.split(" ")
           if pieces[0].start_with?(/[A-Z]/) # Ruby class name
             pieces[0].prepend " "
@@ -45,9 +44,6 @@ module Serbea
             pieces.last << ")"
             buffer << "{%= render#{pieces.join(" ")} %}"
           end
-          (original_line_length - 1).times do
-            buffer << "\n{% %}" # preserve original directive line length
-          end
         end
       }
     end
@@ -55,30 +51,21 @@ module Serbea
     def self.front_matter_preamble=(varname)
       @front_matter_preamble = varname
     end
+
     def self.front_matter_preamble
       @front_matter_preamble ||= "frontmatter = YAML.load"
     end
-  
+
     def self.has_yaml_header?(template)
       template.lines.first&.match? %r!\A---\s*\r?\n!
     end
-  
+
     def initialize(input, properties={})
       properties[:regexp] = /{%(={1,2}|-|\#|%)?(.*?)([-=])?%}([ \t]*\r?\n)?/m
       properties[:strip_front_matter] = true unless properties.key?(:strip_front_matter)
       super process_serbea_input(input, properties), properties
     end
-  
-    def add_postamble(postamble)
-      src << postamble
-      src << "#{@bufvar}.html_safe"
-  
-      src.gsub!("__RAW_START_PRINT__", "{{")
-      src.gsub!("__RAW_END_PRINT__", "}}")
-      src.gsub!("__RAW_START_EVAL__", "{%")
-      src.gsub!("__RAW_END_EVAL__", "%}")
-    end
-  
+
     def process_serbea_input(template, properties)
       buff = ""
   
@@ -190,7 +177,11 @@ module Serbea
             directive = $1 ? self.class.directives[$1] : self.class.directives["@"]
 
             if directive
+              additional_length = "#{buff}#{code}".lines.size
               directive.(code, buff)
+              (additional_length - buff.lines.size).times do
+                buff << "{% %}\n" # preserve original directive line length
+              end
             else
               raise "Handler for Serbea template directive `#{$1}' not found"
             end
@@ -202,7 +193,7 @@ module Serbea
 
       buff
     end
-  
+
     private
 
     def add_code(code)
@@ -226,5 +217,15 @@ module Serbea
     def add_expression_result_escaped(code)
       add_expression_result(code)
     end
-  end # class
+
+    def add_postamble(postamble)
+      src << postamble
+      src << "#{@bufvar}.html_safe"
+  
+      src.gsub!("__RAW_START_PRINT__", "{{")
+      src.gsub!("__RAW_END_PRINT__", "}}")
+      src.gsub!("__RAW_START_EVAL__", "{%")
+      src.gsub!("__RAW_END_EVAL__", "%}")
+    end
+  end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "0.10.3"
+  VERSION = "0.10.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2020-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport