haml 6.2.2 → 6.2.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +8 -0
  3. data/README.md +0 -6
  4. data/lib/haml/compiler/doctype_compiler.rb +8 -2
  5. data/lib/haml/parser.rb +1 -1
  6. data/lib/haml/version.rb +1 -1
  7. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: faa2c94b5f7453469904cc8f4054af08e35cdd99905e24ce85a502c19bcc9d18
4
- data.tar.gz: '09f1b8d5cacb30d4f10acc89f0ad7df6d523c3afb16d26eb20c02a45874372fe'
3
+ metadata.gz: 35ca3f363ea3804867a60a4376ce6741d625f5bff0f76efb63c40f3b61258a47
4
+ data.tar.gz: 4fa86b2608fa197b3a59b2759ad91f60e5ecf12f67bce27d58debb7f387e4e8c
5
5
  SHA512:
6
- metadata.gz: 564b6fdbcff4cf3539635dff2b6f9e482e927bccc4f723f9038355fd4ced189ae0bdd9195885c4e76a6fc7e1c60a7ed2bd9587e912ca3f75a04fd0df7369e75c
7
- data.tar.gz: a177490474b02d7febb02930b15ab1db4297fb00d6cff0e04394e322779b38a221b9ebfbbea7357b46774c2d8ba4e0cf0d79a3f50d859cbf4522ce0ba1e261a0
6
+ metadata.gz: 7acba6590cfebf51d676a2d881aec06bdc6533fdc91d4a65a3f36d72b00110c925a0bedb1902414d7c62afc2dc78231419a75d3e6646f67268e9ee510d24782f
7
+ data.tar.gz: 9b3039ae16730220b43be25bced9de1e69537606309d3b701384f74ba53ec67240d6a69160000511f7dc76894c7da47714a1a01281fcc0069c2d92d91b4ca6c5
data/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # Haml Changelog
2
2
 
3
+ ## 6.2.4
4
+
5
+ * Support case-in statement [#1155](https://github.com/haml/haml/issues/1155)
6
+
7
+ ## 6.2.3
8
+
9
+ * Resurrect RDFa doctype support [#1147](https://github.com/haml/haml/issues/1147)
10
+
3
11
  ## 6.2.2
4
12
 
5
13
  * Allow adding custom attributes to `Haml::BOOLEAN_ATTRIBUTES` [#1148](https://github.com/haml/haml/issues/1148)
data/README.md CHANGED
@@ -146,12 +146,6 @@ Once this is complete, you should be able to run the test suite:
146
146
  rake
147
147
  ~~~
148
148
 
149
- You'll get a warning that you need to install haml-spec, so run this:
150
-
151
- ~~~sh
152
- git submodule update --init
153
- ~~~
154
-
155
149
  At this point `rake` should run without error or warning and you are ready to
156
150
  start working on your patch!
157
151
 
data/lib/haml/compiler/doctype_compiler.rb CHANGED
@@ -8,10 +8,12 @@ module Haml
8
8
 
9
9
  def compile(node)
10
10
  case node.value[:type]
11
- when 'xml'
12
- xml_doctype
13
11
  when ''
14
12
  html_doctype(node)
13
+ when 'xml'
14
+ xml_doctype
15
+ when 'rdfa'
16
+ rdfa_doctype
15
17
  else
16
18
  [:html, :doctype, node.value[:type]]
17
19
  end
@@ -41,6 +43,10 @@ module Haml
41
43
  [:multi]
42
44
  end
43
45
  end
46
+
47
+ def rdfa_doctype
48
+ [:static, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">']
49
+ end
44
50
  end
45
51
  end
46
52
  end
data/lib/haml/parser.rb CHANGED
@@ -78,7 +78,7 @@ module Haml
78
78
  #
79
79
  BLOCK_WITH_SPACES = /do\s*\|\s*[^\|]*\s+\|\z/
80
80
 
81
- MID_BLOCK_KEYWORDS = %w[else elsif rescue ensure end when].freeze
81
+ MID_BLOCK_KEYWORDS = %w[else elsif rescue ensure end when in].freeze
82
82
  START_BLOCK_KEYWORDS = %w[if begin case unless].freeze
83
83
  # Try to parse assignments to block starters as best as possible
84
84
  START_BLOCK_KEYWORD_REGEX = /(?:\w+(?:,\s*\w+)*\s*=\s*)?(#{START_BLOCK_KEYWORDS.join('|')})/
data/lib/haml/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module Haml
3
- VERSION = '6.2.2'
3
+ VERSION = '6.2.4'
4
4
  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.2.2
4
+ version: 6.2.4
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: 2023-10-04 00:00:00.000000000 Z
15
+ date: 2023-12-09 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: temple
@@ -337,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
337
337
  - !ruby/object:Gem::Version
338
338
  version: '0'
339
339
  requirements: []
340
- rubygems_version: 3.3.26
340
+ rubygems_version: 3.4.10
341
341
  signing_key:
342
342
  specification_version: 4
343
343
  summary: An elegant, structured (X)HTML/XML templating engine.