octopress-ink 1.0.0.rc.10 → 1.0.0.rc.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -2
- data/lib/octopress-ink/tags/render.rb +8 -8
- data/lib/octopress-ink/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 576099a0e49e1ab0edc2d5cbb5a9e16200a4394f
|
4
|
+
data.tar.gz: e5eb8df4eda75bfc27abfe48f0b20e293fe84525
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c3bee656fcd73fd9c9fa3e24eb69d26fc7cd978838c25a5a38af9daa8b6e5c18cba20393146d3cfd026ead3f5a415a24cfbbdfea13d220762209c99633c077c5
|
7
|
+
data.tar.gz: 1336166f60125b7cab46bacbcde7f4a3d50f26672f63a17a1c641a6323c3ae0f08d921a93dd468b24ac4c756db9badf607884f5e70830869a6f96369fb20702c
|
data/CHANGELOG.md
CHANGED
@@ -2,12 +2,16 @@
|
|
2
2
|
|
3
3
|
## Current released version
|
4
4
|
|
5
|
-
### 1.0.0
|
5
|
+
### 1.0.0 RC11 - 2014-06-27
|
6
6
|
|
7
|
-
- Render tag
|
7
|
+
- Fixed: Render tag properly processes local variables.
|
8
8
|
|
9
9
|
## Past versions
|
10
10
|
|
11
|
+
### 1.0.0 RC10 - 2014-06-26
|
12
|
+
|
13
|
+
- Render tag does a better job of preserving {% raw %} escaped content.
|
14
|
+
|
11
15
|
### 1.0.0 RC9 - 2014-06-21
|
12
16
|
|
13
17
|
- Added jekyll-page-hooks as a dependency.
|
@@ -24,22 +24,20 @@ module Octopress
|
|
24
24
|
|
25
25
|
content = read(markup, context)
|
26
26
|
|
27
|
+
if content =~ /\A-{3}(.+[^\A])-{3}\n(.+)/m
|
28
|
+
local_vars = SafeYAML.load($1.strip)
|
29
|
+
content = $2.strip
|
30
|
+
end
|
31
|
+
|
27
32
|
raw_content = {}
|
28
33
|
|
29
34
|
content = content.gsub /{%\s*raw\s*%}(.+?){% endraw %}/m do
|
30
35
|
data = $1
|
31
36
|
key = Digest::MD5.hexdigest(data)
|
32
|
-
raw_content[key] = data
|
37
|
+
raw_content[key] = "{% raw %}#{data}{% endraw %}"
|
33
38
|
key
|
34
39
|
end
|
35
40
|
|
36
|
-
content = parse_convertible(content, context).strip
|
37
|
-
|
38
|
-
if content =~ /\A-{3}(.+[^\A])-{3}\n(.+)/m
|
39
|
-
local_vars = SafeYAML.load($1.strip)
|
40
|
-
content = $2.strip
|
41
|
-
end
|
42
|
-
|
43
41
|
return content if @raw
|
44
42
|
|
45
43
|
include_tag = Jekyll::Tags::IncludeTag.new('include', markup, [])
|
@@ -55,6 +53,8 @@ module Octopress
|
|
55
53
|
|
56
54
|
raw_content.each { |k, v| content.sub!(k, v) }
|
57
55
|
|
56
|
+
content = parse_convertible(content, context).strip
|
57
|
+
|
58
58
|
unless content.nil? || filters.nil?
|
59
59
|
content = Helpers::Var.render_filters(content, filters, context)
|
60
60
|
end
|