serbea 0.4.3 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd530996d44bf1ab692ebef54630f131669dc773b084a0181713c7d929a1eb3b
-  data.tar.gz: a65ff4d61f7c400177f83ac2f83986fcb26b30eaf85d386ec9d4497aa4ec9a48
+  metadata.gz: 34249683bdebe93a40e03acefcd4201f315144a5c87e1a83991ef9919e982153
+  data.tar.gz: e83e7b8e9dbefe2791f5f9d4301a000d5e53ddef6f4ce9cb281a4a089bbeadd2
 SHA512:
-  metadata.gz: 780f93e3d44d80e8ddfc0cd9cff2482027ed003a26d35e78f7b78748996162e1a5df1c7097b69f4526528efa1c3c04950c11cf963cf1c88b7dca72cfc9f4daf9
-  data.tar.gz: b18cec53f65e1ae0d91333885657a9b2adec3ebcd61920a8a3c12363d7b95d6168898ed899bebbf48cf7f58990138e8d8c0843c7a4d385b9c41f6ad5861d5a1e
+  metadata.gz: 511a5355a79a5afac0bd81787c8d40be68915e39bb2144d1ade08aae40bbc18bcf5ade5408f9295f048d21ef20d0ba4a9f16dc997534fa8a120de6d945b7db60
+  data.tar.gz: 1fc0bde29f6e0e532be6863648807d519cf37994ceec057a367e65ed542f4f4608aa14dca9a55a47997b34fd4c35dec2d4183ce8cba94f38a2763d485859aea2

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,12 +1,13 @@
 require "serbea/rouge_lexer"
+require "bridgetown-core"
 
 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] = yield if block_given?
+      options[:content] = capture(&block) if block
 
       partial_segments = partial_name.split("/")
       partial_segments.last.sub!(%r!^!, "_")
@@ -17,11 +18,12 @@ module Bridgetown
       ).render(self, options)
     end
 
-    def markdownify(&block)
-      content = Bridgetown::Utils.reindent_for_markdown(capture(&block))
+    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
 
@@ -51,11 +53,13 @@ module Bridgetown
         end
       end
 
-      def matches(ext, convertible)
-        if convertible.data[:template_engine] == "serbea" ||
-            (convertible.data[:template_engine].nil? &&
-              @config[:template_engine] == "serbea")
-          return true
+      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)
@@ -67,3 +71,13 @@ module Bridgetown
     end
   end
 end
+
+Bridgetown::Hooks.register :site, :pre_render do |site|
+  # make sure Liquid doesn't find {% %} and decide to process Serbea code!
+  site.contents.each do |convertible|
+    convertible.data.render_with_liquid = false if convertible.extname == ".serb"
+  end
+  site.layouts.values.each do |convertible|
+    convertible.data.render_with_liquid = false if convertible.ext == ".serb"
+  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,11 +34,15 @@ module Serbea
     end
   
     def h(input)
-      result = Erubi.h(input)
-      result.respond_to?(:html_safe) ? result.html_safe : result
+      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,17 @@ 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
@@ -85,7 +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
   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/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__", "}}")
@@ -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.3"
+  VERSION = "0.6.2"
 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.3
+  version: 0.6.2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2020-10-29 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