haml 6.0.9 → 6.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7cac6caf4e6a000adb17458dd0b65665d4c3bf3ccc1aa63fd13373628b8c0a1
-  data.tar.gz: 2e86dff9c54de2af99face10d8e3910a46cbb5544075f76d402c88ad36d461af
+  metadata.gz: 1775ac3d762a6136ef378f69b5522a73b98dfe5ce5a4727c06a061e3d6ceb989
+  data.tar.gz: '06938ad9c4452c051d39dbc1d03bd352fa260a4f3768afb3bcce66f3f3b81b70'
 SHA512:
-  metadata.gz: 8619598cd1bc18afc3b34d22ecd5537758489fe4b51455296e13688c1c52e5b5909232d6d8a3c702153f3b9bbf51769a8ce08b0b028a917ee026bcfd6222326b
-  data.tar.gz: ec437a3aa3de4e6327ff0335f0d27faa041fbc01c031af7bf22d4f72821d19941cf63f488d0744d3cfdb12034ebfd40c25999a16a86a998a2d0e5dfc4c020f25
+  metadata.gz: ac77e8fd0f76d1bdec1092f34e95b438ce0e85477d7eb5a9a973f8ab1d95327be035eac8b70589cb043d99a7ab5bb9d112136ca21c022d2f157239d99aea62a7
+  data.tar.gz: c76565dda6a32822dfb98a8c808b7dfe8c0b640cc59516bf2c69cb6b51aa1605aafbe506d747a67c26c35f46e09f342bf4493191cd8cfb71f100c146ea74c935

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Haml Changelog
 
+## 6.0.11
+
+* Fix a whitespace removal with `>` and an `if` statement [#1114](https://github.com/haml/haml/issues/1114)
+
+## 6.0.10
+
+* Evaluate :erb filter in the template context like Haml 5
+
 ## 6.0.9
 
 * Support sass-embedded [#1112](https://github.com/haml/haml/issues/1112)
@@ -91,6 +99,7 @@ Released on September 21, 2022
   * `-` script lines no longer support capturing. Only `=` lines are supported to yield a nested block.
   * Overriding `data` attributes with another falsy `data-*` attribute that has the same name
     is no longer supported. [#1105](https://github.com/haml/haml/issues/1105)
+  * :erb filter is not executed in the template context (fixed in 6.0.10)
 
 ## 5.2.2
 

data/REFERENCE.md

@@ -338,20 +338,19 @@ will render as:
 <a> tag is so old links to here still work. -->
 <a id="html5_custom_data_attributes" style="border:0;"></a>
 
-#### Prefixed Attributes
+#### Data Attributes
 
 HTML5 allows for adding
 [custom non-visible data attributes](http://www.whatwg.org/specs/web-apps/current-work/multipage/elements.html#embedding-custom-non-visible-data-with-the-data-*-attributes)
 to elements using attribute names beginning with `data-`. The
 [Accessible Rich Internet Applications](http://www.w3.org/WAI/intro/aria)
-specification makes use of attributes beginning with `aria-`. There are also
-frameworks that use non-standard attributes with a common prefix.
+specification makes use of attributes beginning with `aria-`.
 
 Haml can help generate collections of attributes that share a prefix like
-these. Any entry in an attribute hash that has a Hash as its value is expanded
-into a series of attributes, one for each key/value pair in the hash, with the
-attribute name formed by joining the “parent” key name to the key name with a
-hyphen.
+these. Any entry in an `data` or `aria` attribute hash that has a Hash as its
+value is expanded into a series of attributes, one for each key/value pair in
+the hash, with the attribute name formed by joining the “parent” key name to
+the key name with a hyphen. This works only for `data` or `aria`.
 
 For example:
 

data/lib/haml/compiler/children_compiler.rb

@@ -12,15 +12,15 @@ module Haml
         temple = [:multi]
         return temple if node.children.empty?
 
-        temple << :whitespace if prepend_whitespace?(node)
+        temple << [:whitespace] if prepend_whitespace?(node)
         node.children.each do |n|
           rstrip_whitespace!(temple) if nuke_prev_whitespace?(n)
           insert_newlines!(temple, n)
           temple << moving_lineno(n) { block.call(n) }
-          temple << :whitespace if insert_whitespace?(n)
+          temple << [:whitespace] if insert_whitespace?(n)
         end
         rstrip_whitespace!(temple) if nuke_inner_whitespace?(node)
-        confirm_whitespace(temple)
+        temple
       end
 
       private
@@ -56,17 +56,6 @@ module Haml
         temple
       end
 
-      def confirm_whitespace(temple)
-        temple.map do |exp|
-          case exp
-          when :whitespace
-            [:static, "\n"]
-          else
-            exp
-          end
-        end
-      end
-
       def prepend_whitespace?(node)
         return false unless %i[comment tag].include?(node.type)
         !nuke_inner_whitespace?(node)
@@ -100,8 +89,14 @@ module Haml
       end
 
       def rstrip_whitespace!(temple)
-        if temple[-1] == :whitespace
-          temple.delete_at(-1)
+        case temple[0]
+        when :multi, :block
+          case temple[-1][0]
+          when :multi, :block
+            rstrip_whitespace!(temple[-1])
+          when :whitespace
+            temple.delete_at(-1)
+          end
         end
       end
 

data/lib/haml/engine.rb

@@ -8,6 +8,7 @@ require 'haml/escapable'
 require 'haml/force_escapable'
 require 'haml/dynamic_merger'
 require 'haml/ambles'
+require 'haml/whitespace'
 
 module Haml
   class Engine < Temple::Engine
@@ -36,6 +37,7 @@ module Haml
     filter :ControlFlow
     use Ambles
     filter :MultiFlattener
+    use Whitespace
     filter :StaticMerger
     use DynamicMerger
     use :Generator, -> { options[:generator] }

data/lib/haml/filters/erb.rb

@@ -3,7 +3,7 @@ module Haml
   class Filters
     class Erb < TiltBase
       def compile(node)
-        compile_with_tilt(node, 'erb')
+        precompiled_with_tilt(node, 'erb')
       end
     end
   end

data/lib/haml/filters/tilt_base.rb

@@ -21,6 +21,12 @@ module Haml
 
       private
 
+      # TODO: support interpolation
+      def precompiled_with_tilt(node, name)
+        src = ::Tilt["t.#{name}"].new { node.value[:text] }.send(:precompiled, {}).first
+        [:dynamic, src]
+      end
+
       def compile_with_tilt(node, name, indent_width: 0)
         if ::Haml::Util.contains_interpolation?(node.value[:text])
           dynamic_compile(node, name, indent_width: indent_width)

data/lib/haml/version.rb

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

data/lib/haml/whitespace.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+module Haml
+  class Whitespace < Temple::Filter
+    def on_whitespace
+      [:static, "\n"]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 6.0.9
+  version: 6.0.11
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2022-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -334,6 +334,7 @@ files:
 - lib/haml/temple_line_counter.rb
 - lib/haml/util.rb
 - lib/haml/version.rb
+- lib/haml/whitespace.rb
 homepage: https://haml.info
 licenses:
 - MIT
@@ -353,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.0.dev
 signing_key: 
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.