serbea 0.11.1 → 0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39a8f3905355c95bbf6cbfd93de278f06d12c0c653df17c4b008e80f4b076d80
-  data.tar.gz: cc1c29fb0d3e4555177f0c34c22e2e1b21a525c0e7b28253699ca8f1b4175c4d
+  metadata.gz: a06fc22c4a790174a7d774b39eb7332bef7c78c328ed4582a77dc1fd2d79a968
+  data.tar.gz: e94abb8855965947238b8c3c32ce953d2ad13208425fba92c02ac97f76f70b81
 SHA512:
-  metadata.gz: d63c852a2d6dee0ed422086d5fa4fec79bfc7807c6448b33d98d5ab8f8c344388fdc192f611eada6c8fabf22af53dd2f9642805591bbe448be3d505492d9fcc7
-  data.tar.gz: e8b31b1791ec606bc712ed7663c5bb590631990738a941460d2f27c6aa5bfa5b1328561c7f346341a684fc45907a369e89c31c55f25ceed790a8115396ef9740
+  metadata.gz: fb47116dbb72fd826be07dd8e6294b0f32536434b7012d4541c14929788cbc4ac635567a7579b254002645e8db9dc492b806ba6d040ff76043faa4e851833ea9
+  data.tar.gz: 436c2f51d6da3d047016de80dce01496fa4648d10a427512ddc4a5652bce63bc126e03d4902298f1b2f5b500910d04e80387cad213611d00fb46c4ddc0de0de3

data/docs/src/index.md

@@ -48,7 +48,19 @@ layout: home
 * Built-in frontmatter support. Now you can access the variables written into a top YAML block 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).
 
   For example, you could put `<title>{{ @frontmatter.title }}</title>` in your head partial, and then each page could define `title` frontmatter individually. You can even use Ruby string interpolation within the YAML so titles and other metadata can come from `t` language helpers.
+* Define macros/helpers which can be imported and used within Serbea templates.
 
+  ```serb
+  <!-- _macros.serb -->
+  {% macro :greet do |name:| %}
+    {{ name }}, my old friend!
+  {% end %}
+
+  <!-- tmpl.serb -->
+  {% import "macros" %}
+
+  Hello {{ greet(name: "darkness") }}
+  ```
 
 {% endraw %}
 

data/lib/serbea/bridgetown_support.rb

@@ -3,9 +3,7 @@ require "bridgetown-core"
 
 module Bridgetown
   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]

data/lib/serbea/helpers.rb

@@ -10,9 +10,10 @@ module Serbea
       previous_buffer_state = @_erbout
       @_erbout = Serbea::OutputBuffer.new
       result = yield(*args)
+      result = @_erbout.presence || result
       @_erbout = previous_buffer_state
 
-      result&.html_safe
+      Serbea::OutputBuffer === result ? result.html_safe : result
     end
 
     def pipeline(context, value)
@@ -20,17 +21,20 @@ module Serbea
     end
 
     def helper(name, &helper_block)
-      self.class.define_method(name) do |*args, &block|
-        previous_buffer_state = @_erbout
-        @_erbout = Serbea::OutputBuffer.new
-        result = helper_block.call(*args, &block)
-        @_erbout = previous_buffer_state
-
-        result.is_a?(String) ? result.html_safe : result
+      self.class.define_method(name) do |*args, **kwargs, &block|
+        capture { helper_block.call(*args, **kwargs, &block) }
       end
     end
     alias_method :macro, :helper
 
+    def import(*args, **kwargs, &block)
+      helper_names = %i(partial render)
+      available_helper = helper_names.find { |meth| respond_to?(meth) }
+      raise "Serbea error: no `render' helper is available in #{self.class}" unless available_helper
+      available_helper == :partial ? partial(*args, **kwargs, &block) : render(*args, **kwargs, &block)
+      nil
+    end
+
     def h(input)
       ERB::Util.h(input.to_s)
     end

data/lib/serbea/pipeline.rb

@@ -3,6 +3,11 @@ require "active_support/core_ext/object/blank"
 
 module Serbea
   class Pipeline
+    # Exec the pipes!
+    # @param template [String]
+    # @param locals [Hash]
+    # @param include_helpers [Module]
+    # @param kwargs [Hash]
     def self.exec(template, locals = {}, include_helpers: nil, **kwargs)
       anon = Class.new do
         include Serbea::Helpers
@@ -24,9 +29,12 @@ module Serbea
       pipeline_obj.output
     end
 
+    # @param processor [Proc]
     def self.output_processor=(processor)
       @output_processor = processor
     end
+
+    # @return [Proc]
     def self.output_processor
       @output_processor ||= lambda do |input|
         (!input.html_safe? && self.autoescape) ? ERB::Util.h(input) : input.html_safe

data/lib/serbea/rails_support.rb

@@ -42,9 +42,10 @@ end
 Serbea::TemplateEngine.directive :form, ->(code, buffer) do
   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 << model_name << " #{params}"
   buffer << " %}"
 end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Serbea
-  VERSION = "0.11.1"
+  VERSION = "0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: '0.12'
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2021-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport