octopress-codefence 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d176b1039ba0554aa4c339d32e93497095c1485
-  data.tar.gz: 61eb87caa9ef502a7953d28021247f5b6a3b216f
+  metadata.gz: bf168abaf067cae3f00fcce33588f6d15488b69c
+  data.tar.gz: 13a35b2a962d82286047b53752c23c6adbffd65e
 SHA512:
-  metadata.gz: fb69a7f8697aa2760c6417e20c54c5c9a884072960a16d83b796262263ef32fa414646b53fa3c0770017028b7a9f05045859df136b484f200a9c05fdd5df5115
-  data.tar.gz: 876b36050c39bb7f14a3f9fbc0f16f2366fa8544dd966d9599da451645cec184a3d19957a1103a94cc1212ad8674d8a0635ab24fb7019d87731e2bc0d0d68740
+  metadata.gz: a9c88d260cca26c010d31846be0d5dfe320b3718b1bf6ece49f59827b6f1cb1fc04c9a674b21495a07df8bdae9b0340107dd4f610712f4be55239929b15aa605
+  data.tar.gz: bf9745981705b1b8f1995187dada2531ef4aaeb52459f28e445a880e588635d0de382c771ed75899d4983498d15988fe43e0a0b64fed9c83b899f860d32949b5

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 1.9.3
 script: bundle exec clash test

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 1.7.0 (2015-12-08)
+- Now requires Jekyll 3+
+
 ### 1.6.1 (2015-05-16)
 - Added support for Jekyll Hooks & Jekyll 3
 

data/README.md

@@ -2,8 +2,8 @@
 
 Write beautiful fenced code snippets within any template.
 
-[![Gem Version](https://badge.fury.io/rb/octopress-codefence.png)](http://badge.fury.io/rb/octopress-codefence)
-[![Build Status](https://travis-ci.org/octopress/codefence.png?branch=master)](https://travis-ci.org/octopress/codefence)
+[![Gem Version](https://badge.fury.io/rb/octopress-codefence.svg)](http://badge.fury.io/rb/octopress-codefence)
+[![Build Status](https://travis-ci.org/octopress/codefence.svg?branch=master)](https://travis-ci.org/octopress/codefence)
 
 ## Installation
 
@@ -47,7 +47,7 @@ Note that order does not matter.
 |`lang`        | `ruby`                 | Used by the syntax highlighter. Passing 'plain' disables highlighting.|
 |`title`       | `title:"Figure 1.A"`   | Add a figcaption title to your code block. |
 |`link_text`   | `link_text:"Download"` | Text for the link, default: `"link"`. |
-|`linenos`     | `lineos:false`         | Disable line numbering. |
+|`linenos`     | `linenos:false`        | Disable line numbering. |
 |`start`       | `start:5`              | Start the line numbering at the given value. |
 |`mark`        | `mark:1-4,8`           | Highlight lines of code. This example marks lines 1,2,3,4 and 8 |
 |`class`       | `class:"css example"`  | Add CSS class names to the code `<figure>` element |
@@ -112,11 +112,14 @@ end
 ```
 Here's a themed sample:
 
-<img src="http://cl.ly/TFCm/content.png" alt='sample screenshot of the code snippet above renderd with the light theme' width="816px">
+Note: This plugin does not come with stylesheets. Check out [octopress solarized](https://github.com/octopress/solarized) for styling code
+snippets.
+
+<img src="http://cl.ly/TFCm/content.svg" alt='sample screenshot of the code snippet above renderd with the light theme' width="816px">
 
 Here's a look at the dark theme:
 
-<img src="http://cl.ly/TFPX/content.png" alt='sample screenshot of the code snippet above renderd with the dark theme' width="816px">
+<img src="http://cl.ly/TFPX/content.svg" alt='sample screenshot of the code snippet above renderd with the dark theme' width="816px">
 
 More documentation coming soon.
 

data/lib/octopress-codefence.rb

@@ -3,29 +3,13 @@ require 'octopress-code-highlighter'
 
 module Octopress
   module Codefence
-    if defined?(Jekyll::Hooks)
-      Jekyll::Hooks.register [:post, :page, :document], :pre_render do |item, payload|
-        item.content = Codefence::Highlighter.new(item.content, item.ext, item.site.config['code_aliases']).render
-      end
-    else
-      require 'octopress-hooks'
-      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
-
-      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
-
-      class DocumentHook < Hooks::Document
-        def pre_render(document)
-          document.content = Codefence::Highlighter.new(document.content).render
-        end
+    Jekyll::Hooks.register [:posts, :pages, :documents], :pre_render do |item, payload|
+      if item.respond_to?(:ext)
+        ext = item.ext
+      else
+        ext = nil
       end
+      item.content = Codefence::Highlighter.new(item.content, ext, item.site.config['code_aliases']).render
     end
 
     class Highlighter
@@ -41,8 +25,14 @@ module Octopress
       def render
         @input.encode!("UTF-8")
         @input = sub_option_comment(@input)
+
+        # Match code bwteen backticks
+        #
         @input.gsub /^`{3}(.+?)`{3}/m do
           str = $1.to_s
+
+          # separate code from arguments after backticks
+          #
           str.gsub /([^\n]+)?\n(.+?)\Z/m do
             markup = $1 || ''
             code = $2.to_s

data/lib/octopress-codefence/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Codefence
-    VERSION = "1.6.1"
+    VERSION = "1.7.0"
   end
 end

data/octopress-codefence.gemspec

@@ -13,14 +13,11 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
 
   gem.add_runtime_dependency 'octopress-code-highlighter', '~> 4.2'
-  gem.add_runtime_dependency 'octopress-hooks', '~> 2.1'
+  gem.add_runtime_dependency 'jekyll', '~> 3.0'
 
-  gem.add_development_dependency 'octopress'
-  gem.add_development_dependency 'jekyll'
   gem.add_development_dependency 'clash'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rouge'
-  gem.add_development_dependency 'octopress-solarized'
 
   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.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-code-highlighter
@@ -25,47 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: octopress-hooks
+  name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: octopress
-  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'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: clash
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: octopress-solarized
-  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: 
 email:
 - brandon@imathis.com
@@ -159,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Generate beautiful code snippets with advanced features on any Jekyll site.