serbea 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 170e76b3b2d6c6024d9721f95831ebc85dd32fda2bca10f2471546bbc95cc5f7
-  data.tar.gz: 5dc3336c8549c6933325646f5a3fecdee6fec520393df8e141f86a3ef4b3f0ae
+  metadata.gz: 3aedaea6776741f8b501ad554019405c093c28947b810d44a1647424206b6cd8
+  data.tar.gz: 95b6936d84b60f31cacccde7b4213623bb03789d97fc9b07afa0dc2e76e1d27b
 SHA512:
-  metadata.gz: a8733456977f41a78a2e4a56bd8d25a4b737abdedf54d19cfbf7ad61f43a9edbbd422e1d81206205df366ef56d751567a87284de9c480887a79cefb0ae51ae1c
-  data.tar.gz: 57c097000a365d52fa0ee88ca8472957dccbfc898b2acb6d066f3fea49e865f94033cfcb30b9edc6585a1fb72ab191b524fb631c437b86a16c2a707e078b85ca
+  metadata.gz: bd51862c6db8dc1bac37d6dded1e3f08d8f7cc9e8787011c4eddb44cc62799df80fb1fb16aafcab7a00f696b1fcd57f2872bb6dfc12a5104b3b34c2948d34955
+  data.tar.gz: f45b665cb6b684892ce792c91b1f14f59f7af33364875eddc7a4b0eb34f2b8e771cce1d1b0ad99aee06fc49dc3f1d6c8a2176118fc0685dde5d3892ce927d93b

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_to)
+    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_to(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

@@ -35,8 +35,7 @@ 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
   
@@ -56,7 +55,7 @@ module Serbea
         end
       end
 
-      # Process the pipeline outputs
+      # Process any pipelines
       string = buff
       buff = ""
       until string.empty?
@@ -68,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 ? ")" : "))"
@@ -82,7 +81,15 @@ module Serbea
         end
       end
 
-      # Process the render directives
+      # 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?
@@ -100,8 +107,17 @@ module Serbea
             else # string or something else
               pieces[0].prepend "("
             end
-            if pieces.last == "do"
-              pieces.last.prepend ") "
+
+            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 << ")"

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "0.3.0"
+  VERSION = "0.3.5"
 end

metadata

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