serbea 0.6.2 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34249683bdebe93a40e03acefcd4201f315144a5c87e1a83991ef9919e982153
-  data.tar.gz: e83e7b8e9dbefe2791f5f9d4301a000d5e53ddef6f4ce9cb281a4a089bbeadd2
+  metadata.gz: 002caf1e91a373f0b94de2cfca37145b80d725205296623276e0693aed768953
+  data.tar.gz: 0b27aa02debeb406fc4896fb497367accbe19250f9fb5d5f022ff256af538da5
 SHA512:
-  metadata.gz: 511a5355a79a5afac0bd81787c8d40be68915e39bb2144d1ade08aae40bbc18bcf5ade5408f9295f048d21ef20d0ba4a9f16dc997534fa8a120de6d945b7db60
-  data.tar.gz: 1fc0bde29f6e0e532be6863648807d519cf37994ceec057a367e65ed542f4f4608aa14dca9a55a47997b34fd4c35dec2d4183ce8cba94f38a2763d485859aea2
+  metadata.gz: 366027ed40d71bc2279c26c11f80dda3dae1345bc14324668f591e8e2a7eece974fc4ab9947c23bc31bbd4a68c4187c17b9761066454d79008626191778083b4
+  data.tar.gz: 537d54b0be5690ad547acf848648061056499fe530bdc434a73e55672202d3f0ae54118a4e4cb92a03aba884a8dfd14a91b447533c708633dfb67a4229d11946

data/Gemfile

@@ -4,3 +4,5 @@ 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

@@ -1,3 +1,109 @@
-👑 Serbea: Similar to ERB, Except Awesomer
+# 👑 Serbea: Similar to ERB, Except Awesomer
 
-The Ruby template language you always dreamed of is here. Le roi est mort, vive le roi!
+The Ruby template language you've always dreamed of is finally here. _Le roi est mort, vive le roi!_
+
+Serbea combines the best ideas from "brace-style" template languages such as Liquid, Nunjucks, Twig, Jinja, Mustache, etc.—and applies them to the world of ERB. You can use Serbea in Rails applications, Bridgetown static sites, or pretty much any Ruby scenario you could imagine.
+
+## Features
+
+* Real Ruby. Like, for real.
+* Filters!!! Pipeline operators!!!
+* Autoescaped variables by default within the pipeline (`{{ }}`) tags. Use the `safe`/`raw` or `escape`/`h` filters to control escaping on output.
+* Render directive `{%@ %}` as shortcut for rendering either string-named partials (`render "tmpl"`) or object instances (`render MyComponent.new`).
+* Supports every convention of ERB and builds upon it with new features (which is why it's "awesomer!").
+* Builtin frontmatter support (even in Rails!) so you can access the variables written into the top YAML within your templates.
+* 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]`.
+
+## What It Looks Like
+
+```hbs
+# example.serb
+
+{% wow = capture do %}
+  This is {{ "amazing" + "!" | upcase }}
+{% end.each_char.reduce("") do |newstr, c|
+    newstr += " #{c}"
+   end.strip %}
+
+{{ wow | prepend: "OMG! " }}
+```
+
+```hbs
+<p>
+  {%
+    helper :multiply_array do |input, multiply_by = 2|
+      input.map do |i|
+        i.to_i * multiply_by
+      end
+    end
+  %}
+
+  Multiply! {{ [1,3,6, "9"] | multiply_array: 10 }}
+</p>
+```
+
+```hbs
+{%= form classname: "checkout" do |f| %}
+  {{ f.input :first_name, required: true | errors: error_messages }}
+{% end %}
+```
+
+```hbs
+{%= render "box" do %}
+  This is **dope!**
+  {%= render "card", title: "Nifty!" do %}
+    So great.
+  {% end %}
+{% end %}
+
+# Let's simplify that using the new render directive!
+
+{%@ "box" do %}
+  This is **dope!**
+  {%@ "card", title: "Nifty!" do %}
+    So great.
+  {% end %}
+{% end %}
+```
+
+```hbs
+# Works with ViewComponent!
+
+{%= render(Theme::DropdownComponent.new(name: "banner", label: "Banners")) do |dropdown| %}
+  {% RegistryTheme::BANNERS.each do |banner| %}
+    {% dropdown.slot(:item, value: banner) do %}
+      <img src="{{ banner | parameterize: separator: "_" | prepend: "/themes/" | append: ".jpg" }}">
+      <strong>{{ banner }}</strong>
+    {% end %}
+  {% end %}
+{% end %}
+
+# Even better, use the new render directive!
+
+{%@ Theme::DropdownComponent name: "banner", label: "Banners" do |dropdown| %}
+  {% RegistryTheme::BANNERS.each do |banner| %}
+    {% dropdown.slot(:item, value: banner) do %}
+      <img src="{{ banner | parameterize: separator: "_" | prepend: "/themes/" | append: ".jpg" }}">
+      <strong>{{ banner }}</strong>
+    {% end %}
+  {% end %}
+{% end %}
+```
+
+```hbs
+# The | and |> pipeline operators are equivalent, so you can write like this if you want!
+
+{{
+  [1,2,3] |>
+  map: -> i  {
+    i * 10
+  } |>
+  filter: -> i do
+    i > 15
+  end |>
+  assign_to: :array_length
+}}
+
+Array length: {{ @array_length.length }}
+```

data/Rakefile

@@ -1,10 +1,12 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
+require "bundler"
+
+Bundler.setup
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/test_*.rb"]
+  t.test_files = FileList["test/test.rb"]
+  t.warning = false
 end
 
 task :default => :test

data/lib/serbea.rb

@@ -4,12 +4,17 @@ require "tilt/erubi"
 require "serbea/helpers"
 require "serbea/pipeline"
 require "serbea/template_engine"
-require "serbea/component_renderer"
 
 module Tilt
   class SerbeaTemplate < ErubiTemplate
     def prepare
-      @options.merge!(outvar: "@_erbout", bufval: "Serbea::Buffer.new", engine_class: Serbea::TemplateEngine)
+      @options.merge!(
+        outvar: "@_erbout",
+        bufval: "Serbea::Buffer.new", 
+        literal_prefix: "{%",
+        literal_postfix: "%}",
+        engine_class: Serbea::TemplateEngine
+      )
       super
     end
 

data/lib/serbea/bridgetown_support.rb

@@ -40,6 +40,8 @@ module Bridgetown
       #
       # @return [String] The converted content.
       def convert(content, convertible)
+        return content if convertible.data[:template_engine] != "serbea"
+
         serb_view = Bridgetown::SerbeaView.new(convertible)
 
         serb_renderer = Tilt::SerbeaTemplate.new(convertible.relative_path) { content }
@@ -53,16 +55,17 @@ module Bridgetown
         end
       end
 
-      def matches(ext, convertible = nil)
-        if convertible
-          if convertible.data[:template_engine] == "serbea" ||
-              (convertible.data[:template_engine].nil? &&
-                @config[:template_engine] == "serbea")
-            return true
-          end
+      def matches(ext, convertible)
+        if convertible.data[:template_engine] == "serbea" ||
+            (convertible.data[:template_engine].nil? &&
+              @config[:template_engine] == "serbea")
+          convertible.data[:template_engine] = "serbea"
+          return true
         end
 
-        super(ext)
+        super(ext).tap do |ext_matches|
+          convertible.data[:template_engine] = "serbea" if ext_matches
+        end
       end
 
       def output_ext(ext)
@@ -71,13 +74,3 @@ module Bridgetown
     end
   end
 end
-
-Bridgetown::Hooks.register :site, :pre_render do |site|
-  # make sure Liquid doesn't find {% %} and decide to process Serbea code!
-  site.contents.each do |convertible|
-    convertible.data.render_with_liquid = false if convertible.extname == ".serb"
-  end
-  site.layouts.values.each do |convertible|
-    convertible.data.render_with_liquid = false if convertible.ext == ".serb"
-  end
-end

data/lib/serbea/helpers.rb

@@ -22,16 +22,34 @@ module Serbea
       @_erbout = previous_buffer_state
       @output_buffer = previous_ob_state
 
-      result.html_safe
+      result&.html_safe
     end
   
     def pipeline(context, value)
       Pipeline.new(context, value)
     end
   
-    def helper(name, &block)
-      self.class.send(:define_method, name, &block)
+    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
+  
+        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)

data/lib/serbea/rails_support.rb

@@ -2,7 +2,6 @@
 
 # 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

data/lib/serbea/template_engine.rb

@@ -1,3 +1,5 @@
+require "strscan"
+
 module Serbea
   class Buffer < String
     def concat_to_s(input)
@@ -64,13 +66,11 @@ module Serbea
   
       # Ensure the raw "tag" will strip out all ERB-style processing
       until string.empty?
-        text, code, string = string.partition(/{% raw %}.*?{% endraw %}/m)
+        text, code, string = string.partition(/{% raw %}(.*?){% endraw %}/m)
   
         buff << text
         if code.length > 0
-          buff << code.
-            sub("{% raw %}", "").
-            sub("{% endraw %}", "").
+          buff << $1.
             gsub("{{", "__RAW_START_PRINT__").
             gsub("}}", "__RAW_END_PRINT__").
             gsub("{%", "__RAW_START_EVAL__").
@@ -82,27 +82,61 @@ module Serbea
       string = buff
       buff = ""
       until string.empty?
-        text, code, string = string.partition(/{{.*?}}/m)
+        text, code, string = string.partition(/{{(.*?)}}/m)
   
         buff << text
         if code.length > 0
           original_line_length = code.lines.size
-          processed_filters = false
-  
-          code = code.gsub('\|', "__PIPE_C__")
-  
-          subs = code.gsub(/\s*\|>?\s+(.*?)\s([^|}]*)/) do
-            args = $2
-            args = nil if args.strip == ""
-            prefix = processed_filters ? ")" : "))"
-            processed_filters = true
-            "#{prefix}.filter(:#{$1.chomp(":")}" + (args ? ", #{args}" : "")
+
+          s = StringScanner.new($1)
+          escaped_segment = ""
+          segments = []
+          until s.eos?
+            portion = s.scan_until(/\|>?/)
+            if portion
+              if portion.end_with?('\|')
+                # the pipe is escaped, so save that for later
+                escaped_segment += portion.sub(/\\\|$/, "|")
+              elsif escaped_segment.length > 0
+                # we already have escaped content, so finish that up
+                segments << escaped_segment + portion.sub(/\|>?$/, "")
+                escaped_segment = ""
+              else
+                # let's find out if this is actionable now
+                if s.check(/\|/)
+                  # nope, the next character is another pipe, so let's escape
+                  s.pos += 1
+                  escaped_segment += portion + "|"
+                else
+                  # finally, we have liftoff!
+                  segments << portion.sub(/\|>?$/, "")
+                end
+              end
+            else
+              # we've reached the last bit of the code
+              if escaped_segment.length > 0
+                # escape and get the rest
+                segments << escaped_segment + s.rest
+              else
+                # or just the rest will do
+                segments << s.rest
+              end
+              s.terminate
+            end
+          end
+
+          segments[0] = "pipeline(self, (#{segments[0].strip}))"
+          segments[1..-1].each_with_index do |segment, index|
+            filter, args = segment.strip.match(/([^ :]*)(.*)/m).captures
+            segments[index + 1] = ".filter(:" + filter
+            if args == ""
+              segments[index + 1] += ")"
+            else
+              segments[index + 1] += "," + args.sub(/^:/, "") + ")"
+            end
           end
-  
-          pipeline_suffix = processed_filters ? ") %}" : ")) %}"
-  
-          subs = subs.sub("{{", "{%= pipeline(self, (").sub("}}", pipeline_suffix).gsub("__PIPE_C__", '|')
 
+          subs = "{%= #{segments.join} %}"
           buff << subs
 
           (original_line_length - subs.lines.size).times do
@@ -111,24 +145,15 @@ module Serbea
         end
       end
 
-      # Process any directives
-      #
-      # TODO: allow custom directives! aka
-      # {%@something whatever %}
-      # {%@script
-      #   const foo = "really? #{really}!"
-      #   alert(foo.toLowerCase())
-      # %}
-      # {%@preact AwesomeChart data={#{ruby_data.to_json}} %}
+      # Process any render directives
       string = buff
       buff = ""
       until string.empty?
-        text, code, string = string.partition(/{%@.*?%}/m)
+        text, code, string = string.partition(/{%@(.*?)%}/m)
   
         buff << text
         if code.length > 0
-          code.sub! /^\{%@/, ""
-          code.sub! /%}$/, ""
+          code = $1
           unless ["end", ""].include? code.strip
             original_line_length = code.lines.size
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "0.6.2"
+  VERSION = "0.7.2"
 end

data/serbea.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|script|spec|features)/!) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency("rake", "~> 13.0")
   spec.add_runtime_dependency("erubi", "~> 1.9")
   spec.add_runtime_dependency("activesupport", "~> 6.0")
   spec.add_runtime_dependency("tilt", "~> 2.0")

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2020-11-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement
@@ -64,7 +78,6 @@ files:
 - Rakefile
 - lib/serbea.rb
 - lib/serbea/bridgetown_support.rb
-- lib/serbea/component_renderer.rb
 - lib/serbea/helpers.rb
 - lib/serbea/pipeline.rb
 - lib/serbea/rails_support.rb

data/lib/serbea/component_renderer.rb

@@ -1,19 +0,0 @@
-module Serbea
-  class ComponentRenderer
-    include Helpers
-
-    def initialize(variables = {})
-      @variables = variables
-    end
-
-    def respond_to_missing?(key, include_private = false)
-      @variables.key?(key)
-    end
-
-    def method_missing(key)
-      return @variables[key] if respond_to_missing?(key)
-      
-      super
-    end
-  end
-end