serbea 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0313ced0cb154585166b76fcc3b65e35dff3bb260666c62ad0b3535d34d62029
-  data.tar.gz: 877a5c31aa98d2f3794dc8664e3cb5324d035f77e0899521b568d1a1d4c8e674
+  metadata.gz: 170e76b3b2d6c6024d9721f95831ebc85dd32fda2bca10f2471546bbc95cc5f7
+  data.tar.gz: 5dc3336c8549c6933325646f5a3fecdee6fec520393df8e141f86a3ef4b3f0ae
 SHA512:
-  metadata.gz: a5f18dd506a40f8f27798bd9a263f797676ebd83847f264e5540a8304441fbab436e16e5c8180ab64774581e6fee2d53d110e013a03812854cc96b0a739dae89
-  data.tar.gz: a4dd36aa574393c03cf84e4c846c499609e6e0e9aa1268b5abb1bffdac6cd67c59e3cdd413731a9e7ce8374486f2fc5d05faabecf7836916d9be56fbd9c50ef3
+  metadata.gz: a8733456977f41a78a2e4a56bd8d25a4b737abdedf54d19cfbf7ad61f43a9edbbd422e1d81206205df366ef56d751567a87284de9c480887a79cefb0ae51ae1c
+  data.tar.gz: 57c097000a365d52fa0ee88ca8472957dccbfc898b2acb6d066f3fea49e865f94033cfcb30b9edc6585a1fb72ab191b524fb631c437b86a16c2a707e078b85ca

data/Gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in serbea.gemspec
+gemspec

data/lib/serbea.rb

@@ -1,183 +1,16 @@
 require "tilt"
 require "tilt/erubi"
-require 'erubi/capture_end'
-require "ostruct"
+require "erubi/capture_end"
 
-module SerbeaHelpers
-  def capture(obj=nil)
-    previous_buffer_state = @_erbout
-    @_erbout = +""
-    result = obj ? yield(obj) : yield
-    @_erbout = previous_buffer_state
-  
-    result.respond_to?(:html_safe) ? result.html_safe : result
-  end
-
-  def pipeline(context, value)
-    Serbea::Pipeline.new(context, value)
-  end
-
-  def helper(name, &block)
-    self.class.send(:define_method, name, &block)
-  end
-
-  def h(input)
-    Erubi.h(input)
-  end
-  alias_method :escape, :h
-end
-
-module Serbea
-  class Pipeline
-    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)
-      else
-        "Serbea warning: Filter not found: #{sym}".tap do |warning|
-          raise_on_missing_filters ? raise(warning) : puts(warning)
-        end
-      end
-
-      self
-    end
-
-    def to_s
-      @value.to_s
-    end
-
-    def raise_on_missing_filters; false; end
-  end
-
-  class ComponentRenderer
-    include SerbeaHelpers
-
-    def initialize(variables = {})
-      @variables = variables
-    end
-
-    def respond_to_missing?(key)
-      @variables.key?(key)
-    end
-
-    def method_missing(key)
-      @variables[key] if respond_to_missing?(key)
-    end
-  end
-end
-
-class SerbeaEngine < Erubi::CaptureEndEngine
-  FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m.freeze
-
-  def self.has_yaml_header?(template)
-    template.lines.first&.match? %r!\A---\s*\r?\n!
-  end
-
-  def initialize(input, properties={})
-    properties[:regexp] = /{%(\:?={1,2}|-|\#|%|\:)?(.*?)([-=])?%}([ \t]*\r?\n)?/m
-    properties[:strip_front_matter] = true unless properties.key?(:strip_front_matter)
-    super process_serbea_input(input, properties), properties
-  end
-
-  def add_postamble(postamble)
-    src << postamble
-    src << "@_erbout.html_safe" if postamble.respond_to?(:html_safe)
-
-    src.gsub!("__RAW_START_PRINT__", "{{")
-    src.gsub!("__RAW_END_PRINT__", "}}")
-    src.gsub!("__RAW_START_EVAL__", "{%")
-    src.gsub!("__RAW_END_EVAL__", "%}")
-  end
-
-  def process_serbea_input(template, properties)
-    buff = ""
-
-    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])
-      end
-    end
-
-    until string.empty?
-      text, code, string = string.partition(/{% raw %}.*?{% endraw %}/m)
-
-      buff << text
-      if code.length > 0
-        buff << code.
-          sub("{% raw %}", "").
-          sub("{% endraw %}", "").
-          gsub("{{", "__RAW_START_PRINT__").
-          gsub("}}", "__RAW_END_PRINT__").
-          gsub("{%", "__RAW_START_EVAL__").
-          gsub("%}", "__RAW_END_EVAL__")
-      end
-    end
-
-    string = buff
-    buff = ""
-    until string.empty?
-      text, code, string = string.partition(/{{.*?}}/m)
-
-      buff << text
-      if code.length > 0
-        processed_filters = false
-
-        code = code.gsub('\|', "__PIPE_C__")
-
-        subs = code.gsub(/ *\| +(.*?) ([^|}]*)/) do
-          args = $2
-          args = nil if args.strip == ""
-          prefix = processed_filters ? ")" : "))"
-          processed_filters = true
-          "#{prefix}.filter(:#{$1.chomp(":")}" + (args ? ", #{args}" : "")
-        end
-
-        pipeline_suffix = processed_filters ? ") %}" : ")) %}"
-
-        buff << subs.sub("{{", "{%= pipeline(self, (").sub("}}", pipeline_suffix).gsub("__PIPE_C__", '\|')
-      end
-    end
-
-#      puts buff
-    buff
-  end # method
-
-  private
-
-  # Handle the <%:= and <%:== tags
-  # Carried over from the Erubi class but with changed indicators
-  def handle(indicator, code, tailch, rspace, lspace)
-    case indicator
-    when ':=', ':=='
-      rspace = nil if tailch && !tailch.empty?
-      add_text(lspace) if lspace
-      escape_capture = !((indicator == ':=') ^ @escape_capture)
-      src << "begin; (#{@bufstack} ||= []) << #{@bufvar}; #{@bufvar} = #{@bufval}; #{@bufstack}.last << #{@escapefunc if escape_capture}((" << code
-      add_text(rspace) if rspace
-    when ':'
-      rspace = nil if tailch && !tailch.empty?
-      add_text(lspace) if lspace
-      result = @yield_returns_buffer ? " #{@bufvar}; " : ""
-      src << result << code << ")).to_s; ensure; #{@bufvar} = #{@bufstack}.pop; end;"
-      add_text(rspace) if rspace
-    else
-      super
-    end
-  end
-end # class
+require "serbea/helpers"
+require "serbea/component_renderer"
+require "serbea/pipeline"
+require "serbea/template_engine"
 
 module Tilt
   class SerbeaTemplate < ErubiTemplate
     def prepare
-      @options.merge!(outvar: "@_erbout", engine_class: SerbeaEngine)
+      @options.merge!(outvar: "@_erbout", engine_class: Serbea::TemplateEngine)
       super
     end
 
@@ -187,7 +20,7 @@ module Tilt
   end
 end
 
-Tilt.register Tilt::SerbeaTemplate, "serb" #, "serbea"
+Tilt.register Tilt::SerbeaTemplate, "serb"
 
 if defined?(Rails::Railtie)
   class Railtie < ::Rails::Railtie
@@ -198,3 +31,7 @@ if defined?(Rails::Railtie)
     end
   end
 end
+
+if defined?(Bridgetown)
+  require "serbea/bridgetown_support"
+end

data/lib/serbea/bridgetown_support.rb

@@ -0,0 +1,56 @@
+module Bridgetown
+  class SerbeaView < RubyTemplateView
+    include Serbea::Helpers
+
+    def partial(partial_name, options = {})
+      options.merge!(options[:locals]) if options[:locals]
+
+      partial_segments = partial_name.split("/")
+      partial_segments.last.sub!(%r!^!, "_")
+      partial_name = partial_segments.join("/")
+
+      Tilt::SerbeaTemplate.new(
+        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)
+      converter = site.find_converter_instance(Bridgetown::Converters::Markdown)
+      md_output = converter.convert(content).strip
+      @_erbout << md_output
+    end
+  end
+
+  module Converters
+    class SerbeaTemplates < Converter
+      input :serb
+
+      # Logic to do the Serbea content conversion.
+      #
+      # @param content [String] Content of the file (without front matter).
+      # @params convertible [Bridgetown::Page, Bridgetown::Document, Bridgetown::Layout]
+      #   The instantiated object which is processing the file.
+      #
+      # @return [String] The converted content.
+      def convert(content, convertible)
+        serb_view = Bridgetown::SerbeaView.new(convertible)
+
+        serb_renderer = Tilt::SerbeaTemplate.new(convertible.relative_path) { content }
+
+        if convertible.is_a?(Bridgetown::Layout)
+          serb_renderer.render(serb_view) do
+            convertible.current_document_output
+          end
+        else
+          serb_renderer.render(serb_view)
+        end
+      end
+    end
+  end
+end

data/lib/serbea/component_renderer.rb

@@ -0,0 +1,19 @@
+module Serbea
+  class ComponentRenderer
+    include Helpers
+
+    def initialize(variables = {})
+      @variables = variables
+    end
+
+    def respond_to_missing?(key, include_private = false)
+      @variables.key?(key)
+    end
+
+    def method_missing(key)
+      return @variables[key] if respond_to_missing?(key)
+      
+      super
+    end
+  end
+end

data/lib/serbea/helpers.rb

@@ -0,0 +1,25 @@
+module Serbea
+  module Helpers
+    def capture(obj=nil)
+      previous_buffer_state = @_erbout
+      @_erbout = +""
+      result = obj ? yield(obj) : yield
+      @_erbout = previous_buffer_state
+    
+      result.respond_to?(:html_safe) ? result.html_safe : result
+    end
+  
+    def pipeline(context, value)
+      Pipeline.new(context, value)
+    end
+  
+    def helper(name, &block)
+      self.class.send(:define_method, name, &block)
+    end
+  
+    def h(input)
+      Erubi.h(input)
+    end
+    alias_method :escape, :h
+  end
+end

data/lib/serbea/pipeline.rb

@@ -0,0 +1,38 @@
+module Serbea
+  class Pipeline
+    def self.output_processor=(processor)
+      @output_processor = processor
+    end
+    def self.output_processor
+      @output_processor ||= lambda do |input|
+        # no-op
+        input
+      end
+    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)
+      else
+        "Serbea warning: Filter not found: #{sym}".tap do |warning|
+          raise_on_missing_filters ? raise(warning) : puts(warning)
+        end
+      end
+
+      self
+    end
+
+    def to_s
+      self.class.output_processor.call @value.to_s
+    end
+
+    def raise_on_missing_filters; false; end
+  end
+end

data/lib/serbea/rails_support.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# copied from https://github.com/haml/haml/blob/main/lib/haml/plugin.rb
+# inspired by https://github.com/haml/haml/blob/main/lib/haml/plugin.rb
 module Serbea
 
   # This module makes Serbea work with Rails using the template handler API.
@@ -8,9 +8,7 @@ module Serbea
     def handles_encoding?; true; end
 
     def compile(template, source)
-      foo = "self.class.include(SerbeaHelpers)\n" + Tilt::SerbeaTemplate.new { source }.precompiled_template([])
-      p foo
-      foo
+      "self.class.include(Serbea::Helpers);" + Tilt::SerbeaTemplate.new { source }.precompiled_template([])
     end
 
     def self.call(template, source = nil)
@@ -27,4 +25,8 @@ module Serbea
   end
 end
 
-ActionView::Template.register_template_handler(:serb, Serbea::Plugin)
+ActionView::Template.register_template_handler(:serb, Serbea::Plugin)
+
+Serbea::Pipeline.output_processor = lambda do |input|
+  input.html_safe? ? input : ActionController::Base.helpers.strip_tags(input)
+end

data/lib/serbea/template_engine.rb

@@ -0,0 +1,142 @@
+module Serbea
+  class TemplateEngine < Erubi::CaptureEndEngine
+    FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m.freeze
+
+    def self.render_directive=(directive)
+      @render_directive = directive
+    end
+    def self.render_directive
+      @render_directive ||= "render"
+    end
+  
+    def self.has_yaml_header?(template)
+      template.lines.first&.match? %r!\A---\s*\r?\n!
+    end
+  
+    def initialize(input, properties={})
+      properties[:regexp] = /{%(\:?={1,2}|-|\#|%|\:)?(.*?)([-=])?%}([ \t]*\r?\n)?/m
+      properties[:strip_front_matter] = true unless properties.key?(:strip_front_matter)
+      super process_serbea_input(input, properties), properties
+    end
+  
+    def add_postamble(postamble)
+      src << postamble
+      src << "@_erbout.html_safe" if postamble.respond_to?(:html_safe)
+  
+      src.gsub!("__RAW_START_PRINT__", "{{")
+      src.gsub!("__RAW_END_PRINT__", "}}")
+      src.gsub!("__RAW_START_EVAL__", "{%")
+      src.gsub!("__RAW_END_EVAL__", "%}")
+    end
+  
+    def process_serbea_input(template, properties)
+      buff = ""
+  
+      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])
+        end
+      end
+  
+      # Ensure the raw "tag" will strip out all ERB-style processing
+      until string.empty?
+        text, code, string = string.partition(/{% raw %}.*?{% endraw %}/m)
+  
+        buff << text
+        if code.length > 0
+          buff << code.
+            sub("{% raw %}", "").
+            sub("{% endraw %}", "").
+            gsub("{{", "__RAW_START_PRINT__").
+            gsub("}}", "__RAW_END_PRINT__").
+            gsub("{%", "__RAW_START_EVAL__").
+            gsub("%}", "__RAW_END_EVAL__")
+        end
+      end
+
+      # Process the pipeline outputs
+      string = buff
+      buff = ""
+      until string.empty?
+        text, code, string = string.partition(/{{.*?}}/m)
+  
+        buff << text
+        if code.length > 0
+          processed_filters = false
+  
+          code = code.gsub('\|', "__PIPE_C__")
+  
+          subs = code.gsub(/\s*\|\s+(.*?)\s([^|}]*)/) do
+            args = $2
+            args = nil if args.strip == ""
+            prefix = processed_filters ? ")" : "))"
+            processed_filters = true
+            "#{prefix}.filter(:#{$1.chomp(":")}" + (args ? ", #{args}" : "")
+          end
+  
+          pipeline_suffix = processed_filters ? ") %}" : ")) %}"
+  
+          buff << subs.sub("{{", "{%= pipeline(self, (").sub("}}", pipeline_suffix).gsub("__PIPE_C__", '\|')
+        end
+      end
+
+      # Process the render directives
+      string = buff
+      buff = ""
+      until string.empty?
+        text, code, string = string.partition(/{%@.*?%}/m)
+  
+        buff << text
+        if code.length > 0
+          code.sub! /^\{%@/, ""
+          code.sub! /%}$/, ""
+          unless ["end", ""].include? code.strip
+            pieces = code.split(" ")
+            if pieces[0].start_with?(/[A-Z]/) # Ruby class name
+              pieces[0].prepend " "
+              pieces[0] << ".new("
+            else # string or something else
+              pieces[0].prepend "("
+            end
+            if pieces.last == "do"
+              pieces.last.prepend ") "
+              buff << "{%:= #{self.class.render_directive}#{pieces.join(" ")} %}"
+            else
+              pieces.last << ")"
+              buff << "{%= #{self.class.render_directive}#{pieces.join(" ")} %}"
+            end
+          else
+            buff << "{%: end %}"
+          end
+        end
+      end
+
+      buff
+    end
+  
+    private
+  
+    # Handle the {%:= and {%:== tags
+    # Carried over from the Erubi class but with changed indicators
+    def handle(indicator, code, tailch, rspace, lspace)
+      case indicator
+      when ':=', ':=='
+        rspace = nil if tailch && !tailch.empty?
+        add_text(lspace) if lspace
+        escape_capture = !((indicator == ':=') ^ @escape_capture)
+        src << "begin; (#{@bufstack} ||= []) << #{@bufvar}; #{@bufvar} = #{@bufval}; #{@bufstack}.last << #{@escapefunc if escape_capture}((" << code
+        add_text(rspace) if rspace
+      when ':'
+        rspace = nil if tailch && !tailch.empty?
+        add_text(lspace) if lspace
+        result = @yield_returns_buffer ? " #{@bufvar}; " : ""
+        src << result << code << ")).to_s; ensure; #{@bufvar} = #{@bufstack}.pop; end;"
+        add_text(rspace) if rspace
+      else
+        super
+      end
+    end
+  end # class
+end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -45,10 +45,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Gemfile
 - README.md
 - Rakefile
 - lib/serbea.rb
+- lib/serbea/bridgetown_support.rb
+- lib/serbea/component_renderer.rb
+- lib/serbea/helpers.rb
+- lib/serbea/pipeline.rb
 - lib/serbea/rails_support.rb
+- lib/serbea/template_engine.rb
 - lib/version.rb
 - serbea.gemspec
 homepage: https://github.com/bridgetownrb/serbea