haml 6.1.1-java → 6.1.2-java
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/test.yml +2 -1
- data/CHANGELOG.md +6 -0
- data/Gemfile +4 -0
- data/README.md +1 -1
- data/REFERENCE.md +12 -15
- data/haml.gemspec +2 -0
- data/lib/haml/rails_template.rb +5 -0
- data/lib/haml/version.rb +1 -1
- metadata +22 -21
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c207bda3154c0dd51a94e779751650c9caaaea1368d32106cdcac5abee1ec51c
|
4
|
+
data.tar.gz: bf8cc80cf573ca66ecb03f66114179ce4389b31003ae8123699a2eeec2e154c3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6a6a0003a1a1b2938fce423477866098dc68d3267199578d4ddec31537f13fdc08b1243aa7f853c9910c55f1a587b4c1b36fdb9e05f3d10c0d425916bd2fdf22
|
7
|
+
data.tar.gz: 4dd6d9decfc40933f201e0b18b9f6988002abd763afc7b3e2205e028ab3468aa6ad12c870dbdb95ea044b4444e7d52714d9651faeca6b408f3a8b0ca2f88aa94
|
data/.github/workflows/test.yml
CHANGED
@@ -22,10 +22,11 @@ jobs:
|
|
22
22
|
- '2.7'
|
23
23
|
- '3.0'
|
24
24
|
- '3.1'
|
25
|
+
- '3.2'
|
25
26
|
- jruby
|
26
27
|
- truffleruby-head
|
27
28
|
steps:
|
28
|
-
- uses: actions/checkout@
|
29
|
+
- uses: actions/checkout@v3
|
29
30
|
- run: sudo apt-get update && sudo apt-get install -y nodejs libxslt-dev # nodejs for execjs, libxslt for TruffleRuby nokogiri
|
30
31
|
- name: Set up Ruby
|
31
32
|
uses: ruby/setup-ruby@v1
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,9 @@
|
|
1
1
|
# Haml Changelog
|
2
2
|
|
3
|
+
## 6.1.2
|
4
|
+
|
5
|
+
* Use the rails template path as `filename` [#1140](https://github.com/haml/haml/issues/1140)
|
6
|
+
|
3
7
|
## 6.1.1
|
4
8
|
|
5
9
|
* Fix an empty output of Ruby 3.1's Hash shorthand syntax [#1083](https://github.com/haml/haml/issues/1083)
|
@@ -100,6 +104,8 @@ Released on September 21, 2022
|
|
100
104
|
* Removed: `block_is_haml?`, `capture_haml`, `escape_once`, `find_and_preserve`, `flatten`, `haml_concat`,
|
101
105
|
`haml_indent`, `haml_tag`, `haml_tag_if`, `html_attrs`, `html_escape`, `init_haml_helpers`, `is_haml?`,
|
102
106
|
`list_of`, `non_haml`, `precede`, `succeed`, `surround`, `tab_down`, `tab_up`, `with_tabs`
|
107
|
+
* `:ruby` filter
|
108
|
+
* Removed: `haml_io`
|
103
109
|
* Only the following attributes and `aria`/`data` attributes are considered boolean attributes:
|
104
110
|
* `allowfullscreen`, `async`, `autobuffer`, `autofocus`, `autoplay`, `checked`, `controls`, `default`,
|
105
111
|
`defer`, `disabled`, `download`, `formnovalidate`, `hidden`, `inert`, `ismap`, `itemscope`, `loop`,
|
data/Gemfile
CHANGED
data/README.md
CHANGED
@@ -3,7 +3,7 @@
|
|
3
3
|
[![Gem Version](https://badge.fury.io/rb/haml.svg)](http://rubygems.org/gems/haml)
|
4
4
|
[![test](https://github.com/haml/haml/actions/workflows/test.yml/badge.svg)](https://github.com/haml/haml/actions/workflows/test.yml)
|
5
5
|
[![Code Climate](https://codeclimate.com/github/haml/haml/badges/gpa.svg)](https://codeclimate.com/github/haml/haml)
|
6
|
-
[![Inline docs](
|
6
|
+
[![Inline docs](https://inch-ci.org/github/haml/haml.svg)](https://inch-ci.org/github/haml/haml)
|
7
7
|
|
8
8
|
Haml is a templating engine for HTML. It's designed to make it both easier and
|
9
9
|
more pleasant to write HTML documents, by eliminating redundancy, reflecting the
|
data/REFERENCE.md
CHANGED
@@ -180,10 +180,10 @@ closing tags for any element.
|
|
180
180
|
|
181
181
|
### Attributes: `{}` or `()` {#attributes}
|
182
182
|
|
183
|
-
|
183
|
+
Braces represent a Ruby hash that is used for specifying the attributes of an
|
184
184
|
element. It is literally evaluated as a Ruby hash, so logic will work in it and
|
185
185
|
local variables may be used. Quote characters within the attribute will be
|
186
|
-
replaced
|
186
|
+
replaced with appropriate escape sequences. The hash is placed after the tag is
|
187
187
|
defined. For example:
|
188
188
|
|
189
189
|
%html{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en", :lang => "en"}
|
@@ -247,7 +247,7 @@ could render as either of:
|
|
247
247
|
#### HTML-style Attributes: `()`
|
248
248
|
|
249
249
|
Haml also supports a terser, less Ruby-specific attribute syntax based on HTML's
|
250
|
-
attributes. These are used with parentheses instead of
|
250
|
+
attributes. These are used with parentheses instead of braces, like so:
|
251
251
|
|
252
252
|
%html(xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en")
|
253
253
|
|
@@ -320,7 +320,7 @@ or using `true` and `false`:
|
|
320
320
|
%input(selected=true)
|
321
321
|
|
322
322
|
This feature works only for attributes that are included in
|
323
|
-
[`Haml::AttributeBuilder::BOOLEAN_ATTRIBUTES`](lib/haml/attribute_builder.rb),
|
323
|
+
[`Haml::AttributeBuilder::BOOLEAN_ATTRIBUTES`](https://github.com/haml/haml/blob/main/lib/haml/attribute_builder.rb#L5),
|
324
324
|
as well as `data-` and `aria-` attributes.
|
325
325
|
|
326
326
|
%input{'data-hidden' => false}
|
@@ -360,7 +360,7 @@ will render as:
|
|
360
360
|
|
361
361
|
<a data-author-id='123' data-category='7' href='/posts'>Posts By Author</a>
|
362
362
|
|
363
|
-
Notice that the underscore in `author_id` was replaced
|
363
|
+
Notice that the underscore in `author_id` was replaced with a hyphen. If you wish
|
364
364
|
to suppress this behavior, you can set Haml's
|
365
365
|
{Haml::Options#hyphenate_data_attrs `:hyphenate_data_attrs` option} to `false`,
|
366
366
|
and the output will be rendered as:
|
@@ -992,7 +992,7 @@ most code but you may have errors with code like the following:
|
|
992
992
|
|
993
993
|
%span #{'{'}
|
994
994
|
|
995
|
-
This code will generate a syntax error, complaining about unbalanced
|
995
|
+
This code will generate a syntax error, complaining about unbalanced braces.
|
996
996
|
In cases like this, the recommended workaround is output the code as a Ruby
|
997
997
|
string to force Haml to parse the code with Ruby.
|
998
998
|
|
@@ -1093,7 +1093,7 @@ uses to implement many of its filters:
|
|
1093
1093
|
|
1094
1094
|
Tilt.prefer Tilt::RedCarpetTemplate
|
1095
1095
|
|
1096
|
-
See the [Tilt documentation](https://github.com/rtomayko/tilt
|
1096
|
+
See the [Tilt documentation](https://github.com/rtomayko/tilt) for
|
1097
1097
|
more info.
|
1098
1098
|
|
1099
1099
|
Haml comes with the following filters defined:
|
@@ -1145,7 +1145,7 @@ implemented using Tilt.
|
|
1145
1145
|
|
1146
1146
|
### `:maruku` {#maruku-filter}
|
1147
1147
|
|
1148
|
-
Parses the filtered text with [Maruku](https://github.com/
|
1148
|
+
Parses the filtered text with [Maruku](https://github.com/bhollis/maruku), which
|
1149
1149
|
has some non-standard extensions to Markdown.
|
1150
1150
|
|
1151
1151
|
As of Haml 4.0, this filter is defined in [Haml
|
@@ -1168,11 +1168,8 @@ HTML escape code for newlines, to preserve nice-looking output. See also
|
|
1168
1168
|
|
1169
1169
|
### `:ruby` {#ruby-filter}
|
1170
1170
|
|
1171
|
-
Parses the filtered text with the normal Ruby interpreter.
|
1172
|
-
|
1173
|
-
Not available if the {Haml::Options#suppress_eval `:suppress_eval`} option is
|
1174
|
-
set to true. The Ruby code is evaluated in the same context as the Haml
|
1175
|
-
template.
|
1171
|
+
Parses the filtered text with the normal Ruby interpreter.
|
1172
|
+
The Ruby code is evaluated in the same context as the Haml template.
|
1176
1173
|
|
1177
1174
|
### `:sass` {#sass-filter}
|
1178
1175
|
|
@@ -1213,7 +1210,7 @@ end
|
|
1213
1210
|
Haml::Filters.registered[:hello] ||= HelloFilter
|
1214
1211
|
```
|
1215
1212
|
|
1216
|
-
A more complex
|
1213
|
+
A more complex example:
|
1217
1214
|
|
1218
1215
|
```ruby
|
1219
1216
|
class BetterFilter < Haml::Filters::Base
|
@@ -1285,7 +1282,7 @@ can be wrapped over multiple lines,
|
|
1285
1282
|
as long as each line but the last ends in a comma
|
1286
1283
|
(see [Inserting Ruby](#inserting_ruby)).
|
1287
1284
|
|
1288
|
-
## Whitespace Preservation
|
1285
|
+
## Whitespace Preservation {#whitespace_preservation}
|
1289
1286
|
|
1290
1287
|
Sometimes you don't want Haml to indent all your text.
|
1291
1288
|
For example, tags like `pre` and `textarea` are whitespace-sensitive;
|
data/haml.gemspec
CHANGED
@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
|
|
19
19
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
20
20
|
spec.require_paths = ['lib']
|
21
21
|
|
22
|
+
spec.metadata = { 'rubygems_mfa_required' => 'true' }
|
23
|
+
|
22
24
|
if /java/ === RUBY_PLATFORM
|
23
25
|
spec.platform = 'java'
|
24
26
|
else
|
data/lib/haml/rails_template.rb
CHANGED
@@ -27,6 +27,11 @@ module Haml
|
|
27
27
|
source ||= template.source
|
28
28
|
options = RailsTemplate.options
|
29
29
|
|
30
|
+
# Make the filename available in parser etc.
|
31
|
+
if template.respond_to?(:identifier)
|
32
|
+
options = options.merge(filename: template.identifier)
|
33
|
+
end
|
34
|
+
|
30
35
|
# https://github.com/haml/haml/blob/4.0.7/lib/haml/template/plugin.rb#L19-L20
|
31
36
|
# https://github.com/haml/haml/blob/4.0.7/lib/haml/options.rb#L228
|
32
37
|
if template.respond_to?(:type) && template.type == 'text/xml'
|
data/lib/haml/version.rb
CHANGED
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.1.
|
4
|
+
version: 6.1.2
|
5
5
|
platform: java
|
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:
|
15
|
+
date: 2023-08-25 00:00:00.000000000 Z
|
16
16
|
dependencies:
|
17
17
|
- !ruby/object:Gem::Dependency
|
18
18
|
requirement: !ruby/object:Gem::Requirement
|
@@ -21,8 +21,8 @@ dependencies:
|
|
21
21
|
- !ruby/object:Gem::Version
|
22
22
|
version: 0.8.2
|
23
23
|
name: temple
|
24
|
-
prerelease: false
|
25
24
|
type: :runtime
|
25
|
+
prerelease: false
|
26
26
|
version_requirements: !ruby/object:Gem::Requirement
|
27
27
|
requirements:
|
28
28
|
- - ">="
|
@@ -35,8 +35,8 @@ dependencies:
|
|
35
35
|
- !ruby/object:Gem::Version
|
36
36
|
version: '0'
|
37
37
|
name: thor
|
38
|
-
prerelease: false
|
39
38
|
type: :runtime
|
39
|
+
prerelease: false
|
40
40
|
version_requirements: !ruby/object:Gem::Requirement
|
41
41
|
requirements:
|
42
42
|
- - ">="
|
@@ -49,8 +49,8 @@ dependencies:
|
|
49
49
|
- !ruby/object:Gem::Version
|
50
50
|
version: '0'
|
51
51
|
name: tilt
|
52
|
-
prerelease: false
|
53
52
|
type: :runtime
|
53
|
+
prerelease: false
|
54
54
|
version_requirements: !ruby/object:Gem::Requirement
|
55
55
|
requirements:
|
56
56
|
- - ">="
|
@@ -63,8 +63,8 @@ dependencies:
|
|
63
63
|
- !ruby/object:Gem::Version
|
64
64
|
version: '0'
|
65
65
|
name: benchmark_driver
|
66
|
-
prerelease: false
|
67
66
|
type: :development
|
67
|
+
prerelease: false
|
68
68
|
version_requirements: !ruby/object:Gem::Requirement
|
69
69
|
requirements:
|
70
70
|
- - ">="
|
@@ -77,8 +77,8 @@ dependencies:
|
|
77
77
|
- !ruby/object:Gem::Version
|
78
78
|
version: '0'
|
79
79
|
name: bundler
|
80
|
-
prerelease: false
|
81
80
|
type: :development
|
81
|
+
prerelease: false
|
82
82
|
version_requirements: !ruby/object:Gem::Requirement
|
83
83
|
requirements:
|
84
84
|
- - ">="
|
@@ -91,8 +91,8 @@ dependencies:
|
|
91
91
|
- !ruby/object:Gem::Version
|
92
92
|
version: '0'
|
93
93
|
name: coffee-script
|
94
|
-
prerelease: false
|
95
94
|
type: :development
|
95
|
+
prerelease: false
|
96
96
|
version_requirements: !ruby/object:Gem::Requirement
|
97
97
|
requirements:
|
98
98
|
- - ">="
|
@@ -105,8 +105,8 @@ dependencies:
|
|
105
105
|
- !ruby/object:Gem::Version
|
106
106
|
version: '0'
|
107
107
|
name: erubi
|
108
|
-
prerelease: false
|
109
108
|
type: :development
|
109
|
+
prerelease: false
|
110
110
|
version_requirements: !ruby/object:Gem::Requirement
|
111
111
|
requirements:
|
112
112
|
- - ">="
|
@@ -119,8 +119,8 @@ dependencies:
|
|
119
119
|
- !ruby/object:Gem::Version
|
120
120
|
version: '5'
|
121
121
|
name: haml
|
122
|
-
prerelease: false
|
123
122
|
type: :development
|
123
|
+
prerelease: false
|
124
124
|
version_requirements: !ruby/object:Gem::Requirement
|
125
125
|
requirements:
|
126
126
|
- - ">="
|
@@ -133,8 +133,8 @@ dependencies:
|
|
133
133
|
- !ruby/object:Gem::Version
|
134
134
|
version: '0'
|
135
135
|
name: less
|
136
|
-
prerelease: false
|
137
136
|
type: :development
|
137
|
+
prerelease: false
|
138
138
|
version_requirements: !ruby/object:Gem::Requirement
|
139
139
|
requirements:
|
140
140
|
- - ">="
|
@@ -147,8 +147,8 @@ dependencies:
|
|
147
147
|
- !ruby/object:Gem::Version
|
148
148
|
version: '1.1'
|
149
149
|
name: minitest-reporters
|
150
|
-
prerelease: false
|
151
150
|
type: :development
|
151
|
+
prerelease: false
|
152
152
|
version_requirements: !ruby/object:Gem::Requirement
|
153
153
|
requirements:
|
154
154
|
- - "~>"
|
@@ -161,8 +161,8 @@ dependencies:
|
|
161
161
|
- !ruby/object:Gem::Version
|
162
162
|
version: '4.0'
|
163
163
|
name: rails
|
164
|
-
prerelease: false
|
165
164
|
type: :development
|
165
|
+
prerelease: false
|
166
166
|
version_requirements: !ruby/object:Gem::Requirement
|
167
167
|
requirements:
|
168
168
|
- - ">="
|
@@ -175,8 +175,8 @@ dependencies:
|
|
175
175
|
- !ruby/object:Gem::Version
|
176
176
|
version: '0'
|
177
177
|
name: rake
|
178
|
-
prerelease: false
|
179
178
|
type: :development
|
179
|
+
prerelease: false
|
180
180
|
version_requirements: !ruby/object:Gem::Requirement
|
181
181
|
requirements:
|
182
182
|
- - ">="
|
@@ -189,8 +189,8 @@ dependencies:
|
|
189
189
|
- !ruby/object:Gem::Version
|
190
190
|
version: '0'
|
191
191
|
name: rake-compiler
|
192
|
-
prerelease: false
|
193
192
|
type: :development
|
193
|
+
prerelease: false
|
194
194
|
version_requirements: !ruby/object:Gem::Requirement
|
195
195
|
requirements:
|
196
196
|
- - ">="
|
@@ -203,8 +203,8 @@ dependencies:
|
|
203
203
|
- !ruby/object:Gem::Version
|
204
204
|
version: '0'
|
205
205
|
name: sass
|
206
|
-
prerelease: false
|
207
206
|
type: :development
|
207
|
+
prerelease: false
|
208
208
|
version_requirements: !ruby/object:Gem::Requirement
|
209
209
|
requirements:
|
210
210
|
- - ">="
|
@@ -217,8 +217,8 @@ dependencies:
|
|
217
217
|
- !ruby/object:Gem::Version
|
218
218
|
version: '0'
|
219
219
|
name: slim
|
220
|
-
prerelease: false
|
221
220
|
type: :development
|
221
|
+
prerelease: false
|
222
222
|
version_requirements: !ruby/object:Gem::Requirement
|
223
223
|
requirements:
|
224
224
|
- - ">="
|
@@ -231,8 +231,8 @@ dependencies:
|
|
231
231
|
- !ruby/object:Gem::Version
|
232
232
|
version: '0'
|
233
233
|
name: string_template
|
234
|
-
prerelease: false
|
235
234
|
type: :development
|
235
|
+
prerelease: false
|
236
236
|
version_requirements: !ruby/object:Gem::Requirement
|
237
237
|
requirements:
|
238
238
|
- - ">="
|
@@ -245,8 +245,8 @@ dependencies:
|
|
245
245
|
- !ruby/object:Gem::Version
|
246
246
|
version: '0'
|
247
247
|
name: unindent
|
248
|
-
prerelease: false
|
249
248
|
type: :development
|
249
|
+
prerelease: false
|
250
250
|
version_requirements: !ruby/object:Gem::Requirement
|
251
251
|
requirements:
|
252
252
|
- - ">="
|
@@ -338,7 +338,8 @@ files:
|
|
338
338
|
homepage: https://haml.info
|
339
339
|
licenses:
|
340
340
|
- MIT
|
341
|
-
metadata:
|
341
|
+
metadata:
|
342
|
+
rubygems_mfa_required: 'true'
|
342
343
|
post_install_message:
|
343
344
|
rdoc_options: []
|
344
345
|
require_paths:
|
@@ -354,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
354
355
|
- !ruby/object:Gem::Version
|
355
356
|
version: '0'
|
356
357
|
requirements: []
|
357
|
-
rubygems_version: 3.
|
358
|
+
rubygems_version: 3.3.26
|
358
359
|
signing_key:
|
359
360
|
specification_version: 4
|
360
361
|
summary: An elegant, structured (X)HTML/XML templating engine.
|