serbea 0.10.1 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b926b4c2862564b92db8e06de1c440827b96165cd63397e2c757cfcd2c077b0
-  data.tar.gz: f6a31873aa5eecf6bc23ea2878b81b5b4872f30cd89debed7a313d4e98992e47
+  metadata.gz: b350bfc24a2bccc41291ffec1e28d213271685fd2ca27413fd5eb07d7d120a46
+  data.tar.gz: bae64f05c4a70a7b53656b6ec8aa88b0693c755e1c51e5fffff2c619b72d7fa9
 SHA512:
-  metadata.gz: 4bf447cc67c26721d64a3cbc37b12519894a54e7e8ce03f0c801b4a0e273e29309179a5ac753c728cc8f9ccfd787a1b58ce554022905f57f1d14feb295b1cd26
-  data.tar.gz: 1ba95acd1ba3905b3e41a109c1044e052d59a0a71c0b4f231c59c9f65d45af73c568f95486b30a2b13aa5a6eace5a250122b230db682bf77a8dd9f36afef9871
+  metadata.gz: f4dd4fa55bbb9031a55e19da029a73e0f5bbb6b67735aef4cf24be5e009f9f2b186edcd6724b43151de6ccdd6547425befd146b22734d7dda39bf3836ebe035a
+  data.tar.gz: f1acbc71a92e58d1c229cbf7de524e7ac933f2547b48b551c81a44e552ae0298de8cffba6a6c77ff7c0c6507d3fc99b3999df80631832aaed9c224ccb0d2c495

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/rails_support.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "hash_with_dot_access"
+
 module Serbea
   module Rails
     module FrontmatterHelpers
@@ -42,10 +44,32 @@ Serbea::TemplateEngine.directive :form, ->(code, buffer) do
   buffer << code
   buffer << " %}"
 end
-Serbea::TemplateEngine.directive :_, ->(code, buffer) do
-  buffer << "{%= content_tag "
+
+Serbea::TemplateEngine.directive :frame, ->(code, buffer) do
+  buffer << "{%= turbo_frame_tag "
   buffer << code
   buffer << " %}"
 end
 
+%i(append prepend update replace remove).each do |action|
+  Serbea::TemplateEngine.directive action, ->(code, buffer) do
+    buffer << "{%= turbo_stream.#{action} "
+    buffer << code
+    buffer << " %}"
+  end
+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

@@ -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,11 @@ module Serbea
             pieces.last << ")"
             buffer << "{%= render#{pieces.join(" ")} %}"
           end
-          (original_line_length - 1).times do
-            buffer << "\n{% %}" # preserve original directive line length
-          end
+        end,
+        "`" => ->(code, buffer) do
+          buffer << "{%= %`"
+          buffer << code.gsub(%r("([^\\]?)\#{(.*?)}"), "\"\\1\#{h(\\2)}\"")
+          buffer << ".strip %}"
         end
       }
     end
@@ -55,30 +56,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 = ""
   
@@ -180,7 +172,7 @@ module Serbea
       string = buff
       buff = ""
       until string.empty?
-        text, code, string = string.partition(/{%@([a-z_]+)?(.*?)%}/m)
+        text, code, string = string.partition(/{%@([a-z_`]+)?(.*?)%}/m)
 
         buff << text
         if code.length > 0
@@ -190,7 +182,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 +198,7 @@ module Serbea
 
       buff
     end
-  
+
     private
 
     def add_code(code)
@@ -226,5 +222,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.1"
+  VERSION = "0.11"
 end

metadata

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