serbea 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 439fb102e78e2208de075b03b058b77d1cc909a6fe9414c341a48370fd3988e2
-  data.tar.gz: d0ff78ac67f00a59fa1047f7f05795cee88051ff0fdb9c179601984601fecae4
+  metadata.gz: 352c314f5f5a9b6df23933e1b379af39617c82c9b583f4c0703480a5f71df498
+  data.tar.gz: 364a353dba20ce3af4bcc071247477ec6dfa6f95c15bb94c88677520344a3cf1
 SHA512:
-  metadata.gz: 6ca9922186315539c54e3a44fad5da81b3075425bb991dd8521e4777f5d46e515d4a65f9fd7fd54c52b870df21c8155b32beb3a24c84080c95367b1143526ff5
-  data.tar.gz: ccb34f9d8129fe5c4e34f96d7cbce118f5dbf8538151ae554cca9c35f63e223a0d14b4456e1463c8a79661de6109831ca3058aaee184f2925af974acfbc5f6b1
+  metadata.gz: 6bcdd89d15300e24e051f68de0d87899bec18c9f304162e3b667afc7c8a420ab5978e5eb91ab40f8dfd4201375a7fab769d9419a19562196e3ba93b85692e262
+  data.tar.gz: 8ba0cddf305d712c3e970adb06979e27f426aae797b2d99702f844e6e5c9248d34a96e35238134314da783e5fbd3de93b56cf7d5701ecc909690719393aa05fc

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

data/lib/serbea/helpers.rb

@@ -8,11 +8,12 @@ module Serbea
 
     def capture(obj = nil, &block)
       previous_buffer_state = @_erbout
-      @_erbout = Serbea::Buffer.new
+      @_erbout = Serbea::OutputBuffer.new
 
       # For compatibility with ActionView, not used by Bridgetown normally
       previous_ob_state = @output_buffer
-      @output_buffer = Serbea::Buffer.new
+      @output_buffer = Serbea::OutputBuffer.new
+
 
       result = instance_exec(obj, &block)
       if @output_buffer != ""
@@ -32,11 +33,11 @@ module Serbea
     def helper(name, &helper_block)
       self.class.define_method(name) do |*args, &block|
         previous_buffer_state = @_erbout
-        @_erbout = Serbea::Buffer.new
+        @_erbout = Serbea::OutputBuffer.new
   
         # For compatibility with ActionView, not used by Bridgetown normally
         previous_ob_state = @output_buffer
-        @output_buffer = Serbea::Buffer.new
+        @output_buffer = Serbea::OutputBuffer.new
   
         result = helper_block.call(*args, &block)
         if @output_buffer != ""

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/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
@@ -125,7 +125,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

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 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.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-14 00:00:00.000000000 Z
+date: 2020-11-19 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