serbea 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dfc45d5f8581d988481bf56c492498b5bbd8b08186910c655e6fa0964fe48dc
-  data.tar.gz: a25507d87ae9eeed0f575cdc5825212ca5d3bfadd1fbe388b7dfc219b53d721d
+  metadata.gz: 18caf5a2b809d0cf64dc3d6ed6b05186ec6c1cdbb6faf4c3c8f01ec607f65918
+  data.tar.gz: f94c3df3de70cbfbac1cd481ee41706beff8a0cfc78a23ee54b13ec4345d39fe
 SHA512:
-  metadata.gz: 3da42d61791e24028f5ac9c68c24c6cf73d98f7568ffa87fb04cca4c8f45b77d9dddc4a68025cbbd7e9f58429ccaa95e79eecdae249b7a272d424cf32648ed36
-  data.tar.gz: 216bdddc4a48696fabac9321e9f6d25b63e15adda17a22041f23b7963fd7a807a7840ddfb4e289349309361d8f6285801f651822b0ec86538d07980c54c3fb8b
+  metadata.gz: 27f9d07b128e5b7537be078b8056add0da4caed1304375a3f2decbd00d14232a60ade8d07817f7c520f2479f78957aff9774ba980391edd4643bb1c4b72454b2
+  data.tar.gz: dfe541a83671109526c0b9069ef2054dfb9a57c21474180d572ccba8cfcf13b3b59cab5a58e3e9b70e3952ca00ff46ab239a0fdf5f260a07e7956d646ef059b9

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 assign_to)
+    end
+
     def capture(obj=nil)
       previous_buffer_state = @_erbout
       @_erbout = +""
@@ -21,5 +25,18 @@ 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 assign_to(input, varname, preserve: false)
+      self.instance_variable_set("@#{varname}", input)
+      preserve ? input : nil
+    end
   end
 end

data/lib/serbea/pipeline.rb

@@ -1,5 +1,27 @@
 module Serbea
   class Pipeline
+    def self.exec(template, input: (no_input_passed = true; nil), include_helpers: nil)
+      anon = Class.new do
+        include Serbea::Helpers
+
+        attr_accessor :input, :output
+      end
+
+      if include_helpers
+        anon.include include_helpers
+      end
+
+      pipeline_obj = anon.new
+      pipeline_obj.input = input unless no_input_passed
+
+      full_template = "{{ #{template} | assign_to: :output }}"
+
+      tmpl = Tilt::SerbeaTemplate.new { full_template }
+      tmpl.render(pipeline_obj)
+
+      pipeline_obj.output
+    end
+
     def self.output_processor=(processor)
       @output_processor = processor
     end
@@ -10,19 +32,45 @@ 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)
+    # TODO: clean this up somehow and still support Ruby 2.5..3.0!
+    def filter(name, *args, **kwargs)
+      if @value.respond_to?(name) && !self.class.value_methods_denylist.include?(name)
+        if args.last.is_a?(Proc)
+          real_args = args.take(args.length - 1)
+          block = args.last
+          unless kwargs.empty?
+            @value = @value.send(name, *real_args, **kwargs, &block)
+          else
+            @value = @value.send(name, *real_args, &block)
+          end
+        else
+          unless kwargs.empty?
+            @value = @value.send(name, *args, **kwargs)
+          else
+            @value = @value.send(name, *args)
+          end
+        end
+      elsif @context.respond_to?(name)
+        unless kwargs.empty?
+          @value = @context.send(name, @value, *args, **kwargs)
+        else
+          @value = @context.send(name, @value, *args)
+        end
       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

@@ -8,6 +8,13 @@ module Serbea
     def self.render_directive
       @render_directive ||= "render"
     end
+
+    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!
@@ -35,8 +42,13 @@ 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])
+          require "yaml" if self.class.front_matter_preamble.include?(" = YAML.load")
+
+          string = "{% #{self.class.front_matter_preamble} <<~YAMLDATA\n" + 
+            string[1].sub(/^---\n/,'') +
+            "YAMLDATA\n%}" +
+            string[2].sub(/^---\n/, '') +
+            string.post_match
         end
       end
   
@@ -56,7 +68,7 @@ module Serbea
         end
       end
 
-      # Process the pipeline outputs
+      # Process any pipelines
       string = buff
       buff = ""
       until string.empty?
@@ -68,7 +80,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 +94,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?

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

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