serbea 0.4.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22177afa63ae7dccc14171dbfaac1d77b237b75b97f4779eeefc4c7fdf44dd5b
-  data.tar.gz: fa0591db51fd9d2f78541d48a717369d7d9b5b5e22be38f5c126972fbba8aa57
+  metadata.gz: 843083ae2fadbebd662b112d2a5c1710e3724f34857b1c6a2a54245e7abc52b9
+  data.tar.gz: 104fdeb290cfd5a94cfa26beed5aa31c55771c8cd23f7501e42af6ec27803de9
 SHA512:
-  metadata.gz: 1c5c3e615db4ea48225efc20a0f345a05aadd14f2ba9d38fe7406298fcfa371a77d3e8517d08d05dfe34f42cf7025818309b210ab6e7b0d14daeca0ccabe438c
-  data.tar.gz: 699e31b8fc7fd9bd32437170c5cf5c48b625f905c1a2b7312b4476ec8b3a89c76cbe1d7056bffdf1000099cbd67abd2862717a58177ee9725eb65090bc983ce1
+  metadata.gz: 8cfc623c9246ca644fdd64b5cfe306a66918ae250c066b7500d34e53b9ef2b2b61504cc1707831b40eb44fd3a27ab24dd3556bc9a5cb943ae4725a5269c4670a
+  data.tar.gz: 9fc958b5e73f32d6094d9ef811934deb7a0994b74159a7ed3b86ac73137064a2dd727015d7211051dc51901c9c9e444eaa1ea4afbee64fe9e1b526bd43d62da5

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,15 @@ 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")
+            # make sure Liquid doesn't find {% %} and decide to process Serbea code!
+            convertible.data["render_with_liquid"] = false
+            return true
+          end
         end
 
         super(ext)

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)
-      h.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.2"
+  VERSION = "0.6.1"
 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.2
+  version: 0.6.1
 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