berns 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 844af14032659e36711f21b482d7e07ba1627cdca43045ec1fb30869171ee21a
-  data.tar.gz: 828da05830d2d5c1a516fe51bcc2a5c5c9c346359f9eedde4b3ee5bd60a6bf25
+  metadata.gz: bcded7fea247763fc7b27807c2c945943e0f08895b117ae086e4041bf1b08371
+  data.tar.gz: 965518819feb3eef689f19b7cc5470a973198b891e00f9d7f8ac7fd5b4620119
 SHA512:
-  metadata.gz: 93e0a7fc35666b0395d338cafc5a7aa9bb8aa3d1467158cdb1fc325640d275b3cfa0033921edfd62f0d6a52cbf8728842b45c31ea4d19552d18ee6440c135b59
-  data.tar.gz: 6bc2ea5f4749e09d8bbc4dacd2fac2981ad66dfdc649cb14f78a50ed21af5705d057228764edf6bdd32e4eb4dc8e848f6a42ffbab157ec9bf78f05c94899be6c
+  metadata.gz: f023bfcde5d5b272477d2dd7e7c2d6de430c4ec544d6a10da75f7ff72b5980349d282710796a2ac5c4bede5e72df5456dd733828c7869f3f1231b26314f450e4
+  data.tar.gz: d606bdeed6b199fa467c4f80236d9dab40ef0db13e3105397bbe411caffa71c00274ea5902e1ce3f4764ab915cada0a9574d133905f07e28a348e2e28f9b7cfa

data/README.org

@@ -1,6 +1,7 @@
 * Berns
 
 [[https://badge.fury.io/rb/berns][https://badge.fury.io/rb/berns.svg]]
+[[https://github.com/evanleck/berns/actions/workflows/main.yml][https://github.com/evanleck/berns/actions/workflows/main.yml/badge.svg]]
 
 A utility library for generating HTML strings.
 
@@ -121,11 +122,11 @@ template = Berns::Builder.new do
 end
 #+end_src
 
-Within the block provided to =Berns::Builder.new= every standard and void
-element is available as a method 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.
+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.
 
 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

data/ext/berns/berns.c

@@ -228,7 +228,7 @@ static char * hash_value_to_attribute(const char *attr, const size_t attrlen, VA
 
   Check_Type(value, T_HASH);
 
-  if (rb_hash_size(value) == 1) {
+  if (RHASH_SIZE(value) == 0) {
     return strdup("");
   }
 
@@ -439,7 +439,7 @@ static VALUE external_to_attribute(RB_UNUSED_VAR(VALUE self), VALUE attr, VALUE
 static VALUE external_to_attributes(RB_UNUSED_VAR(VALUE self), VALUE attributes) {
   Check_Type(attributes, T_HASH);
 
-  if (rb_hash_size(attributes) == 1) {
+  if (RHASH_SIZE(attributes) == 0) {
     return rb_utf8_str_new_cstr("");
   }
 
@@ -453,37 +453,32 @@ static VALUE external_to_attributes(RB_UNUSED_VAR(VALUE self), VALUE attributes)
 }
 
 static char * void_element(const char *tag, size_t tlen, VALUE attributes) {
-  /* T_IMEMO is what we get if an optional argument was not passed. */
-  if (TYPE(attributes) == T_IMEMO) {
-    size_t total = tag_olen + tlen + tag_clen + 1;
-    char *string = malloc(total);
-    char *ptr;
-    char *end = string + total;
+  const char *empty = "";
+  char *attrs = hash_value_to_attribute(empty, 0, attributes);
+  size_t alen = strlen(attrs);
 
-    ptr = stecpy(string, tag_open, end);
-    ptr = stecpy(ptr, tag, end);
-    ptr = stecpy(ptr, tag_close, end);
+  size_t total = tag_olen + tlen + tag_clen + 1;
 
-    return string;
-  } else {
-    const char *empty = "";
-    char *attrs = hash_value_to_attribute(empty, 0, attributes);
+  /* If we have some attributes, add a space and the attributes' length. */
+  if (alen > 0) {
+    total += splen + alen;
+  }
 
-    size_t total = tag_olen + tlen + splen + strlen(attrs) + tag_clen + 1;
-    char *string = malloc(total);
-    char *ptr;
-    char *end = string + total;
+  char *dest = malloc(total);
+  char *ptr = NULL;
+  char *end = dest + total;
 
-    ptr = stecpy(string, tag_open, end);
-    ptr = stecpy(ptr, tag, end);
+  ptr = stecpy(dest, tag_open, end);
+  ptr = stecpy(ptr, tag, end);
+
+  if (alen > 0) {
     ptr = stecpy(ptr, space, end);
     ptr = stecpy(ptr, attrs, end);
-    ptr = stecpy(ptr, tag_close, end);
+  }
 
-    free(attrs);
+  ptr = stecpy(ptr, tag_close, end);
 
-    return string;
-  }
+  return dest;
 }
 
 /*

data/ext/berns/extconf.rb

@@ -9,5 +9,6 @@ append_cflags '-Wstrict-overflow'
 append_cflags '-flto'
 append_cflags '-fno-strict-aliasing'
 append_cflags '-msse4'
+append_cflags '-std=c99'
 
 create_makefile 'berns/berns'

data/lib/berns/builder.rb

@@ -28,6 +28,21 @@ module Berns
       @buffer << Berns.escape_html(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 }
+    end
+
+    # Append an arbitrary void element to the buffer.
+    #
+    # @return [String]
+    def void(*args, **opts)
+      @buffer << Berns.void(*args, **opts)
+    end
+
     Berns::STANDARD.each do |meth|
       define_method(meth) do |*args, **opts, &block|
         content = Builder.new.instance_exec(*args, **opts, &block) if block

data/lib/berns/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berns
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Taylor Beck
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips