octopress-escape-code 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 265a17b0eb6c9ba1a4cbbaa1f01a456e958b0e8d
-  data.tar.gz: 65cbeed0d373060db77e0e08d9e81bbed0289574
+  metadata.gz: ca16dcac0c8038eb9a7068e2b706beb0edea8cf8
+  data.tar.gz: 47d6aaa2db951aba700a7acfbef0c3aa2ba72747
 SHA512:
-  metadata.gz: 94351ffb99649c83c509be109dbef8fcb95cd18890c66ab951625746e45bacfb9826e8849b6cee5de53e4c88746fbc4f99d6f23dc50204f32a14d95057c822e8
-  data.tar.gz: 8e608f4cd8974d0a473a2f1e4aba255913b5249ef2af06d652e429fb51956b9e22a8989d5bf801adc1baa79e27f90231335df2a260065d1e4a2c91d76b1baa84
+  metadata.gz: 831d88825c3f4a385b61236dc7bb35e6be6e7359b72ee102b0d9d04ead5caabd04acf911706be86dfeba1da65e2107a0946e7cd767238ab6244d06d8be548fd3
+  data.tar.gz: 1aae49f38d24565cb301408eecf21fb3b894824f774009dc23bfde04438ba2842940d0e156aaea57cddcd276524ed9f55abb55a1dc55e0c512667873aa898ee7

data/.travis.yml

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

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+### 1.0.1
+- Upgraded to octopress-hooks 2.x
+
+### 1.0.0
+- Initial release

data/README.md

@@ -1,8 +1,8 @@
 # Octopress Escape Code
 
-Automatically escape code blocks so you can use liquid tags
-without worry having to surround them with unsightly `{% raw %}` and
-`{% endraw %}` tags.
+Automatically escape code blocks so you can use liquid tags without worry having to surround them with unsightly 
+`{% raw %}` and `{% endraw %}` tags. This escapes code block created with `{% highlight %}`, `{% codeblock %}`, code fences,
+Markdown indented code blocks, and in-line back tick code tags.
 
 [![Build Status](https://travis-ci.org/octopress/escape-code.svg)](https://travis-ci.org/octopress/escape-code)
 [![Gem Version](http://img.shields.io/gem/v/octopress-escape-code.svg)](https://rubygems.org/gems/octopress-escape-code)
@@ -39,9 +39,9 @@ ensuring that their contents aren't parsed by Liquid. For example, a `{% highlig
     {% endraw %}{% endhighlight %}
 
 The `{% highlight %}` block is still interpreted by Liquid, but the contents are escaped. This will also escape the 
-[Octopress code block](https://github.com/octopress/code-block) plugin.
+[Octopress codeblock](https://github.com/octopress/codeblock) plugin.
 
-Some Markdown processors and the [Octopress codefence](https://github.com/octopress/code-block) plugin render code blocks which are
+Some Markdown processors and the [Octopress codefence](https://github.com/octopress/codefence) plugin render code blocks which are
 surrounded by three back ticks. These are also wrapped with `{% raw %}` tags.
 
     {% raw %}
@@ -71,8 +71,7 @@ This works with double back tick code tags as well.
 
 ### Disable Automatic escaping
 
-Adding this gem will automatically enable code escaping for your entire site. To disable code escaping for a single page, add this to the
-page's YAML front-matter.
+To disable code escaping for a single page, add this to the page's YAML front-matter.
 
     escape_code: fasle
 
@@ -81,7 +80,7 @@ If you prefer, you can enable it on a per page basis, by turning off automatic c
     // in Jekyll's _config.yml
     escape_code: false
 
-Then, to enable code escaping on a single page simply add `escape_code: true` to the page's YAML front-matter.
+Then, add `escape_code: true` to the page's YAML front-matter to enable code escaping for a single page.
 
 
 ## Contributing

data/lib/octopress-escape-code.rb

@@ -1,9 +1,26 @@
 require "octopress-escape-code/version"
-require 'jekyll-page-hooks'
+require 'octopress-hooks'
 
-module Jekyll
-  class EscapeCode < PageHooks
-    def pre_render(page)
+module Octopress
+  module EscapeCode
+
+    class EscapePage < Octopress::Hooks::Page
+      def pre_render(page)
+        if Octopress::EscapeCode.escape_enabled?(page)
+          page.content = Octopress::EscapeCode.escape(page.content, page.ext)
+        end
+      end
+    end
+
+    class EscapePost < Octopress::Hooks::Post
+      def pre_render(page)
+        if Octopress::EscapeCode.escape_enabled?(page)
+          page.content = Octopress::EscapeCode.escape(page.content, page.ext)
+        end
+      end
+    end
+
+    def self.escape_enabled?(page)
       site_config = page.site.config['escape_code']
       site_config = true if site_config.nil?
 
@@ -11,16 +28,8 @@ module Jekyll
       page_config = site_config if page_config.nil?
 
       enabled = page_config
-
-      if enabled
-        page.content = Octopress::EscapeCode.escape(page.content, page.ext)
-      end
     end
-  end
-end
 
-module Octopress
-  module EscapeCode
     def self.escape(content, ext)
       ext = ext.downcase
       content.encode!("UTF-8")

data/lib/octopress-escape-code/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module EscapeCode
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/octopress-escape-code.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'jekyll-page-hooks', '~> 1.1'
+  spec.add_runtime_dependency 'octopress-hooks', '~> 2.0'
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: octopress-escape-code
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !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.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -87,8 +87,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".clash.yml"
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -96,7 +98,6 @@ files:
 - lib/octopress-escape-code.rb
 - lib/octopress-escape-code/version.rb
 - octopress-escape-code.gemspec
-- test/.clash.yml
 - test/Gemfile
 - test/_config.yml
 - test/_expected/index.html
@@ -121,12 +122,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Return tag renders a variable with some nice features
 test_files:
-- test/.clash.yml
 - test/Gemfile
 - test/_config.yml
 - test/_expected/index.html