hamlit 2.14.3 → 2.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8411628a286cbe1cca22d568a4b2f44e4020ef65900b3e318726e51ba2c0d89e
-  data.tar.gz: c80c4c4a4bf7d860d3fca4d5d27f94ef1825ff4027842b64153ecb8eb979e528
+  metadata.gz: f7ba07071048a08ffc2c58df5987c6772236c1b895b9a301881d27c13311d318
+  data.tar.gz: cde3a650bcc4d06ac8909447203f90b99460ff187140347c9e528107bc62a1bc
 SHA512:
-  metadata.gz: 97df4a6d73c8745648158562e3ed41e104d87e0bf4a0245dd0948c3cf92ee434b289bc359de007c236b223c55f62d3704bb0c915d6f0912f5081266a21ddf06e
-  data.tar.gz: cf29b17b64a66bc104b23a1bf115a3719ebd21b1db357c1d987a356c185d5d13b8bf179956f554d63383b0ad196d909230e8282ef69afb68158ea893f1ed0d61
+  metadata.gz: de8bf0cddb83e2fd86b7876461e0b44c46eced02dc85b6375e60c3669d31b4079a9e8142842abb9a5b09dbf806c1d7288f96fbc4000168659029b115e033c7a9
+  data.tar.gz: 759a9899a5aaa126c10d5894294c66af62d74585f4d2eb99e4ed9813554fa7a07aade664071c529d7ebb71d72c62b87636abd9d09e3e82e77c8fb1193ee7ad8b

data/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org/). This change log is based upon
 [keep-a-changelog](https://github.com/olivierlacan/keep-a-changelog).
 
+## [2.14.4](https://github.com/k0kubun/hamlit/compare/v2.14.3...v2.14.4) - 2021-02-01
+
+### Fixed
+
+- Prevent another SEGV in a C extension after `GC.compact` [#177](https://github.com/k0kubun/hamlit/issues/177)
+  *Thanks to @stanhu*
+
 ## [2.14.3](https://github.com/k0kubun/hamlit/compare/v2.14.2...v2.14.3) - 2021-01-24
 
 ### Fixed

data/ext/hamlit/hamlit.c

@@ -6,7 +6,7 @@
 
 VALUE mAttributeBuilder, mObjectRef;
 static ID id_flatten, id_keys, id_parse, id_prepend, id_tr, id_uniq_bang;
-static ID id_boolean_attributes, id_xhtml;
+static ID id_xhtml;
 
 static VALUE str_aria, str_data, str_equal, str_hyphen, str_space, str_underscore;
 
@@ -342,13 +342,10 @@ merge_all_attrs(VALUE hashes)
 }
 
 int
-is_boolean_attribute(VALUE key)
+is_boolean_attribute(VALUE key, VALUE boolean_attributes)
 {
-  VALUE boolean_attributes;
   if (str_eq(rb_str_substr(key, 0, 5), "data-", 5)) return 1;
   if (str_eq(rb_str_substr(key, 0, 5), "aria-", 5)) return 1;
-
-  boolean_attributes = rb_const_get(mAttributeBuilder, id_boolean_attributes);
   return RTEST(rb_ary_includes(boolean_attributes, key));
 }
 
@@ -418,7 +415,7 @@ hamlit_build_for_boolean(VALUE escape_attrs, VALUE quote, VALUE format, VALUE bu
 }
 
 static VALUE
-hamlit_build(VALUE escape_attrs, VALUE quote, VALUE format, VALUE object_ref, VALUE hashes)
+hamlit_build(VALUE escape_attrs, VALUE quote, VALUE format, VALUE boolean_attributes, VALUE object_ref, VALUE hashes)
 {
   long i;
   VALUE attrs, buf, key, keys, value;
@@ -439,7 +436,7 @@ hamlit_build(VALUE escape_attrs, VALUE quote, VALUE format, VALUE object_ref, VA
       hamlit_build_for_data(escape_attrs, quote, buf, value);
     } else if (str_eq(key, "aria", 4)) {
       hamlit_build_for_aria(escape_attrs, quote, buf, value);
-    } else if (is_boolean_attribute(key)) {
+    } else if (is_boolean_attribute(key, boolean_attributes)) {
       hamlit_build_for_boolean(escape_attrs, quote, format, buf, key, value);
     } else {
       hamlit_build_for_others(escape_attrs, quote, buf, key, value);
@@ -498,10 +495,10 @@ rb_hamlit_build(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
 {
   VALUE array;
 
-  rb_check_arity(argc, 4, UNLIMITED_ARGUMENTS);
-  rb_scan_args(argc - 4, argv + 4, "*", &array);
+  rb_check_arity(argc, 5, UNLIMITED_ARGUMENTS);
+  rb_scan_args(argc - 5, argv + 5, "*", &array);
 
-  return hamlit_build(argv[0], argv[1], argv[2], argv[3], array);
+  return hamlit_build(argv[0], argv[1], argv[2], argv[3], argv[4], array);
 }
 
 void
@@ -527,9 +524,7 @@ Init_hamlit(void)
   id_prepend   = rb_intern("prepend");
   id_tr        = rb_intern("tr");
   id_uniq_bang = rb_intern("uniq!");
-
-  id_boolean_attributes = rb_intern("BOOLEAN_ATTRIBUTES");
-  id_xhtml = rb_intern("xhtml");
+  id_xhtml     = rb_intern("xhtml");
 
   // Consider using rb_interned_str() once we stop supporting Ruby 2.7.
   rb_gc_register_mark_object(str_aria       = rb_obj_freeze(rb_str_new_cstr("aria")));

data/lib/hamlit/attribute_builder.rb

@@ -13,7 +13,7 @@ module Hamlit::AttributeBuilder
   # TruffleRuby does not implement `rb_ary_sort_bang`, etc.
   if /java/ === RUBY_PLATFORM || RUBY_ENGINE == 'truffleruby'
     class << self
-      def build(escape_attrs, quote, format, object_ref, *hashes)
+      def build(escape_attrs, quote, format, boolean_attributes, object_ref, *hashes)
         hashes << Hamlit::ObjectRef.parse(object_ref) if object_ref
         buf  = []
         hash = merge_all_attrs(hashes)
@@ -27,7 +27,7 @@ module Hamlit::AttributeBuilder
             buf << " class=#{quote}#{build_class(escape_attrs, *hash[key])}#{quote}"
           when 'data'.freeze
             buf << build_data(escape_attrs, quote, *hash[key])
-          when *BOOLEAN_ATTRIBUTES, /\Adata-/
+          when *boolean_attributes, /\Adata-/
             build_boolean!(escape_attrs, quote, format, buf, key, hash[key])
           else
             buf << " #{key}=#{quote}#{escape_html(escape_attrs, hash[key].to_s)}#{quote}"

data/lib/hamlit/attribute_compiler.rb

@@ -31,7 +31,10 @@ module Hamlit
       attrs = []
       attrs.unshift(node.value[:attributes].inspect) if node.value[:attributes] != {}
 
-      args = [@escape_attrs.inspect, "#{@quote.inspect}.freeze", @format.inspect].push(node.value[:object_ref]) + attrs
+      args = [
+        @escape_attrs.inspect, "#{@quote.inspect}.freeze", @format.inspect,
+        '::Hamlit::AttributeBuilder::BOOLEAN_ATTRIBUTES', node.value[:object_ref],
+      ] + attrs
       [:html, :attrs, [:dynamic, "::Hamlit::AttributeBuilder.build(#{args.join(', ')}, #{node.value[:dynamic_attributes].to_literal})"]]
     end
 

data/lib/hamlit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hamlit
-  VERSION = '2.14.3'
+  VERSION = '2.14.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.14.3
+  version: 2.14.4
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-24 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -391,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.6
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: High Performance Haml Implementation