serbea 0.11.5 → 0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1b5a4aac5a9230d11e68a3b58c75363f644fef35b9328ac35c7d9cc4d9995d9
-  data.tar.gz: 49c2eaf825d3547cc13815071dce83b35bb7c7f31db72f3523e5c96bb13eacc9
+  metadata.gz: a06fc22c4a790174a7d774b39eb7332bef7c78c328ed4582a77dc1fd2d79a968
+  data.tar.gz: e94abb8855965947238b8c3c32ce953d2ad13208425fba92c02ac97f76f70b81
 SHA512:
-  metadata.gz: 984de9e83b3daba448203b3a7cc834bbe4bd5d6262311293a6e507b9416be73ea442a33127fef9706dbda07f19a63c6b45625fcdd4532eef9753dd0118885898
-  data.tar.gz: 324f24744d74d315c7e950d230dd5cfd901b70648e236e75b11c60c504695c79ee9c9ba637d56544d3c8c4820ac700259cbd7c57ab2cd0c94641a35086df042f
+  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/helpers.rb

@@ -13,7 +13,7 @@ module Serbea
       result = @_erbout.presence || result
       @_erbout = previous_buffer_state
 
-      safe(result)
+      Serbea::OutputBuffer === result ? result.html_safe : result
     end
 
     def pipeline(context, value)
@@ -22,16 +22,19 @@ module Serbea
 
     def helper(name, &helper_block)
       self.class.define_method(name) do |*args, **kwargs, &block|
-        previous_buffer_state = @_erbout
-        @_erbout = Serbea::OutputBuffer.new
-        result = helper_block.call(*args, **kwargs, &block)
-        @_erbout = previous_buffer_state
-
-        result.is_a?(String) ? result.html_safe : result
+        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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serbea
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: '0.12'
 platform: ruby
 authors:
 - Bridgetown Team