octopress-codefence 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31389d6206eeb0e184e5afdafe06235497f42744
-  data.tar.gz: e2393cb5737626a4671513a266f29d4c37863350
+  metadata.gz: 9972ada98f5f0fe17581ba4ada1aa4561250a6b8
+  data.tar.gz: be614c779b644172ea332eda3b4a44fe2d147f68
 SHA512:
-  metadata.gz: a825431f236a0304836c5fe51b342f2d1702e4be62969995f1ce895f383d4e4d9797dbb01f55f084826ce0bf10eec0ae49b833b880c947a5518e2c4afd93fa33
-  data.tar.gz: 854a01a502c5dc07701e70413ca9c741ec5235dc42f1914609e3f92cb7049f9e21ab58a0462e3b0555e8804f71b3a2113de4fd5efdd311f509d460df3e518b1c
+  metadata.gz: 1d7a8afccc518ea2c3bf5b1042ac814cc16dbf2a87b13f16cade3214b0d269a34cc4dd1d024854363d81393ba3eb206ae9298d0fb02ec451939886160f3dcf70
+  data.tar.gz: 7e3b406e7e1c66aca04bd04ec98f35bac5ba0ca49e0270c9cd501b030182fbabb310e50292311d4901f84d0195f38699ef042be0daeb5f382142e25a69269f72

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 _site
 .sass-cache
 .code-highlighter-cache
+site

data/.travis.yml

@@ -2,4 +2,4 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
-script: cd test && ruby test.rb
+script: cd test && bundle exec clash

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.4.4 - 2014-07-27
+- Now using octopress-hooks instead of jekyll-page-hooks.
+
 ## 1.4.3 - 2014-06-29
 - Updated to latest octopress-code-highlighter gem. Relaxed dependencies.
 

data/lib/octopress-codefence.rb

@@ -1,69 +1,75 @@
 require 'octopress-codefence/version'
 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['code_aliases']).render
-    end
-  end
-end
+require 'octopress-hooks'
 
 module Octopress
-  class Codefence
-    AllOptions = /([^\s]+)\s+(.+?)\s+(https?:\/\/\S+|\/\S+)\s*(.+)?/i
-    LangCaption = /([^\s]+)\s*(.+)?/i
+  module Codefence
+    class PageHook < Hooks::Page
+      def pre_render(page)
+        page.content = Codefence::Highlighter.new(page.content, page.ext, page.site.config['code_aliases']).render
+      end
+    end
 
-    def initialize(input, ext=nil, aliases=nil)
-      @input   = input
-      @ext     = ext
-      @aliases = aliases
+    class PostHook < Hooks::Post
+      def pre_render(post)
+        post.content = Codefence::Highlighter.new(post.content, post.ext, post.site.config['code_aliases']).render
+      end
     end
-    
-    def render
-      @input.encode!("UTF-8")
-      @input.gsub /^`{3}(.+?)`{3}/m do
-        str = $1.to_s
-        str.gsub /([^\n]+)?\n(.+?)\Z/m do
-          markup = $1 || ''
-          code = $2.to_s
-          begin
-            get_code(code, get_options(markup))
-          rescue => e
-            markup = "```#{markup}"
-            CodeHighlighter.highlight_failed(e, "```[language] [title] [url] [link text] [linenos:false] [start:#] [mark:#,#-#]\ncode\n```", markup, code)
+
+    class Highlighter
+      AllOptions = /([^\s]+)\s+(.+?)\s+(https?:\/\/\S+|\/\S+)\s*(.+)?/i
+      LangCaption = /([^\s]+)\s*(.+)?/i
+
+      def initialize(input, ext=nil, aliases=nil)
+        @input   = input
+        @ext     = ext
+        @aliases = aliases
+      end
+      
+      def render
+        @input.encode!("UTF-8")
+        @input.gsub /^`{3}(.+?)`{3}/m do
+          str = $1.to_s
+          str.gsub /([^\n]+)?\n(.+?)\Z/m do
+            markup = $1 || ''
+            code = $2.to_s
+            begin
+              get_code(code, get_options(markup))
+            rescue => e
+              markup = "```#{markup}"
+              CodeHighlighter.highlight_failed(e, "```[language] [title] [url] [link text] [linenos:false] [start:#] [mark:#,#-#]\ncode\n```", markup, code)
+            end
           end
         end
       end
-    end
 
-    def get_options(markup)
-      defaults = { escape: true }
-      clean_markup = CodeHighlighter.clean_markup(markup)
+      def get_options(markup)
+        defaults = { escape: true }
+        clean_markup = CodeHighlighter.clean_markup(markup)
 
-      if clean_markup =~ AllOptions
-        defaults = {
-          lang: $1,
-          title: $2,
-          url: $3,
-          link_text: $4,
-        }
-      elsif clean_markup =~ LangCaption
-        defaults = {
-          lang: $1,
-          title: $2
-        }
+        if clean_markup =~ AllOptions
+          defaults = {
+            lang: $1,
+            title: $2,
+            url: $3,
+            link_text: $4,
+          }
+        elsif clean_markup =~ LangCaption
+          defaults = {
+            lang: $1,
+            title: $2
+          }
+        end
+        CodeHighlighter.parse_markup(markup, defaults)
       end
-      CodeHighlighter.parse_markup(markup, defaults)
-    end
 
 
-    def get_code(code, options)
-      options[:aliases] = @aliases || {}
-      code = CodeHighlighter.highlight(code, options)
-      code = "<notextile>#{code}</notextile>" if !@ext.nil? and @ext.match(/textile/)
-      code
+      def get_code(code, options)
+        options[:aliases] = @aliases || {}
+        code = CodeHighlighter.highlight(code, options)
+        code = "<notextile>#{code}</notextile>" if !@ext.nil? and @ext.match(/textile/)
+        code
+      end
     end
   end
 end

data/lib/octopress-codefence/version.rb

@@ -1,5 +1,5 @@
 module Octopress
-  class Codefence
-    VERSION = "1.4.3"
+  module Codefence
+    VERSION = "1.4.4"
   end
 end

data/octopress-codefence.gemspec

@@ -14,7 +14,10 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
 
   gem.add_runtime_dependency 'octopress-code-highlighter', '~> 4.2'
-  gem.add_runtime_dependency 'jekyll-page-hooks', '~> 1.1'
+  gem.add_runtime_dependency 'octopress-hooks', '~> 2.1'
+
+  gem.add_development_dependency 'clash'
+  gem.add_development_dependency 'jekyll'
 
   gem.files         = `git ls-files`.split($/).reject {|f| f =~ /^test\// }
   gem.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-codefence
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-29 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-code-highlighter
@@ -25,19 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: jekyll-page-hooks
+  name: octopress-hooks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: clash
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jekyll
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generate beautiful code snippets with advanced features on any Jekyll
   site.
 email:
@@ -47,7 +75,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile

data/.rspec

@@ -1,2 +0,0 @@
---color
---format progress