devcenter-parser 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: c4625d0620bfb6d0da568af275972249776bc60e
-  data.tar.gz: 12e3576026957882728a1c14b335864cb570592a
+  metadata.gz: 00864c53d10600e6cccd5e25c00d06f137f64f7e
+  data.tar.gz: 84f810e795e30e8da6f0a9ac870caf3120b20ef7
 !binary "U0hBNTEy":
-  metadata.gz: 91498d9bb224e4a1c66ba3fc983e0ad620e33d71b8cfec7a5273e9a1d5ebede093f05d46e40c6e941b72c445c903cf7cd4ea02a59c00f37c765468299c81606a
-  data.tar.gz: b2899c194bd68b0c556768a97675b6c0c35019bb7875bed2a04e5dac628c9d8ead99ac658f4da18f784b92846bbc385a6ccf85bb0549eee507689f94f82228e4
+  metadata.gz: 0b7343fe802c7a3940b47b8c8ab8651dc694d65db9ecb5eeafe47e862c9707a71415c6a35839dff891f39ca80ef60a0ba68bd69337539d69849013cf53d50beb
+  data.tar.gz: fffb99dddf5e8cb7102a7129d8ee0022e04d6547e419baf8149fb47af5a73b1145d63fe16585d5e8580117a77a7e1840049d69a21459acae5947a873f69bb205

data/lib/devcenter-parser.rb

@@ -6,7 +6,7 @@ require 'sanitize'
 
 module DevcenterParser
 
-  VERSION = '1.3.2'
+  VERSION = '1.3.4'
 
   AVAILABLE_FLAVOURS = [:github, :maruku]
 
@@ -23,7 +23,24 @@ module DevcenterParser
     sanitize(html)
   end
 
+  # The current parsers consider something like:
+  # > foo
+  # 
+  # > bar
+  # as a single blockquote, while we want it to be two different ones.
+  # This method adds an empty paragraph between consecutive blocks so parsers process them separately
+  def self.separate_consecutive_blockquote_blocks(markdown)
+    separator = '<p class="devcenter-parser-special-block-separator" style="display:none">&nbsp;</p>'
+    markdown.gsub(/^>(.*)?\s\s>/, '>\1' + "\n\n#{separator}\n\n>")
+  end
+
+  def self.normalize_newlines(markdown)
+    markdown.lines.map{ |l| l.chomp }.join("\n")
+  end
+
   def self.to_unsanitized_html(markdown, flavour)
+    markdown = normalize_newlines(markdown)
+    markdown = separate_consecutive_blockquote_blocks(markdown)
     doc = case flavour.to_sym
           when :maruku
             html = Maruku.new(markdown, :on_error => :raise).to_html
@@ -55,7 +72,7 @@ module DevcenterParser
   private
 
   def self.github_parser
-    @@github_parser ||= Redcarpet::Markdown.new(HTMLWithPantsRenderer, fenced_code_blocks: true)
+    @@github_parser ||= Redcarpet::Markdown.new(HTMLWithPantsRenderer, fenced_code_blocks: true, tables: true)
   end
 
   def self.sanitize_config

data/test/devcenter-parser_test.rb

@@ -193,9 +193,13 @@ And that's it.
 
 <div class="callout">
 <p><strong>strong</strong></p>
+</div>
+
+<p class="devcenter-parser-special-block-separator" style="display:none"> </p>
 
+<blockquote>
 <p>normal</p>
-</div>
+</blockquote>
 
 <p>And that’s it.</p>
         HTML
@@ -206,6 +210,60 @@ And that's it.
       end
     end
 
+    it 'github markdown generates separate special blocks from blockquotes separated by empty lines' do
+      md = <<-MARKDOWN
+> warning
+> foo
+
+> note
+> bar
+      MARKDOWN
+
+      html = <<-HTML
+<div class="warning">
+<p>foo</p>
+</div>
+
+<p class="devcenter-parser-special-block-separator" style="display:none"> </p>
+
+<div class="note">
+<p>bar</p>
+</div>
+      HTML
+
+      assert_github_result md, html
+    end
+
+    it 'github markdown supports tables' do
+      md = <<-MARKDOWN
+|  A  |  B  |
+| --- | --- |
+|  1  |  2  |
+|  3  |  4  | 
+      MARKDOWN
+
+      html = <<-HTML
+<table>
+<thead><tr>
+<th>A</th>
+<th>B</th>
+</tr></thead>
+<tbody>
+<tr>
+<td>1</td>
+<td>2</td>
+</tr>
+<tr>
+<td>3</td>
+<td>4</td>
+</tr>
+</tbody>
+</table>
+      HTML
+
+      assert_github_result md, html
+    end
+
     it "does emdashes both in all flavours" do
       md = "foo -- bar"
       html = '<p>foo – bar</p>'
@@ -236,6 +294,41 @@ And that's it.
       assert_github_result md, "<p>#{md}</p>"
     end
 
+
+    it 'generates separate blockquotes from blockquotes separated by empty lines' do
+      md = <<-MARKDOWN
+> foo
+
+> bar
+      MARKDOWN
+
+      html_maruku = <<-HTML
+<blockquote>
+<p>foo</p>
+</blockquote>
+<p class="devcenter-parser-special-block-separator" style="display:none"> </p>
+<blockquote>
+<p>bar</p>
+</blockquote>
+      HTML
+
+      assert_maruku_result md, html_maruku
+
+      html_github = <<-HTML
+<blockquote>
+<p>foo</p>
+</blockquote>
+
+<p class="devcenter-parser-special-block-separator" style="display:none"> </p>
+
+<blockquote>
+<p>bar</p>
+</blockquote>
+      HTML
+
+      assert_github_result md, html_github
+    end
+
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devcenter-parser
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Heroku
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maruku
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Parser for Heroku Dev Center's content