hamlit 2.13.2 → 2.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbc8030c410cd15d25db47c6a69ffb977ea32d7ce65e77cbdae3658c11456caa
-  data.tar.gz: 922dccdfef223350790f605c76df0e8efb1f866d8d7b291a15ef1caaa4985499
+  metadata.gz: f7ba07071048a08ffc2c58df5987c6772236c1b895b9a301881d27c13311d318
+  data.tar.gz: cde3a650bcc4d06ac8909447203f90b99460ff187140347c9e528107bc62a1bc
 SHA512:
-  metadata.gz: d055eeb98d94ce58784bbf6686b38c6ccdf4465a8ec56381b6c81ab137e6b6b9d193b7eb224f9b45115cbaa7a26432ceae90b8af4e5b4b59d068d7098e773507
-  data.tar.gz: 3d24de3051c7bebea572b3f5f749f22bc6774212de8c6267b264162dae5d7e38b45bdb5a10e6dd0aec44936ba93db14bcda37ac4cd1a9f3b66fad76650fdd717
+  metadata.gz: de8bf0cddb83e2fd86b7876461e0b44c46eced02dc85b6375e60c3669d31b4079a9e8142842abb9a5b09dbf806c1d7288f96fbc4000168659029b115e033c7a9
+  data.tar.gz: 759a9899a5aaa126c10d5894294c66af62d74585f4d2eb99e4ed9813554fa7a07aade664071c529d7ebb71d72c62b87636abd9d09e3e82e77c8fb1193ee7ad8b

data/.github/workflows/test.yml

@@ -13,18 +13,28 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-    container: ${{ matrix.ruby }}
     strategy:
       fail-fast: false
       matrix:
         ruby:
-          - ruby:2.5
-          - ruby:2.6
-          - ruby:2.7
-          # TODO: add jruby and truffleruby
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - jruby
+          - truffleruby-head
     steps:
       - uses: actions/checkout@v2
-      - run: apt-get update && apt-get install -y nodejs # For execjs
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: ${{ runner.os }}-gems-
+      - run: sudo apt-get update && sudo apt-get install -y nodejs libxslt-dev # nodejs for execjs, libxslt for TruffleRuby nokogiri
       - name: bundle install
-        run: bundle install -j$(nproc) --retry 3
+        run: bundle config path vendor/bundle && bundle install -j$(nproc) --retry 3
       - run: bundle exec rake test

data/.gitignore

@@ -13,6 +13,6 @@
 *.bundle
 *.so
 *.su
-*.o
 *.a
+*.o
 *.swp

data/CHANGELOG.md

@@ -4,6 +4,45 @@ 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
+
+- Ensure the Rails initializer is called before `:load_config_initializers` [#176](https://github.com/k0kubun/hamlit/issues/176)
+  *Thanks to @sunny*
+
+## [2.14.2](https://github.com/k0kubun/hamlit/compare/v2.14.1...v2.14.2) - 2021-01-21
+
+### Fixed
+
+- Prevent SEGV in a C extension after `GC.compact` [#171](https://github.com/k0kubun/hamlit/issues/171)
+  *Thanks to @stanhu*
+
+## [2.14.1](https://github.com/k0kubun/hamlit/compare/v2.14.0...v2.14.1) - 2021-01-07
+
+### Added
+
+- Add `-c` option to `hamlit compile` that works like `haml -c` [#166](https://github.com/k0kubun/hamlit/issues/166)
+  *Thanks to @knightq*
+
+## [2.14.0](https://github.com/k0kubun/hamlit/compare/v2.13.2...v2.14.0) - 2021-01-07
+
+### Changed
+
+- CLI changes
+  - Remove `-c` shorthand of `--color`.
+  - Make `--color` default. Please use `--no-color` to disable it.
+  - `--color` uses IRB instead of Pry for syntax highlight.
+     - Syntax highlight of `hamlit compile` is enabled only with IRB of Ruby 2.7+.
+     - Syntax highlight of `hamlit parse` / `hamlit temple` is enabled only with IRB of Ruby 3.1+.
+
 ## [2.13.2](https://github.com/k0kubun/hamlit/compare/v2.13.1...v2.13.2) - 2020-12-27
 
 ### Added

data/README.md

@@ -1,7 +1,7 @@
 # Hamlit
 
 [![Gem Version](https://badge.fury.io/rb/hamlit.svg)](http://badge.fury.io/rb/hamlit)
-[![Build Status](https://travis-ci.org/k0kubun/hamlit.svg?branch=master)](https://travis-ci.org/k0kubun/hamlit)
+[![test](https://github.com/k0kubun/hamlit/workflows/test/badge.svg)](https://github.com/k0kubun/hamlit/actions?query=workflow%3Atest)
 
 Hamlit is a high performance [Haml](https://github.com/haml/haml) implementation.
 

data/ext/hamlit/hamlit.c

@@ -6,15 +6,9 @@
 
 VALUE mAttributeBuilder, mObjectRef;
 static ID id_flatten, id_keys, id_parse, id_prepend, id_tr, id_uniq_bang;
-static ID id_aria, id_data, id_equal, id_hyphen, id_space, id_underscore;
-static ID id_boolean_attributes, id_xhtml;
+static ID id_xhtml;
 
-static VALUE str_aria()        { return rb_const_get(mAttributeBuilder, id_aria); }
-static VALUE str_data()        { return rb_const_get(mAttributeBuilder, id_data); }
-static VALUE str_equal()       { return rb_const_get(mAttributeBuilder, id_equal); }
-static VALUE str_hyphen()      { return rb_const_get(mAttributeBuilder, id_hyphen); }
-static VALUE str_space()       { return rb_const_get(mAttributeBuilder, id_space); }
-static VALUE str_underscore()  { return rb_const_get(mAttributeBuilder, id_underscore); }
+static VALUE str_aria, str_data, str_equal, str_hyphen, str_space, str_underscore;
 
 static void
 delete_falsey_values(VALUE values)
@@ -51,7 +45,7 @@ hyphenate(VALUE str)
 
   for (i = 0; i < RSTRING_LEN(str); i++) {
     if (RSTRING_PTR(str)[i] == '_') {
-      rb_str_update(str, i, 1, str_hyphen());
+      rb_str_update(str, i, 1, str_hyphen);
     }
   }
   return str;
@@ -97,7 +91,7 @@ hamlit_build_id(VALUE escape_attrs, VALUE values)
   values = rb_funcall(values, id_flatten, 0);
   delete_falsey_values(values);
 
-  attr_value = rb_ary_join(values, str_underscore());
+  attr_value = rb_ary_join(values, str_underscore);
   return escape_attribute(escape_attrs, attr_value);
 }
 
@@ -110,7 +104,7 @@ hamlit_build_single_class(VALUE escape_attrs, VALUE value)
     case T_ARRAY:
       value = rb_funcall(value, id_flatten, 0);
       delete_falsey_values(value);
-      value = rb_ary_join(value, str_space());
+      value = rb_ary_join(value, str_space);
       break;
     default:
       if (RTEST(value)) {
@@ -154,7 +148,7 @@ hamlit_build_multi_class(VALUE escape_attrs, VALUE values)
 
   rb_funcall(buf, id_uniq_bang, 0);
 
-  return escape_attribute(escape_attrs, rb_ary_join(buf, str_space()));
+  return escape_attribute(escape_attrs, rb_ary_join(buf, str_space));
 }
 
 static VALUE
@@ -285,7 +279,7 @@ hamlit_build_data(VALUE escape_attrs, VALUE quote, VALUE values, VALUE key_str)
 
     switch (value) {
       case Qtrue:
-        rb_str_concat(buf, str_space());
+        rb_str_concat(buf, str_space);
         rb_str_concat(buf, key);
         break;
       case Qnil:
@@ -293,9 +287,9 @@ hamlit_build_data(VALUE escape_attrs, VALUE quote, VALUE values, VALUE key_str)
       case Qfalse:
         break; // noop
       default:
-        rb_str_concat(buf, str_space());
+        rb_str_concat(buf, str_space);
         rb_str_concat(buf, key);
-        rb_str_concat(buf, str_equal());
+        rb_str_concat(buf, str_equal);
         rb_str_concat(buf, quote);
         rb_str_concat(buf, escape_attribute(escape_attrs, to_s(value)));
         rb_str_concat(buf, quote);
@@ -348,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));
 }
 
@@ -379,13 +370,13 @@ hamlit_build_for_class(VALUE escape_attrs, VALUE quote, VALUE buf, VALUE values)
 void
 hamlit_build_for_data(VALUE escape_attrs, VALUE quote, VALUE buf, VALUE values)
 {
-  rb_str_concat(buf, hamlit_build_data(escape_attrs, quote, values, str_data()));
+  rb_str_concat(buf, hamlit_build_data(escape_attrs, quote, values, str_data));
 }
 
 void
 hamlit_build_for_aria(VALUE escape_attrs, VALUE quote, VALUE buf, VALUE values)
 {
-  rb_str_concat(buf, hamlit_build_data(escape_attrs, quote, values, str_aria()));
+  rb_str_concat(buf, hamlit_build_data(escape_attrs, quote, values, str_aria));
 }
 
 void
@@ -424,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;
@@ -445,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);
@@ -485,7 +476,7 @@ rb_hamlit_build_aria(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
   rb_check_arity(argc, 2, UNLIMITED_ARGUMENTS);
   rb_scan_args(argc - 2, argv + 2, "*", &array);
 
-  return hamlit_build_data(argv[0], argv[1], array, str_aria());
+  return hamlit_build_data(argv[0], argv[1], array, str_aria);
 }
 
 static VALUE
@@ -496,7 +487,7 @@ rb_hamlit_build_data(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
   rb_check_arity(argc, 2, UNLIMITED_ARGUMENTS);
   rb_scan_args(argc - 2, argv + 2, "*", &array);
 
-  return hamlit_build_data(argv[0], argv[1], array, str_data());
+  return hamlit_build_data(argv[0], argv[1], array, str_data);
 }
 
 static VALUE
@@ -504,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
@@ -533,22 +524,14 @@ Init_hamlit(void)
   id_prepend   = rb_intern("prepend");
   id_tr        = rb_intern("tr");
   id_uniq_bang = rb_intern("uniq!");
-
-  id_aria       = rb_intern("ARIA");
-  id_data       = rb_intern("DATA");
-  id_equal      = rb_intern("EQUAL");
-  id_hyphen     = rb_intern("HYPHEN");
-  id_space      = rb_intern("SPACE");
-  id_underscore = rb_intern("UNDERSCORE");
-
-  id_boolean_attributes = rb_intern("BOOLEAN_ATTRIBUTES");
-  id_xhtml = rb_intern("xhtml");
-
-  rb_const_set(mAttributeBuilder, id_aria,       rb_obj_freeze(rb_str_new_cstr("aria")));
-  rb_const_set(mAttributeBuilder, id_data,       rb_obj_freeze(rb_str_new_cstr("data")));
-  rb_const_set(mAttributeBuilder, id_equal,      rb_obj_freeze(rb_str_new_cstr("=")));
-  rb_const_set(mAttributeBuilder, id_hyphen,     rb_obj_freeze(rb_str_new_cstr("-")));
-  rb_const_set(mAttributeBuilder, id_space,      rb_obj_freeze(rb_str_new_cstr(" ")));
-  rb_const_set(mAttributeBuilder, id_underscore, rb_obj_freeze(rb_str_new_cstr("_")));
+  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")));
+  rb_gc_register_mark_object(str_data       = rb_obj_freeze(rb_str_new_cstr("data")));
+  rb_gc_register_mark_object(str_equal      = rb_obj_freeze(rb_str_new_cstr("=")));
+  rb_gc_register_mark_object(str_hyphen     = rb_obj_freeze(rb_str_new_cstr("-")));
+  rb_gc_register_mark_object(str_space      = rb_obj_freeze(rb_str_new_cstr(" ")));
+  rb_gc_register_mark_object(str_underscore = rb_obj_freeze(rb_str_new_cstr("_")));
 }
 #endif

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/cli.rb

@@ -13,25 +13,33 @@ module Hamlit
     def render(file)
       process_load_options
       code = generate_code(file)
-      puts eval(code)
+      puts eval(code, binding, file)
     end
 
     desc 'compile HAML', 'Show compile result'
     option :actionview, type: :boolean, default: false, aliases: %w[-a]
-    option :color, type: :boolean, default: false, aliases: %w[-c]
+    option :color, type: :boolean, default: true
+    option :check, type: :boolean, default: false, aliases: %w[-c]
     def compile(file)
       code = generate_code(file)
+      if options[:check]
+        if error = validate_ruby(code, file)
+          abort error.message.split("\n").first
+        end
+        puts "Syntax OK"
+        return
+      end
       puts_code(code, color: options[:color])
     end
 
     desc 'temple HAML', 'Show temple intermediate expression'
-    option :color, type: :boolean, default: false, aliases: %w[-c]
+    option :color, type: :boolean, default: true
     def temple(file)
       pp_object(generate_temple(file), color: options[:color])
     end
 
     desc 'parse HAML', 'Show parse result'
-    option :color, type: :boolean, default: false, aliases: %w[-c]
+    option :color, type: :boolean, default: true
     def parse(file)
       pp_object(generate_ast(file), color: options[:color])
     end
@@ -107,24 +115,40 @@ module Hamlit
       render(args.first.to_s)
     end
 
-    def puts_code(code, color: false)
+    def puts_code(code, color: true)
+      begin
+        require 'irb/color'
+      rescue LoadError
+        color = false
+      end
       if color
-        require 'pry'
-        puts Pry.Code(code).highlighted
+        puts IRB::Color.colorize_code(code)
       else
         puts code
       end
     end
 
     # Enable colored pretty printing only for development environment.
-    def pp_object(arg, color: false)
+    def pp_object(arg, color: true)
+      begin
+        require 'irb/color_printer'
+      rescue LoadError
+        color = false
+      end
       if color
-        require 'pry'
-        Pry::ColorPrinter.pp(arg)
+        IRB::ColorPrinter.pp(arg)
       else
         require 'pp'
         pp(arg)
       end
     end
+
+    def validate_ruby(code, file)
+      begin
+        eval("BEGIN {return nil}; #{code}", binding, file)
+      rescue ::SyntaxError # Not to be confused with Hamlit::SyntaxError
+        $!
+      end
+    end
   end
 end

data/lib/hamlit/railtie.rb

@@ -3,7 +3,7 @@ require 'rails'
 
 module Hamlit
   class Railtie < ::Rails::Railtie
-    initializer :hamlit do |app|
+    initializer :hamlit, before: :load_config_initializers do |app|
       require 'hamlit/rails_template'
     end
   end

data/lib/hamlit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.13.2
+  version: 2.14.4
 platform: ruby
 authors:
 - Takashi Kokubun
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -376,7 +376,7 @@ homepage: https://github.com/k0kubun/hamlit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -391,8 +391,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: High Performance Haml Implementation
 test_files: []