haml 7.0.1 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b10bef5fb4fb8621296fd6756746b6981a736d1b2a6adb356109c95fa37f047
-  data.tar.gz: 5925fcc2f3f7029cfcd81e82399c5a103e494ef9dcf808a5d6c8f414552bced4
+  metadata.gz: b5fd21b96511ffb6ab57ac08adcbb48f4fba26c9ba3998f9c320527e193b5d65
+  data.tar.gz: 42788bd91d1e0c66c8db3ab579f4005ccd176012207e300ee15244e079ea046c
 SHA512:
-  metadata.gz: d7c7c493fbcaf1f98458b0d7cf3f2a1d196d1d9d568b034151c1fe4e711ba532edd20cb8cf8c69e00a12e5b7bdb7427c55849ae80cfff2039ed7001d20f071f6
-  data.tar.gz: 9b86bd8074d90eaec2e7ed7a7317da23d4a7a83ddeca7861d1a93e16be637d69cacb49f2ab833596328cfeb7708b624af977f8caa28c035ffdca6f75701a0ee3
+  metadata.gz: 6a3959bebf8b2351923c7820d522aedc2bf104ac2d1d75cb76d7a8b2c5dbb4f6fb8b34434981534969658bc1f8068b768365a5a5a222f63dfe12376785462470
+  data.tar.gz: e5bb8177220ef5c56cbc2e34f3c0583b783604719ef1d666f707ee3dee95d2c73b0edd64654ff11776a57d63a9852ad6ee2f080e29431533a937d6dbea5d860c

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # 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
+* Add source code URI to gemspec metadata https://github.com/haml/haml/pull/1197
+
 ## 7.0.1
 
 * Use `Regexp#match?` predicate where possible https://github.com/haml/haml/pull/1194

data/bin/stackprof

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'hamlit'
+require 'haml'
 require 'stackprof'
 
 def open_flamegraph(report)
@@ -20,7 +20,7 @@ end
 
 haml = File.read(ARGV.first)
 StackProf.start(mode: :wall, interval: 1, raw: false)
-Hamlit::Engine.new.call(haml)
+Haml::Engine.new.call(haml)
 StackProf.stop
 
 report = StackProf::Report.new(StackProf.results)

data/haml.gemspec

@@ -22,6 +22,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["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/parser.rb

@@ -182,7 +182,7 @@ module Haml
 
       tabs = line.whitespace.length / @indentation.length
       return tabs if line.whitespace == @indentation * tabs
-      return @template_tabs + 1 if flat? && line.whitespace =~ /^#{@flat_spaces}/
+      return @template_tabs + 1 if flat? && /^#{@flat_spaces}/.match?(line.whitespace)
 
       message = Error.message(:inconsistent_indentation,
         human_indentation(line.whitespace),
@@ -630,7 +630,7 @@ module Haml
 
       tag_name, attributes, rest = match
 
-      if !attributes.empty? && (attributes =~ /[.#](\.|#|\z)/)
+      if !attributes.empty? && /[.#](\.|#|\z)/.match?(attributes)
         raise SyntaxError.new(Error.message(:illegal_element))
       end
 
@@ -786,7 +786,7 @@ module Haml
       line_defined = instance_variable_defined?(:@line)
       @line.tabs if line_defined
       unless (flat? && !closes_flat?(line) && !closes_flat?(@line)) ||
-          (line_defined && @line.text[0] == ?: && line.full =~ %r[^#{@line.full[/^\s+/]}\s])
+          (line_defined && @line.text[0] == ?: && %r[^#{@line.full[/^\s+/]}\s].match?(line.full))
         return next_line if line.text.empty?
 
         handle_multiline(line)
@@ -796,7 +796,7 @@ module Haml
     end
 
     def closes_flat?(line)
-      line && !line.text.empty? && line.full !~ /^#{@flat_spaces}/
+      line && !line.text.empty? && !(/^#{@flat_spaces}/.match?(line.full))
     end
 
     def handle_multiline(line)
@@ -814,7 +814,7 @@ module Haml
 
     # Checks whether or not `line` is in a multiline sequence.
     def is_multiline?(text)
-      text && text.length > 1 && text[-1] == MULTILINE_CHAR_VALUE && text[-2] == ?\s && text !~ BLOCK_WITH_SPACES
+      text && text.length > 1 && text[-1] == MULTILINE_CHAR_VALUE && text[-2] == ?\s && !BLOCK_WITH_SPACES.match?(text)
     end
 
     def handle_ruby_multiline(line)
@@ -838,7 +838,7 @@ module Haml
     # - and not "?\," which is a character literal
     def is_ruby_multiline?(text)
       text && text.length > 1 && text[-1] == ?, &&
-        !((text[-3, 2] =~ /\W\?/) || text[-3, 2] == "?\\")
+        !(/\W\?/.match?(text[-3, 2]) || text[-3, 2] == "?\\")
     end
 
     def balance(*args)
@@ -871,7 +871,7 @@ module Haml
     # Same semantics as block_opened?, except that block_opened? uses Line#tabs,
     # which doesn't interact well with filter lines
     def filter_opened?
-      @next_line.full =~ (@indentation ? /^#{@indentation * (@template_tabs + 1)}/ : /^\s/)
+      (@indentation ? /^#{@indentation * (@template_tabs + 1)}/ : /^\s/).match?(@next_line.full)
     end
 
     def flat?

data/lib/haml/util.rb

@@ -252,7 +252,7 @@ MSG
       # From Ruby's parse.y
       return unless scanner.scan(/([^\s'":;]+)\s*:\s*("(?:\\.|[^"])*"|[^"\s;]+?)[\s;]*-\*-/n)
       name, val = scanner[1], scanner[2]
-      return unless name =~ /(en)?coding/in
+      return unless /(en)?coding/in.match?(name)
       val = $1 if val =~ /^"(.*)"$/n
       return val
     ensure

data/lib/haml/version.rb

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

metadata

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