haml 6.1.4 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d737ee35f4f57bdbbedceeb61233e0b21818fee84a50e00a1e317b2a8efcb50
-  data.tar.gz: 6e8a41c9e3a9e8c9db478f0c5ea636a6eb8bb2fe811b609664808edfac204645
+  metadata.gz: 28980224aeb7aaf767631d85d1a25371bd1e1fd78b87afa34ba5e300ee397126
+  data.tar.gz: c6e6cf4c766238cf501eb7695d75bc973746010a0c11bc90bce88d51d3d6b20d
 SHA512:
-  metadata.gz: b298a5a331bf81368054ac7fbae382a4ea739d9b24a8aa2db68ddf0e9595e116d3439ae75ddf73bd16dc943ee5e6fa0bdcd3f693ddf09c5abf54eaacbcfd9b14
-  data.tar.gz: b5ebe7e3ae7337224db692aad4c116674a6992e0880f46e96a4e9486d72bf22f57b3d1fb94396353d3b06d680387fbfb24f4dcc7ef0eb17dca4acbc7bc0336e9
+  metadata.gz: 42427402b30e767c124156562de33826ba7e16905a71ee38d494182bb0bd2f7f29135c1fd736702932ca656b94d3fdf8503e5829bd1d4cf62928eb3703261123
+  data.tar.gz: a8786a46da773e42d90bca9c29a9003a07be1a0b0f4ef2ad8ce7af117566ea96e891bc13ec22ccb5ab3ad0b6c62be8f247c7ac5b9db279c2f21cd0e4b3d06576

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Haml Changelog
 
+## 6.2.1
+
+* Fix v6.2.0's bug in rendering dynamic `aria` attributes [#1149](https://github.com/haml/haml/issues/1149)
+
+## 6.2.0
+
+* Drop the C extension [#1146](https://github.com/haml/haml/issues/1146)
+
 ## 6.1.4
 
 * Let `Haml::Util.escape_html` use `ERB::Escape` if available [#1145](https://github.com/haml/haml/issues/1145)
@@ -1444,7 +1452,7 @@ Haml 2.2 introduces a new syntax for attributes
 based on the HTML syntax.
 For example:
 
-    %a(href="http://haml.info" title="Haml's so cool!")
+    %a(href="https://haml.info" title="Haml's so cool!")
       %img(src="/images/haml.png" alt="Haml")
 
 There are two main reasons for this.

data/FAQ.md

@@ -141,7 +141,7 @@ For other plugins, a little searching will probably turn up a way to fix them as
 
 ## You still haven't answered my question!
 
-Sorry! Try looking at the [Haml](http://haml.info/docs/yardoc/file.REFERENCE.html) reference,
+Sorry! Try looking at the [Haml](https://haml.info/docs/yardoc/file.REFERENCE.html) reference,
 If you can't find an answer there,
 feel free to ask in `#haml` on irc.freenode.net
 or send an email to the [mailing list](http://groups.google.com/group/haml).

data/README.md

@@ -1,6 +1,6 @@
 # Haml
 
-[![Gem Version](https://badge.fury.io/rb/haml.svg)](http://rubygems.org/gems/haml)
+[![Gem Version](https://badge.fury.io/rb/haml.svg)](https://rubygems.org/gems/haml)
 [![test](https://github.com/haml/haml/actions/workflows/test.yml/badge.svg)](https://github.com/haml/haml/actions/workflows/test.yml)
 [![Code Climate](https://codeclimate.com/github/haml/haml/badges/gpa.svg)](https://codeclimate.com/github/haml/haml)
 [![Inline docs](https://inch-ci.org/github/haml/haml.svg)](https://inch-ci.org/github/haml/haml)
@@ -31,7 +31,7 @@ to compile it to HTML. For more information on these commands, check out
 haml --help
 ~~~
 
-To use Haml programmatically, check out the [YARD documentation](http://haml.info/docs/yardoc/).
+To use Haml programmatically, check out the [YARD documentation](https://haml.info/docs/yardoc/).
 
 ## Using Haml with Rails
 
@@ -120,7 +120,7 @@ output the result. You can even use control statements like `if` and `while`:
 ~~~
 
 Haml provides far more tools than those presented here. Check out the [reference
-documentation](http://haml.info/docs/yardoc/file.REFERENCE.html)
+documentation](https://haml.info/docs/yardoc/file.REFERENCE.html)
 for full details.
 
 ### Indentation
@@ -132,7 +132,7 @@ can't be mixed, and the same number of tabs or spaces must be used throughout.
 ## Contributing
 
 Contributions are welcomed, but before you get started please read the
-[guidelines](http://haml.info/development.html#contributing).
+[guidelines](https://haml.info/development.html#contributing).
 
 After forking and then cloning the repo locally, install Bundler and then use it
 to install the development gem dependencies:
@@ -182,7 +182,7 @@ but still consults on language issues.
 [Natalie Weizenbaum](http://nex-3.com) was for many years the primary developer
 and architect of the "modern" Ruby implementation of Haml.
 
-[Norman Clarke](http://github.com/norman) was the primary maintainer of Haml from 2012 to 2016.
+[Norman Clarke](https://github.com/norman) was the primary maintainer of Haml from 2012 to 2016.
 
 ## License
 

data/REFERENCE.md

@@ -1200,40 +1200,36 @@ You can also define your own filters.
 
 The simplest example of a filter might be something like:
 
-```ruby
-class HelloFilter < Haml::Filters::Base
-  def compile(_node)
-    [:static, "hello world"]
-  end
-end
-
-Haml::Filters.registered[:hello] ||= HelloFilter
-```
+    class HelloFilter < Haml::Filters::Base
+      def compile(_node)
+        [:static, "hello world"]
+      end
+    end
+    
+    Haml::Filters.registered[:hello] ||= HelloFilter
 
 A more complex example:
 
-```ruby
-class BetterFilter < Haml::Filters::Base
-  def compile(node)
-    temple = [:multi]
-    temple << [:static, "hello "]
-    temple << compile_text(node.value[:text])
-    temple << [:static, " world"]
-    temple
-  end
-
-  private
-  def compile_text(text)
-    if ::Haml::Util.contains_interpolation?(text)
-      [:dynamic, ::Haml::Util.unescape_interpolation(text)]
-    else
-      [:static, text]
+    class BetterFilter < Haml::Filters::Base
+      def compile(node)
+        temple = [:multi]
+        temple << [:static, "hello "]
+        temple << compile_text(node.value[:text])
+        temple << [:static, " world"]
+        temple
+      end
+    
+      private
+      def compile_text(text)
+        if ::Haml::Util.contains_interpolation?(text)
+          [:dynamic, ::Haml::Util.unescape_interpolation(text)]
+        else
+          [:static, text]
+        end
+      end
     end
-  end
-end
 
-Haml::Filters.registered[:better] ||= BetterFilter
-```
+    Haml::Filters.registered[:better] ||= BetterFilter
 
 See {Haml::Filters} for examples.
 

data/Rakefile

@@ -1,39 +1,5 @@
 require 'bundler/gem_tasks'
-
-#
-# Prepend DevKit into compilation phase
-#
-if Gem.win_platform?
-  desc 'Activates DevKit'
-  task :devkit do
-    begin
-      require 'devkit'
-    rescue LoadError
-      abort 'Failed to load DevKit required for compilation'
-    end
-  end
-  task compile: :devkit
-end
-
 require 'rake/testtask'
-if /java/ === RUBY_PLATFORM
-  # require 'rake/javaextensiontask'
-  # Rake::JavaExtensionTask.new(:haml) do |ext|
-  #   ext.ext_dir = 'ext/java'
-  #   ext.lib_dir = 'lib/haml'
-  # end
-
-  task :compile do
-    # dummy for now
-  end
-else
-  require 'rake/extensiontask'
-  Rake::ExtensionTask.new(:haml) do |ext|
-    ext.lib_dir = 'lib/haml'
-  end
-end
-
-Dir['benchmark/*.rake'].each { |b| import(b) }
 
 Rake::TestTask.new do |t|
   t.libs << 'lib' << 'test'
@@ -42,10 +8,10 @@ Rake::TestTask.new do |t|
   t.test_files = files
   t.verbose = true
 end
-task test: :compile
+task :test
 
 desc 'bench task for CI'
-task bench: :compile do
+task :bench do
   if ENV['SLIM_BENCH'] == '1'
     cmd = %w[bundle exec ruby benchmark/slim/run-benchmarks.rb]
   else
@@ -79,4 +45,4 @@ task(:doc => 'doc:sass') {sh "yard"}
 desc "Generate documentation incrementally"
 task(:redoc) {sh "yard -c"}
 
-task default: %w[compile test]
+task default: :test

data/haml.gemspec

@@ -21,12 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata      = { 'rubygems_mfa_required' => 'true' }
 
-  if /java/ === RUBY_PLATFORM
-    spec.platform = 'java'
-  else
-    spec.extensions = ['ext/haml/extconf.rb']
-    spec.required_ruby_version = '>= 2.1.0'
-  end
+  spec.required_ruby_version = '>= 2.1.0'
 
   spec.add_dependency 'temple', '>= 0.8.2'
   spec.add_dependency 'thor'
@@ -41,7 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
   spec.add_development_dependency 'rails', '>= 4.0'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rake-compiler'
   spec.add_development_dependency 'sass'
   spec.add_development_dependency 'slim'
   spec.add_development_dependency 'string_template'

data/lib/haml/attribute_builder.rb

@@ -9,166 +9,161 @@ module Haml::AttributeBuilder
                        itemscope allowfullscreen default inert sortable
                        truespeed typemustmatch download].freeze
 
-  # For JRuby, TruffleRuby, and Wasm, fallback to Ruby implementation.
-  if /java|wasm/ === RUBY_PLATFORM || RUBY_ENGINE == 'truffleruby'
-    class << self
-      def build(escape_attrs, quote, format, boolean_attributes, object_ref, *hashes)
-        hashes << Haml::ObjectRef.parse(object_ref) if object_ref
-        buf  = []
-        hash = merge_all_attrs(hashes)
-
-        keys = hash.keys.sort!
-        keys.each do |key|
-          case key
-          when 'id'.freeze
-            buf << " id=#{quote}#{build_id(escape_attrs, *hash[key])}#{quote}"
-          when 'class'.freeze
-            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-/
-            build_boolean!(escape_attrs, quote, format, buf, key, hash[key])
-          else
-            buf << " #{key}=#{quote}#{escape_html(escape_attrs, hash[key].to_s)}#{quote}"
-          end
+  class << self
+    def build(escape_attrs, quote, format, boolean_attributes, object_ref, *hashes)
+      hashes << Haml::ObjectRef.parse(object_ref) if object_ref
+      buf  = []
+      hash = merge_all_attrs(hashes)
+
+      keys = hash.keys.sort!
+      keys.each do |key|
+        case key
+        when 'id'
+          buf << " id=#{quote}#{build_id(escape_attrs, *hash[key])}#{quote}"
+        when 'class'
+          buf << " class=#{quote}#{build_class(escape_attrs, *hash[key])}#{quote}"
+        when 'data'
+          buf << build_data(escape_attrs, quote, *hash[key])
+        when 'aria'
+          buf << build_aria(escape_attrs, quote, *hash[key])
+        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}"
         end
-        buf.join
       end
+      buf.join
+    end
 
-      def build_id(escape_attrs, *values)
-        escape_html(escape_attrs, values.flatten.select { |v| v }.join('_'))
-      end
+    def build_id(escape_attrs, *values)
+      escape_html(escape_attrs, values.flatten.select { |v| v }.join('_'))
+    end
 
-      def build_class(escape_attrs, *values)
-        if values.size == 1
-          value = values.first
-          case
-          when value.is_a?(String)
-            # noop
-          when value.is_a?(Array)
-            value = value.flatten.select { |v| v }.map(&:to_s).uniq.join(' ')
-          when value
-            value = value.to_s
-          else
-            return ''
-          end
-          return escape_html(escape_attrs, value)
+    def build_class(escape_attrs, *values)
+      if values.size == 1
+        value = values.first
+        case
+        when value.is_a?(String)
+          # noop
+        when value.is_a?(Array)
+          value = value.flatten.select { |v| v }.map(&:to_s).uniq.join(' ')
+        when value
+          value = value.to_s
+        else
+          return ''
         end
+        return escape_html(escape_attrs, value)
+      end
 
-        classes = []
-        values.each do |value|
-          case
-          when value.is_a?(String)
-            classes += value.split(' ')
-          when value.is_a?(Array)
-            classes += value.select { |v| v }
-          when value
-            classes << value.to_s
-          end
+      classes = []
+      values.each do |value|
+        case
+        when value.is_a?(String)
+          classes += value.split(' ')
+        when value.is_a?(Array)
+          classes += value.select { |v| v }
+        when value
+          classes << value.to_s
         end
-        escape_html(escape_attrs, classes.map(&:to_s).uniq.join(' '))
       end
+      escape_html(escape_attrs, classes.map(&:to_s).uniq.join(' '))
+    end
 
-      def build_data(escape_attrs, quote, *hashes)
-        build_data_attribute(:data, escape_attrs, quote, *hashes)
-      end
+    def build_data(escape_attrs, quote, *hashes)
+      build_data_attribute(:data, escape_attrs, quote, *hashes)
+    end
 
-      def build_aria(escape_attrs, quote, *hashes)
-        build_data_attribute(:aria, escape_attrs, quote, *hashes)
-      end
+    def build_aria(escape_attrs, quote, *hashes)
+      build_data_attribute(:aria, escape_attrs, quote, *hashes)
+    end
 
-      private
+    private
 
-      def build_data_attribute(key, escape_attrs, quote, *hashes)
-        attrs = []
-        if hashes.size > 1 && hashes.all? { |h| h.is_a?(Hash) }
-          data_value = merge_all_attrs(hashes)
-        else
-          data_value = hashes.last
-        end
-        hash = flatten_attributes(key => data_value)
-
-        hash.sort_by(&:first).each do |key, value|
-          case value
-          when true
-            attrs << " #{key}"
-          when nil, false
-            # noop
-          else
-            attrs << " #{key}=#{quote}#{escape_html(escape_attrs, value.to_s)}#{quote}"
-          end
-        end
-        attrs.join
+    def build_data_attribute(key, escape_attrs, quote, *hashes)
+      attrs = []
+      if hashes.size > 1 && hashes.all? { |h| h.is_a?(Hash) }
+        data_value = merge_all_attrs(hashes)
+      else
+        data_value = hashes.last
       end
+      hash = flatten_attributes(key => data_value)
 
-      def flatten_attributes(attributes)
-        flattened = {}
-
-        attributes.each do |key, value|
-          case value
-          when attributes
-          when Hash
-            flatten_attributes(value).each do |k, v|
-              if k.nil?
-                flattened[key] = v
-              else
-                flattened["#{key}-#{k.to_s.gsub(/_/, '-')}"] = v
-              end
-            end
-          else
-            flattened[key] = value if value
-          end
+      hash.sort_by(&:first).each do |key, value|
+        case value
+        when true
+          attrs << " #{key}"
+        when nil, false
+          # noop
+        else
+          attrs << " #{key}=#{quote}#{escape_html(escape_attrs, value.to_s)}#{quote}"
         end
-        flattened
       end
+      attrs.join
+    end
+
+    def flatten_attributes(attributes)
+      flattened = {}
 
-      def merge_all_attrs(hashes)
-        merged = {}
-        hashes.each do |hash|
-          hash.each do |key, value|
-            key = key.to_s
-            case key
-            when 'id'.freeze, 'class'.freeze, 'data'.freeze
-              merged[key] ||= []
-              merged[key] << value
+      attributes.each do |key, value|
+        case value
+        when attributes
+        when Hash
+          flatten_attributes(value).each do |k, v|
+            if k.nil?
+              flattened[key] = v
             else
-              merged[key] = value
+              flattened["#{key}-#{k.to_s.gsub(/_/, '-')}"] = v
             end
           end
+        else
+          flattened[key] = value if value
         end
-        merged
       end
+      flattened
+    end
 
-      def build_boolean!(escape_attrs, quote, format, buf, key, value)
-        case value
-        when true
-          case format
-          when :xhtml
-            buf << " #{key}=#{quote}#{key}#{quote}"
+    def merge_all_attrs(hashes)
+      merged = {}
+      hashes.each do |hash|
+        unless hash.is_a?(Hash)
+          raise ArgumentError, "Non-hash object is given to attributes!"
+        end
+        hash.each do |key, value|
+          key = key.to_s
+          case key
+          when 'id', 'class', 'data', 'aria'
+            merged[key] ||= []
+            merged[key] << value
           else
-            buf << " #{key}"
+            merged[key] = value
           end
-        when false, nil
-          # omitted
-        else
-          buf << " #{key}=#{quote}#{escape_html(escape_attrs, value)}#{quote}"
         end
       end
+      merged
+    end
 
-      def escape_html(escape_attrs, str)
-        if escape_attrs
-          Haml::Util.escape_html(str)
+    def build_boolean!(escape_attrs, quote, format, buf, key, value)
+      case value
+      when true
+        case format
+        when :xhtml
+          buf << " #{key}=#{quote}#{key}#{quote}"
         else
-          str
+          buf << " #{key}"
         end
+      when false, nil
+        # omitted
+      else
+        buf << " #{key}=#{quote}#{escape_html(escape_attrs, value)}#{quote}"
+      end
+    end
+
+    def escape_html(escape_attrs, str)
+      if escape_attrs
+        Haml::Util.escape_html(str)
+      else
+        str
       end
     end
-  else
-    # Haml::AttributeBuilder.build
-    # Haml::AttributeBuilder.build_id
-    # Haml::AttributeBuilder.build_class
-    # Haml::AttributeBuilder.build_data
-    # Haml::AttributeBuilder.build_aria
-    require 'haml/haml'
   end
 end

data/lib/haml/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Haml
-  VERSION = '6.1.4'
+  VERSION = '6.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.1.4
+  version: 6.2.1
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -182,20 +182,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -258,8 +244,7 @@ email:
 - ronnie@dio.jp
 executables:
 - haml
-extensions:
-- ext/haml/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - ".github/FUNDING.yml"
@@ -280,10 +265,6 @@ files:
 - bin/stackprof
 - bin/test
 - exe/haml
-- ext/haml/extconf.rb
-- ext/haml/haml.c
-- ext/haml/hescape.c
-- ext/haml/hescape.h
 - haml.gemspec
 - lib/haml.rb
 - lib/haml/ambles.rb

data/ext/haml/extconf.rb

@@ -1,10 +0,0 @@
-require 'mkmf'
-
-$CFLAGS << ' -Wall -Wextra'
-
-$srcs = %w[
-  haml.c
-  hescape.c
-]
-
-create_makefile('haml/haml')

data/ext/haml/haml.c

@@ -1,529 +0,0 @@
-#include <ruby.h>
-#include <ruby/encoding.h>
-#ifndef TRUFFLERUBY
-#include "hescape.h"
-#include "string.h"
-
-VALUE mAttributeBuilder, mObjectRef;
-static ID id_flatten, id_keys, id_parse, id_prepend, id_tr, id_uniq_bang;
-static ID id_xhtml;
-
-static VALUE str_aria, str_data, str_equal, str_hyphen, str_space, str_underscore;
-
-static void
-delete_falsey_values(VALUE values)
-{
-  VALUE value;
-  long i;
-
-  for (i = RARRAY_LEN(values) - 1; 0 <= i; i--) {
-    value = rb_ary_entry(values, i);
-    if (!RTEST(value)) {
-      rb_ary_delete_at(values, i);
-    }
-  }
-}
-
-static int
-str_eq(VALUE str, const char *cstr, long n)
-{
-  return RSTRING_LEN(str) == n && memcmp(RSTRING_PTR(str), cstr, n) == 0;
-}
-
-static VALUE
-to_s(VALUE value)
-{
-  return rb_convert_type(value, T_STRING, "String", "to_s");
-}
-
-static VALUE
-hyphenate(VALUE str)
-{
-  long i;
-
-  if (OBJ_FROZEN(str)) str = rb_str_dup(str);
-
-  for (i = 0; i < RSTRING_LEN(str); i++) {
-    if (RSTRING_PTR(str)[i] == '_') {
-      rb_str_update(str, i, 1, str_hyphen);
-    }
-  }
-  return str;
-}
-
-static VALUE
-escape_html(VALUE str)
-{
-  char *buf;
-  unsigned int size;
-  Check_Type(str, T_STRING);
-
-  size = hesc_escape_html(&buf, RSTRING_PTR(str), RSTRING_LEN(str));
-  if (size > RSTRING_LEN(str)) {
-    str = rb_enc_str_new(buf, size, rb_utf8_encoding());
-    free((void *)buf);
-  }
-
-  return str;
-}
-
-static VALUE
-escape_attribute(VALUE escape_attrs, VALUE str)
-{
-  if (RTEST(escape_attrs)) {
-    return escape_html(str);
-  } else {
-    return str;
-  }
-}
-
-static VALUE
-haml_build_id(VALUE escape_attrs, VALUE values)
-{
-  VALUE attr_value;
-
-  values = rb_funcall(values, id_flatten, 0);
-  delete_falsey_values(values);
-
-  attr_value = rb_ary_join(values, str_underscore);
-  return escape_attribute(escape_attrs, attr_value);
-}
-
-static VALUE
-haml_build_single_class(VALUE escape_attrs, VALUE value)
-{
-  switch (TYPE(value)) {
-    case T_STRING:
-      break;
-    case T_ARRAY:
-      value = rb_funcall(value, id_flatten, 0);
-      delete_falsey_values(value);
-      value = rb_ary_join(value, str_space);
-      break;
-    default:
-      if (RTEST(value)) {
-        value = to_s(value);
-      } else {
-        return rb_str_new_cstr("");
-      }
-      break;
-  }
-  return escape_attribute(escape_attrs, value);
-}
-
-static VALUE
-haml_build_multi_class(VALUE escape_attrs, VALUE values)
-{
-  long i, j;
-  VALUE value, buf;
-
-  buf = rb_ary_new2(RARRAY_LEN(values));
-
-  for (i = 0; i < RARRAY_LEN(values); i++) {
-    value = rb_ary_entry(values, i);
-    switch (TYPE(value)) {
-      case T_STRING:
-        rb_ary_concat(buf, rb_str_split(value, " "));
-        break;
-      case T_ARRAY:
-        value = rb_funcall(value, id_flatten, 0);
-        delete_falsey_values(value);
-        for (j = 0; j < RARRAY_LEN(value); j++) {
-          rb_ary_push(buf, to_s(rb_ary_entry(value, j)));
-        }
-        break;
-      default:
-        if (RTEST(value)) {
-          rb_ary_push(buf, to_s(value));
-        }
-        break;
-    }
-  }
-
-  rb_funcall(buf, id_uniq_bang, 0);
-
-  return escape_attribute(escape_attrs, rb_ary_join(buf, str_space));
-}
-
-static VALUE
-haml_build_class(VALUE escape_attrs, VALUE array)
-{
-  if (RARRAY_LEN(array) == 1) {
-    return haml_build_single_class(escape_attrs, rb_ary_entry(array, 0));
-  } else {
-    return haml_build_multi_class(escape_attrs, array);
-  }
-}
-
-struct merge_data_attrs_var {
-  VALUE merged;
-  VALUE key_str;
-};
-
-static int
-merge_data_attrs_i(VALUE key, VALUE value, VALUE ptr)
-{
-  struct merge_data_attrs_var *arg = (struct merge_data_attrs_var *)ptr;
-  VALUE merged = arg->merged;
-  VALUE key_str = arg->key_str;
-
-  if (NIL_P(key)) {
-    rb_hash_aset(merged, key_str, value);
-  } else {
-    key = rb_str_concat(rb_str_concat(rb_str_dup(key_str), rb_str_new_cstr("-")), to_s(key));
-    rb_hash_aset(merged, key, value);
-  }
-  return ST_CONTINUE;
-}
-
-static VALUE
-merge_data_attrs(VALUE values, VALUE key_str)
-{
-  long i;
-  VALUE value, merged = rb_hash_new();
-
-  for (i = 0; i < RARRAY_LEN(values); i++) {
-    struct merge_data_attrs_var arg;
-    arg.merged = merged;
-    arg.key_str = key_str;
-
-    value = rb_ary_entry(values, i);
-    switch (TYPE(value)) {
-      case T_HASH:
-        rb_hash_foreach(value, merge_data_attrs_i, (VALUE)&arg);
-        break;
-      default:
-        rb_hash_aset(merged, key_str, value);
-        break;
-    }
-  }
-  return merged;
-}
-
-struct flatten_data_attrs_i2_arg {
-  VALUE flattened;
-  VALUE key;
-};
-
-static int
-flatten_data_attrs_i2(VALUE k, VALUE v, VALUE ptr)
-{
-  VALUE key;
-  struct flatten_data_attrs_i2_arg *arg = (struct flatten_data_attrs_i2_arg *)ptr;
-
-  if (!RTEST(v)) return ST_CONTINUE;
-
-  if (k == Qnil) {
-    rb_hash_aset(arg->flattened, arg->key, v);
-  } else {
-    key = rb_str_dup(arg->key);
-    rb_str_cat(key, "-", 1);
-    rb_str_concat(key, to_s(k));
-
-    rb_hash_aset(arg->flattened, key, v);
-  }
-  return ST_CONTINUE;
-}
-
-static VALUE flatten_data_attrs(VALUE attrs);
-
-static int
-flatten_data_attrs_i(VALUE key, VALUE value, VALUE flattened)
-{
-  struct flatten_data_attrs_i2_arg arg;
-  key = hyphenate(to_s(key));
-
-  switch (TYPE(value)) {
-    case T_HASH:
-      value = flatten_data_attrs(value);
-      arg.key       = key;
-      arg.flattened = flattened;
-      rb_hash_foreach(value, flatten_data_attrs_i2, (VALUE)(&arg));
-      break;
-    default:
-      if (RTEST(value)) rb_hash_aset(flattened, key, value);
-      break;
-  }
-  return ST_CONTINUE;
-}
-
-static VALUE
-flatten_data_attrs(VALUE attrs)
-{
-  VALUE flattened = rb_hash_new();
-  rb_hash_foreach(attrs, flatten_data_attrs_i, flattened);
-
-  return flattened;
-}
-
-static VALUE
-haml_build_data(VALUE escape_attrs, VALUE quote, VALUE values, VALUE key_str)
-{
-  long i;
-  VALUE attrs, buf, keys, key, value;
-
-  attrs = merge_data_attrs(values, key_str);
-  attrs = flatten_data_attrs(attrs);
-  keys  = rb_ary_sort_bang(rb_funcall(attrs, id_keys, 0));
-  buf   = rb_str_new("", 0);
-
-  for (i = 0; i < RARRAY_LEN(keys); i++) {
-    key   = rb_ary_entry(keys, i);
-    value = rb_hash_aref(attrs, key);
-
-    switch (value) {
-      case Qtrue:
-        rb_str_concat(buf, str_space);
-        rb_str_concat(buf, key);
-        break;
-      case Qnil:
-        break; // noop
-      case Qfalse:
-        break; // noop
-      default:
-        rb_str_concat(buf, str_space);
-        rb_str_concat(buf, key);
-        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);
-        break;
-    }
-  }
-
-  return buf;
-}
-
-static VALUE
-parse_object_ref(VALUE object_ref)
-{
-  return rb_funcall(mObjectRef, id_parse, 1, object_ref);
-}
-
-static int
-merge_all_attrs_i(VALUE key, VALUE value, VALUE merged)
-{
-  VALUE array;
-
-  key = to_s(key);
-  if (str_eq(key, "id", 2) || str_eq(key, "class", 5) || str_eq(key, "data", 4) || str_eq(key, "aria", 4)) {
-    array = rb_hash_aref(merged, key);
-    if (NIL_P(array)) {
-      array = rb_ary_new2(1);
-      rb_hash_aset(merged, key, array);
-    }
-    rb_ary_push(array, value);
-  } else {
-    rb_hash_aset(merged, key, value);
-  }
-  return ST_CONTINUE;
-}
-
-static VALUE
-merge_all_attrs(VALUE hashes)
-{
-  long i;
-  VALUE hash, merged = rb_hash_new();
-
-  for (i = 0; i < RARRAY_LEN(hashes); i++) {
-    hash = rb_ary_entry(hashes, i);
-    if (!RB_TYPE_P(hash, T_HASH)) {
-      rb_raise(rb_eArgError, "Non-hash object is given to attributes!");
-    }
-    rb_hash_foreach(hash, merge_all_attrs_i, merged);
-  }
-  return merged;
-}
-
-int
-is_boolean_attribute(VALUE key, 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;
-  return RTEST(rb_ary_includes(boolean_attributes, key));
-}
-
-void
-haml_build_for_id(VALUE escape_attrs, VALUE quote, VALUE buf, VALUE values)
-{
-  rb_str_cat(buf, " id=", 4);
-  rb_str_concat(buf, quote);
-  rb_str_concat(buf, haml_build_id(escape_attrs, values));
-  rb_str_concat(buf, quote);
-}
-
-void
-haml_build_for_class(VALUE escape_attrs, VALUE quote, VALUE buf, VALUE values)
-{
-  rb_str_cat(buf, " class=", 7);
-  rb_str_concat(buf, quote);
-  rb_str_concat(buf, haml_build_class(escape_attrs, values));
-  rb_str_concat(buf, quote);
-}
-
-void
-haml_build_for_data(VALUE escape_attrs, VALUE quote, VALUE buf, VALUE values)
-{
-  rb_str_concat(buf, haml_build_data(escape_attrs, quote, values, str_data));
-}
-
-void
-haml_build_for_aria(VALUE escape_attrs, VALUE quote, VALUE buf, VALUE values)
-{
-  rb_str_concat(buf, haml_build_data(escape_attrs, quote, values, str_aria));
-}
-
-void
-haml_build_for_others(VALUE escape_attrs, VALUE quote, VALUE buf, VALUE key, VALUE value)
-{
-  rb_str_cat(buf, " ", 1);
-  rb_str_concat(buf, key);
-  rb_str_cat(buf, "=", 1);
-  rb_str_concat(buf, quote);
-  rb_str_concat(buf, escape_attribute(escape_attrs, to_s(value)));
-  rb_str_concat(buf, quote);
-}
-
-void
-haml_build_for_boolean(VALUE escape_attrs, VALUE quote, VALUE format, VALUE buf, VALUE key, VALUE value)
-{
-  switch (value) {
-    case Qtrue:
-      rb_str_cat(buf, " ", 1);
-      rb_str_concat(buf, key);
-      if ((TYPE(format) == T_SYMBOL || TYPE(format) == T_STRING) && rb_to_id(format) == id_xhtml) {
-        rb_str_cat(buf, "=", 1);
-        rb_str_concat(buf, quote);
-        rb_str_concat(buf, key);
-        rb_str_concat(buf, quote);
-      }
-      break;
-    case Qfalse:
-      break; // noop
-    case Qnil:
-      break; // noop
-    default:
-      haml_build_for_others(escape_attrs, quote, buf, key, value);
-      break;
-  }
-}
-
-static VALUE
-haml_build(VALUE escape_attrs, VALUE quote, VALUE format, VALUE boolean_attributes, VALUE object_ref, VALUE hashes)
-{
-  long i;
-  VALUE attrs, buf, key, keys, value;
-
-  if (!NIL_P(object_ref)) rb_ary_push(hashes, parse_object_ref(object_ref));
-  attrs = merge_all_attrs(hashes);
-  buf   = rb_str_new("", 0);
-  keys  = rb_ary_sort_bang(rb_funcall(attrs, id_keys, 0));
-
-  for (i = 0; i < RARRAY_LEN(keys); i++) {
-    key   = rb_ary_entry(keys, i);
-    value = rb_hash_aref(attrs, key);
-    if (str_eq(key, "id", 2)) {
-      haml_build_for_id(escape_attrs, quote, buf, value);
-    } else if (str_eq(key, "class", 5)) {
-      haml_build_for_class(escape_attrs, quote, buf, value);
-    } else if (str_eq(key, "data", 4)) {
-      haml_build_for_data(escape_attrs, quote, buf, value);
-    } else if (str_eq(key, "aria", 4)) {
-      haml_build_for_aria(escape_attrs, quote, buf, value);
-    } else if (is_boolean_attribute(key, boolean_attributes)) {
-      haml_build_for_boolean(escape_attrs, quote, format, buf, key, value);
-    } else {
-      haml_build_for_others(escape_attrs, quote, buf, key, value);
-    }
-  }
-
-  return buf;
-}
-
-static VALUE
-rb_haml_build_id(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
-{
-  VALUE array;
-
-  rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
-  rb_scan_args(argc - 1, argv + 1, "*", &array);
-
-  return haml_build_id(argv[0], array);
-}
-
-static VALUE
-rb_haml_build_class(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
-{
-  VALUE array;
-
-  rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
-  rb_scan_args(argc - 1, argv + 1, "*", &array);
-
-  return haml_build_class(argv[0], array);
-}
-
-static VALUE
-rb_haml_build_aria(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
-{
-  VALUE array;
-
-  rb_check_arity(argc, 2, UNLIMITED_ARGUMENTS);
-  rb_scan_args(argc - 2, argv + 2, "*", &array);
-
-  return haml_build_data(argv[0], argv[1], array, str_aria);
-}
-
-static VALUE
-rb_haml_build_data(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
-{
-  VALUE array;
-
-  rb_check_arity(argc, 2, UNLIMITED_ARGUMENTS);
-  rb_scan_args(argc - 2, argv + 2, "*", &array);
-
-  return haml_build_data(argv[0], argv[1], array, str_data);
-}
-
-static VALUE
-rb_haml_build(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
-{
-  VALUE array;
-
-  rb_check_arity(argc, 5, UNLIMITED_ARGUMENTS);
-  rb_scan_args(argc - 5, argv + 5, "*", &array);
-
-  return haml_build(argv[0], argv[1], argv[2], argv[3], argv[4], array);
-}
-
-void
-Init_haml(void)
-{
-  VALUE mHaml;
-
-  mHaml             = rb_define_module("Haml");
-  mObjectRef        = rb_define_module_under(mHaml, "ObjectRef");
-  mAttributeBuilder = rb_define_module_under(mHaml, "AttributeBuilder");
-
-  rb_define_singleton_method(mAttributeBuilder, "build", rb_haml_build, -1);
-  rb_define_singleton_method(mAttributeBuilder, "build_id", rb_haml_build_id, -1);
-  rb_define_singleton_method(mAttributeBuilder, "build_class", rb_haml_build_class, -1);
-  rb_define_singleton_method(mAttributeBuilder, "build_aria", rb_haml_build_aria, -1);
-  rb_define_singleton_method(mAttributeBuilder, "build_data", rb_haml_build_data, -1);
-
-  id_flatten   = rb_intern("flatten");
-  id_keys      = rb_intern("keys");
-  id_parse     = rb_intern("parse");
-  id_prepend   = rb_intern("prepend");
-  id_tr        = rb_intern("tr");
-  id_uniq_bang = rb_intern("uniq!");
-  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/ext/haml/hescape.c

@@ -1,108 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "hescape.h"
-
-static const char *ESCAPED_STRING[] = {
-  "",
-  "&quot;",
-  "&amp;",
-  "&#39;",
-  "&lt;",
-  "&gt;",
-};
-
-// This is strlen(ESCAPED_STRING[x]) optimized specially.
-// Mapping: 1 => 6, 2 => 5, 3 => 5, 4 => 4, 5 => 4
-#define ESC_LEN(x) ((13 - x) / 2)
-
-/*
- * Given ASCII-compatible character, return index of ESCAPED_STRING.
- *
- * " (34) => 1 (&quot;)
- * & (38) => 2 (&amp;)
- * ' (39) => 3 (&#39;)
- * < (60) => 4 (&lt;)
- * > (62) => 5 (&gt;)
- */
-static const char HTML_ESCAPE_TABLE[] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 1, 0, 0, 0, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 5, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-static char*
-ensure_allocated(char *buf, size_t size, size_t *asize)
-{
-  size_t new_size;
-
-  if (size < *asize)
-    return buf;
-
-  if (*asize == 0) {
-    new_size = size;
-  } else {
-    new_size = *asize;
-  }
-
-  // Increase buffer size by 1.5x if realloced multiple times.
-  while (new_size < size)
-    new_size = (new_size << 1) - (new_size >> 1);
-
-  // Round allocation up to multiple of 8.
-  new_size = (new_size + 7) & ~7;
-
-  *asize = new_size;
-  return realloc(buf, new_size);
-}
-
-size_t
-hesc_escape_html(char **dest, const char *buf, size_t size)
-{
-  size_t asize = 0, esc_i = 0, esize = 0, i = 0, rbuf_end = 0;
-  const char *esc;
-  char *rbuf = NULL;
-
-  while (i < size) {
-    // Loop here to skip non-escaped characters fast.
-    while (i < size && (esc_i = HTML_ESCAPE_TABLE[(unsigned char)buf[i]]) == 0)
-      i++;
-
-    if (i < size && esc_i) {
-      esc = ESCAPED_STRING[esc_i];
-      rbuf = ensure_allocated(rbuf, sizeof(char) * (size + esize + ESC_LEN(esc_i) + 1), &asize);
-
-      // Copy pending characters and escaped string.
-      memmove(rbuf + rbuf_end, buf + (rbuf_end - esize), i - (rbuf_end - esize));
-      memmove(rbuf + i + esize, esc, ESC_LEN(esc_i));
-      rbuf_end = i + esize + ESC_LEN(esc_i);
-      esize += ESC_LEN(esc_i) - 1;
-    }
-    i++;
-  }
-
-  if (rbuf_end == 0) {
-    // Return given buf and size if there are no escaped characters.
-    *dest = (char *)buf;
-    return size;
-  } else {
-    // Copy pending characters including NULL character.
-    memmove(rbuf + rbuf_end, buf + (rbuf_end - esize), (size + 1) - (rbuf_end - esize));
-
-    *dest = rbuf;
-    return size + esize;
-  }
-}

data/ext/haml/hescape.h

@@ -1,20 +0,0 @@
-#ifndef HESCAPE_H
-#define HESCAPE_H
-
-#include <sys/types.h>
-
-/*
- * Replace characters according to the following rules.
- * Note that this function can handle only ASCII-compatible string.
- *
- * " => &quot;
- * & => &amp;
- * ' => &#39;
- * < => &lt;
- * > => &gt;
- *
- * @return size of dest. If it's larger than len, dest is required to be freed.
- */
-extern size_t hesc_escape_html(char **dest, const char *src, size_t size);
-
-#endif