haml 6.1.1 → 6.2.3

data/lib/haml/attribute_builder.rb

@@ -2,173 +2,161 @@
 require 'haml/object_ref'
 
 module Haml::AttributeBuilder
-  BOOLEAN_ATTRIBUTES = %w[disabled readonly multiple checked autobuffer
-                       autoplay controls loop selected hidden scoped async
-                       defer reversed ismap seamless muted required
-                       autofocus novalidate formnovalidate open pubdate
-                       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, 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 *Haml::BOOLEAN_ATTRIBUTES, /\Adata-/, /\Aaria-/
+          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
-
-      def build_id(escape_attrs, *values)
-        escape_html(escape_attrs, values.flatten.select { |v| v }.join('_'))
       end
+      buf.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)
-        end
+    def build_id(escape_attrs, *values)
+      escape_html(escape_attrs, values.flatten.select { |v| v }.join('_'))
+    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
+    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
-        escape_html(escape_attrs, classes.map(&:to_s).uniq.join(' '))
+        return escape_html(escape_attrs, value)
       end
 
-      def build_data(escape_attrs, quote, *hashes)
-        build_data_attribute(:data, escape_attrs, quote, *hashes)
+      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
       end
+      escape_html(escape_attrs, classes.map(&:to_s).uniq.join(' '))
+    end
 
-      def build_aria(escape_attrs, quote, *hashes)
-        build_data_attribute(:aria, escape_attrs, quote, *hashes)
-      end
+    def build_data(escape_attrs, quote, *hashes)
+      build_data_attribute(:data, escape_attrs, quote, *hashes)
+    end
 
-      private
+    def build_aria(escape_attrs, quote, *hashes)
+      build_data_attribute(:aria, escape_attrs, quote, *hashes)
+    end
 
-      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)
+    private
 
-        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/attribute_compiler.rb

@@ -4,6 +4,14 @@ require 'haml/attribute_parser'
 require 'haml/ruby_expression'
 
 module Haml
+  # The list of boolean attributes. You may add custom attributes to this constant.
+  BOOLEAN_ATTRIBUTES = %w[disabled readonly multiple checked autobuffer
+                       autoplay controls loop selected hidden scoped async
+                       defer reversed ismap seamless muted required
+                       autofocus novalidate formnovalidate open pubdate
+                       itemscope allowfullscreen default inert sortable
+                       truespeed typemustmatch download]
+
   class AttributeCompiler
     def initialize(identity, options)
       @identity = identity
@@ -31,10 +39,7 @@ module Haml
       attrs = []
       attrs.unshift(node.value[:attributes].inspect) if node.value[:attributes] != {}
 
-      args = [
-        @escape_attrs.inspect, "#{@quote.inspect}.freeze", @format.inspect,
-        '::Haml::AttributeBuilder::BOOLEAN_ATTRIBUTES', node.value[:object_ref],
-      ] + attrs
+      args = [@escape_attrs.inspect, "#{@quote.inspect}.freeze", @format.inspect, node.value[:object_ref]] + attrs
       [:html, :attrs, [:dynamic, "::Haml::AttributeBuilder.build(#{args.join(', ')}, #{node.value[:dynamic_attributes].to_literal})"]]
     end
 
@@ -52,7 +57,7 @@ module Haml
           compile_class!(temple, key, values)
         when 'data', 'aria'
           compile_data!(temple, key, values)
-        when *AttributeBuilder::BOOLEAN_ATTRIBUTES, /\Adata-/, /\Aaria-/
+        when *BOOLEAN_ATTRIBUTES, /\Adata-/, /\Aaria-/
           compile_boolean!(temple, key, values)
         else
           compile_common!(temple, key, values)

data/lib/haml/compiler/doctype_compiler.rb

@@ -8,10 +8,12 @@ module Haml
 
       def compile(node)
         case node.value[:type]
-        when 'xml'
-          xml_doctype
         when ''
           html_doctype(node)
+        when 'xml'
+          xml_doctype
+        when 'rdfa'
+          rdfa_doctype
         else
           [:html, :doctype, node.value[:type]]
         end
@@ -41,6 +43,10 @@ module Haml
           [:multi]
         end
       end
+
+      def rdfa_doctype
+        [:static, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">']
+      end
     end
   end
 end

data/lib/haml/rails_template.rb

@@ -27,6 +27,11 @@ module Haml
       source ||= template.source
       options = RailsTemplate.options
 
+      # Make the filename available in parser etc.
+      if template.respond_to?(:identifier)
+        options = options.merge(filename: template.identifier)
+      end
+
       # https://github.com/haml/haml/blob/4.0.7/lib/haml/template/plugin.rb#L19-L20
       # https://github.com/haml/haml/blob/4.0.7/lib/haml/options.rb#L228
       if template.respond_to?(:type) && template.type == 'text/xml'
@@ -43,6 +48,11 @@ module Haml
       Engine.new(options).call(source)
     end
 
+    # Rails Turbo looks for this
+    def default_format
+      :html
+    end
+
     def supports_streaming?
       RailsTemplate.options[:streaming]
     end

data/lib/haml/util.rb

@@ -14,15 +14,16 @@ module Haml
   module Util
     extend self
 
-    # For JRuby, TruffleRuby, and Wasm, fallback to Ruby implementation.
-    if /java|wasm/ === RUBY_PLATFORM || RUBY_ENGINE == 'truffleruby'
+    begin # Ruby 3.2+ or ERB 4+
+      require 'erb/escape'
+
+      define_singleton_method(:escape_html, ERB::Escape.instance_method(:html_escape))
+    rescue LoadError
       require 'cgi/escape'
 
       def self.escape_html(html)
         CGI.escapeHTML(html.to_s)
       end
-    else
-      require 'haml/haml' # Haml::Util.escape_html
     end
 
     # TODO: Remove unescape_interpolation's workaround and get rid of `respond_to?`.

data/lib/haml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.2.3
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-10 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
@@ -339,7 +320,8 @@ files:
 homepage: https://haml.info
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -355,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.

data/ext/haml/extconf.rb

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