octopress-escape-code 1.0.1 → 1.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +7 -4
- data/lib/octopress-escape-code.rb +12 -11
- data/lib/octopress-escape-code/version.rb +1 -1
- data/octopress-escape-code.gemspec +1 -0
- data/test/Gemfile +1 -4
- data/test/index.md +3 -4
- metadata +16 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1d3a34c64bec8c3ee3e982e62ac51011b3d7d2c9
|
4
|
+
data.tar.gz: db44ed823e5e5b1bfbc172a4a5a47a1b999404ef
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 92c02b47adfeaba704485bed1035084696e31c5f3abdfa66dc31f7e7391e014c43fbee9b9b96f58d395c1e4a4e1d30a1e03493e3ff42165398784d935920bb22
|
7
|
+
data.tar.gz: 371f160ffdf3205ba16fdbe870b0477dbd8087ff939ef7e2d83ef37ac37a2929bc84548adfbb9c63e364bec64447e51f3820353242cee206a2aa62a82d118bde
|
data/CHANGELOG.md
CHANGED
@@ -1,7 +1,10 @@
|
|
1
1
|
# Changelog
|
2
2
|
|
3
|
-
### 1.0.
|
4
|
-
-
|
3
|
+
### 1.0.2 - 2014-9-13
|
4
|
+
- Fix: Removing extra raw tags in markdown code blocks.
|
5
5
|
|
6
|
-
### 1.0.
|
7
|
-
-
|
6
|
+
### 1.0.1 - 2014-9-12
|
7
|
+
- Upgraded to octopress-hooks 2.
|
8
|
+
|
9
|
+
### 1.0.0 - 2014-7-20
|
10
|
+
- Initial release.
|
@@ -35,21 +35,16 @@ module Octopress
|
|
35
35
|
content.encode!("UTF-8")
|
36
36
|
md_ext = %w{.markdown .mdown .mkdn .md .mkd .mdwn .mdtxt .mdtext}
|
37
37
|
|
38
|
-
# Escape codefenced codeblocks
|
39
|
-
content = content.gsub /^(`{3}.+?`{3})/m do
|
40
|
-
"{% raw %}\n#{$1}\n{% endraw %}"
|
41
|
-
end
|
42
|
-
|
43
38
|
# Escape markdown style code blocks
|
44
39
|
if md_ext.include?(ext)
|
45
40
|
|
46
41
|
# Escape four space indented code blocks
|
47
|
-
content = content.gsub /^(\s{4}.+?)\n(
|
42
|
+
content = content.gsub /^(\s{4}.+?)\n($|\S)/m do
|
48
43
|
"{% raw %}\n#{$1}\n{% endraw %}\n#{$2}"
|
49
44
|
end
|
50
45
|
|
51
46
|
# Escape tab indented code blocks
|
52
|
-
content = content.gsub /^(\t.+?)\n(
|
47
|
+
content = content.gsub /^(\t.+?)\n($|\S)/m do
|
53
48
|
"{% raw %}\n#{$1}\n{% endraw %}\n#{$2}"
|
54
49
|
end
|
55
50
|
|
@@ -60,14 +55,20 @@ module Octopress
|
|
60
55
|
|
61
56
|
end
|
62
57
|
|
58
|
+
# Escape codefenced codeblocks
|
59
|
+
content = content.gsub /^(`{3}.+?`{3})/m do
|
60
|
+
c = $1.gsub /{% (end)?raw %}\n/, ''
|
61
|
+
"{% raw %}\n#{c}\n{% endraw %}"
|
62
|
+
end
|
63
|
+
|
63
64
|
# Escape codeblock tag contents
|
64
|
-
content = content.gsub /^({%\s*codeblock.+?%})(.+?)
|
65
|
-
"#{$1}{% raw %}#{$2}{% endraw %}
|
65
|
+
content = content.gsub /^({%\s*codeblock.+?%})(.+?){%\s*endcodeblock\s*%}/m do
|
66
|
+
"#{$1}{% raw %}#{$2.gsub /{% (end)?raw %}\n/, ''}{% endraw %}{% endcodeblock %}"
|
66
67
|
end
|
67
68
|
|
68
69
|
# Escape highlight tag contents
|
69
|
-
content = content.gsub /^({%\s*highlight.+?%})(.+?)
|
70
|
-
"#{$1}{% raw %}#{$2}{% endraw %}
|
70
|
+
content = content.gsub /^({%\s*highlight.+?%})(.+?){%\s*endhighlight\s*%}/m do
|
71
|
+
"#{$1}{% raw %}#{$2.gsub(/{% (end)?raw %}\n/, '')}{% endraw %}{% endhighlight %}"
|
71
72
|
end
|
72
73
|
|
73
74
|
content
|
@@ -23,5 +23,6 @@ Gem::Specification.new do |spec|
|
|
23
23
|
spec.add_development_dependency "bundler", "~> 1.6"
|
24
24
|
spec.add_development_dependency "rake"
|
25
25
|
spec.add_development_dependency "clash"
|
26
|
+
spec.add_development_dependency "pry-byebug"
|
26
27
|
spec.add_development_dependency "octopress-codeblock"
|
27
28
|
end
|
data/test/Gemfile
CHANGED
data/test/index.md
CHANGED
@@ -6,7 +6,7 @@ Some text
|
|
6
6
|
|
7
7
|
```
|
8
8
|
Some kind of example:
|
9
|
-
{% some tag that should break %}
|
9
|
+
{% some tag that should break %}
|
10
10
|
Stuff!
|
11
11
|
```
|
12
12
|
guys!
|
@@ -24,11 +24,10 @@ Stuff!
|
|
24
24
|
|
25
25
|
{% codeblock html %}
|
26
26
|
Some kind of example:
|
27
|
+
stuff
|
27
28
|
{% some tag that should break %}
|
28
29
|
Stuff!
|
29
30
|
{% endcodeblock %}
|
30
|
-
|
31
31
|
stuff
|
32
|
-
|
33
|
-
|
32
|
+
{% foo %}
|
34
33
|
some text
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: octopress-escape-code
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Brandon Mathis
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-09-
|
11
|
+
date: 2014-09-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: octopress-hooks
|
@@ -66,6 +66,20 @@ dependencies:
|
|
66
66
|
- - ">="
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '0'
|
69
|
+
- !ruby/object:Gem::Dependency
|
70
|
+
name: pry-byebug
|
71
|
+
requirement: !ruby/object:Gem::Requirement
|
72
|
+
requirements:
|
73
|
+
- - ">="
|
74
|
+
- !ruby/object:Gem::Version
|
75
|
+
version: '0'
|
76
|
+
type: :development
|
77
|
+
prerelease: false
|
78
|
+
version_requirements: !ruby/object:Gem::Requirement
|
79
|
+
requirements:
|
80
|
+
- - ">="
|
81
|
+
- !ruby/object:Gem::Version
|
82
|
+
version: '0'
|
69
83
|
- !ruby/object:Gem::Dependency
|
70
84
|
name: octopress-codeblock
|
71
85
|
requirement: !ruby/object:Gem::Requirement
|