haml 6.0.10 → 6.0.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0b1a2e9891d05d2723574950d4f2e8239234c0a59587dd4eb453554b2b597f75
4
- data.tar.gz: a66cb9a12b12700bf815425feaae73fa840cae26ae630a1aaee188066be09429
3
+ metadata.gz: 1775ac3d762a6136ef378f69b5522a73b98dfe5ce5a4727c06a061e3d6ceb989
4
+ data.tar.gz: '06938ad9c4452c051d39dbc1d03bd352fa260a4f3768afb3bcce66f3f3b81b70'
5
5
  SHA512:
6
- metadata.gz: b05af5eefbaeeb3440d5e8c8e5389fef759d76a4641b8e678e5fe14404a98f84acadf2187ed192472fa05ece0d19cb528c427e00cadec6ec7cb9cf6314fb5609
7
- data.tar.gz: 27d504c0129637c4bb06601af899d6f11bd5668abdcd9b0034484c1a57c8537bf3da5d5c552de712368ef0c213d713fa7e38b4b10f2e16e467d19e1d3e929d2c
6
+ metadata.gz: ac77e8fd0f76d1bdec1092f34e95b438ce0e85477d7eb5a9a973f8ab1d95327be035eac8b70589cb043d99a7ab5bb9d112136ca21c022d2f157239d99aea62a7
7
+ data.tar.gz: c76565dda6a32822dfb98a8c808b7dfe8c0b640cc59516bf2c69cb6b51aa1605aafbe506d747a67c26c35f46e09f342bf4493191cd8cfb71f100c146ea74c935
data/CHANGELOG.md CHANGED
@@ -1,8 +1,12 @@
1
1
  # Haml Changelog
2
2
 
3
+ ## 6.0.11
4
+
5
+ * Fix a whitespace removal with `>` and an `if` statement [#1114](https://github.com/haml/haml/issues/1114)
6
+
3
7
  ## 6.0.10
4
8
 
5
- * Evaluate :erb filter in the template context
9
+ * Evaluate :erb filter in the template context like Haml 5
6
10
 
7
11
  ## 6.0.9
8
12
 
@@ -95,6 +99,7 @@ Released on September 21, 2022
95
99
  * `-` script lines no longer support capturing. Only `=` lines are supported to yield a nested block.
96
100
  * Overriding `data` attributes with another falsy `data-*` attribute that has the same name
97
101
  is no longer supported. [#1105](https://github.com/haml/haml/issues/1105)
102
+ * :erb filter is not executed in the template context (fixed in 6.0.10)
98
103
 
99
104
  ## 5.2.2
100
105
 
data/REFERENCE.md CHANGED
@@ -338,20 +338,19 @@ will render as:
338
338
  <a> tag is so old links to here still work. -->
339
339
  <a id="html5_custom_data_attributes" style="border:0;"></a>
340
340
 
341
- #### Prefixed Attributes
341
+ #### Data Attributes
342
342
 
343
343
  HTML5 allows for adding
344
344
  [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)
345
345
  to elements using attribute names beginning with `data-`. The
346
346
  [Accessible Rich Internet Applications](http://www.w3.org/WAI/intro/aria)
347
- specification makes use of attributes beginning with `aria-`. There are also
348
- frameworks that use non-standard attributes with a common prefix.
347
+ specification makes use of attributes beginning with `aria-`.
349
348
 
350
349
  Haml can help generate collections of attributes that share a prefix like
351
- these. Any entry in an attribute hash that has a Hash as its value is expanded
352
- into a series of attributes, one for each key/value pair in the hash, with the
353
- attribute name formed by joining the “parent” key name to the key name with a
354
- hyphen.
350
+ these. Any entry in an `data` or `aria` attribute hash that has a Hash as its
351
+ value is expanded into a series of attributes, one for each key/value pair in
352
+ the hash, with the attribute name formed by joining the “parent” key name to
353
+ the key name with a hyphen. This works only for `data` or `aria`.
355
354
 
356
355
  For example:
357
356
 
@@ -12,15 +12,15 @@ module Haml
12
12
  temple = [:multi]
13
13
  return temple if node.children.empty?
14
14
 
15
- temple << :whitespace if prepend_whitespace?(node)
15
+ temple << [:whitespace] if prepend_whitespace?(node)
16
16
  node.children.each do |n|
17
17
  rstrip_whitespace!(temple) if nuke_prev_whitespace?(n)
18
18
  insert_newlines!(temple, n)
19
19
  temple << moving_lineno(n) { block.call(n) }
20
- temple << :whitespace if insert_whitespace?(n)
20
+ temple << [:whitespace] if insert_whitespace?(n)
21
21
  end
22
22
  rstrip_whitespace!(temple) if nuke_inner_whitespace?(node)
23
- confirm_whitespace(temple)
23
+ temple
24
24
  end
25
25
 
26
26
  private
@@ -56,17 +56,6 @@ module Haml
56
56
  temple
57
57
  end
58
58
 
59
- def confirm_whitespace(temple)
60
- temple.map do |exp|
61
- case exp
62
- when :whitespace
63
- [:static, "\n"]
64
- else
65
- exp
66
- end
67
- end
68
- end
69
-
70
59
  def prepend_whitespace?(node)
71
60
  return false unless %i[comment tag].include?(node.type)
72
61
  !nuke_inner_whitespace?(node)
@@ -100,8 +89,14 @@ module Haml
100
89
  end
101
90
 
102
91
  def rstrip_whitespace!(temple)
103
- if temple[-1] == :whitespace
104
- temple.delete_at(-1)
92
+ case temple[0]
93
+ when :multi, :block
94
+ case temple[-1][0]
95
+ when :multi, :block
96
+ rstrip_whitespace!(temple[-1])
97
+ when :whitespace
98
+ temple.delete_at(-1)
99
+ end
105
100
  end
106
101
  end
107
102
 
data/lib/haml/engine.rb CHANGED
@@ -8,6 +8,7 @@ require 'haml/escapable'
8
8
  require 'haml/force_escapable'
9
9
  require 'haml/dynamic_merger'
10
10
  require 'haml/ambles'
11
+ require 'haml/whitespace'
11
12
 
12
13
  module Haml
13
14
  class Engine < Temple::Engine
@@ -36,6 +37,7 @@ module Haml
36
37
  filter :ControlFlow
37
38
  use Ambles
38
39
  filter :MultiFlattener
40
+ use Whitespace
39
41
  filter :StaticMerger
40
42
  use DynamicMerger
41
43
  use :Generator, -> { options[:generator] }
data/lib/haml/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module Haml
3
- VERSION = '6.0.10'
3
+ VERSION = '6.0.11'
4
4
  end
@@ -0,0 +1,8 @@
1
+ # frozen_string_literal: true
2
+ module Haml
3
+ class Whitespace < Temple::Filter
4
+ def on_whitespace
5
+ [:static, "\n"]
6
+ end
7
+ end
8
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: haml
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.10
4
+ version: 6.0.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Natalie Weizenbaum
@@ -12,7 +12,7 @@ authors:
12
12
  autorequire:
13
13
  bindir: exe
14
14
  cert_chain: []
15
- date: 2022-11-10 00:00:00.000000000 Z
15
+ date: 2022-11-26 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: temple
@@ -334,6 +334,7 @@ files:
334
334
  - lib/haml/temple_line_counter.rb
335
335
  - lib/haml/util.rb
336
336
  - lib/haml/version.rb
337
+ - lib/haml/whitespace.rb
337
338
  homepage: https://haml.info
338
339
  licenses:
339
340
  - MIT
@@ -353,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
353
354
  - !ruby/object:Gem::Version
354
355
  version: '0'
355
356
  requirements: []
356
- rubygems_version: 3.3.7
357
+ rubygems_version: 3.4.0.dev
357
358
  signing_key:
358
359
  specification_version: 4
359
360
  summary: An elegant, structured (X)HTML/XML templating engine.