serbea 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdeba2843c805f483e3514fbceaa63d610ac9b436762b8ff7c34ae6f7f6d8c3a
-  data.tar.gz: 325e190e80f4cc5cd777e824c512361a71435b482672c1da8d17bf4ffc4d639c
+  metadata.gz: 2403adca3b4cbb2e82ad7bb758df50c04257d45f1b303a1a9b03a15453d66953
+  data.tar.gz: 1ccfc568da131dd13d9cc627b05fb13577854d4edfbf2ea0a3353b69b097a5f2
 SHA512:
-  metadata.gz: fbfa7787a1ed422c4e1e238f2f328c37586e65d1bcc11458e6650803d8d6bfc21a6204bbdd6fa5e038b15e2120d43d08ef9a327e2ff25500e7bd569078d11a0e
-  data.tar.gz: b8789ea01c5eb34aed8ceb0d770b94401d6a7167d0fca38d9892ca79d4be7681b30705fb96061e31a9f52aaf5babaa9af4fa57921cab665c63f414bf286408ae
+  metadata.gz: 22633765cd7a2ce0020cdd27708e2bc349cc9ccd168d1d15f7f135926d4a0333098fa05ebd34b7f77811371620f01860d7876935e0be47160e03714f8efc01d6
+  data.tar.gz: 9c5a097fe9fdb43738e3d61f3d61d973d15bff640ad3ae85cc9fb670e61c4a31154f67522bf9651f65ec6a1e67bf755d1b50ea6bc2508b42dfe9dd6f24c627d3

data/lib/serbea/helpers.rb

@@ -1,7 +1,7 @@
 module Serbea
   module Helpers
     def self.included(mod)
-      Serbea::Pipeline.deny_value_method %i(prepend append)
+      Serbea::Pipeline.deny_value_method %i(escape h prepend append assign_to)
     end
 
     def capture(obj=nil)
@@ -33,5 +33,10 @@ module Serbea
     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
@@ -22,11 +44,30 @@ module Serbea
       @value = value
     end
 
-    def filter(name, *args)
+    # 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)
-        @value = @value.send(name, *args)
+        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)
-        @value = @context.send(name, @value, *args)
+        unless kwargs.empty?
+          @value = @context.send(name, @value, *args, **kwargs)
+        else
+          @value = @context.send(name, @value, *args)
+        end
       else
         "Serbea warning: Filter not found: #{name}".tap do |warning|
           raise_on_missing_filters ? raise(warning) : STDERR.puts(warning)

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
   
@@ -64,11 +76,12 @@ module Serbea
   
         buff << text
         if code.length > 0
+          original_line_length = code.lines.size
           processed_filters = false
   
           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 ? ")" : "))"
@@ -78,7 +91,13 @@ module Serbea
   
           pipeline_suffix = processed_filters ? ") %}" : ")) %}"
   
-          buff << subs.sub("{{", "{%= pipeline(self, (").sub("}}", pipeline_suffix).gsub("__PIPE_C__", '\|')
+          subs = subs.sub("{{", "{%= pipeline(self, (").sub("}}", pipeline_suffix).gsub("__PIPE_C__", '\|')
+
+          buff << subs
+
+          (original_line_length - subs.lines.size).times do
+            buff << "\n{% %}" # preserve original line length
+          end
         end
       end
 
@@ -101,6 +120,8 @@ module Serbea
           code.sub! /^\{%@/, ""
           code.sub! /%}$/, ""
           unless ["end", ""].include? code.strip
+            original_line_length = code.lines.size
+
             pieces = code.split(" ")
             if pieces[0].start_with?(/[A-Z]/) # Ruby class name
               pieces[0].prepend " "
@@ -124,6 +145,9 @@ module Serbea
               pieces.last << ")"
               buff << "{%= #{self.class.render_directive}#{pieces.join(" ")} %}"
             end
+            (original_line_length - 1).times do
+              buff << "\n{% %}" # preserve original directive line length
+            end
           else
             buff << "{%: end %}"
           end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "0.3.2"
+  VERSION = "0.4.1"
 end

metadata

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