sablon 0.0.19.beta4 → 0.0.19.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac235d2921b38ea77aa5aef274e73aa34e84ffcf
-  data.tar.gz: 9ce6a08012f8540e2a1998d35a177a9e6b95a909
+  metadata.gz: 938b6732ab4800db8bcfdf4b7cb96b4b8918c391
+  data.tar.gz: 1ffa8b58a380a18723abc38b4f037e10512c9446
 SHA512:
-  metadata.gz: 219cb0acb4fdbf3eedc347577dc4c42996e78eb792a51394261e60a48d7b8114cd6d3668d91bcd00f0bdeb6406d0e0f3a2fb4ff63f12e12454bb5682cdbe967d
-  data.tar.gz: 51128d4324f508395837d57cf8330dabed48729ebe8518bacafd18416fa502b0e2a8dfbf4e980ab763a93f5f49c50f5330739dde185780d8f02ac83f66776b59
+  metadata.gz: 4d1196ac369f906e38a89850b04943a87e92ebea62e861e6fc9dd983c446462b901910c4ad16c8ced6dcb6c680c90c3d52b4a946207deb9582002c010d125e70
+  data.tar.gz: 42c19fda296fbfc9ff1c6163f7dba58b02b96c66ac62cd74a255bb00a89e99e3937443c815eab977deefb5597b264306a28ee549e54dd31a6f36541dfac8332e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sablon (0.0.19.beta4)
+    sablon (0.0.19.beta5)
       nokogiri (>= 1.6.0)
       redcarpet (>= 3.2)
       rubyzip (>= 1.1)

data/README.md

@@ -100,7 +100,12 @@ IMPORTANT: This feature is very much *experimental*. Currently, the insertion
     will replace the containing paragraph. This means that other content in the same
     paragraph is discarded.
 
-##### Markdown [experimental]
+##### Markdown [deprecated]
+
+IMPORTANT: Markdown insertion has been deprecated in favor of HTML
+    insertion. For now the behavior is still packaged with sablon. Note that the
+    implementation of `Sablon::Content::Markdown` is already based on
+    `Sablon::Content::HTML`. Markdown insertion will be removed in the future.
 
 Similar to WordProcessingML it's possible to use markdown while processing the
 tempalte. You don't need to modify your templates, a simple insertion operation
@@ -158,7 +163,7 @@ To use HTML insertion prepare the context like so:
 ```ruby
 html_body = <<-HTML
 <div>This text can contain <em>additional formatting</em>
-according to the <strong>Markdown</strongstrong> specification.</div>
+according to the <strong>HTML</strong> specification.</div>
 HTML
 context = {
   article: { html_body: Sablon.content(:html, html_body) }
@@ -218,6 +223,17 @@ to repeat. Have a look at the
 
 It is possible to nest loops and conditionals.
 
+#### Comments
+
+Sometimes it's necessary to include markup in the template that should not be
+visible in the rendered output. For example when defining sample numbering
+styles for HTML insertion.
+
+```
+«comment»
+    ... arbitrary document markup ...
+«endComment»
+```
 
 ### Executable
 

data/lib/sablon.rb

@@ -15,7 +15,6 @@ require "sablon/html/converter"
 require "sablon/content"
 
 require 'redcarpet'
-require "sablon/redcarpet/render/word_ml"
 
 module Sablon
   class TemplateError < ArgumentError; end

data/lib/sablon/content.rb

@@ -83,8 +83,9 @@ module Sablon
       def self.wraps?(value) false end
 
       def initialize(markdown)
-        redcarpet = ::Redcarpet::Markdown.new(Sablon::Redcarpet::Render::WordML)
-        word_ml = Sablon.content(:word_ml, redcarpet.render(markdown))
+        warn "[DEPRECATION] `Sablon::Content::Markdown` is deprecated.  Please use `Sablon::Content::HTML` instead."
+        redcarpet = ::Redcarpet::Markdown.new(::Redcarpet::Render::HTML.new)
+        word_ml = Sablon.content(:html, redcarpet.render(markdown))
         super word_ml
       end
 

data/lib/sablon/html/ast.rb

@@ -99,15 +99,17 @@ XML
     end
 
     class TextFormat
-      def initialize(bold, italic)
+      def initialize(bold, italic, underline)
         @bold = bold
         @italic = italic
+        @underline = underline
       end
 
       def inspect
         parts = []
         parts << 'bold' if @bold
         parts << 'italic' if @italic
+        parts << 'underline' if @underline
         parts.join('|')
       end
 
@@ -115,6 +117,7 @@ XML
         styles = []
         styles << '<w:b />' if @bold
         styles << '<w:i />' if @italic
+        styles << '<w:u w:val="single"/>' if @underline
         if styles.any?
           "<w:rPr>#{styles.join}</w:rPr>"
         else
@@ -123,15 +126,19 @@ XML
       end
 
       def self.default
-        @default ||= new(false, false)
+        @default ||= new(false, false, false)
       end
 
       def with_bold
-        TextFormat.new(true, @italic)
+        TextFormat.new(true, @italic, @underline)
       end
 
       def with_italic
-        TextFormat.new(@bold, true)
+        TextFormat.new(@bold, true, @underline)
+      end
+
+      def with_underline
+        TextFormat.new(@bold, @italic, true)
       end
     end
 

data/lib/sablon/html/converter.rb

@@ -92,6 +92,9 @@ module Sablon
       elsif node.name == 'p'
         @builder.new_layer
         @builder.emit Paragraph.new('Paragraph', ast_text(node.children))
+      elsif node.name =~ /h(\d+)/
+        @builder.new_layer
+        @builder.emit Paragraph.new("Heading#{$1}", ast_text(node.children))
       elsif node.name == 'ul'
         @builder.new_layer ilvl: true
         unless @builder.nested?
@@ -120,10 +123,12 @@ module Sablon
           Text.new(node.text, format)
         elsif node.name == 'br'
           Newline.new
-        elsif node.name == 'strong'
+        elsif node.name == 'strong' || node.name == 'b'
           ast_text(node.children, format: format.with_bold).nodes
-        elsif node.name == 'em'
+        elsif node.name == 'em' || node.name == 'i'
           ast_text(node.children, format: format.with_italic).nodes
+        elsif node.name == 'u'
+          ast_text(node.children, format: format.with_underline).nodes
         elsif ['ul', 'ol', 'p', 'div'].include?(node.name)
           @builder.push(node)
           nil

data/lib/sablon/operations.rb

@@ -44,6 +44,12 @@ module Sablon
         end
       end
     end
+
+    class Comment < Struct.new(:block)
+      def evaluate(context)
+        block.replace []
+      end
+    end
   end
 
   module Expression

data/lib/sablon/processor/document.rb

@@ -171,6 +171,9 @@ module Sablon
           when /([^ ]+):if/
             block = consume_block("#{$1}:endIf")
             Statement::Condition.new(Expression.parse($1), block)
+          when /comment/
+            block = consume_block("endComment")
+            Statement::Comment.new(block)
           end
         end
 

data/lib/sablon/version.rb

@@ -1,3 +1,3 @@
 module Sablon
-  VERSION = "0.0.19.beta4"
+  VERSION = "0.0.19.beta5"
 end

data/test/content_test.rb

@@ -163,6 +163,14 @@ end
 class ContentMarkdownTest < Sablon::TestCase
   include ContentTestSetup
 
+  def test_is_deprecated
+    previous_stderr, $stderr = $stderr, StringIO.new
+    Sablon.content(:markdown, "")
+    assert_equal "[DEPRECATION] `Sablon::Content::Markdown` is deprecated.  Please use `Sablon::Content::HTML` instead.\n", $stderr.string
+  ensure
+    $stderr = previous_stderr
+  end
+
   def test_blank_markdown
     Sablon.content(:markdown, "").append_to @paragraph, @node
 

data/test/fixtures/xml/comment.xml

@@ -0,0 +1,23 @@
+<w:r><w:t xml:space="preserve">Before </w:t></w:r>
+<w:p>
+  <w:fldSimple w:instr=" MERGEFIELD comment \* MERGEFORMAT ">
+    <w:r>
+      <w:rPr><w:noProof/></w:rPr>
+      <w:t>«comment»</w:t>
+    </w:r>
+  </w:fldSimple>
+</w:p>
+<w:p>
+  <w:r>
+    <w:t>Inside Comment! </w:t>
+  </w:r>
+</w:p>
+<w:p>
+  <w:fldSimple w:instr=" MERGEFIELD endComment \* MERGEFORMAT ">
+    <w:r>
+      <w:rPr><w:noProof/></w:rPr>
+      <w:t>«endComment»</w:t>
+    </w:r>
+  </w:fldSimple>
+</w:p>
+<w:r><w:t xml:space="preserve">After</w:t></w:r>

data/test/html/converter_test.rb

@@ -70,6 +70,22 @@ DOCX
     assert_equal normalize_wordml(expected_output), @converter.process(input)
   end
 
+  def test_convert_u_tags_inside_p
+    input = '<p>Lorem&nbsp;<u>ipsum dolor</u>&nbsp;sit amet</div>'
+    expected_output = <<-DOCX.strip
+<w:p>
+  <w:pPr><w:pStyle w:val="Paragraph" /></w:pPr>
+  <w:r><w:t xml:space="preserve">Lorem </w:t></w:r>
+  <w:r>
+    <w:rPr><w:u w:val="single"/></w:rPr>
+    <w:t xml:space="preserve">ipsum dolor</w:t>
+  </w:r>
+  <w:r><w:t xml:space="preserve"> sit amet</w:t></w:r>
+</w:p>
+DOCX
+    assert_equal normalize_wordml(expected_output), @converter.process(input)
+  end
+
   def test_convert_em_tags_inside_div
     input = '<div>Lorem&nbsp;<em>ipsum dolor</em>&nbsp;sit amet</div>'
     expected_output = <<-DOCX.strip
@@ -102,6 +118,17 @@ DOCX
     assert_equal normalize_wordml(expected_output), @converter.process(input)
   end
 
+  def test_convert_h1
+    input = '<h1>Lorem ipsum dolor</h1>'
+    expected_output = <<-DOCX.strip
+<w:p>
+  <w:pPr><w:pStyle w:val="Heading1" /></w:pPr>
+  <w:r><w:t xml:space="preserve">Lorem ipsum dolor</w:t></w:r>
+</w:p>
+DOCX
+    assert_equal normalize_wordml(expected_output), @converter.process(input)
+  end
+
   def test_unorderd_lists
     input = '<ul><li>Lorem</li><li>ipsum</li><li>dolor</li></ul>'
     expected_output = <<-DOCX.strip
@@ -292,6 +319,18 @@ class HTMLConverterASTTest < Sablon::TestCase
     assert_equal '<Root: [<Paragraph{Paragraph}: [<Text{}: Lorem ipsum dolor sit amet>]>]>', ast.inspect
   end
 
+  def test_b
+    input = '<p>Lorem <b>ipsum dolor sit amet</b></p>'
+    ast = @converter.processed_ast(input)
+    assert_equal '<Root: [<Paragraph{Paragraph}: [<Text{}: Lorem >, <Text{bold}: ipsum dolor sit amet>]>]>', ast.inspect
+  end
+
+  def test_i
+    input = '<p>Lorem <i>ipsum dolor sit amet</i></p>'
+    ast = @converter.processed_ast(input)
+    assert_equal '<Root: [<Paragraph{Paragraph}: [<Text{}: Lorem >, <Text{italic}: ipsum dolor sit amet>]>]>', ast.inspect
+  end
+
   def test_br_in_strong
     input = '<div><strong>Lorem<br />ipsum<br />dolor</strong></div>'
     par = @converter.processed_ast(input).grep(Sablon::HTMLConverter::Paragraph).first
@@ -322,6 +361,18 @@ class HTMLConverterASTTest < Sablon::TestCase
     assert_equal "[]", par.runs.inspect
   end
 
+  def test_headings
+    input = '<h1>First</h1><h2>Second</h2><h3>Third</h3>'
+    ast = @converter.processed_ast(input)
+    assert_equal "<Root: [<Paragraph{Heading1}: [<Text{}: First>]>, <Paragraph{Heading2}: [<Text{}: Second>]>, <Paragraph{Heading3}: [<Text{}: Third>]>]>", ast.inspect
+  end
+
+  def test_h_with_formatting
+    input = '<h1><strong>Lorem</strong> ipsum dolor <em>sit <u>amet</u></em></h1>'
+    ast = @converter.processed_ast(input)
+    assert_equal "<Root: [<Paragraph{Heading1}: [<Text{bold}: Lorem>, <Text{}:  ipsum dolor >, <Text{italic}: sit >, <Text{italic|underline}: amet>]>]>", ast.inspect
+  end
+
   def test_ul
     input = '<ul><li>Lorem</li><li>ipsum</li></ul>'
     ast = @converter.processed_ast(input)

data/test/html_test.rb

@@ -39,7 +39,11 @@ class SablonHTMLTest < Sablon::TestCase
   private
   def content
     <<-HTML
-<div>Lorem&nbsp;<strong>ipsum</strong>&nbsp;<em>dolor</em>&nbsp;<strong>sit</strong>&nbsp;<em>amet</em>,&nbsp;<strong>consectetur adipiscing elit</strong>.&nbsp;<em>Suspendisse a tempus turpis</em>. Duis urna justo, vehicula vitae ultricies vel, congue at sem. Fusce turpis turpis, aliquet id pulvinar aliquam, iaculis non elit. Nulla feugiat lectus nulla, in dictum ipsum cursus ac. Quisque at odio neque. Sed ac tortor iaculis, bibendum leo ut, malesuada velit. Donec iaculis sed urna eget pharetra. Praesent ornare fermentum turpis, placerat iaculis urna bibendum vitae. Nunc in quam consequat, tristique tellus in, commodo turpis. Curabitur ullamcorper odio purus, lobortis egestas magna laoreet vitae. Nunc fringilla velit ante, eu aliquam nisi cursus vitae. Suspendisse sit amet dui egestas, volutpat nisi vel, mattis justo. Nullam pellentesque, ipsum eget blandit pharetra, augue elit aliquam mauris, vel mollis nisl augue ut ipsum.</div><ol><li>Vestibulum&nbsp;<ol><li>ante ipsum primis&nbsp;</li></ol></li><li>in faucibus orci luctus&nbsp;<ol><li>et ultrices posuere cubilia Curae;&nbsp;<ol><li>Aliquam vel dolor&nbsp;</li><li>sed sem maximus&nbsp;</li></ol></li><li>fermentum in non odio.&nbsp;<ol><li>Fusce hendrerit ornare mollis.&nbsp;</li></ol></li><li>Nunc scelerisque nibh nec turpis tempor pulvinar.&nbsp;</li></ol></li><li>Donec eros turpis,&nbsp;</li><li>aliquet vel volutpat sit amet,&nbsp;<ol><li>semper eu purus.&nbsp;</li><li>Proin ac erat nec urna efficitur vulputate.&nbsp;<ol><li>Quisque varius convallis ultricies.&nbsp;</li><li>Nullam vel fermentum eros.&nbsp;</li></ol></li></ol></li></ol><div>Pellentesque nulla leo, auctor ornare erat sed, rhoncus congue diam. Duis non porttitor nulla, ut eleifend enim. Pellentesque non tempor sem.</div><div>Mauris auctor egestas arcu,&nbsp;</div><ol><li>id venenatis nibh dignissim id.&nbsp;</li><li>In non placerat metus.&nbsp;</li></ol><ul><li>Nunc sed consequat metus.&nbsp;</li><li>Nulla consectetur lorem consequat,&nbsp;</li><li>malesuada dui at, lacinia lectus.&nbsp;</li></ul><ol><li>Aliquam efficitur&nbsp;</li><li>lorem a mauris feugiat,&nbsp;</li><li>at semper eros pellentesque.&nbsp;</li></ol><div>Nunc lacus diam, consectetur ut odio sit amet, placerat pharetra erat. Sed commodo ut sem id congue. Sed eget neque elit. Curabitur at erat tortor. Maecenas eget sapien vitae est sagittis accumsan et nec orci. Integer luctus at nisl eget venenatis. Nunc nunc eros, consectetur at tortor et, tristique ultrices elit. Nulla in turpis nibh.</div><ul><li>Nam consectetur&nbsp;<ul><li>venenatis tempor.&nbsp;</li></ul></li><li>Aenean&nbsp;<ul><li>blandit<ul><li>porttitor massa,&nbsp;<ul><li>non efficitur&nbsp;<ul><li>metus.&nbsp;</li></ul></li></ul></li></ul></li></ul></li><li>Duis faucibus nunc nec venenatis faucibus.&nbsp;</li><li>Aliquam erat volutpat.&nbsp;</li></ul><div><strong>Quisque non neque ut lacus eleifend volutpat quis sed lacus.<br />Praesent ultrices purus eu quam elementum, sit amet faucibus elit interdum. In lectus orci,<br /> elementum quis dictum ac, porta ac ante. Fusce tempus ac mauris id cursus. Phasellus a erat nulla. <em>Mauris dolor orci</em>, malesuada auctor dignissim non, posuere nec odio. Etiam hendrerit justo nec diam ullamcorper, nec blandit elit sodales.</strong></div>
+<h1>Sablon HTML insertion</h1>
+<h2>Text</h2>
+<div>Lorem&nbsp;<strong>ipsum</strong>&nbsp;<em>dolor</em>&nbsp;<strong>sit</strong>&nbsp;<em>amet</em>,&nbsp;<strong>consectetur adipiscing elit</strong>.&nbsp;<em>Suspendisse a tempus turpis</em>. Duis urna justo, vehicula vitae ultricies vel, congue at sem. Fusce turpis turpis, aliquet id pulvinar aliquam, iaculis non elit. Nulla feugiat lectus nulla, in dictum ipsum cursus ac. Quisque at odio neque. Sed ac tortor iaculis, bibendum leo ut, malesuada velit. Donec iaculis sed urna eget pharetra. <u>Praesent ornare fermentum turpis</u>, placerat iaculis urna bibendum vitae. Nunc in quam consequat, tristique tellus in, commodo turpis. Curabitur ullamcorper odio purus, lobortis egestas magna laoreet vitae. Nunc fringilla velit ante, eu aliquam nisi cursus vitae. Suspendisse sit amet dui egestas, volutpat nisi vel, mattis justo. Nullam pellentesque, ipsum eget blandit pharetra, augue elit aliquam mauris, vel mollis nisl augue ut ipsum.</div>
+<h2>Lists</h2>
+<ol><li>Vestibulum&nbsp;<ol><li>ante ipsum primis&nbsp;</li></ol></li><li>in faucibus orci luctus&nbsp;<ol><li>et ultrices posuere cubilia Curae;&nbsp;<ol><li>Aliquam vel dolor&nbsp;</li><li>sed sem maximus&nbsp;</li></ol></li><li>fermentum in non odio.&nbsp;<ol><li>Fusce hendrerit ornare mollis.&nbsp;</li></ol></li><li>Nunc scelerisque nibh nec turpis tempor pulvinar.&nbsp;</li></ol></li><li>Donec eros turpis,&nbsp;</li><li>aliquet vel volutpat sit amet,&nbsp;<ol><li>semper eu purus.&nbsp;</li><li>Proin ac erat nec urna efficitur vulputate.&nbsp;<ol><li>Quisque varius convallis ultricies.&nbsp;</li><li>Nullam vel fermentum eros.&nbsp;</li></ol></li></ol></li></ol><div>Pellentesque nulla leo, auctor ornare erat sed, rhoncus congue diam. Duis non porttitor nulla, ut eleifend enim. Pellentesque non tempor sem.</div><div>Mauris auctor egestas arcu,&nbsp;</div><ol><li>id venenatis nibh dignissim id.&nbsp;</li><li>In non placerat metus.&nbsp;</li></ol><ul><li>Nunc sed consequat metus.&nbsp;</li><li>Nulla consectetur lorem consequat,&nbsp;</li><li>malesuada dui at, lacinia lectus.&nbsp;</li></ul><ol><li>Aliquam efficitur&nbsp;</li><li>lorem a mauris feugiat,&nbsp;</li><li>at semper eros pellentesque.&nbsp;</li></ol><div>Nunc lacus diam, consectetur ut odio sit amet, placerat pharetra erat. Sed commodo ut sem id congue. Sed eget neque elit. Curabitur at erat tortor. Maecenas eget sapien vitae est sagittis accumsan et nec orci. Integer luctus at nisl eget venenatis. Nunc nunc eros, consectetur at tortor et, tristique ultrices elit. Nulla in turpis nibh.</div><ul><li>Nam consectetur&nbsp;<ul><li>venenatis tempor.&nbsp;</li></ul></li><li>Aenean&nbsp;<ul><li>blandit<ul><li>porttitor massa,&nbsp;<ul><li>non efficitur&nbsp;<ul><li>metus.&nbsp;</li></ul></li></ul></li></ul></li></ul></li><li>Duis faucibus nunc nec venenatis faucibus.&nbsp;</li><li>Aliquam erat volutpat.&nbsp;</li></ul><div><strong>Quisque non neque ut lacus eleifend volutpat quis sed lacus.<br />Praesent ultrices purus eu quam elementum, sit amet faucibus elit interdum. In lectus orci,<br /> elementum quis dictum ac, porta ac ante. Fusce tempus ac mauris id cursus. Phasellus a erat nulla. <em>Mauris dolor orci</em>, malesuada auctor dignissim non, <u>posuere nec odio</u>. Etiam hendrerit justo nec diam ullamcorper, nec blandit elit sodales.</strong></div>
 HTML
   end
 end

data/test/markdown_test.rb

@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+require "test_helper"
+require "support/xml_snippets"
+
+class SablonMarkdownTest < Sablon::TestCase
+  include Sablon::Test::Assertions
+
+  def setup
+    super
+    @base_path = Pathname.new(File.expand_path("../", __FILE__))
+
+    @sample_path = @base_path + "fixtures/markdown_sample.docx"
+  end
+
+  def test_generate_document_from_template_with_styles_and_markdown
+    template_path = @base_path + "fixtures/insertion_template.docx"
+    output_path = @base_path + "sandbox/markdown.docx"
+    template = Sablon.template template_path
+    context = {'markdown:content' => content}
+    template.render_to_file output_path, context
+
+    assert_docx_equal @sample_path, output_path
+  end
+
+  private
+  def content
+    <<-MARKDOWN
+# Sablon Markdown insertion
+
+## Text
+
+**_Lorem ipsum_ dolor sit amet, consectetur adipiscing elit. Suspendisse at libero at elit posuere convallis ac vitae augue. Morbi pretium diam et leo pulvinar, sit amet placerat mauris scelerisque.** Vivamus sollicitudin ante ligula, non egestas diam molestie at.
+
+Nunc tincidunt massa id libero mollis bibendum.
+Sed vel arcu blandit, scelerisque ex ut, semper justo.
+Nunc tempor velit a tortor lacinia, vel mattis diam sollicitudin.
+Etiam eget faucibus enim.
+
+Curabitur rutrum vestibulum nisi, vel posuere ligula commodo a. Sed nibh odio, convallis vitae orci a, cursus venenatis tellus. Duis consequat auctor elementum. Quisque blandit augue id faucibus dignissim. Aenean malesuada placerat turpis. Mauris tincidunt lorem sit amet est ultricies, eu tristique arcu dapibus. Nam ultrices vulputate tellus, quis feugiat ante faucibus non. Donec lectus est, suscipit in arcu molestie, pharetra cursus massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.
+
+## Lists
+
+* Etiam vulputate elementum mi, at porta est malesuada sit amet.
+* Praesent porttitor arcu id justo dignissim, vitae dignissim lectus pharetra.
+* Curabitur efficitur mauris ac justo porta dignissim. Integer sed dui justo.
+
+Donec finibus lectus a erat pharetra dapibus.
+
+1. Nulla facilisis aliquet ex.
+1. Mauris eget ante sed purus dictum tempus eu non dolor.
+1. Aliquam finibus, leo at rutrum euismod, urna quam scelerisque ante, eu finibus dolor lectus vel ipsum.
+
+Ut id condimentum ante, eget convallis justo. Quisque accumsan porta interdum. Integer sit amet luctus felis.
+
+Nunc imperdiet, massa id ultricies porttitor, felis magna tincidunt augue, a egestas orci neque sed odio.
+
+1. Suspendisse
+  1. tempor
+    1. turpis
+      1. turpis
+    1. vitae
+  1. tristique
+    1. nulla
+      1. pulvinar
+1. nec.
+
+* Suspendisse
+  * potenti
+    * In condimentum
+    * enim ut nibh cursus imperdiet.
+  * Aliquam
+  * lacinia
+    * scelerisque
+* tristique.
+
+Phasellus consectetur placerat ornare. Nulla facilisi. Morbi fringilla est vitae pulvinar dictum. Praesent quis malesuada ex. Pellentesque posuere facilisis molestie.
+
+Maecenas pretium erat vitae neque convallis consectetur. Cras ultricies mi nec mauris consectetur, eu blandit purus mattis. Quisque ante nulla, sagittis sed interdum non, eleifend quis augue. Curabitur vestibulum quam sed blandit rhoncus. Morbi eget vestibulum felis. Nulla vitae molestie elit. Etiam sagittis lorem elit, sit amet rhoncus eros dapibus non. Praesent nec dignissim dui. Quisque quis vehicula turpis, sit amet aliquet leo. Ut urna magna, malesuada eget fringilla ut, laoreet sed diam. Maecenas a ipsum varius, efficitur eros quis, vulputate mauris.
+MARKDOWN
+  end
+end

data/test/processor/document_test.rb

@@ -374,6 +374,11 @@ class ProcessorDocumentTest < Sablon::TestCase
     assert_equal "", text(result)
   end
 
+  def test_comment
+    result = process(snippet("comment"), {})
+    assert_equal "Before After", text(result)
+  end
+
   private
   def process(document, context)
     @processor.process(wrap(document), context).to_xml

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sablon
 version: !ruby/object:Gem::Version
-  version: 0.0.19.beta4
+  version: 0.0.19.beta5
 platform: ruby
 authors:
 - Yves Senn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -138,7 +138,6 @@ files:
 - lib/sablon/processor/document.rb
 - lib/sablon/processor/numbering.rb
 - lib/sablon/processor/section_properties.rb
-- lib/sablon/redcarpet/render/word_ml.rb
 - lib/sablon/template.rb
 - lib/sablon/test.rb
 - lib/sablon/test/assertions.rb
@@ -159,9 +158,11 @@ files:
 - test/fixtures/html_sample.docx
 - test/fixtures/insertion_template.docx
 - test/fixtures/insertion_template_no_styles.docx
+- test/fixtures/markdown_sample.docx
 - test/fixtures/recipe_context.json
 - test/fixtures/recipe_sample.docx
 - test/fixtures/recipe_template.docx
+- test/fixtures/xml/comment.xml
 - test/fixtures/xml/complex_field.xml
 - test/fixtures/xml/complex_field_inline_conditional.xml
 - test/fixtures/xml/conditional.xml
@@ -180,8 +181,8 @@ files:
 - test/html/converter_test.rb
 - test/html_test.rb
 - test/mail_merge_parser_test.rb
+- test/markdown_test.rb
 - test/processor/document_test.rb
-- test/redcarpet_render_word_ml_test.rb
 - test/sablon_test.rb
 - test/sandbox/.gitkeep
 - test/section_properties_test.rb
@@ -224,9 +225,11 @@ test_files:
 - test/fixtures/html_sample.docx
 - test/fixtures/insertion_template.docx
 - test/fixtures/insertion_template_no_styles.docx
+- test/fixtures/markdown_sample.docx
 - test/fixtures/recipe_context.json
 - test/fixtures/recipe_sample.docx
 - test/fixtures/recipe_template.docx
+- test/fixtures/xml/comment.xml
 - test/fixtures/xml/complex_field.xml
 - test/fixtures/xml/complex_field_inline_conditional.xml
 - test/fixtures/xml/conditional.xml
@@ -245,8 +248,8 @@ test_files:
 - test/html/converter_test.rb
 - test/html_test.rb
 - test/mail_merge_parser_test.rb
+- test/markdown_test.rb
 - test/processor/document_test.rb
-- test/redcarpet_render_word_ml_test.rb
 - test/sablon_test.rb
 - test/sandbox/.gitkeep
 - test/section_properties_test.rb

data/lib/sablon/redcarpet/render/word_ml.rb

@@ -1,57 +0,0 @@
-module Sablon
-  module Redcarpet
-    module Render
-      class WordML < ::Redcarpet::Render::Base
-        PARAGRAPH_PATTERN = <<-XML.gsub("\n", "")
-<w:p>
-<w:pPr>
-<w:pStyle w:val="%s" />
-</w:pPr>
-%s
-</w:p>
-XML
-
-        def linebreak
-          "<w:r><w:br/></w:r>"
-        end
-
-        def header(title, level)
-          heading_style = "Heading#{level}"
-          PARAGRAPH_PATTERN % [heading_style, title]
-        end
-
-        def paragraph(text)
-          PARAGRAPH_PATTERN % ["Paragraph", text]
-        end
-
-        def normal_text(text)
-          @raw_text = text
-          return '' if text.nil? || text == '' || text == "\n"
-          "<w:r><w:t xml:space=\"preserve\">#{text}</w:t></w:r>"
-        end
-
-        def emphasis(text)
-          "<w:r><w:rPr><w:i /></w:rPr><w:t xml:space=\"preserve\">#{@raw_text}</w:t></w:r>"
-        end
-
-        def double_emphasis(text)
-          "<w:r><w:rPr><w:b /></w:rPr><w:t xml:space=\"preserve\">#{@raw_text}</w:t></w:r>"
-        end
-
-        def list(content, list_type)
-          content
-        end
-
-        LIST_STYLE_MAPPING = {
-          ordered: "ListNumber",
-          unordered: "ListBullet"
-        }
-
-        def list_item(content, list_type)
-          list_style = LIST_STYLE_MAPPING[list_type]
-          PARAGRAPH_PATTERN % [list_style, content]
-        end
-      end
-    end
-  end
-end

data/test/redcarpet_render_word_ml_test.rb

@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-require "test_helper"
-
-class RedcarpetRenderWordMLTest < Sablon::TestCase
-  def setup
-    @redcarpet = ::Redcarpet::Markdown.new(Sablon::Redcarpet::Render::WordML)
-  end
-
-  def test_normal_text
-    word_ml = <<-XML.gsub("\n", "")
-<w:p>
-<w:pPr><w:pStyle w:val=\"Paragraph\" /></w:pPr>
-<w:r><w:t xml:space=\"preserve\">normal</w:t></w:r>
-</w:p>
-XML
-    assert_equal word_ml, @redcarpet.render("normal")
-  end
-
-  def test_empty_string
-    assert_equal "", @redcarpet.render("")
-  end
-
-  def test_blank_string_with_newline
-    assert_equal "", @redcarpet.render("\n")
-  end
-
-  def test_newline_in_a_paragraph_starts_new_paragraph
-    word_ml = <<-XML.gsub("\n", "")
-<w:p>
-<w:pPr><w:pStyle w:val=\"Paragraph\" /></w:pPr>
-<w:r><w:t xml:space=\"preserve\">some  </w:t></w:r>
-<w:r><w:br/></w:r>
-<w:r><w:t xml:space=\"preserve\">text</w:t></w:r>
-</w:p>
-XML
-    assert_equal word_ml, @redcarpet.render("some  \ntext")
-  end
-
-  def test_bold_text
-    word_ml = <<-XML.gsub("\n", "")
-<w:p>
-<w:pPr><w:pStyle w:val=\"Paragraph\" /></w:pPr>
-<w:r>
-<w:rPr><w:b /></w:rPr>
-<w:t xml:space="preserve">bold</w:t>
-</w:r>
-</w:p>
-XML
-    assert_equal word_ml, @redcarpet.render("**bold**")
-  end
-
-  def test_italic_text
-    word_ml = <<-XML.gsub("\n", "")
-<w:p>
-<w:pPr><w:pStyle w:val=\"Paragraph\" /></w:pPr>
-<w:r>
-<w:rPr><w:i /></w:rPr>
-<w:t xml:space="preserve">italic</w:t>
-</w:r>
-</w:p>
-XML
-    assert_equal word_ml, @redcarpet.render("*italic*")
-  end
-
-  def test_single_line_mixed_text
-    word_ml = <<-XML.gsub("\n", "")
-<w:p>
-<w:pPr><w:pStyle w:val=\"Paragraph\" /></w:pPr>
-
-<w:r><w:t xml:space="preserve">some </w:t></w:r>
-
-<w:r>
-<w:rPr><w:i /></w:rPr>
-<w:t xml:space="preserve">random</w:t>
-</w:r>
-
-<w:r><w:t xml:space="preserve"> </w:t></w:r>
-<w:r>
-<w:rPr><w:b /></w:rPr>
-<w:t xml:space="preserve">text</w:t>
-</w:r>
-</w:p>
-XML
-    assert_equal word_ml, @redcarpet.render("some *random* **text**")
-  end
-
-  def test_unordered_lists
-    word_ml = <<-XML.gsub("\n", "")
-<w:p>
-<w:pPr><w:pStyle w:val="ListBullet" /></w:pPr>
-<w:r><w:t xml:space="preserve">first</w:t></w:r>
-</w:p>
-
-<w:p>
-<w:pPr><w:pStyle w:val="ListBullet" /></w:pPr>
-<w:r><w:t xml:space="preserve">second</w:t></w:r>
-</w:p>
-
-<w:p>
-<w:pPr><w:pStyle w:val="ListBullet" /></w:pPr>
-<w:r><w:t xml:space="preserve">third</w:t></w:r>
-</w:p>
-XML
-
-    assert_equal word_ml, @redcarpet.render("- first\n- second\n- third")
-  end
-end