serbea 0.10.0 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7961cb287d077b528dd0367681aee6087a5efc9b3838670e7f8c7072b09c9ad
-  data.tar.gz: ca1a4701f70e49e28c67dfb407018dfd56eaf42391a0aa4230e1a15dc1b57f86
+  metadata.gz: c0aa3994d0779dc0bada9d35a6125dafd4501070f780bd353384a1f72bd1be54
+  data.tar.gz: 455373e852ca5f680adf28d7efe3198e34b97f84d1fb93d58ab32eac84bde61b
 SHA512:
-  metadata.gz: 84036346ec67f5789c380bd0772f1da6644223e1b82f6a5974de93c9c3b82c98b34c5a6f27c8c69dbb598b230a24b33a0ae16a9bee3a284b494eec81cec9f0ff
-  data.tar.gz: 78da2c4e5f3828153b9933fd0173475aaacdf3bb42e4a56a4ec69f12b6991488559a7cfb57f8f1a64008173dd280b7c3c47de4daebc4cda537ed3638c7af3cbc
+  metadata.gz: 9b37ea92fed79e50c3e67ee81e06dfd9daf8c969ee6b6901312b8a74295d73f7a82e7b1fa34555feccd9c877e4e6322cb27e22acd3a3fab30a0b145318bbf221
+  data.tar.gz: 37a8dbcf0799f9cdf352bbe633d959ea6f5ec1ba082ba918d223794b0e00b5a2377f5d960f57d7d47dc5db756cb5a12636062359bfe3922878593cbf286b6299

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "hash_with_dot_access"
+
 module Serbea
   module Rails
     module FrontmatterHelpers
@@ -42,9 +44,17 @@ Serbea::TemplateEngine.directive :form, ->(code, buffer) do
   buffer << code
   buffer << " %}"
 end
+
 Serbea::TemplateEngine.directive :_, ->(code, buffer) do
-  buffer << "{%= content_tag "
-  buffer << code
+  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
 

data/lib/serbea/template_engine.rb

@@ -17,11 +17,10 @@ module Serbea
     def self.directive(new_directive, directive_resolution)
       directives[new_directive.to_s] = directive_resolution
     end
+
     def self.directives
       @directives ||= {
         "@" => ->(code, buffer) do
-          original_line_length = code.lines.size
-
           pieces = code.split(" ")
           if pieces[0].start_with?(/[A-Z]/) # Ruby class name
             pieces[0].prepend " "
@@ -45,9 +44,6 @@ module Serbea
             pieces.last << ")"
             buffer << "{%= render#{pieces.join(" ")} %}"
           end
-          (original_line_length - 1).times do
-            buffer << "\n{% %}" # preserve original directive line length
-          end
         end
       }
     end
@@ -55,30 +51,21 @@ module Serbea
     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 = ""
   
@@ -190,7 +177,11 @@ module Serbea
             directive = $1 ? self.class.directives[$1] : self.class.directives["@"]
 
             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
             else
               raise "Handler for Serbea template directive `#{$1}' not found"
             end
@@ -202,7 +193,7 @@ module Serbea
 
       buff
     end
-  
+
     private
 
     def add_code(code)
@@ -226,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.10.0"
+  VERSION = "0.10.5"
 end

metadata

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