velvet_rope 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1,3 +1,8 @@
 ## v0.0.1
 
 * Initial release
+
+## v0.0.2
+
+* Gracefully handle unsupported lexers
+* Don't render emoji in inline code

data/lib/velvet_rope.rb

@@ -15,7 +15,11 @@ module Redcarpet
         # as it is a wrapper for the implementation written in C
         if @extensions[:highlight_syntax]
           self.class.send(:define_method, :block_code) do |code, language|
-            Pygments.highlight(code, :lexer => language)
+            if Pygments::Lexer.find_by_alias(language)
+              Pygments.highlight(code, :lexer => language)
+            else
+              Pygments.highlight(code)
+            end
           end
         end
 
@@ -23,9 +27,9 @@ module Redcarpet
         super(extensions)
       end
 
-      def postprocess(document)
+      def preprocess(document)
         if @extensions[:emoji]
-          document.gsub!(/:([a-z0-9\+\-_]+):/) do |match|
+          document.gsub!(/:([a-z0-9\+\-_]+):(?=([^`]*`[^`]*`)*[^`]*$)/) do |match|
             if Emoji.names.include?($1)
               emoji_template($1)
             else

data/spec/velvet_rope_spec.rb

@@ -12,6 +12,13 @@ describe Redcarpet::Render::VelvetRope do
       expected = '<p>This should be a <img alt="smiley" src="/images/emoji/smiley.png" style="vertical-align:middle" width="20" height="20" /> face.</p>' + "\n"
       markdown.render(content).should eq(expected)
     end
+
+    it 'does not render emoji inside of inline-code back ticks' do
+      content = 'This should be a :smiley: face. This should be a normal inline code sample `:fire:`.'
+
+      expected = '<p>This should be a <img alt="smiley" src="/images/emoji/smiley.png" style="vertical-align:middle" width="20" height="20" /> face. This should be a normal inline code sample <code>:fire:</code>.</p>' + "\n"
+      markdown.render(content).should eq(expected)
+    end
   end
 
   context 'with highlight_syntax option set to true' do
@@ -48,6 +55,19 @@ end
       expected = %{<p>This is an example of some Ruby code in a fenced code block:</p>\n<div class=\"highlight\"><pre><span class=\"k\">def</span> <span class=\"nf\">my_method</span>\n  <span class=\"s1\">&#39;my string&#39;</span><span class=\"o\">.</span><span class=\"n\">uppercase</span>\n<span class=\"k\">end</span>\n</pre></div>}
       markdown.render(content).should eq(expected)
     end
+
+    it "gracefully handles invalid lexers" do
+      content = <<-EOS
+```jquery
+def my_method
+  'my string'.uppercase
+end
+```
+      EOS
+
+      expected = %{<div class=\"highlight\"><pre><span class=\"n\">def</span> <span class=\"n\">my_method</span>\n  <span class=\"s\">&#39;my string&#39;</span><span class=\"p\">.</span><span class=\"n\">uppercase</span>\n<span class=\"k\">end</span>\n</pre></div>}
+      markdown.render(content).should eq(expected)
+    end
   end
 
 end

data/velvet_rope.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "velvet_rope"
-  gem.version       = "0.0.1"
+  gem.version       = "0.0.2"
   gem.authors       = ["Sean Gaffney"]
   gem.email         = ["sean@seangaffney.cc"]
   gem.description   = %q{VelvetRope is a renderer to complement and enhance Redcarpet's default HTML renderer. It adds support for emoji and syntax-highlighting.}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: velvet_rope
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec