nanoc 4.12.8 → 4.12.9

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/NEWS.md +6 -0
  3. data/lib/nanoc/filters/haml.rb +14 -1
  4. data/lib/nanoc/version.rb +1 -1
  5. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9fe1df1ff334d90e0fb7a59e16d179a18763922ecf80b612eae9ed20311baadc
4
- data.tar.gz: 3e98e4a3e1fb53f7219f981ac4bc0eb93581eaaed05f1ea590c03a14e9e5bbba
3
+ metadata.gz: 74d2fac49f679adfd219ef24e14e388d999c1ed54fe69d793e9d71d0f6d8eada
4
+ data.tar.gz: b914abe2477cdc71d4f19def21433f59115d6abb2013e8faa47c4f75d3a20588
5
5
  SHA512:
6
- metadata.gz: 48f946173bd0b66ed68b8be4c7666f116ce2aa9c4423dd92eb359ac754e257ac49c4fe6e7aef0b6a860371bd497c18e8261185f5a2996732c2b821dfa8612005
7
- data.tar.gz: 045b31dc55983ffdd38a84cfcf2bb217cb9dccfc24814d99f824e341319c6569c1dd6f861f13414209d10882f69388449383dc7818eeff7868690613a2c09da9
6
+ metadata.gz: 4c4197c7a226d2c2ac64f231fa677a79303bf149a3ac08e50338d3d55655d3f8dbe335ed28b9725a1c93f896be7394182bb1b5ecdedd60295689254c10306aac
7
+ data.tar.gz: 9720836931e49417eddc7cf3b205b2db740ad3ea79fb797510b6599c19159ad92b265dd332c72ba31e01ae459ff5c2aa2fac1e5806a3f80f72ab7ce150722787
data/NEWS.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # Nanoc news
2
2
 
3
+ ## 4.12.9 (2022-10-08)
4
+
5
+ Fixes:
6
+
7
+ - Fixed compatibility with Haml 6.0 (#1595, #1593)
8
+
3
9
  ## 4.12.8 (2022-10-03)
4
10
 
5
11
  Fixes:
data/lib/nanoc/filters/haml.rb CHANGED
@@ -22,7 +22,20 @@ module Nanoc::Filters
22
22
 
23
23
  # Get result
24
24
  proc = assigns[:content] ? -> { assigns[:content] } : nil
25
- ::Haml::Engine.new(content, options).render(context, assigns, &proc)
25
+
26
+ # Render
27
+ haml_major_version = ::Haml::VERSION[0]
28
+ case haml_major_version
29
+ when '5'
30
+ ::Haml::Engine.new(content, options).render(context, assigns, &proc)
31
+ when '6'
32
+ template = Tilt::HamlTemplate.new(options) { content }
33
+ template.render(context, assigns, &proc)
34
+ else
35
+ raise Nanoc::Core::TrivialError.new(
36
+ "Cannot run Haml filter: unsupported Haml major version: #{haml_major_version}",
37
+ )
38
+ end
26
39
  end
27
40
  end
28
41
  end
data/lib/nanoc/version.rb CHANGED
@@ -2,5 +2,5 @@
2
2
 
3
3
  module Nanoc
4
4
  # The current Nanoc version.
5
- VERSION = '4.12.8'
5
+ VERSION = '4.12.9'
6
6
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nanoc
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.12.8
4
+ version: 4.12.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Denis Defreyne
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-10-03 00:00:00.000000000 Z
11
+ date: 2022-10-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: addressable
@@ -64,28 +64,28 @@ dependencies:
64
64
  requirements:
65
65
  - - '='
66
66
  - !ruby/object:Gem::Version
67
- version: 4.12.8
67
+ version: 4.12.9
68
68
  type: :runtime
69
69
  prerelease: false
70
70
  version_requirements: !ruby/object:Gem::Requirement
71
71
  requirements:
72
72
  - - '='
73
73
  - !ruby/object:Gem::Version
74
- version: 4.12.8
74
+ version: 4.12.9
75
75
  - !ruby/object:Gem::Dependency
76
76
  name: nanoc-core
77
77
  requirement: !ruby/object:Gem::Requirement
78
78
  requirements:
79
79
  - - '='
80
80
  - !ruby/object:Gem::Version
81
- version: 4.12.8
81
+ version: 4.12.9
82
82
  type: :runtime
83
83
  prerelease: false
84
84
  version_requirements: !ruby/object:Gem::Requirement
85
85
  requirements:
86
86
  - - '='
87
87
  - !ruby/object:Gem::Version
88
- version: 4.12.8
88
+ version: 4.12.9
89
89
  - !ruby/object:Gem::Dependency
90
90
  name: nanoc-deploying
91
91
  requirement: !ruby/object:Gem::Requirement