serbea 0.9.0 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 352c314f5f5a9b6df23933e1b379af39617c82c9b583f4c0703480a5f71df498
-  data.tar.gz: 364a353dba20ce3af4bcc071247477ec6dfa6f95c15bb94c88677520344a3cf1
+  metadata.gz: 212a077a67f1553dc07fc8dd1b989647e19803953fba03976ec9ef95e08a2321
+  data.tar.gz: feda65d983102a217bd8426a8404712f882f23d2c6c3fa4be1981518fb20aae4
 SHA512:
-  metadata.gz: 6bcdd89d15300e24e051f68de0d87899bec18c9f304162e3b667afc7c8a420ab5978e5eb91ab40f8dfd4201375a7fab769d9419a19562196e3ba93b85692e262
-  data.tar.gz: 8ba0cddf305d712c3e970adb06979e27f426aae797b2d99702f844e6e5c9248d34a96e35238134314da783e5fbd3de93b56cf7d5701ecc909690719393aa05fc
+  metadata.gz: 94edc63cbeb21ce38db5ab1270c2b06f5479d5fd529ea12ccca68d69d6abe7fece8dc83cbfeeeba8e724b4fa7c165f831b23d6059bccd9aef022bc6d6545f16d
+  data.tar.gz: b10964bcc171ff4903ae5b98dea1db73b0f21f95a1bbb02027681a84e0834c7838ad3901e00a740586844fc4bf5be78d5d00fc5710e0c310f2bacf44026956db

data/lib/serbea/bridgetown_support.rb

@@ -2,8 +2,10 @@ require "serbea/rouge_lexer"
 require "bridgetown-core"
 
 module Bridgetown
-  class SerbeaView < RubyTemplateView
+  class SerbeaView < ERBView
+    alias_method :_erb_capture, :capture
     include Serbea::Helpers
+    alias_method :capture, :_erb_capture
 
     def partial(partial_name, options = {}, &block)
       options.merge!(options[:locals]) if options[:locals]
@@ -17,14 +19,6 @@ module Bridgetown
         site.in_source_dir(site.config[:partials_dir], "#{partial_name}.serb")
       ).render(self, options)
     end
-
-    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)
-      converter.convert(content).strip
-    end
   end
 
   module Converters

data/lib/serbea/helpers.rb

@@ -6,52 +6,31 @@ module Serbea
       Serbea::Pipeline.deny_value_method %i(escape h prepend append assign_to)
     end
 
-    def capture(obj = nil, &block)
+    def capture(*args)
       previous_buffer_state = @_erbout
       @_erbout = Serbea::OutputBuffer.new
-
-      # For compatibility with ActionView, not used by Bridgetown normally
-      previous_ob_state = @output_buffer
-      @output_buffer = Serbea::OutputBuffer.new
-
-
-      result = instance_exec(obj, &block)
-      if @output_buffer != ""
-        # use Rails' ActionView buffer if present
-        result = @output_buffer
-      end
+      result = yield(*args)
       @_erbout = previous_buffer_state
-      @output_buffer = previous_ob_state
 
       result&.html_safe
     end
-  
+
     def pipeline(context, value)
       Pipeline.new(context, value)
     end
-  
+
     def helper(name, &helper_block)
       self.class.define_method(name) do |*args, &block|
         previous_buffer_state = @_erbout
         @_erbout = Serbea::OutputBuffer.new
-  
-        # For compatibility with ActionView, not used by Bridgetown normally
-        previous_ob_state = @output_buffer
-        @output_buffer = Serbea::OutputBuffer.new
-  
         result = helper_block.call(*args, &block)
-        if @output_buffer != ""
-          # use Rails' ActionView buffer if present
-          result = @output_buffer
-        end
         @_erbout = previous_buffer_state
-        @output_buffer = previous_ob_state
-  
+
         result.is_a?(String) ? result.html_safe : result
       end
     end
     alias_method :macro, :helper
-  
+
     def h(input)
       ERB::Util.h(input.to_s)
     end

data/lib/serbea/rails_support.rb

@@ -37,4 +37,23 @@ module Serbea
   end
 end
 
+Serbea::TemplateEngine.directive :form, ->(code, buffer) do
+  buffer << "{%= form_with model:"
+  buffer << code
+  buffer << " %}"
+end
+
+Serbea::TemplateEngine.directive :_, ->(code, buffer) do
+  tag_name, space, params = code.lstrip.partition(%r(\s)m)
+
+  if tag_name.end_with?(":")
+    tag_name.chomp!(":")
+    tag_name = ":#{tag_name}" unless tag_name.start_with?(":")
+  end
+
+  buffer << "{%= tag.tag_string "
+  buffer << tag_name << ", " << params
+  buffer << " %}"
+end
+
 ActionView::Template.register_template_handler(:serb, Serbea::Rails::TemplateHandler)

data/lib/serbea/template_engine.rb

@@ -14,40 +14,58 @@ module Serbea
   class TemplateEngine < Erubi::Engine
     FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m.freeze
 
-    def self.render_directive=(directive)
-      @render_directive = directive
+    def self.directive(new_directive, directive_resolution)
+      directives[new_directive.to_s] = directive_resolution
     end
-    def self.render_directive
-      @render_directive ||= "render"
+
+    def self.directives
+      @directives ||= {
+        "@" => ->(code, buffer) do
+          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
+
+          includes_block = false
+          pieces.reverse.each do |piece|
+            if piece == "do" && (pieces.last == "do" || pieces.last.end_with?("|"))
+              piece.prepend(") ")
+              includes_block = true
+              break
+            end
+          end
+
+          if includes_block
+            buffer << "{%= render#{pieces.join(" ")} %}"
+          else
+            pieces.last << ")"
+            buffer << "{%= render#{pieces.join(" ")} %}"
+          end
+        end
+      }
     end
 
     def self.front_matter_preamble=(varname)
       @front_matter_preamble = varname
     end
+
     def self.front_matter_preamble
       @front_matter_preamble ||= "frontmatter = YAML.load"
     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 << "#{@bufvar}.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 = ""
   
@@ -149,39 +167,23 @@ module Serbea
       string = buff
       buff = ""
       until string.empty?
-        text, code, string = string.partition(/{%@(.*?)%}/m)
-  
+        text, code, string = string.partition(/{%@([a-z_]+)?(.*?)%}/m)
+
         buff << text
         if code.length > 0
-          code = $1
+          directive = $1
+          code = $2
           unless ["end", ""].include? code.strip
-            original_line_length = code.lines.size
-
-            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
+            directive = $1 ? self.class.directives[$1] : self.class.directives["@"]
 
-            includes_block = false
-            pieces.reverse.each do |piece|
-              if piece == "do" && (pieces.last == "do" || pieces.last.end_with?("|"))
-                piece.prepend(") ")
-                includes_block = true
-                break
+            if directive
+              additional_length = "#{buff}#{code}".lines.size
+              directive.(code, buff)
+              (additional_length - buff.lines.size).times do
+                buff << "{% %}\n" # preserve original directive line length
               end
-            end
-
-            if includes_block
-              buff << "{%= #{self.class.render_directive}#{pieces.join(" ")} %}"
             else
-              pieces.last << ")"
-              buff << "{%= #{self.class.render_directive}#{pieces.join(" ")} %}"
-            end
-            (original_line_length - 1).times do
-              buff << "\n{% %}" # preserve original directive line length
+              raise "Handler for Serbea template directive `#{$1}' not found"
             end
           else
             buff << "{% end %}"
@@ -191,7 +193,7 @@ module Serbea
 
       buff
     end
-  
+
     private
 
     def add_code(code)
@@ -215,5 +217,15 @@ module Serbea
     def add_expression_result_escaped(code)
       add_expression_result(code)
     end
-  end # class
+
+    def add_postamble(postamble)
+      src << postamble
+      src << "#{@bufvar}.html_safe"
+  
+      src.gsub!("__RAW_START_PRINT__", "{{")
+      src.gsub!("__RAW_END_PRINT__", "}}")
+      src.gsub!("__RAW_START_EVAL__", "{%")
+      src.gsub!("__RAW_END_EVAL__", "%}")
+    end
+  end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "0.9.0"
+  VERSION = "0.10.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.4
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2020-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport