haml 6.2.0 → 6.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1374065239926b78aa88c8a9669a4a97ea937ba078f4794be6d3d34c072472e
-  data.tar.gz: a99b6d11b903d2d9985e6e89d857b24c4ca5c31efe2a0c09d29cfea7b58a2057
+  metadata.gz: e0e28e40ec5137482caae5c2fb466d21976027139b3f39d428035dbd35914774
+  data.tar.gz: c906550bd147f7e6a2961ebd07bc59fcc69b3433c454141cb2ae29e1ccd64e2b
 SHA512:
-  metadata.gz: '05423907d445d38fbba24d1b08f6812b43a8bca544554b5ecc1d1190e87842cedf888cd4759f6d568cb861a0f6983e06610d57daa2233feafb0e29cce92c71b1'
-  data.tar.gz: e88712e3391749f5c893512eb595c912718476a7128773b4edd4aa19b191837ff3d6d154a18a0c8a42a107d6c04ce4ee6cd3189d6270210d9b4b5ded33def0dc
+  metadata.gz: '0583d8a879f6c7eda656d6c956a9e5573eedd5f94d14b28d378af85bbab73f220499b9c8021af0bad5946c95073cd1201d2d2765556e138696462bf2d28a4304'
+  data.tar.gz: 2847f03720469d3eaabcc689f628198569f668b1c87c70f67422c70ed1af25103998cc004a86d9f430d57fb12f88078ef2fa27d544dad69ad9df95cc9241bfdd

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # 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)
+
 ## 6.2.0
 
 * Drop the C extension [#1146](https://github.com/haml/haml/issues/1146)
@@ -1448,7 +1461,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/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)
@@ -18,13 +11,15 @@ module Haml::AttributeBuilder
       keys = hash.keys.sort!
       keys.each do |key|
         case key
-        when 'id'.freeze
+        when 'id'
           buf << " id=#{quote}#{build_id(escape_attrs, *hash[key])}#{quote}"
-        when 'class'.freeze
+        when 'class'
           buf << " class=#{quote}#{build_class(escape_attrs, *hash[key])}#{quote}"
-        when 'data'.freeze
+        when 'data'
           buf << build_data(escape_attrs, quote, *hash[key])
-        when *boolean_attributes, /\Adata-/
+        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}"
@@ -129,7 +124,7 @@ module Haml::AttributeBuilder
         hash.each do |key, value|
           key = key.to_s
           case key
-          when 'id'.freeze, 'class'.freeze, 'data'.freeze
+          when 'id', 'class', 'data', 'aria'
             merged[key] ||= []
             merged[key] << value
           else

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.0'
+  VERSION = '6.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.3
 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
@@ -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.