serbea 0.4.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2403adca3b4cbb2e82ad7bb758df50c04257d45f1b303a1a9b03a15453d66953
-  data.tar.gz: 1ccfc568da131dd13d9cc627b05fb13577854d4edfbf2ea0a3353b69b097a5f2
+  metadata.gz: edd4caa76947988e564a917a9457014cfe194d53ec8b0edf1aae5479ea8b9cf4
+  data.tar.gz: e93987c1eb193535cf47fc7dc57b412407d5ad6a832bc8ffd5966bc7bbc5c322
 SHA512:
-  metadata.gz: 22633765cd7a2ce0020cdd27708e2bc349cc9ccd168d1d15f7f135926d4a0333098fa05ebd34b7f77811371620f01860d7876935e0be47160e03714f8efc01d6
-  data.tar.gz: 9c5a097fe9fdb43738e3d61f3d61d973d15bff640ad3ae85cc9fb670e61c4a31154f67522bf9651f65ec6a1e67bf755d1b50ea6bc2508b42dfe9dd6f24c627d3
+  metadata.gz: e59b9abc02d1f2a272bef3adf5239fb385bde5924ad4c3a2bb2f8efe6ec11caab6cf2a4b2901fc9ea59821e119b8ea7fb9dc700a4e22773b535633284da89afe
+  data.tar.gz: 1bddcc5a82fa3cd62ceead72600ec621e6fcad08d2e3a6c58041cca972505917c19f89b2861514599feef93f9449c0eec78b7fbb69de97135fd2aefebcc4bab8

data/lib/serbea.rb

@@ -1,6 +1,5 @@
 require "tilt"
 require "tilt/erubi"
-require "erubi/capture_end"
 
 require "serbea/helpers"
 require "serbea/pipeline"
@@ -10,7 +9,7 @@ require "serbea/component_renderer"
 module Tilt
   class SerbeaTemplate < ErubiTemplate
     def prepare
-      @options.merge!(outvar: "@_erbout", engine_class: Serbea::TemplateEngine)
+      @options.merge!(outvar: "@_erbout", bufval: "Serbea::Buffer.new", engine_class: Serbea::TemplateEngine)
       super
     end
 

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 = {})
+    def partial(partial_name, options = {}, &block)
       options.merge!(options[:locals]) if options[:locals]
+      options[:content] = capture(&block) if block
 
       partial_segments = partial_name.split("/")
       partial_segments.last.sub!(%r!^!, "_")
@@ -13,22 +16,19 @@ 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(input = nil, &block)
+      content = Bridgetown::Utils.reindent_for_markdown(
+        block.nil? ? input.to_s : capture(&block)
+      )
       converter = site.find_converter_instance(Bridgetown::Converters::Markdown)
-      md_output = converter.convert(content).strip
-      @_erbout << md_output
+      converter.convert(content).strip
     end
   end
 
   module Converters
     class SerbeaTemplates < Converter
+      priority :highest
       input :serb
 
       # Logic to do the Serbea content conversion.
@@ -51,6 +51,22 @@ module Bridgetown
           serb_renderer.render(serb_view)
         end
       end
+
+      def matches(ext, convertible = nil)
+        if convertible
+          if convertible.data[:template_engine] == "serbea" ||
+              (convertible.data[:template_engine].nil? &&
+                @config[:template_engine] == "serbea")
+            return true
+          end
+        end
+
+        super(ext)
+      end
+
+      def output_ext(ext)
+        ext == ".serb" ? ".html" : ext
+      end
     end
   end
 end

data/lib/serbea/helpers.rb

@@ -1,16 +1,28 @@
+require "active_support/core_ext/string/output_safety"
+
 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)
+    def capture(obj = nil, &block)
       previous_buffer_state = @_erbout
-      @_erbout = +""
-      result = obj ? yield(obj) : yield
+      @_erbout = Serbea::Buffer.new
+
+      # For compatibility with ActionView, not used by Bridgetown normally
+      previous_ob_state = @output_buffer
+      @output_buffer = Serbea::Buffer.new
+
+      result = instance_exec(obj, &block)
+      if @output_buffer != ""
+        # use Rails' ActionView buffer if present
+        result = @output_buffer
+      end
       @_erbout = previous_buffer_state
-    
-      result.respond_to?(:html_safe) ? result.html_safe : result
+      @output_buffer = previous_ob_state
+
+      result.html_safe
     end
   
     def pipeline(context, value)
@@ -22,10 +34,15 @@ module Serbea
     end
   
     def h(input)
-      Erubi.h(input)
+      ERB::Util.h(input.to_s)
     end
     alias_method :escape, :h
 
+    def safe(input)
+      input.to_s.html_safe
+    end
+    alias_method :raw, :safe
+
     def prepend(old_string, new_string)
       "#{new_string}#{old_string}"
     end

data/lib/serbea/pipeline.rb

@@ -1,3 +1,5 @@
+require "active_support/core_ext/string/output_safety"
+
 module Serbea
   class Pipeline
     def self.exec(template, input: (no_input_passed = true; nil), include_helpers: nil)
@@ -27,11 +29,24 @@ module Serbea
     end
     def self.output_processor
       @output_processor ||= lambda do |input|
-        # no-op
-        input
+        (!input.html_safe? && self.autoescape) ? ERB::Util.h(input) : input.html_safe
       end
     end
 
+    def self.autoescape=(config_boolean)
+      @autoescape = config_boolean
+    end
+    def self.autoescape
+      @autoescape.nil? ? true : @autoescape
+    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
@@ -70,7 +85,7 @@ module Serbea
         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
 
@@ -78,9 +93,7 @@ module Serbea
     end
 
     def to_s
-      self.class.output_processor.call @value.to_s
+      self.class.output_processor.call(@value.is_a?(String) ? @value : @value.to_s)
     end
-
-    def raise_on_missing_filters; false; end
   end
 end

data/lib/serbea/rails_support.rb

@@ -16,17 +16,7 @@ module Serbea
 
       new.compile(template, source)
     end
-
-#    def cache_fragment(block, name = {}, options = nil)
-#      @view.fragment_for(block, name, options) do
-#        eval("_hamlout.buffer", block.binding)
-#      end
-#    end
   end
 end
 
 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/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

@@ -1,5 +1,15 @@
 module Serbea
-  class TemplateEngine < Erubi::CaptureEndEngine
+  class Buffer < String
+    def concat_to_s(input)
+      concat input.to_s
+    end
+
+    alias_method :safe_append=, :concat_to_s
+    alias_method :append=, :concat_to_s
+    alias_method :safe_expr_append=, :concat_to_s
+  end
+
+  class TemplateEngine < Erubi::Engine
     FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m.freeze
 
     def self.render_directive=(directive)
@@ -21,14 +31,14 @@ module Serbea
     end
   
     def initialize(input, properties={})
-      properties[:regexp] = /{%(\:?={1,2}|-|\#|%|\:)?(.*?)([-=])?%}([ \t]*\r?\n)?/m
+      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 << "#{@bufvar}.html_safe"
   
       src.gsub!("__RAW_START_PRINT__", "{{")
       src.gsub!("__RAW_END_PRINT__", "}}")
@@ -91,7 +101,7 @@ module Serbea
   
           pipeline_suffix = processed_filters ? ") %}" : ")) %}"
   
-          subs = subs.sub("{{", "{%= pipeline(self, (").sub("}}", pipeline_suffix).gsub("__PIPE_C__", '\|')
+          subs = subs.sub("{{", "{%= pipeline(self, (").sub("}}", pipeline_suffix).gsub("__PIPE_C__", '|')
 
           buff << subs
 
@@ -140,7 +150,7 @@ module Serbea
             end
 
             if includes_block
-              buff << "{%:= #{self.class.render_directive}#{pieces.join(" ")} %}"
+              buff << "{%= #{self.class.render_directive}#{pieces.join(" ")} %}"
             else
               pieces.last << ")"
               buff << "{%= #{self.class.render_directive}#{pieces.join(" ")} %}"
@@ -149,7 +159,7 @@ module Serbea
               buff << "\n{% %}" # preserve original directive line length
             end
           else
-            buff << "{%: end %}"
+            buff << "{% end %}"
           end
         end
       end
@@ -158,26 +168,27 @@ module Serbea
     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
+
+    def add_code(code)
+      @src << code
+      @src << ";#{@bufvar};" if code.strip.split(".").first == "end"
+      @src << ';' unless code[Erubi::RANGE_LAST] == "\n"
+    end
+
+    # pulled from Rails' ActionView
+    BLOCK_EXPR = %r!\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z!.freeze
+
+    def add_expression(indicator, code)
+      if BLOCK_EXPR.match?(code)
+        src << "#{@bufvar}.append= " << code
       else
         super
       end
     end
+
+    # Don't allow == to output escaped strings, as that's the opposite of Rails
+    def add_expression_result_escaped(code)
+      add_expression_result(code)
+    end
   end # class
 end

data/lib/version.rb

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

data/serbea.gemspec

@@ -17,5 +17,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency("erubi", "~> 1.9")
+  spec.add_runtime_dependency("activesupport", "~> 6.0")
   spec.add_runtime_dependency("tilt", "~> 2.0")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -54,6 +68,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