serbea 0.3.4 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbd946514bace35dc47b5a4cf880db55b6b5af2e6060c40dee607bb776072c30
-  data.tar.gz: 3cac2624f2e6c5f4dd70393f5c6bbef467115da9bc9e465d6a8e91e69e3155b4
+  metadata.gz: fd530996d44bf1ab692ebef54630f131669dc773b084a0181713c7d929a1eb3b
+  data.tar.gz: a65ff4d61f7c400177f83ac2f83986fcb26b30eaf85d386ec9d4497aa4ec9a48
 SHA512:
-  metadata.gz: 122fa4b87a75dacfcdc9026aaac10560695ebbf7cc5b6e0e35999bc7694e880e8df6a5ead634b37685cafa8ad6849380029f5beece1ce17665cef0fad5eb9b38
-  data.tar.gz: bea81f00f032ed410f976041399f1fae6209fb9f4808e747c69ebf6a4d48faf64b9f2c79cb5a470fc0f5a997574916b25143da64de7ed23d9383b2ae71119a6c
+  metadata.gz: 780f93e3d44d80e8ddfc0cd9cff2482027ed003a26d35e78f7b78748996162e1a5df1c7097b69f4526528efa1c3c04950c11cf963cf1c88b7dca72cfc9f4daf9
+  data.tar.gz: b18cec53f65e1ae0d91333885657a9b2adec3ebcd61920a8a3c12363d7b95d6168898ed899bebbf48cf7f58990138e8d8c0843c7a4d385b9c41f6ad5861d5a1e

data/lib/serbea/bridgetown_support.rb

@@ -1,9 +1,12 @@
+require "serbea/rouge_lexer"
+
 module Bridgetown
   class SerbeaView < RubyTemplateView
     include Serbea::Helpers
 
     def partial(partial_name, options = {})
       options.merge!(options[:locals]) if options[:locals]
+      options[:content] = yield if block_given?
 
       partial_segments = partial_name.split("/")
       partial_segments.last.sub!(%r!^!, "_")
@@ -13,14 +16,9 @@ module Bridgetown
         site.in_source_dir(site.config[:partials_dir], "#{partial_name}.serb")
       ).render(self, options)
     end
-    
-    def markdownify
-      previous_buffer_state = @_erbout
-      @_erbout = +""
-      result = yield
-      @_erbout = previous_buffer_state
-
-      content = Bridgetown::Utils.reindent_for_markdown(result)
+
+    def markdownify(&block)
+      content = Bridgetown::Utils.reindent_for_markdown(capture(&block))
       converter = site.find_converter_instance(Bridgetown::Converters::Markdown)
       md_output = converter.convert(content).strip
       @_erbout << md_output
@@ -29,6 +27,7 @@ module Bridgetown
 
   module Converters
     class SerbeaTemplates < Converter
+      priority :highest
       input :serb
 
       # Logic to do the Serbea content conversion.
@@ -51,6 +50,20 @@ module Bridgetown
           serb_renderer.render(serb_view)
         end
       end
+
+      def matches(ext, convertible)
+        if convertible.data[:template_engine] == "serbea" ||
+            (convertible.data[:template_engine].nil? &&
+              @config[:template_engine] == "serbea")
+          return true
+        end
+
+        super(ext)
+      end
+
+      def output_ext(ext)
+        ext == ".serb" ? ".html" : ext
+      end
     end
   end
 end

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)
+      Serbea::Pipeline.deny_value_method %i(escape h prepend append assign_to)
     end
 
     def capture(obj=nil)
@@ -22,7 +22,8 @@ module Serbea
     end
   
     def h(input)
-      Erubi.h(input)
+      result = Erubi.h(input)
+      result.respond_to?(:html_safe) ? result.html_safe : result
     end
     alias_method :escape, :h
 
@@ -34,11 +35,7 @@ module Serbea
       "#{old_string}#{new_string}"
     end
 
-    def map(input, block)
-      input.map(&block)
-    end
-
-    def assign(input, varname, preserve: false)
+    def assign_to(input, varname, preserve: false)
       self.instance_variable_set("@#{varname}", input)
       preserve ? input : nil
     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,6 +32,13 @@ module Serbea
       end
     end
 
+    def self.raise_on_missing_filters=(config_boolean)
+      @raise_on_missing_filters = config_boolean
+    end
+    def self.raise_on_missing_filters
+      @raise_on_missing_filters ||= false
+    end
+
     def self.deny_value_method(name)
       value_methods_denylist.merge Array(name)
     end
@@ -22,14 +51,33 @@ 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)
+          self.class.raise_on_missing_filters ? raise(warning) : STDERR.puts(warning)
         end
       end
 
@@ -39,7 +87,5 @@ module Serbea
     def to_s
       self.class.output_processor.call @value.to_s
     end
-
-    def raise_on_missing_filters; false; end
   end
 end

data/lib/serbea/rouge_lexer.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require "rouge"
+
+module Rouge
+  module Lexers
+    class Serbea < TemplateLexer
+      title "Serbea"
+      desc "Embedded Ruby Serbea template files"
+
+      tag 'serb'
+
+      filenames '*.serb'
+
+      def initialize(opts={})
+        @ruby_lexer = Ruby.new(opts)
+
+        super(opts)
+      end
+
+      start do
+        parent.reset!
+        @ruby_lexer.reset!
+      end
+
+      open  = /{%%|{%=|{%#|{%-|{%|{{/
+      close = /%%}|-%}|%}|}}/
+
+      state :root do
+        rule %r/{%#/, Comment, :comment
+
+        rule open, Comment::Preproc, :ruby
+
+        rule %r/.+?(?=#{open})|.+/m do
+          delegate parent
+        end
+      end
+
+      state :comment do
+        rule close, Comment, :pop!
+        rule %r/.+?(?=#{close})|.+/m, Comment
+      end
+
+      state :ruby do
+        rule close, Comment::Preproc, :pop!
+
+        rule %r/.+?(?=#{close})|.+/m do
+          delegate @ruby_lexer
+        end
+      end
+    end
+  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,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
   
@@ -63,6 +76,7 @@ module Serbea
   
         buff << text
         if code.length > 0
+          original_line_length = code.lines.size
           processed_filters = false
   
           code = code.gsub('\|', "__PIPE_C__")
@@ -77,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
 
@@ -100,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 " "
@@ -123,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.4"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.3
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -54,6 +54,7 @@ files:
 - lib/serbea/helpers.rb
 - lib/serbea/pipeline.rb
 - lib/serbea/rails_support.rb
+- lib/serbea/rouge_lexer.rb
 - lib/serbea/template_engine.rb
 - lib/version.rb
 - serbea.gemspec