serbea 0.8.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72bb8c66c7a574ed69bbec8995cd8a5e28fa72caf82768264b95b602ce1db815
-  data.tar.gz: 3cece4d891ef8100bf0a5eb51570f89bdc58566914fe6f0b514d21a3a76e2f7e
+  metadata.gz: 18cedf3b548b6461f0d5c65ed89aafb009691248811fb1155fa59d4b1b28ccc9
+  data.tar.gz: 5f3300902b294bbbc720d6f4c550d43989a13906c22f93a232f8acba051acf2c
 SHA512:
-  metadata.gz: 3b8d9d2677748d88ec34dbea4abbf65fb05253c0ccd8d1f4bcde2f9781ef9056194a6c25bfe8027dc20f906055fd7db023587aedbb944025109cc443ad9e720a
-  data.tar.gz: a9622d5f4a502291fd8472eb24f2f6e479f434897eec51095eb2ba668b95fd1dd438eb400274d9811eaddfbd485e523d76ce7230245f9e8d11a284170afe3725
+  metadata.gz: 86fa6e781ab8d0b32bb4033dd33cae67167e97b43a14823f660a70d01532f36c041e6ef16861f3c8a1ff4aa0b3550651110455f110986588bd81e8aa3e84833f
+  data.tar.gz: ab43538b4eba0769421eb9138581b18a4d6c846dab8898c4bb037c1deba1c5e4dd6ee86a77fd99c9fdff597b41ff6330500d3cf190e93fc8e628ba10a1e253e7

data/Gemfile

@@ -4,5 +4,3 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in serbea.gemspec
 gemspec
-
-gem "erubi", github: "jaredcwhite/erubi", branch: "config-literal-prefix"

data/README.md

@@ -13,7 +13,7 @@ Serbea combines the best ideas from "brace-style" template languages such as Liq
 * Supports every convention of ERB and builds upon it with new features (which is why it's "awesomer!").
 * Builtin frontmatter support so you can access the variables written into the top YAML within your templates. In any Rails view, including layouts, you'll have access to the `@frontmatter` ivar which is a merged `HashWithDotAccess::Hash` with data from any part of the view tree (partials, pages, layout).
 * The filters accessible within Serbea templates are either helpers (where the variable gets passed as the first argument) or instance methods of the variable itself, so you can build extremely expressive pipelines that take advantage of the code you already know and love. (For example, in Rails you could write `{{ "My Link" | link_to: route_path }}`).
-* The `Serbea::Pipeline.exec` method lets you pass a pipeline template in, along with an optional input value or included helpers module, and you'll get the output as a object of any type (not converted to a string like in traditional templates). For example: `Serbea::Pipeline.exec("[1,2,3] |> map: ->(i) { i * 10 }")` will return `[10, 20, 30]`.
+* The `Serbea::Pipeline.exec` method lets you pass a pipeline template in, along with an optional input value or included helpers module, and you'll get the output as a object of any type (not converted to a string like in traditional templates). For example: `Serbea::Pipeline.exec("arr |> map: ->(i) { i * 10 }", arr: [1,2,3])` will return `[10, 20, 30]`.
 
 ## What It Looks Like
 

data/lib/serbea.rb

@@ -10,7 +10,7 @@ module Tilt
     def prepare
       @options.merge!(
         outvar: "@_erbout",
-        bufval: "Serbea::Buffer.new", 
+        bufval: "Serbea::OutputBuffer.new", 
         literal_prefix: "{%",
         literal_postfix: "%}",
         engine_class: Serbea::TemplateEngine
@@ -32,9 +32,7 @@ if defined?(Rails::Railtie)
       ActiveSupport.on_load(:action_view) do
         require "serbea/rails_support"
 
-        app.config.after_initialize do
-          Serbea::Plugin.initialize_frontmatter
-        end
+        ActionController::Base.include Serbea::Rails::FrontmatterControllerActions
       end
     end
   end

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,51 +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::Buffer.new
-
-      # For compatibility with ActionView, not used by Bridgetown normally
-      previous_ob_state = @output_buffer
-      @output_buffer = Serbea::Buffer.new
-
-      result = instance_exec(obj, &block)
-      if @output_buffer != ""
-        # use Rails' ActionView buffer if present
-        result = @output_buffer
-      end
+      @_erbout = Serbea::OutputBuffer.new
+      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::Buffer.new
-  
-        # For compatibility with ActionView, not used by Bridgetown normally
-        previous_ob_state = @output_buffer
-        @output_buffer = Serbea::Buffer.new
-  
+        @_erbout = 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/pipeline.rb

@@ -1,12 +1,13 @@
 require "active_support/core_ext/string/output_safety"
+require "active_support/core_ext/object/blank"
 
 module Serbea
   class Pipeline
-    def self.exec(template, input: (no_input_passed = true; nil), include_helpers: nil)
+    def self.exec(template, locals = {}, include_helpers: nil, **kwargs)
       anon = Class.new do
         include Serbea::Helpers
 
-        attr_accessor :input, :output
+        attr_accessor :output
       end
 
       if include_helpers
@@ -14,12 +15,11 @@ module Serbea
       end
 
       pipeline_obj = anon.new
-      pipeline_obj.input = input unless no_input_passed
 
       full_template = "{{ #{template} | assign_to: :output }}"
 
       tmpl = Tilt::SerbeaTemplate.new { full_template }
-      tmpl.render(pipeline_obj)
+      tmpl.render(pipeline_obj, locals.presence || kwargs)
 
       pipeline_obj.output
     end
@@ -54,8 +54,9 @@ module Serbea
       @value_methods_denylist ||= Set.new
     end
 
-    def initialize(context, value)
-      @context = context
+    def initialize(binding, value)
+      @binding = binding
+      @context = binding.receiver
       @value = value
     end
 
@@ -83,6 +84,19 @@ module Serbea
         else
           @value = @context.send(name, @value, *args)
         end
+      elsif @binding.local_variables.include?(name)
+        var = @binding.local_variable_get(name)
+        if var.respond_to?(:call)
+          unless kwargs.empty?
+            @value = var.call(@value, *args, **kwargs)
+          else
+            @value = var.call(@value, *args)
+          end
+        else
+          "Serbea warning: Filter #{name} does not respond to call".tap do |warning|
+            self.class.raise_on_missing_filters ? raise(warning) : STDERR.puts(warning)
+          end
+        end
       else
         "Serbea warning: Filter not found: #{name}".tap do |warning|
           self.class.raise_on_missing_filters ? raise(warning) : STDERR.puts(warning)

data/lib/serbea/rails_support.rb

@@ -1,34 +1,51 @@
 # frozen_string_literal: true
 
-# inspired by https://github.com/haml/haml/blob/main/lib/haml/plugin.rb
 module Serbea
-  # This module makes Serbea work with Rails using the template handler API.
-  class Plugin
-    def handles_encoding?; true; end
-
-    def compile(template, source)
-      "self.class.include(Serbea::Helpers);" + Tilt::SerbeaTemplate.new { source }.precompiled_template([])
+  module Rails
+    module FrontmatterHelpers
+      def set_page_frontmatter=(data)
+        @frontmatter ||= HashWithDotAccess::Hash.new
+        @frontmatter.update(data)
+      end
     end
 
-    def self.call(template, source = nil)
-      source ||= template.source
+    module FrontmatterControllerActions
+      extend ActiveSupport::Concern
+
+      included do
+        Serbea::TemplateEngine.front_matter_preamble = "self.set_page_frontmatter = local_frontmatter = YAML.load"
+    
+        before_action { @frontmatter ||= HashWithDotAccess::Hash.new }
 
-      new.compile(template, source)
+        helper Serbea::Rails::FrontmatterHelpers
+      end
     end
 
-    def self.initialize_frontmatter
-      if defined?(ApplicationHelper)
-        Serbea::TemplateEngine.front_matter_preamble = "self.set_page_frontmatter = local_frontmatter = YAML.load"
-      
-        ApplicationHelper.define_method(:set_page_frontmatter=) do |data|
-          @frontmatter ||= HashWithDotAccess::Hash.new
-          @frontmatter.update(data)
-        end
-      
-        ApplicationController.before_action { @frontmatter ||= HashWithDotAccess::Hash.new }
+    class TemplateHandler
+      def handles_encoding?; true; end
+
+      def compile(template, source)
+        "self.class.include(Serbea::Helpers);" + Tilt::SerbeaTemplate.new { source }.precompiled_template([])
+      end
+
+      def self.call(template, source = nil)
+        source ||= template.source
+
+        new.compile(template, source)
       end
     end
   end
 end
 
-ActionView::Template.register_template_handler(:serb, Serbea::Plugin)
+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

@@ -1,7 +1,7 @@
 require "strscan"
 
 module Serbea
-  class Buffer < String
+  class OutputBuffer < String
     def concat_to_s(input)
       concat input.to_s
     end
@@ -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)
@@ -125,7 +156,7 @@ module Serbea
             end
           end
 
-          segments[0] = "pipeline(self, (#{segments[0].strip}))"
+          segments[0] = "pipeline(binding, (#{segments[0].strip}))"
           segments[1..-1].each_with_index do |segment, index|
             filter, args = segment.strip.match(/([^ :]*)(.*)/m).captures
             segments[index + 1] = ".filter(:" + filter
@@ -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.8.0"
+  VERSION = "0.10.2"
 end

data/serbea.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency("activesupport", "~> 6.0")
-  spec.add_runtime_dependency("erubi", "~> 1.9")
+  spec.add_runtime_dependency("erubi", ">= 1.10")
   spec.add_runtime_dependency("hash_with_dot_access", "~> 1.1")
   spec.add_runtime_dependency("tilt", "~> 2.0")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: hash_with_dot_access
   requirement: !ruby/object:Gem::Requirement