haml 7.0.2 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573c7656495ec01083743e533a972fa37d8daed53e617f9ea0e985d214bac0c4
-  data.tar.gz: 1bf75d7b14c90613961ae06be93c35a4cbf3fd41f1a4319042e30892695672c9
+  metadata.gz: 666a9c4513f3c1450ac36b92fefcff06d9a69aae9cc60840eb0182dbe53e2995
+  data.tar.gz: 709a5f0d8ad693be7bb7b2750d84fb1025d77ada780f045071e69bf16abfa76a
 SHA512:
-  metadata.gz: 9e9b8bb74ff5400deef4fa46fa9711a6952f61be3ffb4c1c53f4657f399ae5cc209473c792eab4501073465c86715249fabaf440201230084c3c311223a2f95c
-  data.tar.gz: 16ba05b091a7471ee379c970a136fdcaf167d9ee52356a2165e028f2d36b53b590c672899e5a0e3d083fceeeff908fcff0a767f0ce1096260ce8d36fb8b4c135
+  metadata.gz: 5baeb23700d275b2a6c678b807756ff3536d638b782c4a26f44236fd3b9e9037d6b46c5c09b76b87e19f3cffaa668c5f221a395b8f2ba37a9a026c17ebc2fccc
+  data.tar.gz: cd428da5241f00f831080af924ef7fd2a066699c9805272727dbe32eb7672c90d6fbd1bbf6d3cae8dffc99f472d8dfb721b6558d78e64808b2a1319b7a78aa01

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Haml Changelog
 
+## 7.2.0
+
+* Do not require rails when haml is required https://github.com/haml/haml/pull/1201
+* Point `changelog_uri` to GitHub Releases https://github.com/haml/haml/pull/1202
+
+## 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/haml.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata      = { 'rubygems_mfa_required' => 'true' }
 
-  spec.metadata["changelog_uri"] = spec.homepage + "/docs/yardoc/file.CHANGELOG.html"
+  spec.metadata["changelog_uri"] = "https://github.com/haml/haml/releases"
   spec.metadata["source_code_uri"] = "https://github.com/haml/haml"
 
   spec.required_ruby_version = '>= 3.2.0'

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.2.0'
 end

data/lib/haml.rb

@@ -5,9 +5,5 @@ require 'haml/version'
 require 'haml/template'
 
 if File.basename($0) != 'haml'
-  begin
-    require 'rails'
-    require 'haml/railtie'
-  rescue LoadError
-  end
+  require 'haml/railtie' if defined?(Rails::Railtie)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.2.0
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -308,7 +308,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  changelog_uri: https://haml.info/docs/yardoc/file.CHANGELOG.html
+  changelog_uri: https://github.com/haml/haml/releases
   source_code_uri: https://github.com/haml/haml
 rdoc_options: []
 require_paths: