hamlit 2.14.2 → 2.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c71aa1b03fd903408eef1cff941de4b5d6c9d56ee1a2a9d773f4b9c779ef28c1
-  data.tar.gz: 58113e96249289afc34d814ebda1c256bd7476fb4a2c94d842e6b2d2dc90b75e
+  metadata.gz: 46fb5b844211b5c8bc782ee88d23eca02b16f9285609e76447a493aa10ee442c
+  data.tar.gz: b1069d514efd9b06b534ec82b3d524fbfde98e87b7b660af6041b60132b7324e
 SHA512:
-  metadata.gz: 5b2641814756042ca0a03ddf2b8c8b6c1965c732871a6c9b6dc3249fdaf28afa478980bc4b88b1cac04082c75216d14009f1cd669e63dc1a4a7657780bd8cdb1
-  data.tar.gz: e1255baf55d678ed1300adfe905bf7a53ebec2f520bbfdd8eb0004cc607ae7967cf63f2308bdb015197679cb640820a0803e8c6713de6660876e09a0e5f6c8d4
+  metadata.gz: 52c0df95e9916faa1abecd927019d4429e28607fc4096157f6386f981cb2f5e6249e8aaabab0693942f7f31c01d0babcaf4dabea1b4cc92ea0d40b2d2cdf531c
+  data.tar.gz: 5241185ed6759415eaf9a263142a6b937fe316c550a59490964e6d10668e26529d730996fd3443d953216fe2a2d30e9af0f5ad241eea92c9e64cf68af55f82bb

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: k0kubun

data/.github/workflows/test.yml

@@ -13,24 +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
-          - ruby:3.0
-          # TODO: add jruby and truffleruby
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - jruby
+          - truffleruby-head
     steps:
       - uses: actions/checkout@v2
+      - 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: apt-get update && apt-get install -y nodejs # For execjs
+      - 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 config path vendor/bundle && bundle install -j$(nproc) --retry 3
       - run: bundle exec rake test

data/CHANGELOG.md

@@ -4,6 +4,40 @@ 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.15.0](https://github.com/k0kubun/hamlit/compare/v2.14.6...v2.15.0) - 2021-04-12
+
+### Added
+
+- Always use Hamlit when both haml.gem and hamlit.gem are installed in Rails
+  *Thanks to @igor-drozdov*
+
+## [2.14.6](https://github.com/k0kubun/hamlit/compare/v2.14.5...v2.14.6) - 2021-03-23
+
+### Fixed
+
+- Optimize v2.14.5's implementation a little
+
+## [2.14.5](https://github.com/k0kubun/hamlit/compare/v2.14.4...v2.14.5) - 2021-03-23
+
+### Added
+
+- Support `config.action_view.annotate_rendered_view_with_filenames = true` of Rails 6.1
+  *Thanks to @kirin121*
+
+## [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

data/README.md

@@ -1,7 +1,6 @@
 # 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,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/ambles.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+module Hamlit
+  class Ambles < Temple::Filter
+    define_options :preamble, :postamble
+
+    def initialize(*)
+      super
+      @preamble = options[:preamble]
+      @postamble = options[:postamble]
+    end
+
+    def call(ast)
+      ret = [:multi]
+      ret << [:static, @preamble] if @preamble
+      ret << ast
+      ret << [:static, @postamble] if @postamble
+      ret
+    end
+  end
+end

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

@@ -6,6 +6,7 @@ require 'hamlit/html'
 require 'hamlit/escapable'
 require 'hamlit/force_escapable'
 require 'hamlit/dynamic_merger'
+require 'hamlit/ambles'
 
 module Hamlit
   class Engine < Temple::Engine
@@ -30,6 +31,7 @@ module Hamlit
     use Escapable
     use ForceEscapable
     filter :ControlFlow
+    use Ambles
     filter :MultiFlattener
     filter :StaticMerger
     use DynamicMerger

data/lib/hamlit/rails_template.rb

@@ -33,6 +33,11 @@ module Hamlit
         options = options.merge(format: :xhtml)
       end
 
+      if ActionView::Base.try(:annotate_rendered_view_with_filenames) && template.format == :html
+        options[:preamble] = "<!-- BEGIN #{template.short_identifier} -->\n"
+        options[:postamble] = "<!-- END #{template.short_identifier} -->\n"
+      end
+
       Engine.new(options).call(source)
     end
 

data/lib/hamlit/railtie.rb

@@ -3,7 +3,12 @@ require 'rails'
 
 module Hamlit
   class Railtie < ::Rails::Railtie
-    initializer :hamlit do |app|
+    initializer :hamlit, before: :load_config_initializers do |app|
+      # Load haml/plugin first to override if available
+      begin
+        require 'haml/plugin'
+      rescue LoadError
+      end
       require 'hamlit/rails_template'
     end
   end

data/lib/hamlit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hamlit
 version: !ruby/object:Gem::Version
-  version: 2.14.2
+  version: 2.15.0
 platform: ruby
 authors:
 - Takashi Kokubun
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -257,6 +257,7 @@ extensions:
 - ext/hamlit/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - CHANGELOG.md
@@ -313,6 +314,7 @@ files:
 - ext/hamlit/hescape.h
 - hamlit.gemspec
 - lib/hamlit.rb
+- lib/hamlit/ambles.rb
 - lib/hamlit/attribute_builder.rb
 - lib/hamlit/attribute_compiler.rb
 - lib/hamlit/attribute_parser.rb
@@ -376,7 +378,7 @@ homepage: https://github.com/k0kubun/hamlit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -391,8 +393,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.2.3
+signing_key:
 specification_version: 4
 summary: High Performance Haml Implementation
 test_files: []