markdownizer 0.3.3 → 0.3.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    markdownizer (0.3.2)
+    markdownizer (0.3.3)
       activerecord (>= 3.0.3)
       coderay
       rdiscount

data/lib/markdownizer.rb

@@ -89,6 +89,7 @@ module Markdownizer
       text.gsub! %r[^(\s*)(#+)([\w\s]+)$] do
         $1 << ('#' * hierarchy) << $2 << $3
       end
+      text.gsub!('\#','#')
       RDiscount.new(text).to_html
     end
 
@@ -116,6 +117,11 @@ module Markdownizer
 
         code, language = $2.strip, $1.strip
 
+        # Mark comments to avoid conflicts with Header parsing
+        code.gsub!(/(#+)/) do
+          '\\' + $1
+        end
+
         code, options, caption = extract_caption_from(code, options)
         code, options = extract_highlights_from(code, options)
 

data/lib/markdownizer/version.rb

@@ -1,3 +1,3 @@
 module Markdownizer
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/markdownizer_spec.rb

@@ -110,8 +110,21 @@ describe Markdownizer do
 
     """
     }
+    let(:text_with_comments) { """
+      #My markdown text
 
-    it 'calls CodeRay to parse the code inside {% highlight ruby %} blocks' do
+      {% code ruby %}
+        #My comment
+        # My other comment
+        def function(*args)
+          puts 'result'
+        end
+      {% endcode %}
+
+    """
+    }
+
+    it 'calls CodeRay to parse the code inside {% code ruby %} blocks' do
       scanned_code, html_code = double(:scanned_code), double(:html_code)
 
       CodeRay.should_receive(:scan).with("""def function(*args)
@@ -128,6 +141,15 @@ describe Markdownizer do
     it 'accepts a caption with weird chars inside the code' do
       subject.coderay(text_with_weird_caption).should match('<h5>This will become an h5, with some/strange.characters\yo</h5>')
     end
+    it 'marks ruby comments to avoid conflicts with Markdown headers' do
+      code = ''
+      code.stub(:div).and_return ''
+      CodeRay.should_receive(:scan).with do |string|
+        string.should match(/\\#My comment/)
+        string.should match(/\\# My other comment/)
+      end.and_return code
+      subject.coderay(text_with_comments)
+    end
     it 'passes the caption to the div' do
       parsed = double :parsed
       CodeRay.should_receive(:scan).and_return parsed

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Josep M. Bach