markdownizer 0.3.2 → 0.3.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    markdownizer (0.3.1)
+    markdownizer (0.3.2)
       activerecord (>= 3.0.3)
       coderay
       rdiscount
@@ -9,17 +9,17 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.4)
+      activesupport (= 3.0.4)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activerecord (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.3)
-    arel (2.0.7)
+    activesupport (3.0.4)
+    arel (2.0.8)
     builder (2.1.2)
     coderay (0.9.7)
     diff-lcs (1.1.2)
@@ -31,14 +31,14 @@ GEM
     rocco (0.5)
       mustache
       rdiscount
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
+    rspec-mocks (2.5.0)
     tzinfo (0.3.24)
 
 PLATFORMS
@@ -52,4 +52,4 @@ DEPENDENCIES
   pygments
   rdiscount
   rocco
-  rspec (~> 2.4.0)
+  rspec (~> 2.5.0)

data/lib/markdownizer.rb

@@ -86,8 +86,8 @@ module Markdownizer
     # To parse the markdown in a coherent hierarchical context, you must provide it
     # with the current hierarchical level of the text to be parsed.
     def markdown(text, hierarchy = 0)
-      text.gsub! %r[(#+)([\w\s]+)] do
-        ('#' * hierarchy) << $1 << $2
+      text.gsub! %r[^(\s*)(#+)([\w\s]+)$] do
+        $1 << ('#' * hierarchy) << $2 << $3
       end
       RDiscount.new(text).to_html
     end
@@ -132,7 +132,7 @@ module Markdownizer
 
     def extract_caption_from(code, options)
       caption = nil
-      code.gsub!(%r[\{% caption '([\w\s]+)' %\}]) do
+      code.gsub!(%r[\{% caption '([^']+)' %\}]) do
         options.merge!({:caption => $1.strip}) if $1
         caption = $1.strip
         ''

data/lib/markdownizer/version.rb

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

data/markdownizer.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rocco'
   s.add_development_dependency 'git'
   s.add_development_dependency 'pygments'
-  s.add_development_dependency 'rspec', '~> 2.4.0'
+  s.add_development_dependency 'rspec', '~> 2.5.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/markdownizer_spec.rb

@@ -20,7 +20,7 @@ describe Markdownizer do
         ##This is an H2
         ###This is an H3
         """
-        result = double :result, to_html: true
+        result = double :result, :to_html => true
         RDiscount.should_receive(:new).with do |t|
           t.should =~ /###This is an H1/
           t.should =~ /####This is an H2/
@@ -28,6 +28,26 @@ describe Markdownizer do
         end.and_return result
         subject.markdown(my_text, 2)
       end
+      it 'still does not convert anything that is not a header' do
+        my_text = """
+        #This is an H1
+        I am talking about my #method
+        {% code ruby %}
+          \\#My comment
+        {% endcode %}
+        ###This is an H3
+        """
+        result = double :result, :to_html => true
+        RDiscount.should_receive(:new).with do |t|
+          t.should =~ /###This is an H1/
+          t.should =~ /#method/
+          t.should_not =~ /###method/
+          t.should =~ /#My comment/
+          t.should_not =~ /###My comment/
+          t.should =~ /#####This is an H3/
+        end.and_return result
+        subject.markdown(my_text, 2)
+      end
     end
   end
   describe ".coderay(text)" do
@@ -52,6 +72,18 @@ describe Markdownizer do
         end
       {% endcode %}
 
+    """
+    }
+    let(:text_with_weird_caption) { """
+      #My markdown text
+
+      {% code ruby %}
+      {% caption 'This will become an h5, with some/strange.characters\yo' %}
+        def function(*args)
+          puts 'result'
+        end
+      {% endcode %}
+
     """
     }
     let(:text_with_array_highlights) { """
@@ -93,6 +125,9 @@ describe Markdownizer do
     it 'accepts a caption option inside the code' do
       subject.coderay(text_with_caption).should match('<h5>This will become an h5</h5>')
     end
+    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 '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
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Josep M. Bach
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +01:00
+date: 2011-02-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,9 +109,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 4
+        - 5
         - 0
-        version: 2.4.0
+        version: 2.5.0
   type: :development
   version_requirements: *id007
 description: Render any text as markdown, with code highlighting and all!