frontman-ssg 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d044410bb8578a36c2876cf887a9e807053864fd28045c1bc92e4ecce769f49b
-  data.tar.gz: 0e9400d87ef35ab925d80cc05b4ba9b122ab52d5c280ddb6a39ffb9b9c76c48e
+  metadata.gz: cee9b32f2e8bdbabfe4df7f7990312e7339d20c75b69a17b352f7b9a61f9b2b8
+  data.tar.gz: 73732a4d6061cf78465def47985914b210bf5f040f373e5b036ea5175868da52
 SHA512:
-  metadata.gz: c54550757e0312a3f7e9051a37bb173f98c120f76b75b99b7634383ba687e5977dfd0bf8c82ecacfecf28e998742aa9c3459172086c734fba3287b1868176d4e
-  data.tar.gz: b89cf82a4807cd97ce05e2a569afe1b6a92266d2aca5c942c68ba5360ac8ecf1419400526fd3955e9575670f48d3b5b57dd177117daf5fe1da8703faf36cb1ee
+  metadata.gz: b69ec17dee440b638399678de811876a351df133da02e4589b1df7117544b9822be6e1d8068798b19bc05b7911f85960aeaaeba4d2b51d8fc97bf4f0127daa49
+  data.tar.gz: dbce1d0412b30a5aaf46b01e01a833c8703d0b77b14f24e665a2c3bf058d9cf3861d23b7ea9a58603beb63c933e59e8afffb98378c0b9cc8ea1f22e949d4f477

data/.rubocop.yml

@@ -29,6 +29,8 @@ Metrics/MethodLength:
     - 'lib/frontman/builder/builder.rb'
     - 'lib/frontman/commands/**/*'
     - 'lib/frontman/resource.rb'
+    - 'lib/frontman/context.rb'
+    - 'lib/frontman/helpers/render_helper.rb'
 
 Metrics/AbcSize:
   Exclude:

data/CHANGELOG.md

@@ -5,7 +5,11 @@ We document all notable changes to the project in the file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [semantic versioning](http://semver.org/).
 
 # Release Notes
-## [Unreleased](https://github.com/algolia/frontman/compare/0.1.0...master)
+## [Unreleased](https://github.com/algolia/frontman/compare/0.1.1...master)
+
+## [0.1.1](https://github.com/algolia/frontman/tree/0.1.1) - 2021-01-05
+### Fixed
+* Empty buffer bug when using a nested `content_for` block in HAML templates ([`#43`](https://github.com/algolia/frontman/pull/43))
 
 ## [0.1.0](https://github.com/algolia/frontman/tree/0.1.0) - 2021-01-05
 

data/lib/frontman/context.rb

@@ -4,6 +4,7 @@
 require 'frontman/app'
 require 'frontman/concerns/forward_calls_to_app'
 require 'frontman/config'
+require 'securerandom'
 require 'sorbet-runtime'
 
 module Frontman
@@ -11,6 +12,8 @@ module Frontman
     extend T::Sig
     include Frontman::ForwardCallsToApp
 
+    attr_reader :buffer_hash
+
     sig { params(layout: String, block: T.proc.void).returns(String) }
     def wrap_layout(layout, &block)
       layout_dir = Frontman::Config.get(:layout_dir, fallback: 'views/layouts')
@@ -113,6 +116,9 @@ module Frontman
 
     sig { params(content: T.untyped).returns(String) }
     def get_content_buffer(content)
+      @parent_hash = @buffer_hash || nil
+      @buffer_hash = SecureRandom.hex
+
       # Haml is not designed to do handle wrap_layout properly so we need to
       # hack the buffer of haml that is set inside the context by haml
       save_buffer
@@ -130,6 +136,8 @@ module Frontman
       # Restore the buffer so the rendering of the file can continue
       restore_buffer
 
+      @buffer_hash = @parent_hash
+
       content
     end
   end

data/lib/frontman/helpers/render_helper.rb

@@ -22,7 +22,17 @@ module RenderHelper
     r = Frontman::Resource.from_path(
       File.join(partial_dir, template), nil, false
     )
-    r.render(nil, data)
+
+    # While rendering, if there's no current page we set it to to the resource
+    # This allows using `content_for` directives in partials
+    current_page = Frontman::App.instance.current_page
+    Frontman::App.instance.current_page = r if current_page.nil?
+
+    content = r.render(nil, data)
+
+    Frontman::App.instance.current_page = current_page
+
+    content
   end
 
   sig do

data/lib/frontman/renderers/erb_renderer.rb

@@ -6,6 +6,11 @@ require 'frontman/renderers/renderer'
 
 module Frontman
   class ErbRenderer < Frontman::Renderer
+    def initialize
+      @buffer = {}
+      super
+    end
+
     def compile(layout)
       Erubis::Eruby.new(layout, bufvar: '@_erbout')
     end
@@ -23,13 +28,15 @@ module Frontman
 
       return unless buffer
 
-      @buffer = buffer
+      @buffer[context.buffer_hash] = buffer
       context.instance_variable_set(:@_erbout, '')
     end
 
     def restore_buffer(context)
-      context.instance_variable_set(:@_erbout, @buffer) if @buffer
-      @buffer = nil
+      return unless @buffer[context.buffer_hash]
+
+      context.instance_variable_set(:@_erbout, @buffer[context.buffer_hash])
+      @buffer.delete(context.buffer_hash)
     end
 
     def load_buffer(context)

data/lib/frontman/renderers/haml_renderer.rb

@@ -8,6 +8,7 @@ module Frontman
   class HamlRenderer < Renderer
     def initialize
       Haml::Options.defaults[:format] = :html5
+      @buffer = {}
       super
     end
 
@@ -26,12 +27,11 @@ module Frontman
     end
 
     def save_buffer(context)
-      @buffer = nil
       haml_locals = context.instance_variable_get(:@_haml_locals)
 
       return unless haml_locals
 
-      @buffer = haml_locals[:_hamlout].buffer
+      @buffer[context.buffer_hash] = haml_locals[:_hamlout].buffer
       # empty the buffer so we can capture everything from the new render
       haml_locals[:_hamlout].buffer = ''
       context.instance_variable_set(:@_haml_locals, haml_locals)
@@ -42,9 +42,9 @@ module Frontman
 
       return unless haml_locals
 
-      haml_locals[:_hamlout].buffer = @buffer
+      haml_locals[:_hamlout].buffer = @buffer[context.buffer_hash]
       context.instance_variable_set(:@_haml_locals, haml_locals)
-      @buffer = nil
+      @buffer.delete(context.buffer_hash)
     end
   end
 end

data/lib/frontman/version.rb

@@ -2,5 +2,5 @@
 
 module Frontman
   # Current Version
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/frontman/bootstrapper_spec.rb

@@ -20,7 +20,7 @@ describe Frontman::Bootstrapper do
     it 'should find all resources in a given folder' do
       resources = Frontman::Bootstrapper.resources_from_dir('spec/frontman/mocks')
 
-      expect(resources.size).to eq 16 # Number of non-YAML files in this folder
+      expect(resources.size).to eq 17 # Number of non-YAML files in this folder
     end
   end
 end

data/spec/frontman/helpers/render_helper_spec.rb

@@ -38,6 +38,13 @@ describe RenderHelper do
       expect(subject.partial('paragraph.haml', text: 'Testing'))
         .to eq("<p>\nThe passed text: Testing\n</p>\n")
     end
+
+    it 'should handle content_for in partials' do
+      Frontman::Config.set(:partial_dir, 'spec/frontman/mocks/partials')
+
+      expect(subject.partial('content_for.haml'))
+        .to eq("<ul>\n<li>\nNested `content_for` block\n\n</li>\n\n<li>\nThis is a test!\n</li>\n</ul>\n")
+    end
   end
 
   context 'render page' do

data/spec/frontman/mocks/partials/content_for.haml

@@ -0,0 +1,10 @@
+- content_for :test_data do
+  - content_for :item_text do
+    Nested `content_for` block
+  %li
+    = yield_content :item_text
+
+%ul
+  = yield_content :test_data
+  %li
+    This is a test!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frontman-ssg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Devin Beeuwkes
@@ -529,6 +529,7 @@ files:
 - spec/frontman/mocks/layouts/raw_without_body.haml
 - spec/frontman/mocks/nested/data.yml
 - spec/frontman/mocks/nested/more_data.yml
+- spec/frontman/mocks/partials/content_for.haml
 - spec/frontman/mocks/partials/paragraph.haml
 - spec/frontman/mocks/snippet/html_file.html
 - spec/frontman/mocks/snippet/html_file.yml