octopress-escape-code 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87a16d06eb93d1e274beca0a08c799255a344e3b
-  data.tar.gz: ffd7f742d28c93af2d9f8a68abee0308902dfabd
+  metadata.gz: f9cd2dff39bb81d753dd1148b61c1c98e95f5ce0
+  data.tar.gz: 21b9bc401c836632d65a8ecbfd50037688fa6bd6
 SHA512:
-  metadata.gz: c5f7b1f1d8968fc701298e75000a649e19904a97dde8c759e7de8ce41e122315e4e60696cac0ad995ffd0d19d0aa7ae85f3f69af0ee388a85d5b76e80bcb5674
-  data.tar.gz: 8f5d23b0124230c21f217c70d1ea019a799b849227323ad720972aba2bff3f2942866d97235e3a04cd5dc4ad5a0920df23c14bd26f34487a8f08cc6deb3d60f4
+  metadata.gz: d9482fbcdb4ea1b80637abaac324444c44a1770077c88dcb8d8991a212d87e49285a38fc38175a9073f25fa8afa1c453900a15068b900a72c6fcda9915cef16b
+  data.tar.gz: 4447be2b8f732654a54fb96b590ae514c47cdcccfde5a3f877bf14826c22a0e24c34b570f78183f09bbb64f60e443739bacec876a1a2bb679bf0dd185a428fd9

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 2.0.4 - 2015-01-03
+- Updated regex order to allow different nested code block types.
+
 ### 2.0.3 - 2015-01-03
 - Set plugin priority to lowest, ensuring that code is escaped after all hooks.
 

data/lib/octopress-escape-code.rb

@@ -87,6 +87,16 @@ module Octopress
         end
       end
 
+      # Escape codeblock tag contents
+      content = content.gsub /^({%\s*codeblock.+?%})(.+?){%\s*endcodeblock\s*%}/m do
+        "#{$1}{% raw %}#{$2.gsub /{% (end)?raw %}/, ''}{% endraw %}{% endcodeblock %}"
+      end
+
+      # Escape highlight tag contents
+      content = content.gsub /^({%\s*highlight.+?%})(.+?){%\s*endhighlight\s*%}/m do
+        "#{$1}{% raw %}#{$2.gsub(/{% (end)?raw %}/, '')}{% endraw %}{% endhighlight %}"
+      end
+
       # Escape codefenced codeblocks
       content = content.gsub /^(`{3}.+?`{3})/m do
         
@@ -100,16 +110,6 @@ module Octopress
         "{% raw %}\n#{code}\n{% endraw %}"
       end
 
-      # Escape codeblock tag contents
-      content = content.gsub /^({%\s*codeblock.+?%})(.+?){%\s*endcodeblock\s*%}/m do
-        "#{$1}{% raw %}#{$2.gsub /{% (end)?raw %}/, ''}{% endraw %}{% endcodeblock %}"
-      end
-
-      # Escape highlight tag contents
-      content = content.gsub /^({%\s*highlight.+?%})(.+?){%\s*endhighlight\s*%}/m do
-        "#{$1}{% raw %}#{$2.gsub(/{% (end)?raw %}/, '')}{% endraw %}{% endhighlight %}"
-      end
-
       content
     end
   end

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

@@ -1,5 +1,5 @@
 module Octopress
   module EscapeCode
-    VERSION = "2.0.3"
+    VERSION = "2.0.4"
   end
 end

data/test/_expected/nested-codeblocks.html

@@ -0,0 +1,11 @@
+<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</span>
+<span class="s2">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/nested-codeblocks.md

@@ -0,0 +1,17 @@
+---
+---
+
+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?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-escape-code
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Brandon Mathis
@@ -117,9 +117,11 @@ files:
 - 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
@@ -150,6 +152,8 @@ test_files:
 - 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