octopress-escape-code 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6e19a131fa4bfd5277e042268ea9f8abaa68a3b
-  data.tar.gz: 7abed373b0bf90b6a80ce17369ba3a256c642770
+  metadata.gz: bced10961ade19c5d184e8e59ce59ea0eff0b16f
+  data.tar.gz: 18b62ed0ab2e0d0b1cc09f6bf211dcdd7572312b
 SHA512:
-  metadata.gz: 88fd53be135cffef8078d0ef04f8776d5f959cd8c226a6a23cd9ef4a087f87267249ea85092990a46e71dbfbe4cecd31416919a6fddb337c70e6e103fe2cf4dc
-  data.tar.gz: c6ed8ea8ff13fea03434ace836d04d20f40127306415c56aec45e3b770efbc34016b900ecc9a0daea2fe912050b57a53062ea268fc616da4a842092cf440cd58
+  metadata.gz: 118415429a8e3dc4a1dce5ae5b03ec62e57936d04c542df348cad8a346be76ce8b79091690351332e0a3296d90f73f326661be7085799a6a0eeb6af29b920495
+  data.tar.gz: a7a7eda5485be10d2e7f156fd4e89673fcfee7228ee425ef809993181caa6a3772feca23b8271abfc2a821b1a83d30ff6995f76564134b81f0ff51365775c45e

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 2.1.0 - 2015-12-09
+- Now supports Jekyll 3+
+
 ### 2.0.6 - 2015-01-04
 - Updated docs with better installation instructions.
 

data/lib/octopress-escape-code.rb

@@ -1,42 +1,27 @@
-require "octopress-escape-code/version"
-require 'octopress-hooks'
+require 'octopress-escape-code/version'
+require 'jekyll'
 
 module Octopress
   module EscapeCode
 
-    class EscapePage < Octopress::Hooks::Page
-      priority :lowest
-
-      def pre_render(page)
-        if Octopress::EscapeCode.escape_enabled?(page)
-          page.content = Octopress::EscapeCode.escape(page)
-        end
-      end
-
-      def post_render(page)
-        Octopress::EscapeCode.unescape_brackets(page.output)
+    Jekyll::Hooks.register [:documents, :pages, :posts], :pre_render do |item|
+      if Octopress::EscapeCode.escape_enabled?(item)
+        puts 'yep'
+        item.content = Octopress::EscapeCode.escape(item)
       end
     end
 
-    class EscapePost < Octopress::Hooks::Post
-      priority :lowest
-
-      def pre_render(page)
-        if Octopress::EscapeCode.escape_enabled?(page)
-          page.content = Octopress::EscapeCode.escape(page)
-        end
-      end
-
-      def post_render(page)
-        Octopress::EscapeCode.unescape_brackets(page.output)
-      end
+    Jekyll::Hooks.register [:documents, :pages, :posts], :post_render do |item|
+      Octopress::EscapeCode.unescape_brackets(item.output)
     end
 
-    def self.escape_enabled?(page)
+    extend self
+
+    def escape_enabled?(page)
       get_config(page, 'escape_code', false)
     end
 
-    def self.get_config(page, config, default)
+    def get_config(page, config, default)
       site_config = page.site.config[config]
       site_config = default if site_config.nil?
 
@@ -46,17 +31,17 @@ module Octopress
       page_config
     end
 
-    def self.escape_brackets(content)
+    def escape_brackets(content)
       content.gsub(/{/,'&#x7b;').gsub(/}/, '&#x7d;')
     end
 
-    def self.unescape_brackets(content)
+    def unescape_brackets(content)
       content.gsub!(/&(amp;)?#x7b;/, '{')
       content.gsub!(/&(amp;)?#x7d;/, '}')
       content
     end
 
-    def self.escape(page)
+    def escape(page)
       ext = page.ext.downcase
       content = page.content.encode!("UTF-8")
       md_ext = %w{.markdown .mdown .mkdn .md .mkd .mdwn .mdtxt .mdtext}

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

@@ -1,5 +1,5 @@
 module Octopress
   module EscapeCode
-    VERSION = "2.0.6"
+    VERSION = "2.1.0"
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: octopress-escape-code
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: octopress-hooks
+  name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -101,27 +115,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".clash.yml"
-- ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - lib/octopress-escape-code.rb
 - lib/octopress-escape-code/version.rb
-- octopress-escape-code.gemspec
-- test/Gemfile
-- test/_config.yml
-- test/_expected/indented-codefence.html
-- test/_expected/index.html
-- test/_expected/markdown-table.html
-- test/_expected/nested-codeblocks.html
-- test/indented-codefence.md
-- test/index.md
-- test/markdown-table.md
-- test/nested-codeblocks.md
 homepage: https://github.com/octopress/escape-code
 licenses:
 - MIT
@@ -142,18 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Return tag renders a variable with some nice features
-test_files:
-- test/Gemfile
-- test/_config.yml
-- test/_expected/indented-codefence.html
-- test/_expected/index.html
-- test/_expected/markdown-table.html
-- test/_expected/nested-codeblocks.html
-- test/indented-codefence.md
-- test/index.md
-- test/markdown-table.md
-- test/nested-codeblocks.md
+test_files: []

data/.clash.yml

@@ -1,3 +0,0 @@
-title: simple build
-build: true
-compare: _expected _site

data/.gitignore

@@ -1,24 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-_site
-.code-highlighter-cache

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0
-  - 1.9.3
-script: bundle exec clash test
-notifications:
-  slack:
-    secure: Y3PHypO1A9pd1RneZdRhGIJVb/uchEzjCjHa3myz3UjAY9opjHJRnL4EKoNO6WHAOi0ON9Za2GwAeiT+Sl8YxSsAy8mna33P7gORT4i0it9VFfbOSAe5OBwSbO6H54CZUofWAF5aYGpIfhrPbBek9i0tlT3SH+V259vV/FVDkpw=

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in octopress_render_tag.gemspec
-gemspec

data/Rakefile

@@ -1,2 +0,0 @@
-require "bundler/gem_tasks"
-

data/octopress-escape-code.gemspec

@@ -1,31 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'octopress-escape-code/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "octopress-escape-code"
-  spec.version       = Octopress::EscapeCode::VERSION
-  spec.authors       = ["Brandon Mathis"]
-  spec.email         = ["brandon@imathis.com"]
-  spec.summary       = %q{Return tag renders a variable with some nice features}
-  spec.description   = %q{Return tag renders a variable with some nice features}
-  spec.homepage      = "https://github.com/octopress/escape-code"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency 'octopress-hooks', '~> 2.0'
-
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "clash"
-  spec.add_development_dependency "octopress-codeblock"
-
-  if RUBY_VERSION >= "2"
-    spec.add_development_dependency "pry-byebug"
-  end
-end

data/test/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec path: "../"

data/test/_config.yml

@@ -1,16 +0,0 @@
-# Site settings
-title: Your awesome title
-email: your-email@domain.com
-baseurl: ""
-url: "http://yourdomain.com"
-timezone: UTC
-escape_code: true
-
-exclude:
-  - Gemfile*
-
-# Build settings
-markdown: redcarpet
-gems:
-  - octopress-escape-code
-  - octopress-codeblock

data/test/_expected/indented-codefence.html

@@ -1,28 +0,0 @@
-<p>Here&#39;s some code:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">```ruby mark:2-4 title:&quot;Testing codefence&quot; url:&quot;https://github.com/octopress/codefence&quot; link_text:&quot;plugin link&quot;
-class Float
-  def number_decimal_places
-    self.to_s.length-2
-  end
-
-  def to_fraction
-    higher = 10**self.number_decimal_places
-    lower = self*higher
-
-    gcden = greatest_common_divisor(higher, lower)
-
-    return (lower/gcden).round, (higher/gcden).round
-  end
-
-  private
-
-  def greatest_common_divisor(a, b)
-     while a%b != 0
-       a,b = b.round,(a%b).round
-     end 
-     return b
-  end
-end
-```
-</code></pre></div>
-<p>How&#39;d we do?</p>

data/test/_expected/index.html

@@ -1,33 +0,0 @@
-<p>Some text</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text"> `stuff`
-Some kind of example:
-    {% some tag that should break %}
-Stuff!
-</code></pre></div>
-<p>guys!</p>
-
-<p>Testing the <code>double {% _guys_ seriously? %} ` type</code> of code thing.</p>
-
-<p>The random tab character below shouldn&#39;t trigger an escape.</p>
-
-<p>So here&#39;s a <code>{% nonexistant tag %}</code> that should be escaped.</p>
-
-<div class="highlight"><pre><code class="language-html" data-lang="html">Some kind of example:
-{% some tag that should break %}
-Stuff!</code></pre></div>
-
-<figure class='code-highlight-figure'><figcaption class='code-highlight-caption'><span class='code-highlight-caption-title'>html</span></figcaption><div class='code-highlight'><pre class='code-highlight-pre'><div data-line='1' class='code-highlight-row numbered'><div class='code-highlight-line'>Some kind of example:
-</div></div><div data-line='2' class='code-highlight-row numbered'><div class='code-highlight-line'>    stuff
-</div></div><div data-line='3' class='code-highlight-row numbered'><div class='code-highlight-line'>{% some tag that should break %}
-</div></div><div data-line='4' class='code-highlight-row numbered'><div class='code-highlight-line'>Stuff!</div></div></pre></div></figure>
-<div class="highlight"><pre><code class="language-text" data-lang="text">stuff
-{% foo %}
-</code></pre></div>
-<p>some text</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">{% highlight html %}{% raw %}
-&lt;article&gt;{{ post.content }}&lt;/article&gt;
-{% endraw %}{% endhighlight %}
-</code></pre></div>
-<p>Test inner space block raw replacement:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">This inline {% raw %}`&lt;code&gt;`{% endraw %} tag is escaped.
-</code></pre></div>

data/test/_expected/markdown-table.html

@@ -1,4 +0,0 @@
-<p>| Asset directory |  Description                                    |
-|:----------------|:------------------------------------------------|
-| layouts         | Users can add layouts by setting <code>layout: plugin_slug:some_layout</code> in a page&#39;s YAML front-matter.     |
-| includes        | Includes are available to users by <code>{% include plugin_slug:some_file.html %}</code>.   |</p>

data/test/_expected/nested-codeblocks.html

@@ -1,10 +0,0 @@
-<p>hey</p>
-<div class="highlight"><pre><code class="language-ruby" data-lang="ruby"><span class="p">{</span><span class="o">%</span> <span class="n">codeblock</span> <span class="ss">lang</span><span class="p">:</span><span class="n">ruby</span> <span class="ss">title</span><span class="p">:</span><span class="s2">&quot;Check if a number is prime&quot;</span> <span class="ss">mark</span><span class="p">:</span><span class="mi">3</span> <span class="sx">%}</span>
-<span class="sx">class Fixnum</span>
-<span class="sx">  def prime?</span>
-<span class="sx">    (&#39;1&#39; * self) !~ /^1?$|^(11+?)\1+$/</span>
-<span class="sx">  end</span>
-<span class="sx">end</span>
-<span class="sx">{% endcodeblock %}</span>
-</code></pre></div>
-<p>guys?</p>

data/test/indented-codefence.md

@@ -1,32 +0,0 @@
----
----
-
-Here's some code:
-
-    ```ruby mark:2-4 title:"Testing codefence" url:"https://github.com/octopress/codefence" link_text:"plugin link"
-    class Float
-      def number_decimal_places
-        self.to_s.length-2
-      end
-      
-      def to_fraction
-        higher = 10**self.number_decimal_places
-        lower = self*higher
-
-        gcden = greatest_common_divisor(higher, lower)
-
-        return (lower/gcden).round, (higher/gcden).round
-      end
-      
-      private
-
-      def greatest_common_divisor(a, b)
-         while a%b != 0
-           a,b = b.round,(a%b).round
-         end 
-         return b
-      end
-    end
-    ```
-
-How'd we do?

data/test/index.md

@@ -1,45 +0,0 @@
----
-escape_code: true
-escape_raw: true
----
-
-Some text
-
-```
- `stuff`
-Some kind of example:
-    {% some tag that should break %}
-Stuff!
-```
-guys!
-
-Testing the ``double {% _guys_ seriously? %} ` type`` of code thing.
-
-The random tab character below shouldn't trigger an escape.
-	
-So here's a `{% nonexistant tag %}` that should be escaped.
-
-{% highlight html %}
-Some kind of example:
-{% some tag that should break %}
-Stuff!
-{% endhighlight %}
-
-
-{% codeblock html %}
-Some kind of example:
-    stuff
-{% some tag that should break %}
-Stuff!
-{% endcodeblock %}
-    stuff
-    {% foo %}
-some text
-
-	{% highlight html %}{% raw %}
-	<article>{{ post.content }}</article>
-	{% endraw %}{% endhighlight %}
-
-Test inner space block raw replacement:
-
-    This inline {% raw %}`<code>`{% endraw %} tag is escaped.

data/test/markdown-table.md

@@ -1,7 +0,0 @@
----
----
-| Asset directory |  Description                                    |
-|:----------------|:------------------------------------------------|
-| layouts         | Users can add layouts by setting `layout: plugin_slug:some_layout` in a page's YAML front-matter.     |
-| includes        | Includes are available to users by `{% include plugin_slug:some_file.html %}`.   |
-

data/test/nested-codeblocks.md

@@ -1,16 +0,0 @@
----
----
-
-hey
-
-```ruby
-{% codeblock lang:ruby title:"Check if a number is prime" mark:3 %}
-class Fixnum
-  def prime?
-    ('1' * self) !~ /^1?$|^(11+?)\1+$/
-  end
-end
-{% endcodeblock %}
-```
-
-guys?