haml 6.4.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 313ffec5cc79d2b238173fde9769ac60d26b54bf15d3deda68adc84d0849620b
-  data.tar.gz: 143e9115612a2555a4ce34c817745e330548a7eaedf98bc819ead44b2156f8ad
+  metadata.gz: 2b10bef5fb4fb8621296fd6756746b6981a736d1b2a6adb356109c95fa37f047
+  data.tar.gz: 5925fcc2f3f7029cfcd81e82399c5a103e494ef9dcf808a5d6c8f414552bced4
 SHA512:
-  metadata.gz: 117f3811b514f8abd4142cdc8022e282e5a5434c5c0f6904e7eaff7655f58894e3486c999282f0140b6011016b52b139036071792c3ba33494de73342d512d77
-  data.tar.gz: 99e76cc2438c8ba70aaf39b3ccc0df9b610e3ac06de35b8865c2f2ce5aa692f9642791b863602eef5e382d60224fdb44a143074c11f072ccad7556ae1461b261
+  metadata.gz: d7c7c493fbcaf1f98458b0d7cf3f2a1d196d1d9d568b034151c1fe4e711ba532edd20cb8cf8c69e00a12e5b7bdb7427c55849ae80cfff2039ed7001d20f071f6
+  data.tar.gz: 9b86bd8074d90eaec2e7ed7a7317da23d4a7a83ddeca7861d1a93e16be637d69cacb49f2ab833596328cfeb7708b624af977f8caa28c035ffdca6f75701a0ee3

data/.github/workflows/test.yml

@@ -17,11 +17,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '2.5'
-          - '2.6'
-          - '2.7'
-          - '3.0'
-          - '3.1'
           - '3.2'
           - '3.3'
           - '3.4'

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Haml Changelog
 
+## 7.0.1
+
+* Use `Regexp#match?` predicate where possible https://github.com/haml/haml/pull/1194
+* Fix the 'Changelog' link on rubygems.org/gems/haml https://github.com/haml/haml/pull/1192
+
+## 7.0.0
+
+* Change the default `attr_quote` from `'` to `"` https://github.com/haml/haml/issues/1188
+* Bump required Ruby version to 3.2 https://github.com/haml/haml/issues/1176
+
 ## 6.4.0
 
 * Authorize characters in attribute name for vuejs https://github.com/haml/haml/pull/1172

data/Gemfile

@@ -10,9 +10,11 @@ gemspec
 
 gem 'benchmark-ips', '2.3.0'
 gem 'maxitest'
-gem 'pry'
+gem 'base64'
+gem 'bigdecimal'
+gem 'mutex_m'
 
-if /java/ === RUBY_PLATFORM # JRuby
+if /java/.match?(RUBY_PLATFORM) # JRuby
   gem 'pandoc-ruby'
 else
   gem 'redcarpet'
@@ -21,14 +23,3 @@ else
     gem 'stackprof'
   end
 end
-
-if RUBY_VERSION < '2.6'
-  gem 'rake-compiler', '< 1.2.4'
-end
-
-# Temporary workaround to ensure Ruby 2.5 and 2.6 can pass tests with Rails 6.1
-# Reference: https://github.com/rails/rails/issues/54260
-# TODO: Remove this workaround when dropping support for Rails versions below 7.1
-if RUBY_VERSION < '2.7'
-  gem 'concurrent-ruby', '< 1.3.5'
-end

data/README.md

@@ -157,7 +157,7 @@ on a specific area:
 ruby -Itest test/helper_test.rb -n test_buffer_access
 ~~~
 
-Haml currently supports Ruby 2.0.0 and higher, so please make sure your changes run on 2.0+.
+Haml currently supports Ruby 3.2.0 and higher, so please make sure your changes run on 3.2+.
 
 ## Team
 

data/bin/console

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'hamlit'
+require 'haml'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-require 'pry'
-Pry.start
+require 'irb'
+IRB.start

data/haml.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
 
   spec.metadata      = { 'rubygems_mfa_required' => 'true' }
 
-  spec.metadata["changelog_uri"] = spec.homepage + "/blob/main/CHANGELOG.md"
+  spec.metadata["changelog_uri"] = spec.homepage + "/docs/yardoc/file.CHANGELOG.html"
 
-  spec.required_ruby_version = '>= 2.1.0'
+  spec.required_ruby_version = '>= 3.2.0'
 
   spec.add_dependency 'temple', '>= 0.8.2'
   spec.add_dependency 'thor'
@@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coffee-script'
   spec.add_development_dependency 'erubi'
-  spec.add_development_dependency 'haml', '>= 5'
   spec.add_development_dependency 'less'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
   spec.add_development_dependency 'rails', '>= 4.0'

data/lib/haml/engine.rb

@@ -17,13 +17,13 @@ module Haml
       :buffer_class,
       generator:    Temple::Generators::StringBuffer,
       format:       :html,
-      attr_quote:   "'",
+      attr_quote:   '"',
       escape_html:  true,
       escape_attrs: true,
       autoclose:    %w(area base basefont br col command embed frame
                        hr img input isindex keygen link menuitem meta
                        param source track wbr),
-      filename:     "",
+      filename:     '',
       disable_capture: false,
       remove_whitespace: false,
     )

data/lib/haml/parser.rb

@@ -236,7 +236,7 @@ module Haml
     DynamicAttributes = Struct.new(:new, :old) do
       undef :old=
       def old=(value)
-        unless value =~ /\A{.*}\z/m
+        unless /\A{.*}\z/m.match?(value)
           raise ArgumentError.new('Old attributes must start with "{" and end with "}"')
         end
         self[:old] = value
@@ -528,7 +528,7 @@ module Haml
     end
 
     def filter(name)
-      raise Error.new(Error.message(:invalid_filter_name, name)) unless name =~ /^\w+$/
+      raise Error.new(Error.message(:invalid_filter_name, name)) unless /^\w+$/.match?(name)
 
       if filter_opened?
         @flat = true

data/lib/haml/string_splitter.rb

@@ -7,7 +7,7 @@ end
 module Haml
   # Compile [:dynamic, "foo#{bar}"] to [:multi, [:static, 'foo'], [:dynamic, 'bar']]
   class StringSplitter < Temple::Filter
-    if defined?(Ripper) && RUBY_VERSION >= "2.0.0" && Ripper.respond_to?(:lex)
+    if defined?(Ripper) && Ripper.respond_to?(:lex)
       class << self
         # `code` param must be valid string literal
         def compile(code)

data/lib/haml/util.rb

@@ -69,7 +69,7 @@ module Haml
         # Shortcut for UTF-8 which might be the majority case
         if str.encoding == Encoding::UTF_8
           return str.gsub(/\A\uFEFF/, '')
-        elsif str.encoding.name =~ /^UTF-(16|32)(BE|LE)?$/
+        elsif /^UTF-(16|32)(BE|LE)?$/.match?(str.encoding.name)
           return str.gsub(Regexp.new("\\A\uFEFF".encode(str.encoding)), '')
         else
           return str

data/lib/haml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -111,20 +111,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: less
   requirement: !ruby/object:Gem::Requirement
@@ -322,7 +308,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-  changelog_uri: https://haml.info/blob/main/CHANGELOG.md
+  changelog_uri: https://haml.info/docs/yardoc/file.CHANGELOG.html
 rdoc_options: []
 require_paths:
 - lib
@@ -330,7 +316,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="