haml 6.0.5 → 6.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9efb6d42c07f38f08e6406c470be766f751439a63c0b151aca4040d5ea583d8
-  data.tar.gz: 8bcc4b22a87eb105e380990aa1fcfee19c9cf1ae61467e9bb9c3130f81977279
+  metadata.gz: 686b38a185b57f5b0ce392e06047aa1cadff2b54a0416d1a25b88d9c6d2675d5
+  data.tar.gz: 77abae61a0ca3eb4d42e30e15d3dad08781f4d0566f4565ddf40ff6609370e00
 SHA512:
-  metadata.gz: 07ebd7d512eac2b19e8d8d2d2611064a4742ead90ad9e6570e7612dd45535797d4479aa169371105a37f9f9ba32e6066337ef4a772b7430c7d2ac3a519d34ebb
-  data.tar.gz: 2fae2a68a205536580450fdd0c1ee1ab2c7f14268a01cc65b225f2115a1b3ee529865c2c184fc9b18e7a2141f6cb08d7a2254f14e0a7d5f61bde477387a114f9
+  metadata.gz: d392228708c2754f52dd073839a3b13d3fd4954a04cb11547c016d3a4ee4b792ef3242328df691d834515a94a500c63b5812d017be23805a5c0a6c40e818a60b
+  data.tar.gz: 82262e5e10fd2392a91034ab57621e8c80cd9156be99964642403687f2c6f6409154b7dd7b1ed12a68b9fc3809058a3284ef6bfac20f11ddcc7911be487cf9b8

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Haml Changelog
 
+## 6.0.6
+
+* Prevent CRuby from accidentally using the Ruby implementation fallback
+  * Reversing what v6.0.3 and v6.0.4 did, but still supporting Wasm.
+
 ## 6.0.5
 
 * Resurrect `#haml_object_ref` support in an object reference [#1097](https://github.com/haml/haml/issues/1097)

data/REFERENCE.md

@@ -1201,6 +1201,44 @@ default. This filter is implemented using Tilt.
 You can also define your own filters.
 `Haml::Filters::YourCustomFilter#compile` should return
 [a Temple expression](https://github.com/judofyr/temple/blob/master/EXPRESSIONS.md).
+
+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
+```
+
+A more complex 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]
+    end
+  end
+end
+
+Haml::Filters.registered[:better] ||= BetterFilter
+```
+
 See {Haml::Filters} for examples.
 
 ## Multiline: `|` {#multiline}

data/lib/haml/attribute_builder.rb

@@ -9,15 +9,8 @@ module Haml::AttributeBuilder
                        itemscope allowfullscreen default inert sortable
                        truespeed typemustmatch download].freeze
 
-  begin
-    # Haml::AttributeBuilder.build
-    # Haml::AttributeBuilder.build_id
-    # Haml::AttributeBuilder.build_class
-    # Haml::AttributeBuilder.build_data
-    # Haml::AttributeBuilder.build_aria
-    require 'haml/haml'
-  rescue LoadError
-    # For JRuby and Wasm, fallback to Ruby implementation when C extension is not available.
+  # For JRuby, TruffleRuby, and Wasm, fallback to Ruby implementation.
+  if /java|wasm/ === RUBY_PLATFORM || RUBY_ENGINE == 'truffleruby'
     class << self
       def build(escape_attrs, quote, format, boolean_attributes, object_ref, *hashes)
         hashes << Haml::ObjectRef.parse(object_ref) if object_ref
@@ -170,5 +163,12 @@ module Haml::AttributeBuilder
         end
       end
     end
+  else
+    # Haml::AttributeBuilder.build
+    # Haml::AttributeBuilder.build_id
+    # Haml::AttributeBuilder.build_class
+    # Haml::AttributeBuilder.build_data
+    # Haml::AttributeBuilder.build_aria
+    require 'haml/haml'
   end
 end

data/lib/haml/util.rb

@@ -14,15 +14,15 @@ module Haml
   module Util
     extend self
 
-    begin
-      require 'haml/haml' # Haml::Util.escape_html
-    rescue LoadError
-      # For JRuby and Wasm, fallback to Ruby implementation when C extension is not available.
+    # For JRuby, TruffleRuby, and Wasm, fallback to Ruby implementation.
+    if /java|wasm/ === RUBY_PLATFORM || RUBY_ENGINE == 'truffleruby'
       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.0.5'
+  VERSION = '6.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.0.5
+  version: 6.0.6
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2022-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple