serbea 0.2.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73c7ff8202d675a22d379f36b82f5848465b03c94a47b077467a12c2c321f5c6
-  data.tar.gz: 65ea57087ca64e0c1f4326b53db82326210fb2269b384da0aa583f0982851acb
+  metadata.gz: bbd946514bace35dc47b5a4cf880db55b6b5af2e6060c40dee607bb776072c30
+  data.tar.gz: 3cac2624f2e6c5f4dd70393f5c6bbef467115da9bc9e465d6a8e91e69e3155b4
 SHA512:
-  metadata.gz: 3e129f0707c7b02325e7fc9e3b73e9a71c4e914a1b4bed7a2cc42aa8d3ccd88d881f3154d17eacb49ef449a0fc304ffef627d9b5bd3a43e40de2ee869c9851a0
-  data.tar.gz: 6d841de735b6f21c9f8e620e49504af943a1af1322cd067944b03a502b9f1334b5dec0ea67738cd6714e012c8484bcd7030e9360e30a05accb22d43b5308eb76
+  metadata.gz: 122fa4b87a75dacfcdc9026aaac10560695ebbf7cc5b6e0e35999bc7694e880e8df6a5ead634b37685cafa8ad6849380029f5beece1ce17665cef0fad5eb9b38
+  data.tar.gz: bea81f00f032ed410f976041399f1fae6209fb9f4808e747c69ebf6a4d48faf64b9f2c79cb5a470fc0f5a997574916b25143da64de7ed23d9383b2ae71119a6c

data/lib/serbea.rb

@@ -3,9 +3,9 @@ require "tilt/erubi"
 require "erubi/capture_end"
 
 require "serbea/helpers"
-require "serbea/component_renderer"
 require "serbea/pipeline"
 require "serbea/template_engine"
+require "serbea/component_renderer"
 
 module Tilt
   class SerbeaTemplate < ErubiTemplate

data/lib/serbea/helpers.rb

@@ -1,5 +1,9 @@
 module Serbea
   module Helpers
+    def self.included(mod)
+      Serbea::Pipeline.deny_value_method %i(escape h prepend append map assign)
+    end
+
     def capture(obj=nil)
       previous_buffer_state = @_erbout
       @_erbout = +""
@@ -21,5 +25,22 @@ module Serbea
       Erubi.h(input)
     end
     alias_method :escape, :h
+
+    def prepend(old_string, new_string)
+      "#{new_string}#{old_string}"
+    end
+
+    def append(old_string, new_string)
+      "#{old_string}#{new_string}"
+    end
+
+    def map(input, block)
+      input.map(&block)
+    end
+
+    def assign(input, varname, preserve: false)
+      self.instance_variable_set("@#{varname}", input)
+      preserve ? input : nil
+    end
   end
 end

data/lib/serbea/pipeline.rb

@@ -10,19 +10,26 @@ module Serbea
       end
     end
 
+    def self.deny_value_method(name)
+      value_methods_denylist.merge Array(name)
+    end
+    def self.value_methods_denylist
+      @value_methods_denylist ||= Set.new
+    end
+
     def initialize(context, value)
       @context = context
       @value = value
     end
 
-    def filter(sym, *aargs)
-      if @value.respond_to?(sym)
-        @value = @value.send(sym, *aargs)
-      elsif @context.respond_to?(sym)
-        @value = @context.send(sym, @value, *aargs)
+    def filter(name, *args)
+      if @value.respond_to?(name) && !self.class.value_methods_denylist.include?(name)
+        @value = @value.send(name, *args)
+      elsif @context.respond_to?(name)
+        @value = @context.send(name, @value, *args)
       else
-        "Serbea warning: Filter not found: #{sym}".tap do |warning|
-          raise_on_missing_filters ? raise(warning) : puts(warning)
+        "Serbea warning: Filter not found: #{name}".tap do |warning|
+          raise_on_missing_filters ? raise(warning) : STDERR.puts(warning)
         end
       end
 

data/lib/serbea/template_engine.rb

@@ -1,6 +1,13 @@
 module Serbea
   class TemplateEngine < Erubi::CaptureEndEngine
     FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m.freeze
+
+    def self.render_directive=(directive)
+      @render_directive = directive
+    end
+    def self.render_directive
+      @render_directive ||= "render"
+    end
   
     def self.has_yaml_header?(template)
       template.lines.first&.match? %r!\A---\s*\r?\n!
@@ -28,11 +35,11 @@ module Serbea
       string = template.dup
       if properties[:strip_front_matter] && self.class.has_yaml_header?(string)
         if string = string.match(FRONT_MATTER_REGEXP)
-          string = string.post_match
-  #        yaml_data = SafeYAML.load(template.captures[0])
+          string = ("{%#%}\n" * string.to_s.lines.count) + string.post_match
         end
       end
   
+      # Ensure the raw "tag" will strip out all ERB-style processing
       until string.empty?
         text, code, string = string.partition(/{% raw %}.*?{% endraw %}/m)
   
@@ -47,7 +54,8 @@ module Serbea
             gsub("%}", "__RAW_END_EVAL__")
         end
       end
-  
+
+      # Process any pipelines
       string = buff
       buff = ""
       until string.empty?
@@ -59,7 +67,7 @@ module Serbea
   
           code = code.gsub('\|', "__PIPE_C__")
   
-          subs = code.gsub(/\s*\|\s+(.*?)\s([^|}]*)/) do
+          subs = code.gsub(/\s*\|>?\s+(.*?)\s([^|}]*)/) do
             args = $2
             args = nil if args.strip == ""
             prefix = processed_filters ? ")" : "))"
@@ -73,6 +81,54 @@ 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}} %}
+      string = buff
+      buff = ""
+      until string.empty?
+        text, code, string = string.partition(/{%@.*?%}/m)
+  
+        buff << text
+        if code.length > 0
+          code.sub! /^\{%@/, ""
+          code.sub! /%}$/, ""
+          unless ["end", ""].include? code.strip
+            pieces = code.split(" ")
+            if pieces[0].start_with?(/[A-Z]/) # Ruby class name
+              pieces[0].prepend " "
+              pieces[0] << ".new("
+            else # string or something else
+              pieces[0].prepend "("
+            end
+
+            includes_block = false
+            pieces.reverse.each do |piece|
+              if piece == "do" && (pieces.last == "do" || pieces.last.end_with?("|"))
+                piece.prepend(") ")
+                includes_block = true
+                break
+              end
+            end
+
+            if includes_block
+              buff << "{%:= #{self.class.render_directive}#{pieces.join(" ")} %}"
+            else
+              pieces.last << ")"
+              buff << "{%= #{self.class.render_directive}#{pieces.join(" ")} %}"
+            end
+          else
+            buff << "{%: end %}"
+          end
+        end
+      end
+
       buff
     end
   

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "0.2.0"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.4
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-19 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi