serbea 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edb5cf139c2f14b2f524192f87b45fcfcc931efa0eb27b25e19d6f86ec98f3b2
-  data.tar.gz: 40b5e1177175daad6b356371d58a608e838d214a90b08415f63f4930dd28f4e3
+  metadata.gz: ce17e2b60c2abf63a033d8d358686d4df115e87a4c149ba3c625a403863e129c
+  data.tar.gz: a3901a5286afc92e84b2ecc29b2622e80a592f0d0d9de46a7aa58d836e150c65
 SHA512:
-  metadata.gz: 074cb4b928fe2e79ab5786169f88be23dc01e17f5545d43b6bacdbe619491dc9a656a16fb019ea86e3f7c3feee1ce45f7f3f916063aaed2b61c6ecf21af00066
-  data.tar.gz: 14f6024cec0af16f22de2549f6c0bf25ede4a75b458ab64b9970dc71088923643cdc4be0414b952dd2c12cc814d2b34aa17b6cc9cda97cfe71d72b8b15efa97a
+  metadata.gz: 52aadba5419583064f26be67a99805ea66af5798b3bd3a34604967c91fdee3f2e6010ba692b6f70a2de798fa5d899bb7760fd3a76975e415932e5922c7f21c6a
+  data.tar.gz: 4bc3fcfa08bb021ceb68ae675f4f47d4fd72a2e1cdd71fe68d8b4e435493238c49f205f10ccc52e0980d160a226433af19b70d39d18bc3d73b30c9afb8be0698

data/lib/serbea.rb

@@ -10,7 +10,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

@@ -4,9 +4,9 @@ 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 +17,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
 

data/lib/serbea/helpers.rb

@@ -4,12 +4,22 @@ module Serbea
       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
-    
+      @output_buffer = previous_ob_state
+
       result.respond_to?(:html_safe) ? result.html_safe : result
     end
   

data/lib/serbea/rails_support.rb

@@ -27,6 +27,8 @@ 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)
+if defined?(ActionController::Base)
+  Serbea::Pipeline.output_processor = lambda do |input|
+    input.html_safe? ? input : ActionController::Base.helpers.strip_tags(input)
+  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" if postamble.respond_to?(: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.4"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi