serbea 0.10.3 → 0.11.2

data/lib/serbea/bridgetown_support.rb

@@ -29,7 +29,7 @@ module Bridgetown
       # Logic to do the Serbea content conversion.
       #
       # @param content [String] Content of the file (without front matter).
-      # @params convertible [Bridgetown::Page, Bridgetown::Document, Bridgetown::Layout]
+      # @param convertible [Bridgetown::Page, Bridgetown::Document, Bridgetown::Layout]
       #   The instantiated object which is processing the file.
       #
       # @return [String] The converted content.

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
@@ -38,13 +40,39 @@ module Serbea
 end
 
 Serbea::TemplateEngine.directive :form, ->(code, buffer) do
-  buffer << "{%= form_with model:"
+  model_name, space, params = code.lstrip.partition(%r(\s)m)
+  model_name.chomp!(",")
+  model_name = "#{model_name}," unless params.lstrip.start_with?("do", "{")
+
+  buffer << "{%= form_with model: "
+  buffer << model_name << " #{params}"
+  buffer << " %}"
+end
+
+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
-  buffer << "{%= 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,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.3"
+  VERSION = "0.11.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.2
 platform: ruby
 authors:
 - Bridgetown Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2021-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-description: 
+description:
 email: maintainers@bridgetownrb.com
 executables: []
 extensions: []
@@ -88,8 +88,35 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
+- docs/.gitignore
+- docs/Gemfile
+- docs/bridgetown.config.yml
+- docs/frontend/javascript/index.js
+- docs/frontend/styles/index.scss
+- docs/package.json
+- docs/plugins/builders/.keep
+- docs/plugins/site_builder.rb
+- docs/src/404.html
+- docs/src/_components/footer.liquid
+- docs/src/_components/head.liquid
+- docs/src/_components/navbar.liquid
+- docs/src/_data/site_metadata.yml
+- docs/src/_layouts/default.liquid
+- docs/src/_layouts/home.liquid
+- docs/src/_layouts/page.liquid
+- docs/src/_layouts/post.liquid
+- docs/src/favicon.ico
+- docs/src/images/.keep
+- docs/src/images/serbea-logomark.svg
+- docs/src/images/serbea-logotype.svg
+- docs/src/index.md
+- docs/start.js
+- docs/sync.js
+- docs/webpack.config.js
+- docs/yarn.lock
 - lib/serbea.rb
 - lib/serbea/bridgetown_support.rb
 - lib/serbea/helpers.rb
@@ -103,7 +130,7 @@ homepage: https://github.com/bridgetownrb/serbea
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,8 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Similar to ERB, Except Awesomer
 test_files: []