octopress-codefence 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56f65a05571d2186ca1557c12d24f0f5869f9740
-  data.tar.gz: 118ed72ad0e05b0bf7cc7a5c9eeb85d4c4e8ac7b
+  metadata.gz: 545e619f27984c54373639fcb22e34456e405680
+  data.tar.gz: 9e36dd499d95b870c29a5ae44a548fb3f7d8d25e
 SHA512:
-  metadata.gz: a2bb05dc4dcbbc40371ba4c5b8e812ecd57b3144c38c53b49fd5f0e2a1d75c753ff2d3803a66611c9f0e886941ab0bcda85ae8de950c8513c4ba120228e28b6e
-  data.tar.gz: f643aa6bf1af9d639fba1c4e721bc4e0f5201e19379735cdd9834be3f73ccb03fdb02aa970c6bdd09362bf43c282da40e06d5b4ba28472c91c90dbeb76f3015b
+  metadata.gz: 09f4855f3271d891b8b0330b6293306e6017998c91e0b8bf58252f3ad5dc9af18aad277ec95cb03be69faeb570265702332d750c13e69ceba44f5cf5eb01f8a5
+  data.tar.gz: b2a3477215b68087ee9194c40aecaf8f1761122043b323edaf4edd09bd41000d8b4c8a49fc76bfb82f7ddefa9082d650cde8841257cd98c2de94727cfa59725c

data/CHANGELOG.md

@@ -1,7 +1,10 @@
 # Changelog
 
+## 1.4.0
+- Switched to the new octopress-code-highlighter gem.
+
 ## 1.3.2
-- Removed test files from gem pkg
+- Removed test files from gem pkg.
 
 ## 1.3.1
 - Changed repo homepage url in gemspec.
@@ -16,7 +19,7 @@
 - Updated Octopress pygments, adding default Liquid escape.
 
 ## 1.1.0
-- Added support for language aliases in Jekyll config
+- Added support for language aliases in Jekyll config.
 
 ## 1.0.0
 - Initial release

data/lib/octopress-codefence/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   class Codefence
-    VERSION = "1.3.2"
+    VERSION = "1.4.0"
   end
 end

data/lib/octopress-codefence.rb

@@ -1,11 +1,11 @@
 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
@@ -30,9 +30,9 @@ module Octopress
           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
@@ -40,7 +40,7 @@ module Octopress
 
     def get_options(markup)
       defaults = { escape: true }
-      clean_markup = Pygments.clean_markup(markup)
+      clean_markup = CodeHighlighter.clean_markup(markup)
 
       if clean_markup =~ AllOptions
         defaults = {
@@ -55,13 +55,13 @@ module Octopress
           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

data/octopress-codefence.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/octopress/codefence"
   gem.license       = "MIT"
 
-  gem.add_runtime_dependency 'octopress-pygments', '>= 2.0.0'
+  gem.add_runtime_dependency 'octopress-code-highlighter', '~> 3.0.1'
   gem.add_runtime_dependency 'jekyll-page-hooks', '>= 1.0.2'
 
   gem.files         = `git ls-files`.split($/).reject {|f| f =~ /^test\// }

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: octopress-codefence
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-19 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: octopress-pygments
+  name: octopress-code-highlighter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: jekyll-page-hooks
   requirement: !ruby/object:Gem::Requirement