berns 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cfbcf19e2450ffa23b283ad0bb24717cde0bf6191bd8db538bf2cbb3936f205
-  data.tar.gz: f2639cdade9f1a3ee7b55a66666d23ce9843f5988567d3a630fc7403476825e8
+  metadata.gz: eb2de0ba05a5e234fa5cef7edf3a222411222d0743c0e69492c1e1d5e53541bb
+  data.tar.gz: f62f2273f787a46aa18784b668f1110adb80a1bbb8c33226c9c58e585d5acec7
 SHA512:
-  metadata.gz: f36bec9a6378fa664cc254a24700c63fc4a44720cfd5aad2b7e882dc6aa6ffa523031ec165270cb50d792c85dbcf0e1c0942d3ad22b64b4ec47ee29572170c03
-  data.tar.gz: a520befecc81e00cb2ae6c4a8b973965ee10cbdca0adb003d49ee6464478302ac97391651412f3945a5e6d92f76eaa2f5b51c5d5ef186a3c463c5b6928de564c
+  metadata.gz: 7d8fb46aeb4dc948729b36bbb6a794625618c34742ee2b18024d1cde99bda330b21bd7fb890bd241010a9b60e956c81fe401c3036464a90d28fb4ebca11ba621
+  data.tar.gz: c7c430ae90da5be3b93f15d1ac6ab2bba300b89558cfb131af276b2af9d2e82b118fa0691000402bf7e982e13406defc275c786e2e512304041f660afe0b53cc

data/README.org

@@ -125,12 +125,30 @@ end
 Within the block provided to =Berns::Builder.new= every standard element method,
 void element method, =#element=, and =#void= are available as methods and each
 time you use one of those methods the result is appended to an internal buffer.
-In addition, the =#text= method can be used to append a plain text string to the
-buffer and that text will be HTML escaped, so it's good for untrusted content.
+In addition, the =#text= method appends HTML escaped text to the buffer and
+=#raw= appends text to the buffer without modification.
 
-Once initialized, rendering the template to a string can be done with the
-=#call= method and any arguments, positional or keyword, will be passed through
-as-is to the block provided to =#new=.
+The block provided to =Berns::Builder.new= can take both positional and keyword
+arguments.
+
+#+begin_src ruby
+template = Berns::Builder.new do |content, title:|
+  h1 { title }
+  p(class: 'paragraph') { content }
+end
+
+template.call('Some text.', title: 'The title') # =>
+# <h1>
+#   The title
+# </h1>
+# <p>
+#   Some text.
+# </p>
+#+end_src
+
+Once initialized, the =#call= method will render the template to a string. Any
+arguments, positional or keyword, are passed through as-is to the block provided
+to =#new=.
 
 #+begin_src ruby
 string = template.call # =>
@@ -168,23 +186,6 @@ end # =>
 # </p>
 #+end_src
 
-Lastly, the block provided to =Berns::Builder.new= can take both positional and
-keyword arguments.
-
-#+begin_src ruby
-template = Berns::Builder.new do |content, title:|
-  h1 { title }
-  p(class: 'paragraph') { content }
-end
-
-template.call('Some text.', title: 'The title') # =>
-# <h1>
-#   The title
-# </h1>
-# <p>
-#   Some text.
-# </p>
-#+end_src
 
 *** Standard and void elements
 

data/lib/berns/builder.rb

@@ -5,22 +5,28 @@ module Berns
   # An HTML builder DSL using Berns' HTML methods.
   class Builder
     def initialize(&block)
+      raise(ArgumentError, 'Berns::Builder initialized without a block argument', caller) unless block
+
       @block = block
-      @buffer = +''
     end
 
     # @return [String]
-    def call(*args, **opts)
-      instance_exec(*args, **opts, &@block)
-      to_s
-    end
+    def call(*args, **kwargs)
+      @buffer = +''
+      content = instance_exec(*args, **kwargs, &@block)
 
-    # @return [String]
-    def to_s
-      @buffer.freeze
+      # This is a special case where the buffer hasn't been appended to but the
+      # block returned a string.
+      if @buffer.empty? && content.is_a?(String)
+        Berns.escape_html(content).freeze
+      else
+        @buffer.freeze
+      end
     end
+    alias to_s call
+    alias to_str call
 
-    # Append text to the buffer.
+    # Append HTML escaped text to the buffer.
     #
     # @param string [String]
     # @return [String]
@@ -28,31 +34,39 @@ module Berns
       @buffer << Berns.escape_html(string.to_s)
     end
 
+    # Append raw text to the buffer.
+    #
+    # @param string [String]
+    # @return [String]
+    def raw(string)
+      @buffer << string.to_s
+    end
+
     # Append an arbitrary standard element to the buffer.
     #
     # @return [String]
-    def element(*args, **opts, &block)
-      content = Builder.new.instance_exec(*args, **opts, &block) if block
-      @buffer << Berns.element(*args, **opts) { content }
+    def element(elm, *args, **kwargs, &block)
+      content = Builder.new(&block).call if block
+      @buffer << Berns.element(elm, *args, **kwargs) { content }
     end
 
     # Append an arbitrary void element to the buffer.
     #
     # @return [String]
-    def void(*args, **opts)
-      @buffer << Berns.void(*args, **opts)
+    def void(...)
+      @buffer << Berns.void(...)
     end
 
     Berns::STANDARD.each do |meth|
-      define_method(meth) do |*args, **opts, &block|
-        content = Builder.new.instance_exec(*args, **opts, &block) if block
-        @buffer << Berns.send(meth, *args, **opts) { content }
+      define_method(meth) do |*args, **kwargs, &block|
+        content = Builder.new(&block).call if block
+        @buffer << Berns.send(meth, *args, **kwargs) { content }
       end
     end
 
     Berns::VOID.each do |meth|
-      define_method(meth) do |*args, **opts|
-        @buffer << Berns.send(meth, *args, **opts)
+      define_method(meth) do |*args, **kwargs|
+        @buffer << Berns.send(meth, *args, **kwargs)
       end
     end
   end

data/lib/berns/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Berns
-  VERSION = '4.0.0'
+  VERSION = '4.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berns
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Taylor Beck
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies: []
 description: A utility library for generating HTML strings.
 email:
@@ -26,9 +26,6 @@ files:
 - ext/berns/extconf.rb
 - ext/berns/hescape.c
 - ext/berns/hescape.h
-- ext/berns/sds.c
-- ext/berns/sds.h
-- ext/berns/sdsalloc.h
 - lib/berns.rb
 - lib/berns/berns.bundle
 - lib/berns/builder.rb