lib/octopress-codefence.rb in octopress-codefence-1.3.2 vs lib/octopress-codefence.rb in octopress-codefence-1.4.0

@@ -1,13 +1,13 @@
 require 'octopress-codefence/version'
-require 'octopress-pygments'
+require 'octopress-code-highlighter'
 require 'jekyll-page-hooks'
 
 module Jekyll
   class Codefence < PageHooks
     def pre_render(page)
-      page.content = Octopress::Codefence.new(page.content, page.ext, page.site.config['pygments_aliases']).render
+      page.content = Octopress::Codefence.new(page.content, page.ext, page.site.config['code_aliases']).render
     end
   end
 end
 
 module Octopress
@@ -28,21 +28,21 @@
         str.gsub /([^\n]+)?\n(.+?)\Z/m do
           markup = $1 || ''
           code = $2.to_s
           begin
             get_code(code, get_options(markup))
-          rescue MentosError => e
+          rescue => e
             markup = "```#{markup}"
-            Pygments.highlight_failed(e, "```[language] [title] [url] [link text] [linenos:false] [start:#] [mark:#,#-#]\ncode\n```", markup, code)
+            CodeHighlighter.highlight_failed(e, "```[language] [title] [url] [link text] [linenos:false] [start:#] [mark:#,#-#]\ncode\n```", markup, code)
           end
         end
       end
     end
 
     def get_options(markup)
       defaults = { escape: true }
-      clean_markup = Pygments.clean_markup(markup)
+      clean_markup = CodeHighlighter.clean_markup(markup)
 
       if clean_markup =~ AllOptions
         defaults = {
           lang: $1,
           title: $2,
@@ -53,16 +53,16 @@
         defaults = {
           lang: $1,
           title: $2
         }
       end
-      Pygments.parse_markup(markup, defaults)
+      CodeHighlighter.parse_markup(markup, defaults)
     end
 
 
     def get_code(code, options)
       options[:aliases] = @aliases || {}
-      code = Pygments.highlight(code, options)
+      code = CodeHighlighter.highlight(code, options)
       code = "<notextile>#{code}</notextile>" if !@ext.nil? and @ext.match(/textile/)
       code
     end
   end
 end