octopress-escape-code 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9cd2dff39bb81d753dd1148b61c1c98e95f5ce0
-  data.tar.gz: 21b9bc401c836632d65a8ecbfd50037688fa6bd6
+  metadata.gz: 6cbc0881b03f94478b02987c58fa37613ad6f870
+  data.tar.gz: 80995e2e9a41ea8bdce646a15242c9a6a84b8303
 SHA512:
-  metadata.gz: d9482fbcdb4ea1b80637abaac324444c44a1770077c88dcb8d8991a212d87e49285a38fc38175a9073f25fa8afa1c453900a15068b900a72c6fcda9915cef16b
-  data.tar.gz: 4447be2b8f732654a54fb96b590ae514c47cdcccfde5a3f877bf14826c22a0e24c34b570f78183f09bbb64f60e443739bacec876a1a2bb679bf0dd185a428fd9
+  metadata.gz: 0a160b60d9a79a12ea62eca8d08e899ba432bf27a322402cb514930351cc3839448c2bbefe29033836e28885e4bd610bdd06257e5bdd9219ef35e9000bdd3203
+  data.tar.gz: 40f698c97e87c299be2c0efd0c4130de9841cb5ef49b4383610ef8a57463c90c5dea12fd7ed8eff2cc587a86c24fe0f4cae1dbda7b97609a53169fe276287889

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 2.0.5 - 2015-01-04
+- Simplified code escaping system, reducing use of raw tags.
+
 ### 2.0.4 - 2015-01-03
 - Updated regex order to allow different nested code block types.
 

data/lib/octopress-escape-code.rb

@@ -14,7 +14,7 @@ module Octopress
       end
 
       def post_render(page)
-        Octopress::EscapeCode.unescape_raw(page)
+        Octopress::EscapeCode.unescape_brackets(page.output)
       end
     end
 
@@ -28,14 +28,10 @@ module Octopress
       end
 
       def post_render(page)
-        Octopress::EscapeCode.unescape_raw(page)
+        Octopress::EscapeCode.unescape_brackets(page.output)
       end
     end
 
-    def self.unescape_raw(page)
-      page.output.gsub!(/\*-(end)?raw-\*/, '% \1raw %')
-    end
-
     def self.escape_enabled?(page)
       get_config(page, 'escape_code', false)
     end
@@ -50,51 +46,44 @@ module Octopress
       page_config
     end
 
+    def self.escape_brackets(content)
+      content.gsub(/{/,'{').gsub(/}/, '}')
+    end
+
+    def self.unescape_brackets(content)
+      content.gsub!(/&(amp;)?#x7b;/, '{')
+      content.gsub!(/&(amp;)?#x7d;/, '}')
+      content
+    end
+
     def self.escape(page)
       ext = page.ext.downcase
       content = page.content.encode!("UTF-8")
       md_ext = %w{.markdown .mdown .mkdn .md .mkd .mdwn .mdtxt .mdtext}
 
-      # Escape existing raw tags
-      #
-      content = content.gsub(/% (end)?raw %/, '*-\1raw-*')
-
       # Escape markdown style code blocks
       if md_ext.include?(ext)
 
         # Escape four tab or space indented code blocks
         content = content.gsub /^((\t| {4})[^\n].+?)\n($|\S)/m do
-          "{% raw %}#{$1}\n{% endraw %}#{$3}"
+          "#{escape_brackets $1}\n#{$3}"
         end
 
         # Escape in-line code backticks
         content = content.gsub /(`[^`\n]+?`)/ do
-          "{% raw %}#{$1}{% endraw %}"
+          "#{escape_brackets $1}"
         end
 
         # Escape in-line code double backticks
         content = content.gsub /(``[^\n]+?``)/ do
-          "{% raw %}#{$1}{% endraw %}"
-        end
-
-        # Remove internal raw tags within tab or space intented codeblocks
-        content = content.gsub /^({% raw %})?((\t| {4})[^\n].+?)\n($|\S)/m do
-          c1 = $1
-          c2 = $2
-          c4 = $4
-
-          "#{c1}#{c2.gsub(/{% (end)?raw %}/, '')}\n#{c4}"
+          escape_brackets $1
         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 %}"
+      # Escape highlight and codeblock tag contents
+      content = content.gsub /^({%\s*(codeblock|highlight).+?%})(.+?){%\s*end(codeblock|highlight)\s*%}/m do
+        "#{$1}{% raw %}#{unescape_brackets $3}{% endraw %}{% end#{$4} %}"
       end
 
       # Escape codefenced codeblocks
@@ -104,7 +93,7 @@ module Octopress
         # as some of the regex above may have escaped contents
         # of the codefence block
         #
-        code = $1.gsub(/{% raw %}/, '').gsub(/{% endraw %}/, '') 
+        code = unescape_brackets($1).gsub(/{% (end)?raw %}/, '')
 
         # Wrap codefence content in raw tags
         "{% raw %}\n#{code}\n{% endraw %}"

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

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

data/test/_expected/index.html

@@ -18,7 +18,7 @@ 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'>&#x7b;% some tag that should break %&#x7d;
+</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 %}

data/test/_expected/nested-codeblocks.html

@@ -1,6 +1,5 @@
 <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>
+<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>

data/test/nested-codeblocks.md

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-escape-code
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Brandon Mathis