haml 6.1.2-java → 6.1.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c207bda3154c0dd51a94e779751650c9caaaea1368d32106cdcac5abee1ec51c
-  data.tar.gz: bf8cc80cf573ca66ecb03f66114179ce4389b31003ae8123699a2eeec2e154c3
+  metadata.gz: d9a3d0a5f479a93186f048c7467eced2d5fe68aaba59e455841258a10c3f037d
+  data.tar.gz: 4083a8e54a1f8f4a3b3d5507af60d631603c15c566f9e1542f60241f6cfdd5b2
 SHA512:
-  metadata.gz: 6a6a0003a1a1b2938fce423477866098dc68d3267199578d4ddec31537f13fdc08b1243aa7f853c9910c55f1a587b4c1b36fdb9e05f3d10c0d425916bd2fdf22
-  data.tar.gz: 4dd6d9decfc40933f201e0b18b9f6988002abd763afc7b3e2205e028ab3468aa6ad12c870dbdb95ea044b4444e7d52714d9651faeca6b408f3a8b0ca2f88aa94
+  metadata.gz: 6ee57fe5ab33daa2314916d8289a4a092723984f0fe9d41c8da0c1cb5a75aed41168e274ada0294a560a599c81001ca8b43fa8d1d27eeaeb80acc7aaf55fffdd
+  data.tar.gz: df697dbdaa314e331708fb27781a9511766169b609484e026b5632d76948e6ed95fc0412d2d4b89dd01577516377f6ec2c0c805d4ae640797cd413634d36bcb9

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Haml Changelog
 
+## 6.1.4
+
+* Let `Haml::Util.escape_html` use `ERB::Escape` if available [#1145](https://github.com/haml/haml/issues/1145)
+
+## 6.1.3
+
+* Add `Haml::RailsTemplate#default_format` for Turbo compatibility [#1144](https://github.com/haml/haml/issues/1144)
+
 ## 6.1.2
 
 * Use the rails template path as `filename` [#1140](https://github.com/haml/haml/issues/1140)
@@ -106,6 +114,12 @@ Released on September 21, 2022
            `list_of`, `non_haml`, `precede`, `succeed`, `surround`, `tab_down`, `tab_up`, `with_tabs`
      * `:ruby` filter
          * Removed: `haml_io`
+     * Alternatives to the removed helpers:
+         * Some simple ones could work by copying [the original definition](https://github.com/haml/haml/blob/v5.2.2/lib/haml/helpers.rb).
+         * For helpers generating general HTML tags, also consider using what your framework provides, e.g. Rails `content_tag`.
+           Same applies to `capture_haml`, e.g. Rails `capture`.
+         * Ones that rely on `Haml::Buffer` have no direct alternative by design. They existed at the cost of performance.
+           You need to define a helper, instantiate a String buffer in it, append stuff to it, and call it inside `=`.
   * Only the following attributes and `aria`/`data` attributes are considered boolean attributes:
      * `allowfullscreen`, `async`, `autobuffer`, `autofocus`, `autoplay`, `checked`, `controls`, `default`,
        `defer`, `disabled`, `download`, `formnovalidate`, `hidden`, `inert`, `ismap`, `itemscope`, `loop`,

data/ext/haml/haml.c

@@ -77,12 +77,6 @@ escape_attribute(VALUE escape_attrs, VALUE str)
   }
 }
 
-static VALUE
-rb_escape_html(RB_UNUSED_VAR(VALUE self), VALUE value)
-{
-  return escape_html(to_s(value));
-}
-
 static VALUE
 haml_build_id(VALUE escape_attrs, VALUE values)
 {
@@ -504,14 +498,12 @@ rb_haml_build(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
 void
 Init_haml(void)
 {
-  VALUE mHaml, mUtil;
+  VALUE mHaml;
 
   mHaml             = rb_define_module("Haml");
   mObjectRef        = rb_define_module_under(mHaml, "ObjectRef");
-  mUtil             = rb_define_module_under(mHaml, "Util");
   mAttributeBuilder = rb_define_module_under(mHaml, "AttributeBuilder");
 
-  rb_define_singleton_method(mUtil, "escape_html", rb_escape_html, 1);
   rb_define_singleton_method(mAttributeBuilder, "build", rb_haml_build, -1);
   rb_define_singleton_method(mAttributeBuilder, "build_id", rb_haml_build_id, -1);
   rb_define_singleton_method(mAttributeBuilder, "build_class", rb_haml_build_class, -1);

data/lib/haml/rails_template.rb

@@ -48,6 +48,11 @@ module Haml
       Engine.new(options).call(source)
     end
 
+    # Rails Turbo looks for this
+    def default_format
+      :html
+    end
+
     def supports_streaming?
       RailsTemplate.options[:streaming]
     end

data/lib/haml/util.rb

@@ -14,15 +14,16 @@ module Haml
   module Util
     extend self
 
-    # For JRuby, TruffleRuby, and Wasm, fallback to Ruby implementation.
-    if /java|wasm/ === RUBY_PLATFORM || RUBY_ENGINE == 'truffleruby'
+    begin # Ruby 3.2+ or ERB 4+
+      require 'erb/escape'
+
+      define_singleton_method(:escape_html, ERB::Escape.instance_method(:html_escape))
+    rescue LoadError
       require 'cgi/escape'
 
       def self.escape_html(html)
         CGI.escapeHTML(html.to_s)
       end
-    else
-      require 'haml/haml' # Haml::Util.escape_html
     end
 
     # TODO: Remove unescape_interpolation's workaround and get rid of `respond_to?`.

data/lib/haml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 6.1.4
 platform: java
 authors:
 - Natalie Weizenbaum
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-25 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -21,8 +21,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.2
   name: temple
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -35,8 +35,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: thor
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -49,8 +49,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: tilt
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -63,8 +63,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: benchmark_driver
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -77,8 +77,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: bundler
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -91,8 +91,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: coffee-script
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -105,8 +105,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: erubi
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -119,8 +119,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
   name: haml
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -133,8 +133,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: less
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -147,8 +147,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
   name: minitest-reporters
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -161,8 +161,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
   name: rails
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -175,8 +175,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: rake
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -189,8 +189,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: rake-compiler
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -203,8 +203,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: sass
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -217,8 +217,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: slim
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -231,8 +231,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: string_template
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -245,8 +245,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: unindent
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="