Refactor buffer renderer (#103)

src/blueprint/html.cr

@@ -6,8 +6,6 @@ require "./safe_object"
 require "./safe_value"
 
 module Blueprint::HTML
-  include Blueprint::HTML::BlockRenderer
-  include Blueprint::HTML::BufferAppender
   include Blueprint::HTML::ElementRegistrar
   include Blueprint::HTML::ElementRenderer
   include Blueprint::HTML::OutputHelpers
@@ -61,10 +59,10 @@ module Blueprint::HTML
 
     {% if @type.has_method?(:around_render) %}
       around_render do
-        blueprint { __capture_content__ { yield } }
+        blueprint { BufferRenderer.render(to: @buffer) { yield } }
       end
     {% else %}
-      blueprint { __capture_content__ { yield } }
+      blueprint { BufferRenderer.render(to: @buffer) { yield } }
     {% end %}
 
     {% if @type.has_method?(:after_render) %}

src/blueprint/html/buffer_renderer.cr

@@ -0,0 +1,38 @@
+module Blueprint::HTML::BufferRenderer
+  extend self
+
+  def render(content : String, to buffer : String::Builder)
+    ::HTML.escape(content, buffer)
+  end
+
+  def render(content : Proc, to buffer : String::Builder)
+    BlockRenderer.render(content, to: buffer)
+  end
+
+  def render(content : SafeObject, to buffer : String::Builder)
+    content.to_s(buffer)
+  end
+
+  def render(content : Nil, to buffer : String::Builder)
+  end
+
+  def render(content, to buffer : String::Builder)
+    ::HTML.escape(content.to_s, buffer)
+  end
+
+  def render(to buffer : String::Builder, &) : Nil
+    buffer_size_before_block_evaluation = buffer.bytesize
+    content = yield
+    return if buffer_size_before_block_evaluation != buffer.bytesize # return if something was written to buffer
+
+    render(content, to: buffer)
+  end
+
+  def render(block : Proc, to buffer : String::Builder) : Nil
+    buffer_size_before_block_evaluation = buffer.bytesize
+    content = block.call
+    return if buffer_size_before_block_evaluation != buffer.bytesize # return if something was written to buffer
+
+    render(content, to: buffer)
+  end
+end

src/blueprint/html/element_registrar.cr

@@ -6,7 +6,7 @@ module Blueprint::HTML::ElementRegistrar
       @buffer << "<{{tag.id}}"
       AttributesRenderer.render(@buffer, attributes)
       @buffer << ">"
-      __capture_content__ { yield }
+      BufferRenderer.render(to: @buffer) { yield }
       @buffer << "</{{tag.id}}>"
     end
 

src/blueprint/html/element_renderer.cr

@@ -4,7 +4,7 @@ module Blueprint::HTML::ElementRenderer
     @buffer << tag_name
     AttributesRenderer.render(@buffer, attributes)
     @buffer << ">"
-    __capture_content__ { yield }
+    BufferRenderer.render(to: @buffer) { yield }
     @buffer << "</"
     @buffer << tag_name
     @buffer << ">"

src/blueprint/html/output_helpers.cr

@@ -1,6 +1,6 @@
 module Blueprint::HTML::OutputHelpers
   private def plain(content : String) : Nil
-    __append_to_buffer__(content)
+    BufferRenderer.render(content, to: @buffer)
   end
 
   private def doctype : Nil
@@ -9,7 +9,7 @@ module Blueprint::HTML::OutputHelpers
 
   private def comment(content) : Nil
     @buffer << "<!--"
-    __append_to_buffer__(content)
+    BufferRenderer.render(content, to: @buffer)
     @buffer << "-->"
   end
 
@@ -18,6 +18,6 @@ module Blueprint::HTML::OutputHelpers
   end
 
   private def raw(content : SafeObject) : Nil
-    __append_to_buffer__(content)
+    BufferRenderer.render(content, to: @buffer)
   end
 end

src/blueprint/html/renderer.cr

@@ -20,6 +20,6 @@ module Blueprint::HTML::Renderer
   end
 
   private def render(renderable) : Nil
-    __append_to_buffer__(renderable)
+    BufferRenderer.render(renderable, to: @buffer)
   end
 end