octopress-gist 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e9a8c29068b389c6585948d1f5e8222999af8dc
-  data.tar.gz: 31bd291c115639164cd0fc4a87e4dd7f71484d5a
+  metadata.gz: 2a1a5c9c562e46e66eb9b02a5b70a0bdf8279cb8
+  data.tar.gz: d252afa6512a481e828940e6b0a0915dae956d6e
 SHA512:
-  metadata.gz: 5f264eb8387f2d4c6c22997868c651c6fd1132c7e19ca80225a07e66eaba26c5e864305c6ddf2276f774c4767cecd921a0a8b349e1bc670c3db15692bf745619
-  data.tar.gz: 1b0e9435c8cba851b92559221a5e647b6ea562e007e61e7cb18de822ab9fcadfd1a335f9ab98110997117e61153551f0964ba5ccbdf4f840624afc1832881bb5
+  metadata.gz: a8c9cdef0fc885872a682308ceb876852e516a98c94d7ad6f3517bdb1847fc84e84820be7892e1351b9748c1d0f0f68382bf374b400d71dec83170a347b95f66
+  data.tar.gz: 3f487a5254db39ed6fba51b3e9cb793a9f6e361727dc932c4e496493ad31a605d1ff2921e1dc08e7af91150a78b0b06514ae12a89ee4df117d08241d7c77d651

data/.gitignore

@@ -19,3 +19,6 @@ tmp
 .pygments-cache
 _site
 .gist-cache
+.code-highlighter-cache
+.sass-cache
+site

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.1.0
+- Switched to the new octopress-code-highlighter gem.
+
 ## 1.0.2
 - Updated to latest Octopress pygments.
 - Now using Octopress Ink.

data/lib/octopress-gist.rb

@@ -1,5 +1,5 @@
 require 'liquid'
-require 'octopress-pygments'
+require 'octopress-code-highlighter'
 require 'open-uri'
 require 'json'
 

data/lib/octopress-gist/gist.rb

@@ -10,7 +10,7 @@ module Octopress
       end
       
       def render(context)
-        if Pygments.clean_markup(@markup) =~ /([\S]*)\s*(\S*)/
+        if CodeHighlighter.clean_markup(@markup) =~ /([\S]*)\s*(\S*)/
           gist_id, filename = $1.strip, $2.strip
           filename = $2.strip == "" ? nil : $2.strip
           options = {
@@ -18,7 +18,7 @@ module Octopress
             cache: !@cache_disabled,
             escape: false
           }
-          options = Pygments.parse_markup(@markup, options)
+          options = CodeHighlighter.parse_markup(@markup, options)
 
           if @cache_disabled or ! gist = Cache.read_cache(options)
             gist = download_gist(options)
@@ -34,12 +34,12 @@ module Octopress
               lang: file['language'].downcase
             }.merge(options)
             begin
-              code = Pygments.highlight(file['content'], opt)
+              code = CodeHighlighter.highlight(file['content'], opt)
               code = "<notextile>#{code}</notextile>" if context.registers[:page]['path'].match(/textile/)
               output << code
-            rescue MentosError => e
+            rescue => e
               markup = "{% #{@tag_name} #{@markup.strip} %}"
-              Pygments.highlight_failed(e, "{% #{@tag_name} [gist_id] [file_name] [options...] %}", markup, file['content'])
+              CodeHighlighter.highlight_failed(e, "{% #{@tag_name} [gist_id] [file_name] [options...] %}", markup, file['content'])
             end
           end
           output.join "\n"

data/lib/octopress-gist/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Gist
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

data/octopress-gist.gemspec

@@ -13,9 +13,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/octopress/octopress-gist"
   gem.license       = "MIT"
 
-  gem.add_runtime_dependency 'octopress-pygments', '~> 2.0.1'
-  gem.add_runtime_dependency 'liquid', '~> 2.5.0'
-  gem.add_runtime_dependency 'json'
+  gem.add_runtime_dependency 'octopress-code-highlighter', '~> 3.0.1'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

metadata

@@ -1,57 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: octopress-gist
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.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.1
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
-- !ruby/object:Gem::Dependency
-  name: liquid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.5.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement