octopress-escape-code 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0fb69f01127fe42dcc0d06bdf519ecdc5aa8f4f
-  data.tar.gz: 4f1cc99f2f8eeba1ec6c468f04be895f5863610c
+  metadata.gz: a21f2e11a6569212f382874595303b1f52e3ed07
+  data.tar.gz: c3f819683ed044216b1232d9663c3fa83126100a
 SHA512:
-  metadata.gz: db184f21c438932150fb2d77a47537d34be23f387b239996f81bc881108483cc77541ac2c4d26a5d58629165a04a50e995c2be84d7c086dd185f01d8349d8242
-  data.tar.gz: 687fdedd2892f070d692b243a6c8aad5ddd80fda599ec168959ab34ebc5c0e28a115f5b3be9be60b99953671ba99dca4cdfe26f2de2d283b56b5a01fa2b43f62
+  metadata.gz: 2d32b11143be1aad1b420b555be775caa24a36885bce13bd3943c021b9ca69974933ddb9766925cf87a899e644f9fb90093ecb872641a1246a6c797a4e313666
+  data.tar.gz: fa49aac55368e56dd7c4d516d05deb62ce212198779b7c6550d0fbeb4b096ebd878390b8e19cdc5165ce0c8da106090853e73f2cac3d6c44801b4ca404dabfba

data/.clash.yml

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

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 2.0.1 - 2014-12-19
+- Fixed issue where code blocks would get additional whitespace.
+
 ### 2.0.0 - 2014-12-18
 - Site-wide code escaping now defaults to false.
 

data/lib/octopress-escape-code.rb

@@ -60,12 +60,13 @@ module Octopress
 
         # Escape four space indented code blocks
         content = content.gsub /^( {4}[^\n].+?)\n($|\S)/m do
-          "{% raw %}\n#{$1}\n{% endraw %}\n#{$2}"
+          "{% raw %}#{$1}\n{% endraw %}#{$2}"
         end
         
+        
         # Escape tab indented code blocks
         content = content.gsub /^(\t[^\n].+?)\n($|\S)/m do
-          "{% raw %}\n#{$1}\n{% endraw %}\n#{$2}"
+          "{% raw %}#{$1}\n{% endraw %}#{$2}"
         end
 
         # Escape in-line code backticks
@@ -78,14 +79,16 @@ module Octopress
           "{% raw %}#{$1}{% endraw %}"
         end
 
-        content = content.gsub /^( {4}[^\n].+?)\n($|\S)/m do
+        # Remove internal raw tags within space intented codeblocks
+        content = content.gsub /( {4}[^\n].+?)\n($|\S)/m do
           c1 = $1
           c2 = $2
+
           "#{c1.gsub(/{% (end)?raw %}/, '')}\n#{c2}"
         end
 
-        # Escape tab indented code blocks
-        content = content.gsub /^(\t[^\n].+?)\n($|\S)/m do
+        # Remove internal raw tags within tab intented codeblocks
+        content = content.gsub /(\t[^\n].+?)\n($|\S)/m do
           c1 = $1
           c2 = $2
           "#{c1.gsub(/{% (end)?raw %}/, '')}\n#{c2}"
@@ -99,7 +102,7 @@ module Octopress
         # as some of the regex above may have escaped contents
         # of the codefence block
         #
-        code = $1.gsub(/{% raw %}(\n)?/, '').gsub(/(\n)?{% endraw %}/, '') 
+        code = $1.gsub(/{% raw %}/, '').gsub(/{% endraw %}/, '') 
 
         # Wrap codefence content in raw tags
         "{% raw %}\n#{code}\n{% endraw %}"
@@ -107,12 +110,12 @@ module Octopress
 
       # Escape codeblock tag contents
       content = content.gsub /^({%\s*codeblock.+?%})(.+?){%\s*endcodeblock\s*%}/m do
-        "#{$1}{% raw %}#{$2.gsub /{% (end)?raw %}\n/, ''}{% endraw %}{% endcodeblock %}"
+        "#{$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 %}\n/, '')}{% endraw %}{% endhighlight %}"
+        "#{$1}{% raw %}#{$2.gsub(/{% (end)?raw %}/, '')}{% endraw %}{% endhighlight %}"
       end
 
       content

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

@@ -1,5 +1,5 @@
 module Octopress
   module EscapeCode
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   end
 end

data/test/_expected/indented-codefence.html

@@ -0,0 +1,28 @@
+<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/indented-codefence.md

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-escape-code
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-hooks
@@ -114,7 +114,9 @@ files:
 - octopress-escape-code.gemspec
 - test/Gemfile
 - test/_config.yml
+- test/_expected/indented-codefence.html
 - test/_expected/index.html
+- test/indented-codefence.md
 - test/index.md
 homepage: https://github.com/octopress/escape-code
 licenses:
@@ -143,5 +145,7 @@ 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/indented-codefence.md
 - test/index.md