octopress-pygments 1.2.3 → 1.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzlhODVlOTQ5MGMzYWJkOGQyNDQ1OTZjNGEwMTRjNWI3ODQ2NThhNQ==
-  data.tar.gz: !binary |-
-    N2YzYTQ3OGMxODkzMzgzNjJjNWJjYmM2YWVmODg5NTdhMmU2YzI2ZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YzA3NWJmYzliMWFiMjJhODVjNzI0NDYwZTY1YTMzZmJmMDA2NzdkNWFhN2Vl
-    MDk3MjM4OTMyNmRhN2VjNjI5OGQ2MzNmZmY2MDAyM2JlNjczZTc3NjM0N2Zh
-    ZmU2ZmRhYjM5ZmU0MzBkZmIwYzVlNzI1MzUzNjc4ODYxY2Y5M2Q=
-  data.tar.gz: !binary |-
-    Y2FiMWMwZWYyZmYwMjY2MzMyMThiMmI1NGYyOTEwMjE5ZGE3ZTVmNjA2YjRk
-    NDliMzQ5MGQ0ODc4MTYyZWQzMDAzMGY3MWYzM2FmOTkzMjE0OTNjM2ZmNmMw
-    MzkyNmQxMDRiYzMyNzQ0ZmEwZDFhYTJiZjIyMWZmZjU0Mjg0NTc=
+SHA1:
+  metadata.gz: 80e23f910131a9d50e5ece2741af1dfa8e742439
+  data.tar.gz: 2b86308f5194af2974532336a415c07d729b6ec5
+SHA512:
+  metadata.gz: f27c24996a09b278cc82e146474eff2539992a06f9098a3aaee47c4bed11ef37ca39534b855dc158dc69d9c1c53eb25bb936eb80ab58f94ab85502b6d5b43fd8
+  data.tar.gz: 81e3b650f069ae5026cd2142657c9270aeecd7b060696f598d5781a0b2b4e1ca32543661b137554793c574c06de36bc4b8716134ae9c5e2aad50a46199665576

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.3.0
+  - Added `escape` option which wraps code in {% raw %} tags to escape liquid. Defaults to true.
+
 ## 1.2.3
   - Fixed: figcaptions now work when specifying a title.
 

data/lib/octopress-pygments/options_parser.rb

@@ -1,3 +1,6 @@
+class String
+end
+
 module Octopress
   module Pygments
     class OptionsParser
@@ -17,6 +20,7 @@ module Octopress
           .sub(/\s*start:\s*\d+/i,'')
           .sub(/\s*end:\s*\d+/i,'')
           .sub(/\s*range:\s*\d+-\d+/i,'')
+          .sub(/\s*escape:\s*\w+/i,'')
       end
 
       def parse_markup(defaults = {})
@@ -28,12 +32,13 @@ module Octopress
           marks:     marks,
           link_text: link_text,
           start:     start,
-          end:       endline
+          end:       endline,
+          escape:    escape
         }
         options = options.delete_if { |k,v| v.nil? }
         defaults.merge(options)
       end
-
+      
       def lang
         extract(/\s*lang:\s*(\S+)/i)
       end
@@ -47,7 +52,11 @@ module Octopress
       end
 
       def linenos
-        extract(/\s*linenos:\s*(\w+)/i)
+        boolize(extract(/\s*linenos:\s*(\w+)/i))
+      end
+
+      def escape
+        boolize(extract(/\s*escape:\s*(\w+)/i))
       end
 
       # Public: Matches pattern for line marks and returns array of line
@@ -78,7 +87,7 @@ module Octopress
         if range
           range.first
         else
-          extract(/\s*start:\s*(\d+)/i).to_i
+          extract(/\s*start:\s*(\d+)/i, [1], 1).to_i
         end
       end
 
@@ -106,6 +115,13 @@ module Octopress
           end
         end
       end
+
+      def boolize(str)
+        return nil if str.nil?
+        return true if str == true || str =~ (/(true|t|yes|y|1)$/i)
+        return false if str == false || str =~ (/(false|f|no|n|0)$/i) || str.strip.size > 1
+        return str
+      end
     end
   end
 end

data/lib/octopress-pygments/renderer.rb

@@ -5,7 +5,8 @@ module Octopress
 
       def initialize(code, options = {})
         @code    = code
-        @options = options
+        @options = options.delete_if { |k,v| v.nil? }
+        @options = DEFAULTS.merge(@options)
         @aliases = @options[:aliases]
         @aliases = (@aliases ? stringify_keys(@aliases) : {})
         @lang    = determine_lang(@options[:lang])
@@ -24,13 +25,14 @@ module Octopress
           rendered_code = tableize_code(rendered_code, @lang, {linenos: @options[:linenos], start: @options[:start], marks: @options[:marks]})
           title = captionize(@options[:title], @options[:url], @options[:link_text]) if @options[:title]
           rendered_code = "<figure class='code'>#{title}#{rendered_code}</figure>"
+          rendered_code = "{% raw %}#{rendered_code}{% endraw %}" if @options[:escape]
           Cache.write_to_cache(rendered_code, @options) unless @options[:no_cache]
           rendered_code
         end
       end
 
       def determine_lang(lang)
-        if lang == '' or lang.nil? or !lang
+        if lang == ''
           lang = 'plain'
         elsif ::Pygments::Lexer.find lang 
           lang
@@ -62,9 +64,9 @@ module Octopress
       end
 
       def tableize_code (code, lang, options = {})
-        start = options[:start] || 1
-        lines = options[:linenos] || true
-        marks = options[:marks] || []
+        start = options[:start]
+        lines = options[:linenos]
+        marks = options[:marks]
         table = "<div class='highlight'><table><tr>"
         table += number_lines(start, code.lines.count, marks) if lines
         table += "<td class='main #{'unnumbered' unless lines} #{lang}'><pre>"

data/lib/octopress-pygments/version.rb

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

data/lib/octopress-pygments.rb

@@ -9,6 +9,14 @@ FileUtils.mkdir_p(PYGMENTS_CACHE_DIR)
 
 module Octopress
   module Pygments
+    DEFAULTS = {
+      lang: 'plain',
+      linenos: true,
+      marks: [],
+      start: 1,
+      escape: true
+    }
+
     autoload :Cache,         'octopress-pygments/cache'
     autoload :OptionsParser, 'octopress-pygments/options_parser'
     autoload :Renderer,      'octopress-pygments/renderer'

data/spec/pygments_spec.rb

@@ -4,7 +4,7 @@ describe Octopress::Pygments do
   let(:wrapper) do
     Proc.new do |stuff, numbers|
       [
-        "<figure class='code'>",
+        "{% raw %}<figure class='code'>",
         "<div class='highlight'>",
         "<table><tr>",
         "<td class='line-numbers' aria-hidden='true'>",
@@ -13,20 +13,20 @@ describe Octopress::Pygments do
         "<td class='main  plain'>",
         "<pre>#{stuff}</pre>",
         "</td></tr>",
-        "</table></div></figure>"
+        "</table></div></figure>{% endraw %}"
       ].join
     end
   end
 
   let(:expected_output_no_options) 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  plain'><pre><div class='line'>    require "hi-there-honey"
+{% 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"
 </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>
+</div></pre></td></tr></table></div></figure>{% endraw %}
 EOF
     stuff.strip
   end
@@ -89,7 +89,7 @@ EOF
       lang: "abc",
       url:  "http://something.com/hi/fuaiofnioaf.html",
       title: "Hello",
-      linenos: "yes",
+      linenos: true,
       marks: [5, 8, 9, 10, 15],
       link_text: "get it here",
       start: 5,
@@ -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'} })).to eql(expected_output_lang_ruby.chop)
+        expect(described_class.highlight(code, { lang: 'abc', aliases: {'abc'=>'ruby'}, escape: false })).to eql(expected_output_lang_ruby.chop)
       end
     end
   end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: octopress-pygments
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
@@ -42,28 +42,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Octopress's core plugin for rendering nice code blocks
@@ -100,17 +100,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Octopress's core plugin for rendering nice code blocks