haml 6.2.1 → 6.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28980224aeb7aaf767631d85d1a25371bd1e1fd78b87afa34ba5e300ee397126
-  data.tar.gz: c6e6cf4c766238cf501eb7695d75bc973746010a0c11bc90bce88d51d3d6b20d
+  metadata.gz: e0e28e40ec5137482caae5c2fb466d21976027139b3f39d428035dbd35914774
+  data.tar.gz: c906550bd147f7e6a2961ebd07bc59fcc69b3433c454141cb2ae29e1ccd64e2b
 SHA512:
-  metadata.gz: 42427402b30e767c124156562de33826ba7e16905a71ee38d494182bb0bd2f7f29135c1fd736702932ca656b94d3fdf8503e5829bd1d4cf62928eb3703261123
-  data.tar.gz: a8786a46da773e42d90bca9c29a9003a07be1a0b0f4ef2ad8ce7af117566ea96e891bc13ec22ccb5ab3ad0b6c62be8f247c7ac5b9db279c2f21cd0e4b3d06576
+  metadata.gz: '0583d8a879f6c7eda656d6c956a9e5573eedd5f94d14b28d378af85bbab73f220499b9c8021af0bad5946c95073cd1201d2d2765556e138696462bf2d28a4304'
+  data.tar.gz: 2847f03720469d3eaabcc689f628198569f668b1c87c70f67422c70ed1af25103998cc004a86d9f430d57fb12f88078ef2fa27d544dad69ad9df95cc9241bfdd

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Haml Changelog
 
+## 6.2.3
+
+* Resurrect RDFa doctype support [#1147](https://github.com/haml/haml/issues/1147)
+
+## 6.2.2
+
+* Allow adding custom attributes to `Haml::BOOLEAN_ATTRIBUTES` [#1148](https://github.com/haml/haml/issues/1148)
+* Consider `aria-xxx: false` as a boolean attribute
+
 ## 6.2.1
 
 * Fix v6.2.0's bug in rendering dynamic `aria` attributes [#1149](https://github.com/haml/haml/issues/1149)

data/lib/haml/attribute_builder.rb

@@ -2,15 +2,8 @@
 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
-
   class << self
-    def build(escape_attrs, quote, format, boolean_attributes, object_ref, *hashes)
+    def build(escape_attrs, quote, format, object_ref, *hashes)
       hashes << Haml::ObjectRef.parse(object_ref) if object_ref
       buf  = []
       hash = merge_all_attrs(hashes)
@@ -26,7 +19,7 @@ module Haml::AttributeBuilder
           buf << build_data(escape_attrs, quote, *hash[key])
         when 'aria'
           buf << build_aria(escape_attrs, quote, *hash[key])
-        when *boolean_attributes, /\Adata-/
+        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}"

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.2.3
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -337,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.