haml 7.0.2 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573c7656495ec01083743e533a972fa37d8daed53e617f9ea0e985d214bac0c4
-  data.tar.gz: 1bf75d7b14c90613961ae06be93c35a4cbf3fd41f1a4319042e30892695672c9
+  metadata.gz: b5fd21b96511ffb6ab57ac08adcbb48f4fba26c9ba3998f9c320527e193b5d65
+  data.tar.gz: 42788bd91d1e0c66c8db3ab579f4005ccd176012207e300ee15244e079ea046c
 SHA512:
-  metadata.gz: 9e9b8bb74ff5400deef4fa46fa9711a6952f61be3ffb4c1c53f4657f399ae5cc209473c792eab4501073465c86715249fabaf440201230084c3c311223a2f95c
-  data.tar.gz: 16ba05b091a7471ee379c970a136fdcaf167d9ee52356a2165e028f2d36b53b590c672899e5a0e3d083fceeeff908fcff0a767f0ce1096260ce8d36fb8b4c135
+  metadata.gz: 6a3959bebf8b2351923c7820d522aedc2bf104ac2d1d75cb76d7a8b2c5dbb4f6fb8b34434981534969658bc1f8068b768365a5a5a222f63dfe12376785462470
+  data.tar.gz: e5bb8177220ef5c56cbc2e34f3c0583b783604719ef1d666f707ee3dee95d2c73b0edd64654ff11776a57d63a9852ad6ee2f080e29431533a937d6dbea5d860c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Haml Changelog
 
+## 7.1.0
+
+* Support xhtml format for boolean nested data attributes https://github.com/haml/haml/pull/1200
+
 ## 7.0.2
 
 * Replace usages of `=~` with `.match?` where possible https://github.com/haml/haml/pull/1196

data/lib/haml/attribute_builder.rb

@@ -16,9 +16,9 @@ module Haml::AttributeBuilder
         when 'class'
           buf << " class=#{quote}#{build_class(escape_attrs, *hash[key])}#{quote}"
         when 'data'
-          buf << build_data(escape_attrs, quote, *hash[key])
+          buf << build_data(escape_attrs, quote, format, *hash[key])
         when 'aria'
-          buf << build_aria(escape_attrs, quote, *hash[key])
+          buf << build_aria(escape_attrs, quote, format, *hash[key])
         when *Haml::BOOLEAN_ATTRIBUTES, /\Adata-/, /\Aaria-/
           build_boolean!(escape_attrs, quote, format, buf, key, hash[key])
         else
@@ -62,17 +62,17 @@ module Haml::AttributeBuilder
       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)
+    def build_data(escape_attrs, quote, format, *hashes)
+      build_data_attribute(:data, escape_attrs, quote, format, *hashes)
     end
 
-    def build_aria(escape_attrs, quote, *hashes)
-      build_data_attribute(:aria, escape_attrs, quote, *hashes)
+    def build_aria(escape_attrs, quote, format, *hashes)
+      build_data_attribute(:aria, escape_attrs, quote, format, *hashes)
     end
 
     private
 
-    def build_data_attribute(key, escape_attrs, quote, *hashes)
+    def build_data_attribute(key, escape_attrs, quote, format, *hashes)
       attrs = []
       if hashes.size > 1 && hashes.all? { |h| h.is_a?(Hash) }
         data_value = merge_all_attrs(hashes)
@@ -84,7 +84,7 @@ module Haml::AttributeBuilder
       hash.sort_by(&:first).each do |key, value|
         case value
         when true
-          attrs << " #{key}"
+          build_boolean!(escape_attrs, quote, format, attrs, key, value)
         when nil, false
           # noop
         else

data/lib/haml/attribute_compiler.rb

@@ -85,7 +85,7 @@ module Haml
     end
 
     def compile_data!(temple, key, values)
-      args = [@escape_attrs.inspect, "#{@quote.inspect}.freeze", values.map { |v| literal_for(v) }]
+      args = [@escape_attrs.inspect, "#{@quote.inspect}.freeze", @format.inspect, values.map { |v| literal_for(v) }]
       build_code = "::Haml::AttributeBuilder.build_#{key}(#{args.join(', ')})"
 
       if values.all? { |type, exp| type == :static || Temple::StaticAnalyzer.static?(exp) }

data/lib/haml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.1.0
 platform: ruby
 authors:
 - Natalie Weizenbaum