octopress-code-highlighter 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b873308424a70aaeff4e38929c2d30b3ad997c5
-  data.tar.gz: 04c339c9d22b19071a6d188da480d0242329b9ac
+  metadata.gz: 46baa2ce8aa0f668a09c0bc698c0f82b2700abbd
+  data.tar.gz: ffd4f5ef8d71d0f9ba00551b2c4e2712a251aa0c
 SHA512:
-  metadata.gz: c9277a808f9fea0e4090c39b7a600698fd5b14ce61e609eb15616d9ef4987887a47afef4cf1533a55a344aaf2a027fd4e1da6d00fc555d7eab6213663b62f091
-  data.tar.gz: e06b537a0ab19e4a951ba958712c515567cab02934614607ccbe0b09443a0c63f1f8d3f8db7a413a3e0d43410c8851cc7550a5d93e98ce5c4465584008e19782
+  metadata.gz: 38044e87197659c0434f711ffef5f679923960c93076e704792b0e8df66fad89cee746b2c03fc4b0017ff4cdea90e5a98e669bc0c07d82bd6cea4a1a50ea5146
+  data.tar.gz: e2241329385980c82d7901ed16fcbd1199279e7a5d94b2b50361bc3c6d5c3340cfae6a21e14b5f855a12ac7752d32bca9aabdb1de7370e58214e99be6da820b7

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 4.2.0 - 2014-06-28
+  - New: Add classnames on code figure: `class:"example classnames"`.
+
 ## 4.1.0 - 2014-06-27
   - Added support for setting PHP's startinline option (now defaults to true).
 

data/lib/octopress-code-highlighter/options_parser.rb

@@ -19,6 +19,7 @@ module Octopress
           .sub(/\s*range:\s*\d+-\d+/i,'')
           .sub(/\s*escape:\s*\w+/i,'')
           .sub(/\s*startinline:\s*\w+/i,'')
+          .sub(/\s*class:\s*(("(.+?)")|('(.+?)')|(\S+))/i,'')
       end
 
       def parse_markup(defaults = {})
@@ -32,7 +33,8 @@ module Octopress
           start:     start,
           end:       endline,
           escape:    escape,
-          startinline: startinline
+          startinline: startinline,
+          class:     classnames
         }
         options = options.delete_if { |k,v| v.nil? }
         defaults.merge(options)
@@ -46,6 +48,10 @@ module Octopress
         boolize(extract(/\s*startinline:\s*(\w+)/i))
       end
 
+      def classnames
+        extract(/\s*class:\s*(("(.+?)")|('(.+?)')|(\S+))/i, [3, 5, 6])
+      end
+
       def url
         extract(/\s*url:\s*(("(.+?)")|('(.+?)')|(\S+))/i, [3, 5, 6])
       end

data/lib/octopress-code-highlighter/renderer.rb

@@ -45,7 +45,11 @@ module Octopress
           rendered_code = render
           rendered_code = escape_characters(rendered_code)
           rendered_code = tableize_code(rendered_code)
-          rendered_code = "<figure class='code-highlight-figure'>#{caption}#{rendered_code}</figure>"
+          classnames = 'code-highlight-figure'
+          if options[:class]
+            classnames << ' ' + options[:class]
+          end
+          rendered_code = "<figure class='#{classnames}'>#{caption}#{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
@@ -98,7 +102,7 @@ module Octopress
 
       def render_rouge
         if lexer = Rouge::Lexer.find(lang) || Rouge::Lexer.find(@aliases[lang])
-          formatter = ::Rouge::Formatters::HTML.new()
+          formatter = ::Rouge::Formatters::HTML.new(wrap: false)
           formatter.format(lexer.lex(@code))
         else
           render_plain

data/lib/octopress-code-highlighter/version.rb

@@ -1,6 +1,6 @@
 module Octopress
   module CodeHighlighter
-    VERSION = "4.1.0"
+    VERSION = "4.2.0"
   end
 end
 

data/octopress-code-highlighter.gemspec

@@ -13,12 +13,12 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/octopress/code-highlighter"
   gem.license       = "MIT"
 
-  gem.add_runtime_dependency 'colorator', '~> 0.1.0'
+  gem.add_runtime_dependency 'colorator', '~> 0.1'
 
   gem.add_development_dependency 'pry-debugger'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'rouge', '~> 1.3.2'
+  gem.add_development_dependency 'rouge', '~> 1.3'
 
   gem.files         = `git ls-files`.split($/).reject {|f| f =~ /^demo\// }
   gem.require_paths = ["lib"]

data/spec/pygments_spec.rb

@@ -14,12 +14,12 @@ describe Octopress::CodeHighlighter do
 
   let(:expected_output_no_options) do
     stuff = <<-EOF
-<figure class='code-highlight-figure'><div class='code-highlight'><pre class='code-highlight-pre'><div data-line='1' class='code-highlight-row numbered'><div class='code-highlight-line'>    require "hi-there-honey"
-</div></div><div data-line='2' class='code-highlight-row numbered'><div class='code-highlight-line'> </div></div><div data-line='3' class='code-highlight-row numbered'><div class='code-highlight-line'>    def hi-there-honey
-</div></div><div data-line='4' class='code-highlight-row numbered'><div class='code-highlight-line'>      HiThereHoney.new("your name")
-</div></div><div data-line='5' class='code-highlight-row numbered'><div class='code-highlight-line'>    end
-</div></div><div data-line='6' class='code-highlight-row numbered'><div class='code-highlight-line'> </div></div><div data-line='7' class='code-highlight-row numbered'><div class='code-highlight-line'>    hi-there-honey
-</div></div><div data-line='8' class='code-highlight-row numbered'><div class='code-highlight-line'>    # =>  "Hi, your name"
+<figure class='code-highlight-figure'><div class='code-highlight'><pre class='code-highlight-pre'><div data-line='1' class='code-highlight-row numbered'><div class='code-highlight-line'>require "hi-there-honey"
+</div></div><div data-line='2' class='code-highlight-row numbered'><div class='code-highlight-line'> </div></div><div data-line='3' class='code-highlight-row numbered'><div class='code-highlight-line'>def hi-there-honey
+</div></div><div data-line='4' class='code-highlight-row numbered'><div class='code-highlight-line'>  HiThereHoney.new("your name")
+</div></div><div data-line='5' class='code-highlight-row numbered'><div class='code-highlight-line'>end
+</div></div><div data-line='6' class='code-highlight-row numbered'><div class='code-highlight-line'> </div></div><div data-line='7' class='code-highlight-row numbered'><div class='code-highlight-line'>hi-there-honey
+</div></div><div data-line='8' class='code-highlight-row numbered'><div class='code-highlight-line'># =>  "Hi, your name"
 </div></div></pre></div></figure>
 EOF
     stuff.strip
@@ -27,25 +27,26 @@ EOF
 
   let(:expected_output_lang_ruby) do
     stuff = <<-EOF
-{% raw %}<figure class='code-highlight-figure'><div class='code-highlight'><pre class='code-highlight-pre'><div data-line='1' class='code-highlight-row numbered'><div class='code-highlight-line'><span class="nb">require</span> <span class="s2">"hi-there-honey"</span>
-</div></div><div data-line='2' class='code-highlight-row numbered'><div class='code-highlight-line'> </div></div><div data-line='3' class='code-highlight-row numbered'><div class='code-highlight-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><div data-line='4' class='code-highlight-row numbered'><div class='code-highlight-line'>      <span class="no">HiThereHoney</span><span class="p">.</span><span class="nf">new</span><span class="p">(</span><span class="s2">"your name"</span><span class="p">)</span>
-</div></div><div data-line='5' class='code-highlight-row numbered'><div class='code-highlight-line'>    <span class="k">end</span>
-</div></div><div data-line='6' class='code-highlight-row numbered'><div class='code-highlight-line'> </div></div><div data-line='7' class='code-highlight-row numbered'><div class='code-highlight-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><div data-line='8' class='code-highlight-row numbered'><div class='code-highlight-line'>    <span class="c1"># =&gt;  "Hi, your name"</span></div></div></pre></div></figure>{% endraw %}
+{% raw %}<figure class='code-highlight-figure awesome'><div class='code-highlight'><pre class='code-highlight-pre'><div data-line='1' class='code-highlight-row numbered'><div class='code-highlight-line'><span class="nb">require</span> <span class="s2">"hi-there-honey"</span>
+</div></div><div data-line='2' class='code-highlight-row numbered'><div class='code-highlight-line'> </div></div><div data-line='3' class='code-highlight-row numbered'><div class='code-highlight-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><div data-line='4' class='code-highlight-row numbered'><div class='code-highlight-line'>  <span class="no">HiThereHoney</span><span class="p">.</span><span class="nf">new</span><span class="p">(</span><span class="s2">"your name"</span><span class="p">)</span>
+</div></div><div data-line='5' class='code-highlight-row numbered'><div class='code-highlight-line'><span class="k">end</span>
+</div></div><div data-line='6' class='code-highlight-row numbered'><div class='code-highlight-line'> </div></div><div data-line='7' class='code-highlight-row numbered'><div class='code-highlight-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><div data-line='8' class='code-highlight-row numbered'><div class='code-highlight-line'><span class="c1"># =&gt;  "Hi, your name"</span>
+</div></div></pre></div></figure>{% endraw %}
 EOF
   end
 
   let(:code) do
     <<-EOF
-    require "hi-there-honey"
+require "hi-there-honey"
 
-    def hi-there-honey
-      HiThereHoney.new("your name")
-    end
+def hi-there-honey
+  HiThereHoney.new("your name")
+end
 
-    hi-there-honey
-    # =>  "Hi, your name"
+hi-there-honey
+# =>  "Hi, your name"
     EOF
   end
 
@@ -103,7 +104,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: true })).to eql(expected_output_lang_ruby.chop)
+        expect(described_class.highlight(code, { lang: 'abc', aliases: {'abc'=>'ruby'}, escape: true, class: 'awesome' })).to eql(expected_output_lang_ruby.chop)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-code-highlighter
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorator
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '1.3'
 description: Octopress's core plugin for rendering nice code blocks
 email:
 - brandon@imathis.com