berns 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bce7bd3384f01f587a75bd722cca156b4357e0953bd90a5a2c8f97a630deb8db
-  data.tar.gz: 2c830eb788274a6d96e3e0a7db0e75826dea451eabecb3444878901d6e1adb08
+  metadata.gz: 15dd768826a0b862ad1146c4ba331bd5735f791199aed34d0a217c0ad7fc94ca
+  data.tar.gz: 8a7fb6f17dfd7805163003ac751209138b7b5a7bd286afa3d72fb157d31328e3
 SHA512:
-  metadata.gz: d20138c2bc54ab035eb9d79f1e0ae18065ba422157fa453258acd5d974f08062afee105b50d2d3564b3e4882b4331ec6f93e4da3a3091a1440ad8a74c10f1686
-  data.tar.gz: 598843f7a87302d0a59ba53d8e52caf0f864a2e146b473c2d95b50f1da5b11536603f4d9f51f990de385bbaa08fb6e273381672eb823ddda2b0bb614532aef33
+  metadata.gz: d953ee5567cd4e448f3fd11b3075bcee6c5e1c6253f56714d9c3355ca5a1a7dcb6170bca926f8b537a9dd1e3bb6b218caa408b60e9d8d1146b55cd4b38fd9a58
+  data.tar.gz: 735a2e506fe777f9ab0932bb8d00aecd5cf01fafc03c9780ae1776014b016f61c01e7b8938d3fce80d15bfdb140a104367fe3361b7b0bd5d734fef1a6dc41a05

data/ext/berns/berns.c

@@ -47,11 +47,12 @@ static const size_t sllen = 1;
  * Macro to define a "dynamic" function that generates a void element.
  */
 #define VOID_ELEMENT(element_name) \
-  static VALUE external_##element_name##_element(int argc, VALUE* argv, RB_UNUSED_VAR(VALUE self)) { \
+  static VALUE external_##element_name##_element(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self)) { \
     rb_check_arity(argc, 0, 1); \
     \
-    char *tag = #element_name; \
-    char *string = void_element(tag, strlen(tag), argv[0]); \
+    VALUE attrs = argv[0]; \
+    const char *tag = #element_name; \
+    char *string = void_element(tag, strlen(tag), attrs); \
     VALUE rstring = rb_utf8_str_new_cstr(string); \
     free(string); \
     \
@@ -62,12 +63,13 @@ static const size_t sllen = 1;
  * Macro to define a "dynamic" function that generates a standard element.
  */
 #define STANDARD_ELEMENT(element_name) \
-  static VALUE external_##element_name##_element(int argc, VALUE* argv, RB_UNUSED_VAR(VALUE self)) { \
+  static VALUE external_##element_name##_element(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self)) { \
     rb_check_arity(argc, 0, 1); \
     \
     CONTENT_FROM_BLOCK; \
-    char *tag = #element_name; \
-    char *string = element(tag, strlen(tag), RSTRING_PTR(content), RSTRING_LEN(content), argv[0]); \
+    VALUE attrs = argv[0]; \
+    const char *tag = #element_name; \
+    char *string = element(tag, strlen(tag), RSTRING_PTR(content), RSTRING_LEN(content), attrs); \
     VALUE rstring = rb_utf8_str_new_cstr(string); \
     free(string); \
     \
@@ -78,12 +80,16 @@ static const size_t sllen = 1;
 /*
  * "Safe strcpy" - https://twitter.com/hyc_symas/status/1102573036534972416?s=12
 */
-static char *stecpy(char *destination, const char *source, const char *end) {
+static char * stecpy(char *destination, const char *source, const char *end) {
+  if (end) {
+    end--;
+  }
+
   while (*source && destination < end) {
     *destination++ = *source++;
   }
 
-  if (destination < end) {
+  if (destination) {
     *destination = '\0';
   }
 
@@ -123,7 +129,6 @@ static VALUE external_escape_html(const VALUE self, VALUE string) {
 static char * empty_value_to_attribute(const char *attr, const size_t attrlen) {
   size_t total_size = attrlen + 1;
   char *dest = malloc(total_size);
-  char *ptr = NULL;
   char *end = dest + total_size;
 
   stecpy(dest, attr, end);
@@ -140,7 +145,6 @@ static char * string_value_to_attribute(const char *attr, const size_t attrlen,
   if (vallen == 0) {
     size_t total_size = attrlen + 1;
     char *dest = malloc(total_size);
-    char *ptr = NULL;
     char *end = dest + total_size;
 
     stecpy(dest, attr, end);
@@ -168,7 +172,7 @@ static char * string_value_to_attribute(const char *attr, const size_t attrlen,
   }
 }
 
-static char * hash_value_to_attribute(char *attr, const size_t attrlen, VALUE value) {
+static char * hash_value_to_attribute(const char *attr, const size_t attrlen, VALUE value) {
   if (TYPE(value) == T_IMEMO) {
     return strdup("");
   }
@@ -224,17 +228,17 @@ static char * hash_value_to_attribute(char *attr, const size_t attrlen, VALUE va
 
     char subattr[subattr_len + 1];
     char *ptr = subattr;
-    char *end = subattr + sizeof(subattr);
+    char *subend = subattr + subattr_len + 1;
 
     if (attrlen > 0) {
-      ptr = stecpy(ptr, attr, end);
+      ptr = stecpy(ptr, attr, subend);
     }
 
     if (attrlen > 0 && subkey_len > 0) {
-      ptr = stecpy(ptr, dash, end);
+      ptr = stecpy(ptr, dash, subend);
     }
 
-    stecpy(ptr, RSTRING_PTR(subkey), end);
+    stecpy(ptr, RSTRING_PTR(subkey), subend);
 
     char *combined;
 
@@ -246,7 +250,7 @@ static char * hash_value_to_attribute(char *attr, const size_t attrlen, VALUE va
       case T_NIL:
         /* Fall through. */
       case T_TRUE:
-        combined = string_value_to_attribute(subattr, subattr_len, "", 0);
+        combined = empty_value_to_attribute(subattr, subattr_len);
         break;
 
       case T_STRING:
@@ -326,6 +330,7 @@ static char * to_attribute(VALUE attr, VALUE value) {
 
   switch(TYPE(value)) {
     case T_NIL:
+      /* Fall through. */
     case T_TRUE:
       val = empty_value_to_attribute(RSTRING_PTR(attr), RSTRING_LEN(attr));
       break;
@@ -389,7 +394,7 @@ static VALUE external_to_attributes(RB_UNUSED_VAR(VALUE self), VALUE attributes)
     return rb_utf8_str_new_cstr("");
   }
 
-  char *empty = "";
+  const char *empty = "";
   char *attrs = hash_value_to_attribute(empty, 0, attributes);
 
   VALUE rstring = rb_utf8_str_new_cstr(attrs);
@@ -398,7 +403,7 @@ static VALUE external_to_attributes(RB_UNUSED_VAR(VALUE self), VALUE attributes)
   return rstring;
 }
 
-static char * void_element(char *tag, size_t tlen, 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;
@@ -412,7 +417,7 @@ static char * void_element(char *tag, size_t tlen, VALUE attributes) {
 
     return string;
   } else {
-    char *empty = "";
+    const char *empty = "";
     char *attrs = hash_value_to_attribute(empty, 0, attributes);
 
     size_t total = tag_olen + tlen + splen + strlen(attrs) + tag_clen + 1;
@@ -459,8 +464,8 @@ static VALUE external_void_element(int argc, VALUE *arguments, RB_UNUSED_VAR(VAL
   return rstring;
 }
 
-static char * element(char *tag, size_t tlen, char *content, size_t conlen, VALUE attributes) {
-  char *empty = "";
+static char * element(const char *tag, size_t tlen, char *content, size_t conlen, VALUE attributes) {
+  const char *empty = "";
   char *attrs = hash_value_to_attribute(empty, 0, attributes);
   size_t alen = strlen(attrs);
 
@@ -533,116 +538,116 @@ static VALUE external_element(int argc, VALUE *arguments, RB_UNUSED_VAR(VALUE se
   return rstring;
 }
 
-VOID_ELEMENT(area);
-VOID_ELEMENT(base);
-VOID_ELEMENT(br);
-VOID_ELEMENT(col);
-VOID_ELEMENT(embed);
-VOID_ELEMENT(hr);
-VOID_ELEMENT(img);
-VOID_ELEMENT(input);
-VOID_ELEMENT(link);
-VOID_ELEMENT(menuitem);
-VOID_ELEMENT(meta);
-VOID_ELEMENT(param);
-VOID_ELEMENT(source);
-VOID_ELEMENT(track);
-VOID_ELEMENT(wbr);
-
-STANDARD_ELEMENT(a);
-STANDARD_ELEMENT(abbr);
-STANDARD_ELEMENT(address);
-STANDARD_ELEMENT(article);
-STANDARD_ELEMENT(aside);
-STANDARD_ELEMENT(audio);
-STANDARD_ELEMENT(b);
-STANDARD_ELEMENT(bdi);
-STANDARD_ELEMENT(bdo);
-STANDARD_ELEMENT(blockquote);
-STANDARD_ELEMENT(body);
-STANDARD_ELEMENT(button);
-STANDARD_ELEMENT(canvas);
-STANDARD_ELEMENT(caption);
-STANDARD_ELEMENT(cite);
-STANDARD_ELEMENT(code);
-STANDARD_ELEMENT(colgroup);
-STANDARD_ELEMENT(datalist);
-STANDARD_ELEMENT(dd);
-STANDARD_ELEMENT(del);
-STANDARD_ELEMENT(details);
-STANDARD_ELEMENT(dfn);
-STANDARD_ELEMENT(dialog);
-STANDARD_ELEMENT(div);
-STANDARD_ELEMENT(dl);
-STANDARD_ELEMENT(dt);
-STANDARD_ELEMENT(em);
-STANDARD_ELEMENT(fieldset);
-STANDARD_ELEMENT(figcaption);
-STANDARD_ELEMENT(figure);
-STANDARD_ELEMENT(footer);
-STANDARD_ELEMENT(form);
-STANDARD_ELEMENT(h1);
-STANDARD_ELEMENT(h2);
-STANDARD_ELEMENT(h3);
-STANDARD_ELEMENT(h4);
-STANDARD_ELEMENT(h5);
-STANDARD_ELEMENT(h6);
-STANDARD_ELEMENT(head);
-STANDARD_ELEMENT(header);
-STANDARD_ELEMENT(html);
-STANDARD_ELEMENT(i);
-STANDARD_ELEMENT(iframe);
-STANDARD_ELEMENT(ins);
-STANDARD_ELEMENT(kbd);
-STANDARD_ELEMENT(label);
-STANDARD_ELEMENT(legend);
-STANDARD_ELEMENT(li);
-STANDARD_ELEMENT(main);
-STANDARD_ELEMENT(map);
-STANDARD_ELEMENT(mark);
-STANDARD_ELEMENT(menu);
-STANDARD_ELEMENT(meter);
-STANDARD_ELEMENT(nav);
-STANDARD_ELEMENT(noscript);
-STANDARD_ELEMENT(object);
-STANDARD_ELEMENT(ol);
-STANDARD_ELEMENT(optgroup);
-STANDARD_ELEMENT(option);
-STANDARD_ELEMENT(output);
-STANDARD_ELEMENT(p);
-STANDARD_ELEMENT(picture);
-STANDARD_ELEMENT(pre);
-STANDARD_ELEMENT(progress);
-STANDARD_ELEMENT(q);
-STANDARD_ELEMENT(rp);
-STANDARD_ELEMENT(rt);
-STANDARD_ELEMENT(ruby);
-STANDARD_ELEMENT(s);
-STANDARD_ELEMENT(samp);
-STANDARD_ELEMENT(script);
-STANDARD_ELEMENT(section);
-STANDARD_ELEMENT(select);
-STANDARD_ELEMENT(small);
-STANDARD_ELEMENT(span);
-STANDARD_ELEMENT(strong);
-STANDARD_ELEMENT(style);
-STANDARD_ELEMENT(sub);
-STANDARD_ELEMENT(summary);
-STANDARD_ELEMENT(table);
-STANDARD_ELEMENT(tbody);
-STANDARD_ELEMENT(td);
-STANDARD_ELEMENT(template);
-STANDARD_ELEMENT(textarea);
-STANDARD_ELEMENT(tfoot);
-STANDARD_ELEMENT(th);
-STANDARD_ELEMENT(thead);
-STANDARD_ELEMENT(time);
-STANDARD_ELEMENT(title);
-STANDARD_ELEMENT(tr);
-STANDARD_ELEMENT(u);
-STANDARD_ELEMENT(ul);
-STANDARD_ELEMENT(var);
-STANDARD_ELEMENT(video);
+VOID_ELEMENT(area)
+VOID_ELEMENT(base)
+VOID_ELEMENT(br)
+VOID_ELEMENT(col)
+VOID_ELEMENT(embed)
+VOID_ELEMENT(hr)
+VOID_ELEMENT(img)
+VOID_ELEMENT(input)
+VOID_ELEMENT(link)
+VOID_ELEMENT(menuitem)
+VOID_ELEMENT(meta)
+VOID_ELEMENT(param)
+VOID_ELEMENT(source)
+VOID_ELEMENT(track)
+VOID_ELEMENT(wbr)
+
+STANDARD_ELEMENT(a)
+STANDARD_ELEMENT(abbr)
+STANDARD_ELEMENT(address)
+STANDARD_ELEMENT(article)
+STANDARD_ELEMENT(aside)
+STANDARD_ELEMENT(audio)
+STANDARD_ELEMENT(b)
+STANDARD_ELEMENT(bdi)
+STANDARD_ELEMENT(bdo)
+STANDARD_ELEMENT(blockquote)
+STANDARD_ELEMENT(body)
+STANDARD_ELEMENT(button)
+STANDARD_ELEMENT(canvas)
+STANDARD_ELEMENT(caption)
+STANDARD_ELEMENT(cite)
+STANDARD_ELEMENT(code)
+STANDARD_ELEMENT(colgroup)
+STANDARD_ELEMENT(datalist)
+STANDARD_ELEMENT(dd)
+STANDARD_ELEMENT(del)
+STANDARD_ELEMENT(details)
+STANDARD_ELEMENT(dfn)
+STANDARD_ELEMENT(dialog)
+STANDARD_ELEMENT(div)
+STANDARD_ELEMENT(dl)
+STANDARD_ELEMENT(dt)
+STANDARD_ELEMENT(em)
+STANDARD_ELEMENT(fieldset)
+STANDARD_ELEMENT(figcaption)
+STANDARD_ELEMENT(figure)
+STANDARD_ELEMENT(footer)
+STANDARD_ELEMENT(form)
+STANDARD_ELEMENT(h1)
+STANDARD_ELEMENT(h2)
+STANDARD_ELEMENT(h3)
+STANDARD_ELEMENT(h4)
+STANDARD_ELEMENT(h5)
+STANDARD_ELEMENT(h6)
+STANDARD_ELEMENT(head)
+STANDARD_ELEMENT(header)
+STANDARD_ELEMENT(html)
+STANDARD_ELEMENT(i)
+STANDARD_ELEMENT(iframe)
+STANDARD_ELEMENT(ins)
+STANDARD_ELEMENT(kbd)
+STANDARD_ELEMENT(label)
+STANDARD_ELEMENT(legend)
+STANDARD_ELEMENT(li)
+STANDARD_ELEMENT(main)
+STANDARD_ELEMENT(map)
+STANDARD_ELEMENT(mark)
+STANDARD_ELEMENT(menu)
+STANDARD_ELEMENT(meter)
+STANDARD_ELEMENT(nav)
+STANDARD_ELEMENT(noscript)
+STANDARD_ELEMENT(object)
+STANDARD_ELEMENT(ol)
+STANDARD_ELEMENT(optgroup)
+STANDARD_ELEMENT(option)
+STANDARD_ELEMENT(output)
+STANDARD_ELEMENT(p)
+STANDARD_ELEMENT(picture)
+STANDARD_ELEMENT(pre)
+STANDARD_ELEMENT(progress)
+STANDARD_ELEMENT(q)
+STANDARD_ELEMENT(rp)
+STANDARD_ELEMENT(rt)
+STANDARD_ELEMENT(ruby)
+STANDARD_ELEMENT(s)
+STANDARD_ELEMENT(samp)
+STANDARD_ELEMENT(script)
+STANDARD_ELEMENT(section)
+STANDARD_ELEMENT(select)
+STANDARD_ELEMENT(small)
+STANDARD_ELEMENT(span)
+STANDARD_ELEMENT(strong)
+STANDARD_ELEMENT(style)
+STANDARD_ELEMENT(sub)
+STANDARD_ELEMENT(summary)
+STANDARD_ELEMENT(table)
+STANDARD_ELEMENT(tbody)
+STANDARD_ELEMENT(td)
+STANDARD_ELEMENT(template)
+STANDARD_ELEMENT(textarea)
+STANDARD_ELEMENT(tfoot)
+STANDARD_ELEMENT(th)
+STANDARD_ELEMENT(thead)
+STANDARD_ELEMENT(time)
+STANDARD_ELEMENT(title)
+STANDARD_ELEMENT(tr)
+STANDARD_ELEMENT(u)
+STANDARD_ELEMENT(ul)
+STANDARD_ELEMENT(var)
+STANDARD_ELEMENT(video)
 
 void Init_berns() {
   VALUE Berns = rb_define_module("Berns");

data/ext/berns/extconf.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'mkmf'
 
-$CFLAGS = '-O3 -msse4' # rubocop:disable Style/GlobalVars
+$CFLAGS << ' -O2 -msse4 -std=c99' # rubocop:disable Style/GlobalVars
 
 dir_config('berns')
 create_header

data/lib/berns/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berns
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Taylor Beck
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips