makeup 0.4.0 → 0.4.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    makeup (0.4.0)
+    makeup (0.4.1)
       github-linguist (~> 2.8)
       github-markup (~> 0.7)
       htmlentities (~> 4.3)
@@ -22,7 +22,7 @@ GEM
       pygments.rb (~> 0.4.2)
     github-markup (0.7.5)
     htmlentities (4.3.1)
-    mime-types (1.23)
+    mime-types (1.24)
     minitest (2.12.1)
     multi_json (1.7.7)
     posix-spawn (0.3.6)

data/lib/makeup/syntax_highlighter.rb

@@ -37,12 +37,11 @@ module Makeup
     def highlight(path, code, options = {})
       options[:lexer] ||= lexer(path, code)
       lexer = Pygments::Lexer.find(options[:lexer])
-      code = lexer.nil? ? code : Pygments.highlight(code, highlight_options(options))
-      CodeBlock.new(lexer && lexer.aliases.first, code)
-    rescue MentosError => e
-      # "MentosError" is what Pyments.rb raises when an unknown lexer is
-      # attempted used
-      CodeBlock.new(nil, @entities.encode(code))
+      return unknown_lexer(code) unless lexer
+      code = Pygments.highlight(code, highlight_options(options))
+      CodeBlock.new(lexer.aliases.first, code)
+    rescue MentosError
+      unknown_lexer(code)
     end
 
     def lexer(path, code = nil, mode = nil)
@@ -55,6 +54,11 @@ module Makeup
     end
 
     private
+
+    def unknown_lexer(code)
+      CodeBlock.new(nil, @entities.encode(code))
+    end
+
     def highlight_options(options = {})
       options[:options] ||= {}
       options[:options][:nowrap] = true

data/lib/makeup/version.rb

@@ -24,5 +24,5 @@
 #++
 
 module Makeup
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/makeup/syntax_highlighter_test.rb

@@ -67,6 +67,12 @@ describe Makeup::SyntaxHighlighter do
 
       assert_equal "Yeah yeah yeah", html
     end
+
+    it "encodes the html entities even with no highliting" do
+      html = highlight("file.trololol", "<script>alert('xss')</script>")
+
+      assert_equal "&lt;script&gt;alert(&apos;xss&apos;)&lt;/script&gt;", html
+    end
   end
 
   describe "#lexer" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makeup
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pygments.rb
@@ -164,12 +164,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4298020726532566832
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4298020726532566832
 requirements: []
 rubyforge_project: makeup
 rubygems_version: 1.8.25
@@ -177,4 +183,3 @@ signing_key:
 specification_version: 3
 summary: Pretty markup
 test_files: []
-has_rdoc: