serbea 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 352c314f5f5a9b6df23933e1b379af39617c82c9b583f4c0703480a5f71df498
-  data.tar.gz: 364a353dba20ce3af4bcc071247477ec6dfa6f95c15bb94c88677520344a3cf1
+  metadata.gz: f7961cb287d077b528dd0367681aee6087a5efc9b3838670e7f8c7072b09c9ad
+  data.tar.gz: ca1a4701f70e49e28c67dfb407018dfd56eaf42391a0aa4230e1a15dc1b57f86
 SHA512:
-  metadata.gz: 6bcdd89d15300e24e051f68de0d87899bec18c9f304162e3b667afc7c8a420ab5978e5eb91ab40f8dfd4201375a7fab769d9419a19562196e3ba93b85692e262
-  data.tar.gz: 8ba0cddf305d712c3e970adb06979e27f426aae797b2d99702f844e6e5c9248d34a96e35238134314da783e5fbd3de93b56cf7d5701ecc909690719393aa05fc
+  metadata.gz: 84036346ec67f5789c380bd0772f1da6644223e1b82f6a5974de93c9c3b82c98b34c5a6f27c8c69dbb598b230a24b33a0ae16a9bee3a284b494eec81cec9f0ff
+  data.tar.gz: 78da2c4e5f3828153b9933fd0173475aaacdf3bb42e4a56a4ec69f12b6991488559a7cfb57f8f1a64008173dd280b7c3c47de4daebc4cda537ed3638c7af3cbc

data/lib/serbea/rails_support.rb

@@ -37,4 +37,15 @@ 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
+  buffer << "{%= content_tag "
+  buffer << code
+  buffer << " %}"
+end
+
 ActionView::Template.register_template_handler(:serb, Serbea::Rails::TemplateHandler)

data/lib/serbea/template_engine.rb

@@ -14,11 +14,42 @@ 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
+          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
+
+          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
+          (original_line_length - 1).times do
+            buffer << "\n{% %}" # preserve original directive line length
+          end
+        end
+      }
     end
 
     def self.front_matter_preamble=(varname)
@@ -149,39 +180,19 @@ 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
-              end
-            end
-
-            if includes_block
-              buff << "{%= #{self.class.render_directive}#{pieces.join(" ")} %}"
+            if directive
+              directive.(code, buff)
             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 %}"

data/lib/version.rb

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

metadata

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