octopress-pygments 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80e23f910131a9d50e5ece2741af1dfa8e742439
-  data.tar.gz: 2b86308f5194af2974532336a415c07d729b6ec5
+  metadata.gz: 231883633323fd6b655584e0331b013b80311d3c
+  data.tar.gz: 42fd39de011ca2f67b27815817ac25802a4dc496
 SHA512:
-  metadata.gz: f27c24996a09b278cc82e146474eff2539992a06f9098a3aaee47c4bed11ef37ca39534b855dc158dc69d9c1c53eb25bb936eb80ab58f94ab85502b6d5b43fd8
-  data.tar.gz: 81e3b650f069ae5026cd2142657c9270aeecd7b060696f598d5781a0b2b4e1ca32543661b137554793c574c06de36bc4b8716134ae9c5e2aad50a46199665576
+  metadata.gz: 18806e4d8e86557658093cb502876e4de13b5359e32a368f283095bbcded1a627b4628a7aa778b73d271db7b95670b1a1ebefd3466480026241e9e903ada4877
+  data.tar.gz: cae25c1c67129f9bee09765fa7cd66204f8fdfeada5b385876fab589ad043f458f16298c37f89fc9f4bb3f48d7118aad71dfd5a16b5517b4ca61dd1be3b542bf

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.3.1
+  - Fixed: line numbers now start at 1 instead of zero.
+  - Changed: `escape` option defaults to false.
+
 ## 1.3.0
   - Added `escape` option which wraps code in {% raw %} tags to escape liquid. Defaults to true.
 

data/lib/octopress-pygments/options_parser.rb

@@ -87,7 +87,9 @@ module Octopress
         if range
           range.first
         else
-          extract(/\s*start:\s*(\d+)/i, [1], 1).to_i
+          num = extract(/\s*start:\s*(\d+)/i)
+          num = num.to_i unless num.nil?
+          num
         end
       end
 
@@ -95,7 +97,9 @@ module Octopress
         if range
           range.last
         else
-          extract(/\s*end:\s*(\d+)/i).to_i
+          num = extract(/\s*end:\s*(\d+)/i)
+          num = num.to_i unless num.nil?
+          num
         end
       end
 

data/lib/octopress-pygments/renderer.rb

@@ -84,7 +84,7 @@ module Octopress
       end
 
       def number_lines (start, count, marks)
-        start ||= 1
+        start
         lines = "<td class='line-numbers' aria-hidden='true'><pre>"
         count.times do |index|
           classes = 'line-number'
@@ -103,7 +103,7 @@ module Octopress
       #
       def get_range(code, start, endline)
         length    = code.lines.count
-        start   ||= 1
+        start
         endline ||= length
         if start > 1 or endline < length
           raise "#{filepath} is #{length} lines long, cannot begin at line #{start}" if start > length

data/lib/octopress-pygments/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Pygments
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

data/lib/octopress-pygments.rb

@@ -13,8 +13,7 @@ module Octopress
       lang: 'plain',
       linenos: true,
       marks: [],
-      start: 1,
-      escape: true
+      start: 1
     }
 
     autoload :Cache,         'octopress-pygments/cache'

data/spec/pygments_spec.rb

@@ -4,7 +4,7 @@ describe Octopress::Pygments do
   let(:wrapper) do
     Proc.new do |stuff, numbers|
       [
-        "{% raw %}<figure class='code'>",
+        "<figure class='code'>",
         "<div class='highlight'>",
         "<table><tr>",
         "<td class='line-numbers' aria-hidden='true'>",
@@ -13,33 +13,33 @@ describe Octopress::Pygments do
         "<td class='main  plain'>",
         "<pre>#{stuff}</pre>",
         "</td></tr>",
-        "</table></div></figure>{% endraw %}"
+        "</table></div></figure>"
       ].join
     end
   end
 
   let(:expected_output_no_options) do
     stuff = <<-EOF
-{% 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  plain'><pre><div class='line'>    require "hi-there-honey"
+<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"
 </div><div class='line'> </div><div class='line'>    def hi-there-honey
 </div><div class='line'>      HiThereHoney.new("your name")
 </div><div class='line'>    end
 </div><div class='line'> </div><div class='line'>    hi-there-honey
 </div><div class='line'>    # => "Hi, your name"
-</div></pre></td></tr></table></div></figure>{% endraw %}
+</div></pre></td></tr></table></div></figure>
 EOF
     stuff.strip
   end
 
   let(:expected_output_lang_ruby) do
     stuff = <<-EOF
-<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">&quot;hi-there-honey&quot;</span>
+{% 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">&quot;hi-there-honey&quot;</span>
 </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>
 </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">&quot;your name&quot;</span><span class="p">)</span>
 </div><div class='line'>    <span class="k">end</span>
 </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>
 </div><div class='line'>    <span class="c1"># =&gt; &quot;Hi, your name&quot;</span>
-</div></pre></td></tr></table></div></figure>
+</div></pre></td></tr></table></div></figure>{% endraw %}
 EOF
   end
 
@@ -110,7 +110,7 @@ EOF
 
     context "with a language" do
       it "returns the right HTML for a given set of code" do
-        expect(described_class.highlight(code, { lang: 'abc', aliases: {'abc'=>'ruby'}, escape: false })).to eql(expected_output_lang_ruby.chop)
+        expect(described_class.highlight(code, { lang: 'abc', aliases: {'abc'=>'ruby'}, escape: true })).to eql(expected_output_lang_ruby.chop)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-pygments
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Brandon Mathis