octopress-escape-code 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca16dcac0c8038eb9a7068e2b706beb0edea8cf8
-  data.tar.gz: 47d6aaa2db951aba700a7acfbef0c3aa2ba72747
+  metadata.gz: 1d3a34c64bec8c3ee3e982e62ac51011b3d7d2c9
+  data.tar.gz: db44ed823e5e5b1bfbc172a4a5a47a1b999404ef
 SHA512:
-  metadata.gz: 831d88825c3f4a385b61236dc7bb35e6be6e7359b72ee102b0d9d04ead5caabd04acf911706be86dfeba1da65e2107a0946e7cd767238ab6244d06d8be548fd3
-  data.tar.gz: 1aae49f38d24565cb301408eecf21fb3b894824f774009dc23bfde04438ba2842940d0e156aaea57cddcd276524ed9f55abb55a1dc55e0c512667873aa898ee7
+  metadata.gz: 92c02b47adfeaba704485bed1035084696e31c5f3abdfa66dc31f7e7391e014c43fbee9b9b96f58d395c1e4a4e1d30a1e03493e3ff42165398784d935920bb22
+  data.tar.gz: 371f160ffdf3205ba16fdbe870b0477dbd8087ff939ef7e2d83ef37ac37a2929bc84548adfbb9c63e364bec64447e51f3820353242cee206a2aa62a82d118bde

data/CHANGELOG.md

@@ -1,7 +1,10 @@
 # Changelog
 
-### 1.0.1
-- Upgraded to octopress-hooks 2.x
+### 1.0.2 - 2014-9-13
+- Fix: Removing extra raw tags in markdown code blocks.
 
-### 1.0.0
-- Initial release
+### 1.0.1 - 2014-9-12
+- Upgraded to octopress-hooks 2.
+
+### 1.0.0 - 2014-7-20
+- Initial release.

data/lib/octopress-escape-code.rb

@@ -35,21 +35,16 @@ module Octopress
       content.encode!("UTF-8")
       md_ext = %w{.markdown .mdown .mkdn .md .mkd .mdwn .mdtxt .mdtext}
 
-      # Escape codefenced codeblocks
-      content = content.gsub /^(`{3}.+?`{3})/m do
-        "{% raw %}\n#{$1}\n{% endraw %}"
-      end
-
       # Escape markdown style code blocks
       if md_ext.include?(ext)
 
         # Escape four space indented code blocks
-        content = content.gsub /^(\s{4}.+?)\n($|[^\s{4}])/m do
+        content = content.gsub /^(\s{4}.+?)\n($|\S)/m do
           "{% raw %}\n#{$1}\n{% endraw %}\n#{$2}"
         end
         
         # Escape tab indented code blocks
-        content = content.gsub /^(\t.+?)\n($|[^\t])/m do
+        content = content.gsub /^(\t.+?)\n($|\S)/m do
           "{% raw %}\n#{$1}\n{% endraw %}\n#{$2}"
         end
 
@@ -60,14 +55,20 @@ module Octopress
 
       end
 
+      # Escape codefenced codeblocks
+      content = content.gsub /^(`{3}.+?`{3})/m do
+        c = $1.gsub /{% (end)?raw %}\n/, ''
+        "{% raw %}\n#{c}\n{% endraw %}"
+      end
+
       # Escape codeblock tag contents
-      content = content.gsub /^({%\s*codeblock.+?%})(.+?)({%\s*endcodeblock\s*%})/m do
-        "#{$1}{% raw %}#{$2}{% endraw %}#{$3}"
+      content = content.gsub /^({%\s*codeblock.+?%})(.+?){%\s*endcodeblock\s*%}/m do
+        "#{$1}{% raw %}#{$2.gsub /{% (end)?raw %}\n/, ''}{% endraw %}{% endcodeblock %}"
       end
 
       # Escape highlight tag contents
-      content = content.gsub /^({%\s*highlight.+?%})(.+?)({%\s*endhighlight\s*%})/m do
-        "#{$1}{% raw %}#{$2}{% endraw %}#{$3}"
+      content = content.gsub /^({%\s*highlight.+?%})(.+?){%\s*endhighlight\s*%}/m do
+        "#{$1}{% raw %}#{$2.gsub(/{% (end)?raw %}\n/, '')}{% endraw %}{% endhighlight %}"
       end
 
       content

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

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

data/octopress-escape-code.gemspec

@@ -23,5 +23,6 @@ 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"
 end

data/test/Gemfile

@@ -1,6 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'octopress-escape-code', path: '../'
-gem 'pry-debugger'
-gem 'clash'
-gem 'octopress-codeblock'
+gemspec path: "../"

data/test/index.md

@@ -6,7 +6,7 @@ Some text
 
 ```
 Some kind of example:
-{% some tag that should break %}
+    {% some tag that should break %}
 Stuff!
 ```
 guys!
@@ -24,11 +24,10 @@ Stuff!
 
 {% codeblock html %}
 Some kind of example:
+    stuff
 {% some tag that should break %}
 Stuff!
 {% endcodeblock %}
-
     stuff
-    asdfadsf
-
+    {% foo %}
 some text

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-escape-code
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-hooks
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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: octopress-codeblock
   requirement: !ruby/object:Gem::Requirement