serbea 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aedaea6776741f8b501ad554019405c093c28947b810d44a1647424206b6cd8
-  data.tar.gz: 95b6936d84b60f31cacccde7b4213623bb03789d97fc9b07afa0dc2e76e1d27b
+  metadata.gz: 18caf5a2b809d0cf64dc3d6ed6b05186ec6c1cdbb6faf4c3c8f01ec607f65918
+  data.tar.gz: f94c3df3de70cbfbac1cd481ee41706beff8a0cfc78a23ee54b13ec4345d39fe
 SHA512:
-  metadata.gz: bd51862c6db8dc1bac37d6dded1e3f08d8f7cc9e8787011c4eddb44cc62799df80fb1fb16aafcab7a00f696b1fcd57f2872bb6dfc12a5104b3b34c2948d34955
-  data.tar.gz: f45b665cb6b684892ce792c91b1f14f59f7af33364875eddc7a4b0eb34f2b8e771cce1d1b0ad99aee06fc49dc3f1d6c8a2176118fc0685dde5d3892ce927d93b
+  metadata.gz: 27f9d07b128e5b7537be078b8056add0da4caed1304375a3f2decbd00d14232a60ade8d07817f7c520f2479f78957aff9774ba980391edd4643bb1c4b72454b2
+  data.tar.gz: dfe541a83671109526c0b9069ef2054dfb9a57c21474180d572ccba8cfcf13b3b59cab5a58e3e9b70e3952ca00ff46ab239a0fdf5f260a07e7956d646ef059b9

data/lib/serbea/helpers.rb

@@ -1,7 +1,7 @@
 module Serbea
   module Helpers
     def self.included(mod)
-      Serbea::Pipeline.deny_value_method %i(escape h prepend append map assign_to)
+      Serbea::Pipeline.deny_value_method %i(escape h prepend append assign_to)
     end
 
     def capture(obj=nil)
@@ -34,10 +34,6 @@ module Serbea
       "#{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

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,7 +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 = ("{%#%}\n" * string.to_s.lines.count) + string.post_match
+          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
   

data/lib/version.rb

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

metadata

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