octopress-pygments 1.3.0 → 1.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/lib/octopress-pygments/options_parser.rb +6 -2
- data/lib/octopress-pygments/renderer.rb +2 -2
- data/lib/octopress-pygments/version.rb +1 -1
- data/lib/octopress-pygments.rb +1 -2
- data/spec/pygments_spec.rb +7 -7
- 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: 231883633323fd6b655584e0331b013b80311d3c
|
4
|
+
data.tar.gz: 42fd39de011ca2f67b27815817ac25802a4dc496
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 18806e4d8e86557658093cb502876e4de13b5359e32a368f283095bbcded1a627b4628a7aa778b73d271db7b95670b1a1ebefd3466480026241e9e903ada4877
|
7
|
+
data.tar.gz: cae25c1c67129f9bee09765fa7cd66204f8fdfeada5b385876fab589ad043f458f16298c37f89fc9f4bb3f48d7118aad71dfd5a16b5517b4ca61dd1be3b542bf
|
data/CHANGELOG.md
CHANGED
@@ -87,7 +87,9 @@ module Octopress
|
|
87
87
|
if range
|
88
88
|
range.first
|
89
89
|
else
|
90
|
-
extract(/\s*start:\s*(\d+)/i
|
90
|
+
num = extract(/\s*start:\s*(\d+)/i)
|
91
|
+
num = num.to_i unless num.nil?
|
92
|
+
num
|
91
93
|
end
|
92
94
|
end
|
93
95
|
|
@@ -95,7 +97,9 @@ module Octopress
|
|
95
97
|
if range
|
96
98
|
range.last
|
97
99
|
else
|
98
|
-
extract(/\s*end:\s*(\d+)/i)
|
100
|
+
num = extract(/\s*end:\s*(\d+)/i)
|
101
|
+
num = num.to_i unless num.nil?
|
102
|
+
num
|
99
103
|
end
|
100
104
|
end
|
101
105
|
|
@@ -84,7 +84,7 @@ module Octopress
|
|
84
84
|
end
|
85
85
|
|
86
86
|
def number_lines (start, count, marks)
|
87
|
-
start
|
87
|
+
start
|
88
88
|
lines = "<td class='line-numbers' aria-hidden='true'><pre>"
|
89
89
|
count.times do |index|
|
90
90
|
classes = 'line-number'
|
@@ -103,7 +103,7 @@ module Octopress
|
|
103
103
|
#
|
104
104
|
def get_range(code, start, endline)
|
105
105
|
length = code.lines.count
|
106
|
-
start
|
106
|
+
start
|
107
107
|
endline ||= length
|
108
108
|
if start > 1 or endline < length
|
109
109
|
raise "#{filepath} is #{length} lines long, cannot begin at line #{start}" if start > length
|
data/lib/octopress-pygments.rb
CHANGED
data/spec/pygments_spec.rb
CHANGED
@@ -4,7 +4,7 @@ describe Octopress::Pygments do
|
|
4
4
|
let(:wrapper) do
|
5
5
|
Proc.new do |stuff, numbers|
|
6
6
|
[
|
7
|
-
"
|
7
|
+
"<figure class='code'>",
|
8
8
|
"<div class='highlight'>",
|
9
9
|
"<table><tr>",
|
10
10
|
"<td class='line-numbers' aria-hidden='true'>",
|
@@ -13,33 +13,33 @@ describe Octopress::Pygments do
|
|
13
13
|
"<td class='main plain'>",
|
14
14
|
"<pre>#{stuff}</pre>",
|
15
15
|
"</td></tr>",
|
16
|
-
"</table></div></figure>
|
16
|
+
"</table></div></figure>"
|
17
17
|
].join
|
18
18
|
end
|
19
19
|
end
|
20
20
|
|
21
21
|
let(:expected_output_no_options) do
|
22
22
|
stuff = <<-EOF
|
23
|
-
|
23
|
+
<figure class='code'><div class='highlight'><table><tr><td class='line-numbers' aria-hidden='true'><pre><div data-line='1' class='line-number'></div><div data-line='2' class='line-number'></div><div data-line='3' class='line-number'></div><div data-line='4' class='line-number'></div><div data-line='5' class='line-number'></div><div data-line='6' class='line-number'></div><div data-line='7' class='line-number'></div><div data-line='8' class='line-number'></div></pre></td><td class='main plain'><pre><div class='line'> require "hi-there-honey"
|
24
24
|
</div><div class='line'> </div><div class='line'> def hi-there-honey
|
25
25
|
</div><div class='line'> HiThereHoney.new("your name")
|
26
26
|
</div><div class='line'> end
|
27
27
|
</div><div class='line'> </div><div class='line'> hi-there-honey
|
28
28
|
</div><div class='line'> # => "Hi, your name"
|
29
|
-
</div></pre></td></tr></table></div></figure>
|
29
|
+
</div></pre></td></tr></table></div></figure>
|
30
30
|
EOF
|
31
31
|
stuff.strip
|
32
32
|
end
|
33
33
|
|
34
34
|
let(:expected_output_lang_ruby) do
|
35
35
|
stuff = <<-EOF
|
36
|
-
<figure class='code'><div class='highlight'><table><tr><td class='line-numbers' aria-hidden='true'><pre><div data-line='1' class='line-number'></div><div data-line='2' class='line-number'></div><div data-line='3' class='line-number'></div><div data-line='4' class='line-number'></div><div data-line='5' class='line-number'></div><div data-line='6' class='line-number'></div><div data-line='7' class='line-number'></div><div data-line='8' class='line-number'></div></pre></td><td class='main ruby'><pre><div class='line'> <span class="nb">require</span> <span class="s2">"hi-there-honey"</span>
|
36
|
+
{% raw %}<figure class='code'><div class='highlight'><table><tr><td class='line-numbers' aria-hidden='true'><pre><div data-line='1' class='line-number'></div><div data-line='2' class='line-number'></div><div data-line='3' class='line-number'></div><div data-line='4' class='line-number'></div><div data-line='5' class='line-number'></div><div data-line='6' class='line-number'></div><div data-line='7' class='line-number'></div><div data-line='8' class='line-number'></div></pre></td><td class='main ruby'><pre><div class='line'> <span class="nb">require</span> <span class="s2">"hi-there-honey"</span>
|
37
37
|
</div><div class='line'> </div><div class='line'> <span class="k">def</span> <span class="nf">hi</span><span class="o">-</span><span class="n">there</span><span class="o">-</span><span class="n">honey</span>
|
38
38
|
</div><div class='line'> <span class="no">HiThereHoney</span><span class="o">.</span><span class="n">new</span><span class="p">(</span><span class="s2">"your name"</span><span class="p">)</span>
|
39
39
|
</div><div class='line'> <span class="k">end</span>
|
40
40
|
</div><div class='line'> </div><div class='line'> <span class="n">hi</span><span class="o">-</span><span class="n">there</span><span class="o">-</span><span class="n">honey</span>
|
41
41
|
</div><div class='line'> <span class="c1"># => "Hi, your name"</span>
|
42
|
-
</div></pre></td></tr></table></div></figure>
|
42
|
+
</div></pre></td></tr></table></div></figure>{% endraw %}
|
43
43
|
EOF
|
44
44
|
end
|
45
45
|
|
@@ -110,7 +110,7 @@ EOF
|
|
110
110
|
|
111
111
|
context "with a language" do
|
112
112
|
it "returns the right HTML for a given set of code" do
|
113
|
-
expect(described_class.highlight(code, { lang: 'abc', aliases: {'abc'=>'ruby'}, escape:
|
113
|
+
expect(described_class.highlight(code, { lang: 'abc', aliases: {'abc'=>'ruby'}, escape: true })).to eql(expected_output_lang_ruby.chop)
|
114
114
|
end
|
115
115
|
end
|
116
116
|
end
|