octopress-escape-code 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d3a34c64bec8c3ee3e982e62ac51011b3d7d2c9
-  data.tar.gz: db44ed823e5e5b1bfbc172a4a5a47a1b999404ef
+  metadata.gz: 080cc036a9e132f9d0b5f6c4c7531e59e63d134a
+  data.tar.gz: 447d073260a2e42364acb4b929edd8749c2e67a0
 SHA512:
-  metadata.gz: 92c02b47adfeaba704485bed1035084696e31c5f3abdfa66dc31f7e7391e014c43fbee9b9b96f58d395c1e4a4e1d30a1e03493e3ff42165398784d935920bb22
-  data.tar.gz: 371f160ffdf3205ba16fdbe870b0477dbd8087ff939ef7e2d83ef37ac37a2929bc84548adfbb9c63e364bec64447e51f3820353242cee206a2aa62a82d118bde
+  metadata.gz: 64a4526d32f633c54b0fc7635b675d588ee5c32ffbb00073b9d1c29d396c975649cc2288e9b1bac5b5854b3ce95c949bb91ce51fbbbb99a416321e9340f91e03
+  data.tar.gz: 131b1115d49a0f29ad0c63be42f41a5930bece31344ce4766f9610e15125bc9f49ecdbb4d42e26c4507e70b495d2be63c514da1c7a52ab17b136052240e7c0dc

data/.travis.yml

@@ -3,3 +3,6 @@ rvm:
   - 2.0.0
   - 1.9.3
 script: bundle exec clash test
+notifications:
+  slack:
+    secure: Y3PHypO1A9pd1RneZdRhGIJVb/uchEzjCjHa3myz3UjAY9opjHJRnL4EKoNO6WHAOi0ON9Za2GwAeiT+Sl8YxSsAy8mna33P7gORT4i0it9VFfbOSAe5OBwSbO6H54CZUofWAF5aYGpIfhrPbBek9i0tlT3SH+V259vV/FVDkpw=

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### 1.0.3 - 2014-12-10
+
+Fixes:
+- Random tabs don't trigger escapes.
+- Raw tags inside of code fences are properly stripped.
+- Double in-line code backticks are properly escaped.
+
 ### 1.0.2 - 2014-9-13
 - Fix: Removing extra raw tags in markdown code blocks.
 

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

@@ -1,5 +1,5 @@
 module Octopress
   module EscapeCode
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/lib/octopress-escape-code.rb

@@ -39,17 +39,22 @@ module Octopress
       if md_ext.include?(ext)
 
         # Escape four space indented code blocks
-        content = content.gsub /^(\s{4}.+?)\n($|\S)/m do
+        content = content.gsub /^( {4}[^\n].+?)\n($|\S)/m do
           "{% raw %}\n#{$1}\n{% endraw %}\n#{$2}"
         end
         
         # Escape tab indented code blocks
-        content = content.gsub /^(\t.+?)\n($|\S)/m do
+        content = content.gsub /^(\t[^\n].+?)\n($|\S)/m do
           "{% raw %}\n#{$1}\n{% endraw %}\n#{$2}"
         end
 
         # Escape in-line code backticks
-        content = content.gsub /(`{1,2}[^`\n]+?`{1,2})/ do
+        content = content.gsub /(`[^`\n]+?`)/ do
+          "{% raw %}#{$1}{% endraw %}"
+        end
+
+        # Escape in-line code double backticks
+        content = content.gsub /(``[^\n]+?``)/ do
           "{% raw %}#{$1}{% endraw %}"
         end
 
@@ -57,8 +62,15 @@ module Octopress
 
       # Escape codefenced codeblocks
       content = content.gsub /^(`{3}.+?`{3})/m do
-        c = $1.gsub /{% (end)?raw %}\n/, ''
-        "{% raw %}\n#{c}\n{% endraw %}"
+        
+        # Replace any raw/endraw tags inside of codefence block
+        # as some of the regex above may have escaped contents
+        # of the codefence block
+        #
+        code = $1.gsub(/{% raw %}(\n)?/, '').gsub(/(\n)?{% endraw %}/, '') 
+
+        # Wrap codefence content in raw tags
+        "{% raw %}\n#{code}\n{% endraw %}"
       end
 
       # Escape codeblock tag contents

data/octopress-escape-code.gemspec

@@ -23,6 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "clash"
-  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "octopress-codeblock"
+
+  if RUBY_VERSION >= "2"
+    spec.add_development_dependency "pry-byebug"
+  end
 end

data/test/_expected/index.html

@@ -1,11 +1,14 @@
 <p>Some text</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">Some kind of example:
-{% some tag that should break %}
+<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>dobule ` type</code> of code thing.</p>
+<p>Testing the <code>dobule {% _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>
 
@@ -14,9 +17,10 @@ Stuff!
 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'>&#x7b;% some tag that should break %&#x7d;
-</div></div><div data-line='3' class='code-highlight-row numbered'><div class='code-highlight-line'>Stuff!</div></div></pre></div></figure>
+</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'>&#x7b;% some tag that should break %&#x7d;
+</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
-asdfadsf
+{% foo %}
 </code></pre></div>
 <p>some text</p>

data/test/index.md

@@ -5,14 +5,17 @@ escape_code: true
 Some text
 
 ```
+ `stuff`
 Some kind of example:
     {% some tag that should break %}
 Stuff!
 ```
 guys!
 
-Testing the ``dobule ` type`` of code thing.
+Testing the ``dobule {% _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 %}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-escape-code
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-14 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-hooks
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: octopress-codeblock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: octopress-codeblock
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="