sablon 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a74f19959e3d2566b25c322d1d9365001d95a085
-  data.tar.gz: be248f49337bedb4f7747f6d11b26e721a215514
+  metadata.gz: 249d5af8b120f806c35a208e2804915c575b23e7
+  data.tar.gz: e7a006f1fcd0bbd7202d25681578c4fb327ed49b
 SHA512:
-  metadata.gz: 7e77454cdb18b5a10a2a57b205c6fe837bd8e01e0d22ded78ba43a1db5f2717aa987f62a0cc016c02a5a4f1ba322f6424bd3ff45ef80e459ebded2dd6ca32762
-  data.tar.gz: 301bc31e4ddc13ae6b224b04ddb43fc4ba09db01b2c080c14bc6fbc126adc3bfd59e0f975d137de179d422ad36975ef67698a1da454595e0f383dee61b8274ad
+  metadata.gz: 39bc20fe127fbd6d8bc2737af0e5c1e559182815ce94798ac5c488c66029829148665befdafee6fec0dab3c1b9a241ec6326600dedd6518b8eb5e697e10ed2d3
+  data.tar.gz: ceb09efa9b30aa2a6ac69ef199f2f8f8452db76b9272c5940c9c10b437459bbd4fbff370d62adbba5a3bacda4eb8f79aa0d1abf2856176ef2e33a73e02f4ee89

data/README.md

@@ -61,6 +61,44 @@ This works for chained method calls and nested hash lookup as well:
 «=buyer.address.street»
 ```
 
+##### WordProcessingML
+
+Generally Sablon tries to reuse the formatting defined in the template. However,
+there are situations where more fine grained control is needed. Imagine you need
+to insert a body of text containing different formats. If you can't decide the
+format ahead of processing time (in the template) you can insert
+[WordProcessingML](http://en.wikipedia.org/wiki/Microsoft_Office_XML_formats)
+directly.
+
+The template can use a simple insertion operation like so:
+
+```
+«=long_description»
+```
+
+The thing that changes is the context passed when processing the template:
+
+```ruby
+word_processing_ml = <<-XML
+<w:p>
+  <w:r w:rsidRPr="00B97C39">
+    <w:rPr>
+      <w:b />
+    </w:rPr>
+    <w:t>this is bold text</w:t>
+  </w:r>
+</w:p>
+XML
+context = {
+  long_description: Sablon.word_ml(word_processing_ml)
+}
+template.render_to_file File.expand_path("~/Desktop/output.docx"), context
+```
+
+**IMPORTANT:** This feature is very much *experimental*. Currently, this only
+  works if the insertion is the only thing inside the template paragraph. Other
+  content is discarded!
+
 #### Conditionals
 
 Sablon can render parts of the template conditonally based on the value of a

data/lib/sablon.rb

@@ -1,9 +1,12 @@
 require "sablon/version"
+require "sablon/context"
 require "sablon/template"
 require "sablon/processor"
 require "sablon/processor/section_properties"
 require "sablon/parser/mail_merge"
 require "sablon/operations"
+require "sablon/content"
+
 require 'zip'
 require 'nokogiri'
 
@@ -14,4 +17,12 @@ module Sablon
   def self.template(path)
     Template.new(path)
   end
+
+  def self.word_ml(xml)
+    Sablon::Content::WordML.new(xml)
+  end
+
+  def self.string(object)
+    Sablon::Content::String.new(object.to_s)
+  end
 end

data/lib/sablon/content.rb

@@ -0,0 +1,30 @@
+module Sablon
+  module Content
+    class String < Struct.new(:string)
+      include Sablon::Content
+
+      def append_to(paragraph, display_node)
+        string.scan(/[^\n]+|\n/).reverse.each do |part|
+          if part == "\n"
+            display_node.add_next_sibling Nokogiri::XML::Node.new "w:br", display_node.document
+          else
+            text_part = display_node.dup
+            text_part.content = part
+            display_node.add_next_sibling text_part
+          end
+        end
+      end
+    end
+
+    class WordML < Struct.new(:xml)
+      include Sablon::Content
+
+      def append_to(paragraph, display_node)
+        Nokogiri::XML.fragment(xml).children.reverse.each do |child|
+          paragraph.add_next_sibling child
+        end
+        paragraph.remove
+      end
+    end
+  end
+end

data/lib/sablon/context.rb

@@ -0,0 +1,28 @@
+module Sablon
+  module Context
+    def self.transform(hash)
+      transform_hash(hash)
+    end
+
+    def self.transform_hash(hash)
+      Hash[hash.map{|k,v| transform_pair(k.to_s, v) }]
+    end
+
+    def self.transform_pair(key, value)
+      if key =~ /\Awordml:(.+)\z/
+        [$1, Sablon.word_ml(value)]
+      else
+        transform_standard_key(key, value)
+      end
+    end
+
+    def self.transform_standard_key(key, value)
+      case value
+      when Hash
+        [key, transform_hash(value)]
+      else
+        [key, value]
+      end
+    end
+  end
+end

data/lib/sablon/operations.rb

@@ -3,7 +3,16 @@ module Sablon
   module Statement
     class Insertion < Struct.new(:expr, :field)
       def evaluate(context)
-        field.replace(expr.evaluate(context))
+        field.replace(wrap_content(expr.evaluate(context)))
+      end
+
+      private
+      def wrap_content(value)
+        if value.is_a?(Sablon::Content)
+          value
+        else
+          Sablon.string(value)
+        end
       end
     end
 

data/lib/sablon/parser/mail_merge.rb

@@ -8,17 +8,10 @@ module Sablon
         end
 
         private
-        def replace_field_display(node, text)
+        def replace_field_display(node, content)
+          paragraph = node.ancestors(".//w:p").first
           display_node = node.search(".//w:t").first
-          text.to_s.scan(/[^\n]+|\n/).reverse.each do |part|
-            if part == "\n"
-              display_node.add_next_sibling Nokogiri::XML::Node.new "w:br", display_node.document
-            else
-              text_part = display_node.dup
-              text_part.content = part
-              display_node.add_next_sibling text_part
-            end
-          end
+          content.append_to(paragraph, display_node)
           display_node.remove
         end
       end
@@ -29,8 +22,8 @@ module Sablon
           @raw_expression = @nodes.flat_map {|n| n.search(".//w:instrText").map(&:content) }.join
         end
 
-        def replace(value)
-          replace_field_display(pattern_node, value)
+        def replace(content)
+          replace_field_display(pattern_node, content)
           (@nodes - [pattern_node]).each(&:remove)
         end
 
@@ -54,8 +47,8 @@ module Sablon
           @raw_expression = @node["w:instr"]
         end
 
-        def replace(value)
-          replace_field_display(@node, value)
+        def replace(content)
+          replace_field_display(@node, content)
           @node.replace(@node.children)
         end
 

data/lib/sablon/processor.rb

@@ -3,8 +3,7 @@ module Sablon
   class Processor
     def self.process(xml_node, context, properties = {})
       processor = new(parser)
-      stringified_context = Hash[context.map {|k, v| [k.to_s, v] }]
-      processor.manipulate xml_node, stringified_context
+      processor.manipulate xml_node, Sablon::Context.transform(context)
       processor.write_properties xml_node, properties if properties.any?
       xml_node
     end

data/lib/sablon/template.rb

@@ -6,7 +6,7 @@ module Sablon
 
     # Same as +render_to_string+ but writes the processed template to +output_path+.
     def render_to_file(output_path, context, properties = {})
-      File.open(output_path, 'w') do |f|
+      File.open(output_path, 'wb') do |f|
         f.write render_to_string(context, properties)
       end
     end
@@ -24,14 +24,23 @@ module Sablon
           out.put_next_entry(entry_name)
           content = entry.get_input_stream.read
           if entry_name == 'word/document.xml'
-            out.write(Processor.process(Nokogiri::XML(content), context, properties).to_xml)
+            out.write(process(content, context, properties))
           elsif entry_name =~ /word\/header\d*\.xml/ || entry_name =~ /word\/footer\d*\.xml/
-            out.write(Processor.process(Nokogiri::XML(content), context).to_xml)
+            out.write(process(content, context))
           else
             out.write(content)
           end
         end
       end
     end
+
+    # process the sablon xml template with the given +context+.
+    #
+    # IMPORTANT: Open Office does not ignore whitespace around tags.
+    # We need to render the xml without indent and whitespace.
+    def process(content, context, *args)
+      document = Nokogiri::XML(content)
+      Processor.process(document, context, *args).to_xml(indent: 0, save_with: 0)
+    end
   end
 end

data/lib/sablon/version.rb

@@ -1,3 +1,3 @@
 module Sablon
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/test/content_test.rb

@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+require "test_helper"
+
+module ContentTestSetup
+  def setup
+    super
+    @template_text = '<w:p><span>template</span></w:p><w:p>AFTER</w:p>'
+    @document = Nokogiri::XML.fragment(@template_text)
+    @paragraph = @document.children.first
+    @node = @document.css("span").first
+  end
+
+  private
+  def assert_xml_equal(expected, document)
+    assert_equal expected, document.to_xml(indent: 0, save_with: 0)
+  end
+end
+
+class ContentStringTest < Sablon::TestCase
+  include ContentTestSetup
+
+  def test_single_line_string
+    Sablon.string("a normal string").append_to @paragraph, @node
+
+    output = <<-XML.strip
+<w:p><span>template</span><span>a normal string</span></w:p><w:p>AFTER</w:p>
+    XML
+    assert_xml_equal output, @document
+  end
+
+  def test_numeric_string
+    Sablon.string(42).append_to @paragraph, @node
+
+    output = <<-XML.strip
+<w:p><span>template</span><span>42</span></w:p><w:p>AFTER</w:p>
+    XML
+    assert_xml_equal output, @document
+  end
+
+  def test_string_with_newlines
+    Sablon.string("a\nmultiline\n\nstring").append_to @paragraph, @node
+
+    output = <<-XML.strip.gsub("\n", "")
+<w:p>
+<span>template</span>
+<span>a</span>
+<w:br/>
+<span>multiline</span>
+<w:br/>
+<w:br/>
+<span>string</span>
+</w:p>
+<w:p>AFTER</w:p>
+    XML
+
+    assert_xml_equal output, @document
+  end
+
+  def test_blank_string
+    Sablon.string("").append_to @paragraph, @node
+
+    assert_xml_equal @template_text, @document
+  end
+end
+
+class ContentWordMLTest < Sablon::TestCase
+  include ContentTestSetup
+
+  def test_blank_word_ml
+    Sablon.word_ml("").append_to @paragraph, @node
+
+    assert_xml_equal "<w:p>AFTER</w:p>", @document
+  end
+
+  def test_inserts_word_ml_into_the_document
+    @word_ml = '<w:p><w:r><w:t xml:space="preserve">a </w:t></w:r></w:p>'
+    Sablon.word_ml(@word_ml).append_to @paragraph, @node
+
+    output = <<-XML.strip.gsub("\n", "")
+<w:p>
+<w:r><w:t xml:space=\"preserve\">a </w:t></w:r>
+</w:p>
+<w:p>AFTER</w:p>
+    XML
+
+    assert_xml_equal output, @document
+  end
+
+  def test_inserting_word_ml_multiple_times_into_same_paragraph
+    skip "Content::WordML currently removes the paragraph..."
+  end
+end

data/test/context_test.rb

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+require "test_helper"
+
+class ContextTest < Sablon::TestCase
+  def test_converts_symbol_keys_to_string_keys
+    transformed = Sablon::Context.transform({a: 1, b: {c: 2, "d" => 3}})
+    assert_equal({"a"=>1, "b"=>{"c" =>2, "d"=>3}}, transformed)
+  end
+
+  def test_recognizes_wordml_keys
+    transformed = Sablon::Context.transform({"wordml:mykey" => "<w:p><w:p>", "otherkey" => "<nope>"})
+    assert_equal({ "mykey"=>Sablon.word_ml("<w:p><w:p>"),
+                   "otherkey"=>"<nope>"}, transformed)
+  end
+end

data/test/executable_test.rb

@@ -10,9 +10,7 @@ class ExecutableTest < Sablon::TestCase
     @template_path = @base_path + "fixtures/shopping_list_template.docx"
     @context_path = @base_path + "fixtures/shopping_list_context.json"
     @executable_path = @base_path + '../bin/sablon'
-  end
 
-  def teardown
     @output_path.delete if @output_path.exist?
   end
 

data/test/expression_test.rb

@@ -29,13 +29,6 @@ class LookupOrMethodCallTest < Sablon::TestCase
     assert_equal "Jack", expr.evaluate("user" => user)
   end
 
-  def test_calls_perform_lookup_on_hash_with_symbol_keys
-    skip
-    user = {first_name: "Jack"}
-    expr = Sablon::Expression.parse("user.first_name")
-    assert_equal "Jack", expr.evaluate("user" => user)
-  end
-
   def test_inspect
     expr = Sablon::Expression.parse("user.first_name")
     assert_equal "«user.first_name»", expr.inspect

data/test/fixtures/shopping_list_context.json

@@ -4,7 +4,8 @@
     "author": {
       "first_name": "John",
       "last_name": "Doe"
-    }
+    },
+    "wordml:description": "<w:p><w:r><w:t xml:space=\"preserve\">A list of items to buy at the next </w:t></w:r><w:r><w:rPr><w:b /></w:rPr><w:t>Shop</w:t></w:r><w:r><w:t xml:space=\"preserve\">.</w:t></w:r></w:p>"
   },
   "items": [
     {"name": "Milk", "amount": "1L"},

data/test/fixtures/xml/about_me_snippet.xml

@@ -0,0 +1 @@
+<w:p><w:r><w:t xml:space="preserve">I </w:t></w:r><w:r><w:rPr><w:i /></w:rPr><w:t>am</w:t></w:r><w:r><w:t xml:space="preserve"> </w:t></w:r></w:p><w:p><w:r><w:t xml:space="preserve">a </w:t></w:r><w:r><w:rPr><w:b /></w:rPr><w:t>Software Developer</w:t></w:r></w:p>

data/test/fixtures/xml/complex_field.xml

@@ -1,22 +1,24 @@
-<w:r><w:t xml:space="preserve">Hello! My Name is </w:t></w:r>
-<w:r w:rsidR="00BE47B1" w:rsidRPr="00BE47B1">
-  <w:rPr><w:b/></w:rPr>
-  <w:fldChar w:fldCharType="begin"/>
-</w:r>
-<w:r w:rsidR="00BE47B1" w:rsidRPr="00BE47B1">
-  <w:rPr><w:b/></w:rPr>
-  <w:instrText xml:space="preserve"> MERGEFIELD =last_name \* MERGEFORMAT </w:instrText>
-</w:r>
-<w:r w:rsidR="00BE47B1" w:rsidRPr="00BE47B1">
-  <w:rPr><w:b/></w:rPr>
-  <w:fldChar w:fldCharType="separate"/>
-</w:r>
-<w:r w:rsidR="004B49F0">
-  <w:rPr><w:b/><w:noProof/></w:rPr>
-  <w:t>«=last_name»</w:t>
-</w:r>
-<w:r w:rsidR="00BE47B1" w:rsidRPr="00BE47B1">
-  <w:rPr><w:b/></w:rPr>
-  <w:fldChar w:fldCharType="end"/>
-</w:r>
-<w:r w:rsidR="00BE47B1"><w:t xml:space="preserve">, nice to meet you.</w:t></w:r>
+<w:p>
+  <w:r><w:t xml:space="preserve">Hello! My Name is </w:t></w:r>
+  <w:r w:rsidR="00BE47B1" w:rsidRPr="00BE47B1">
+    <w:rPr><w:b/></w:rPr>
+    <w:fldChar w:fldCharType="begin"/>
+  </w:r>
+  <w:r w:rsidR="00BE47B1" w:rsidRPr="00BE47B1">
+    <w:rPr><w:b/></w:rPr>
+    <w:instrText xml:space="preserve"> MERGEFIELD =last_name \* MERGEFORMAT </w:instrText>
+  </w:r>
+  <w:r w:rsidR="00BE47B1" w:rsidRPr="00BE47B1">
+    <w:rPr><w:b/></w:rPr>
+    <w:fldChar w:fldCharType="separate"/>
+  </w:r>
+  <w:r w:rsidR="004B49F0">
+    <w:rPr><w:b/><w:noProof/></w:rPr>
+    <w:t>«=last_name»</w:t>
+  </w:r>
+  <w:r w:rsidR="00BE47B1" w:rsidRPr="00BE47B1">
+    <w:rPr><w:b/></w:rPr>
+    <w:fldChar w:fldCharType="end"/>
+  </w:r>
+  <w:r w:rsidR="00BE47B1"><w:t xml:space="preserve">, nice to meet you.</w:t></w:r>
+</w:p>

data/test/fixtures/xml/edited_complex_field.xml

@@ -1,26 +1,28 @@
-<w:r>
-  <w:t xml:space="preserve">Hello! My Name is </w:t>
-</w:r>
-<w:r w:rsidR="003C4780">
-  <w:fldChar w:fldCharType="begin" />
-</w:r>
-<w:r w:rsidR="003C4780">
-  <w:instrText xml:space="preserve"> MERGEFIELD </w:instrText>
-</w:r>
-<w:r w:rsidR="003A4504">
-  <w:instrText>=</w:instrText>
-</w:r>
-<w:r w:rsidR="003C4780">
-  <w:instrText xml:space="preserve">first_name \* MERGEFORMAT </w:instrText>
-</w:r>
-<w:r w:rsidR="003C4780">
-  <w:fldChar w:fldCharType="separate" />
-</w:r>
-<w:r w:rsidR="00441382">
-  <w:rPr><w:noProof /></w:rPr>
-  <w:t>«=person.first_name»</w:t>
-</w:r>
-<w:r w:rsidR="003C4780">
-  <w:fldChar w:fldCharType="end" />
-</w:r>
-<w:r w:rsidR="00BE47B1"><w:t xml:space="preserve">, nice to meet you.</w:t></w:r>
+<w:p>
+  <w:r>
+    <w:t xml:space="preserve">Hello! My Name is </w:t>
+  </w:r>
+  <w:r w:rsidR="003C4780">
+    <w:fldChar w:fldCharType="begin" />
+  </w:r>
+  <w:r w:rsidR="003C4780">
+    <w:instrText xml:space="preserve"> MERGEFIELD </w:instrText>
+  </w:r>
+  <w:r w:rsidR="003A4504">
+    <w:instrText>=</w:instrText>
+  </w:r>
+  <w:r w:rsidR="003C4780">
+    <w:instrText xml:space="preserve">first_name \* MERGEFORMAT </w:instrText>
+  </w:r>
+  <w:r w:rsidR="003C4780">
+    <w:fldChar w:fldCharType="separate" />
+  </w:r>
+  <w:r w:rsidR="00441382">
+    <w:rPr><w:noProof /></w:rPr>
+    <w:t>«=person.first_name»</w:t>
+  </w:r>
+  <w:r w:rsidR="003C4780">
+    <w:fldChar w:fldCharType="end" />
+  </w:r>
+  <w:r w:rsidR="00BE47B1"><w:t xml:space="preserve">, nice to meet you.</w:t></w:r>
+</w:p>

data/test/fixtures/xml/simple_field.xml

@@ -1,8 +1,10 @@
-<w:r><w:t xml:space="preserve">Hello! My Name is </w:t></w:r>
-<w:fldSimple w:instr=" MERGEFIELD =first_name \* MERGEFORMAT ">
-  <w:r w:rsidR="004B49F0">
-    <w:rPr><w:noProof/></w:rPr>
-    <w:t>«=first_name»</w:t>
-  </w:r>
-</w:fldSimple>
-<w:r w:rsidR="00BE47B1"><w:t xml:space="preserve">, nice to meet you.</w:t></w:r>
+<w:p>
+  <w:r><w:t xml:space="preserve">Hello! My Name is </w:t></w:r>
+  <w:fldSimple w:instr=" MERGEFIELD =first_name \* MERGEFORMAT ">
+    <w:r w:rsidR="004B49F0">
+      <w:rPr><w:noProof/></w:rPr>
+      <w:t>«=first_name»</w:t>
+    </w:r>
+  </w:fldSimple>
+  <w:r w:rsidR="00BE47B1"><w:t xml:space="preserve">, nice to meet you.</w:t></w:r>
+</w:p>

data/test/fixtures/xml/simple_fields.xml

@@ -1,12 +1,14 @@
-<w:fldSimple w:instr=" MERGEFIELD =first_name \* MERGEFORMAT ">
-  <w:r w:rsidR="004B49F0">
-    <w:rPr><w:noProof/></w:rPr>
-    <w:t>«=first_name»</w:t>
-  </w:r>
-</w:fldSimple>
-<w:fldSimple w:instr=" MERGEFIELD =last_name \* MERGEFORMAT ">
-  <w:r w:rsidR="004B49F0">
-    <w:rPr><w:noProof/></w:rPr>
-    <w:t>«=last_name»</w:t>
-  </w:r>
-</w:fldSimple>
+<w:p>
+  <w:fldSimple w:instr=" MERGEFIELD =first_name \* MERGEFORMAT ">
+    <w:r w:rsidR="004B49F0">
+      <w:rPr><w:noProof/></w:rPr>
+      <w:t>«=first_name»</w:t>
+    </w:r>
+  </w:fldSimple>
+  <w:fldSimple w:instr=" MERGEFIELD =last_name \* MERGEFORMAT ">
+    <w:r w:rsidR="004B49F0">
+      <w:rPr><w:noProof/></w:rPr>
+      <w:t>«=last_name»</w:t>
+    </w:r>
+  </w:fldSimple>
+</w:p>

data/test/mail_merge_parser_test.rb

@@ -19,7 +19,7 @@ module MailMergeParser
     end
 
     def body_xml
-      document.search(".//w:body").children.map(&:to_xml).join.strip
+      document.search(".//w:body").children.map(&:to_xml).map(&:strip).join
     end
 
     def document
@@ -35,59 +35,28 @@ module MailMergeParser
     end
 
     def test_replace
-      field.replace("Hello")
-      xml = <<-xml
-  <w:r w:rsidR=\"004B49F0\">
-    <w:rPr><w:noProof/></w:rPr>
-    <w:t>Hello</w:t>
-  </w:r>
-xml
-    assert_equal body_xml.strip, xml.strip
-    end
-
-    def test_replace_with_newlines
-      field.replace("First\nSecond\n\nThird")
-      xml = <<-xml
-<w:r w:rsidR=\"004B49F0\">
-    <w:rPr><w:noProof/></w:rPr>
-    <w:t>First</w:t><w:br/><w:t>Second</w:t><w:br/><w:br/><w:t>Third</w:t>
-  </w:r>
-xml
-      assert_equal body_xml.strip, xml.strip
-    end
-
-    def test_replace_with_nil
-      field.replace(nil)
-      xml = <<-xml
+      field.replace(Sablon.string("Hello"))
+      xml = <<-xml.strip
+<w:p>
 <w:r w:rsidR=\"004B49F0\">
-    <w:rPr><w:noProof/></w:rPr>
-
-  </w:r>
-xml
-      assert_equal body_xml.gsub(/^\s+$/,'').strip, xml.strip
-    end
-
-    def test_replace_with_numeric
-      field.replace(45)
-      xml = <<-xml
-<w:r w:rsidR=\"004B49F0\">
-    <w:rPr><w:noProof/></w:rPr>
-    <w:t>45</w:t>
-  </w:r>
+<w:rPr><w:noProof/></w:rPr>
+<w:t>Hello</w:t>
+</w:r>
+</w:p>
 xml
-      assert_equal body_xml.gsub(/^\s+$/,'').strip, xml.strip
+    assert_equal xml, body_xml
     end
 
     private
 
     def xml
-      xml = <<-xml
-<w:fldSimple w:instr=" MERGEFIELD =first_name \\* MERGEFORMAT ">
-  <w:r w:rsidR="004B49F0">
-    <w:rPr><w:noProof/></w:rPr>
-    <w:t>«=first_name»</w:t>
-  </w:r>
-</w:fldSimple>
+      xml = <<-xml.strip
+<w:p><w:fldSimple w:instr=" MERGEFIELD =first_name \\* MERGEFORMAT ">
+<w:r w:rsidR="004B49F0">
+<w:rPr><w:noProof/></w:rPr>
+<w:t>«=first_name»</w:t>
+</w:r>
+</w:fldSimple></w:p>
 xml
       wrap(xml)
     end
@@ -101,75 +70,50 @@ xml
     end
 
     def test_replace
-      field.replace("Hello")
-      xml = <<-xml
-<w:r w:rsidR="004B49F0">
-  <w:rPr>
-    <w:b/>
-    <w:noProof/>
-  </w:rPr>
-  <w:t>Hello</w:t>
-</w:r>
-xml
-      assert_equal body_xml.strip, xml.strip
-    end
+      field.replace(Sablon.string("Hello"))
+      xml = <<-xml.strip
+<w:p>
 
-    def test_replace_with_newlines
-      field.replace("First\nSecond\n\nThird")
-      xml = <<-xml
-<w:r w:rsidR="004B49F0">
-  <w:rPr>
-    <w:b/>
-    <w:noProof/>
-  </w:rPr>
-  <w:t>First</w:t><w:br/><w:t>Second</w:t><w:br/><w:br/><w:t>Third</w:t>
-</w:r>
-xml
-      assert_equal body_xml.strip, xml.strip
-    end
-
-    def test_replace_with_nil
-      field.replace(nil)
 
-      xml = <<-xml
 <w:r w:rsidR="004B49F0">
-  <w:rPr>
-    <w:b/>
-    <w:noProof/>
-  </w:rPr>
-
+<w:rPr>
+<w:b/>
+<w:noProof/>
+</w:rPr>
+<w:t>Hello</w:t>
 </w:r>
+</w:p>
 xml
-      assert_equal body_xml.gsub(/^\s+$/,'').strip, xml.strip
+      assert_equal body_xml.strip, xml.strip
     end
 
     private
 
     def xml
-      xml = <<-xml
-<w:r w:rsidR="00BE47B1" w:rsidRPr="00BE47B1">
-  <w:rPr><w:b/></w:rPr>
-  <w:fldChar w:fldCharType="begin"/>
+      xml = <<-xml.strip
+<w:p><w:r w:rsidR="00BE47B1" w:rsidRPr="00BE47B1">
+<w:rPr><w:b/></w:rPr>
+<w:fldChar w:fldCharType="begin"/>
 </w:r>
 <w:r w:rsidR="00BE47B1" w:rsidRPr="00BE47B1">
-  <w:rPr><w:b/></w:rPr>
-  <w:instrText xml:space="preserve"> MERGEFIELD =last_name \\* MERGEFORMAT </w:instrText>
+<w:rPr><w:b/></w:rPr>
+<w:instrText xml:space="preserve"> MERGEFIELD =last_name \\* MERGEFORMAT </w:instrText>
 </w:r>
 <w:r w:rsidR="00BE47B1" w:rsidRPr="00BE47B1">
-  <w:rPr><w:b/></w:rPr>
-  <w:fldChar w:fldCharType="separate"/>
+<w:rPr><w:b/></w:rPr>
+<w:fldChar w:fldCharType="separate"/>
 </w:r>
 <w:r w:rsidR="004B49F0">
-  <w:rPr>
-    <w:b/>
-    <w:noProof/>
-  </w:rPr>
-  <w:t>«=last_name»</w:t>
+<w:rPr>
+<w:b/>
+<w:noProof/>
+</w:rPr>
+<w:t>«=last_name»</w:t>
 </w:r>
 <w:r w:rsidR="00BE47B1" w:rsidRPr="00BE47B1">
-  <w:rPr><w:b/></w:rPr>
-  <w:fldChar w:fldCharType="end"/>
-</w:r>
+<w:rPr><w:b/></w:rPr>
+<w:fldChar w:fldCharType="end"/>
+</w:r></w:p>
 xml
       wrap(xml)
     end
@@ -240,12 +184,12 @@ xml
 
     def xml
       xml = <<-xml
-<w:fldSimple w:instr="  MERGEFIELD    =title    \\*   MERGEFORMAT    ">
-  <w:r w:rsidR="004B49F0">
-    <w:rPr><w:noProof/></w:rPr>
-    <w:t>«=title»</w:t>
-  </w:r>
-</w:fldSimple>
+<w:p><w:fldSimple w:instr="  MERGEFIELD    =title    \\*   MERGEFORMAT    ">
+<w:r w:rsidR="004B49F0">
+<w:rPr><w:noProof/></w:rPr>
+<w:t>«=title»</w:t>
+</w:r>
+</w:fldSimple></w:p>
 xml
       wrap(xml)
     end

data/test/processor_test.rb

@@ -17,12 +17,14 @@ class ProcessorTest < Sablon::TestCase
 
     assert_equal "Hello! My Name is Jack , nice to meet you.", text(result)
     assert_xml_equal <<-document, result
+    <w:p>
       <w:r><w:t xml:space="preserve">Hello! My Name is </w:t></w:r>
         <w:r w:rsidR="004B49F0">
           <w:rPr><w:noProof/></w:rPr>
           <w:t>Jack</w:t>
         </w:r>
       <w:r w:rsidR="00BE47B1"><w:t xml:space="preserve">, nice to meet you.</w:t></w:r>
+    </w:p>
     document
   end
 
@@ -36,12 +38,14 @@ class ProcessorTest < Sablon::TestCase
 
     assert_equal "Hello! My Name is Zane , nice to meet you.", text(result)
     assert_xml_equal <<-document, result
+    <w:p>
       <w:r><w:t xml:space="preserve">Hello! My Name is </w:t></w:r>
       <w:r w:rsidR="004B49F0">
         <w:rPr><w:b/><w:noProof/></w:rPr>
         <w:t>Zane</w:t>
       </w:r>
       <w:r w:rsidR="00BE47B1"><w:t xml:space="preserve">, nice to meet you.</w:t></w:r>
+    </w:p>
     document
   end
 
@@ -50,12 +54,14 @@ class ProcessorTest < Sablon::TestCase
 
     assert_equal "Hello! My Name is Daniel , nice to meet you.", text(result)
     assert_xml_equal <<-document, result
+    <w:p>
       <w:r><w:t xml:space="preserve">Hello! My Name is </w:t></w:r>
       <w:r w:rsidR="00441382">
         <w:rPr><w:noProof/></w:rPr>
         <w:t>Daniel</w:t>
       </w:r>
       <w:r w:rsidR="00BE47B1"><w:t xml:space="preserve">, nice to meet you.</w:t></w:r>
+    </w:p>
     document
   end
 

data/test/sablon_test.rb

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 require "test_helper"
+require "support/xml_snippets"
 
 class SablonTest < Sablon::TestCase
   include Sablon::Test::Assertions
+  include XMLSnippets
 
   def setup
     super
@@ -21,6 +23,7 @@ class SablonTest < Sablon::TestCase
       author: "Yves Senn",
       title: "Letter of application",
       person: person,
+      about_me: Sablon.word_ml(snippet("about_me_snippet").strip),
       items: [item.new("1.", "Ruby", "★" * 5), item.new("2.", "Java", "★" * 1), item.new("3.", "Python", "★" * 3)],
       career: [position.new("1999 - 2006", "Junior Java Engineer", "Lorem ipsum dolor\nsit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat."),
                position.new("2006 - 2013", "Senior Ruby Developer", "Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo."),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sablon
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Yves Senn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -111,6 +111,8 @@ files:
 - Rakefile
 - bin/sablon
 - lib/sablon.rb
+- lib/sablon/content.rb
+- lib/sablon/context.rb
 - lib/sablon/operations.rb
 - lib/sablon/parser/mail_merge.rb
 - lib/sablon/processor.rb
@@ -122,6 +124,8 @@ files:
 - misc/output.png
 - misc/template.png
 - sablon.gemspec
+- test/content_test.rb
+- test/context_test.rb
 - test/executable_test.rb
 - test/expression_test.rb
 - test/fixtures/sablon_sample.docx
@@ -129,6 +133,7 @@ files:
 - test/fixtures/shopping_list_context.json
 - test/fixtures/shopping_list_sample.docx
 - test/fixtures/shopping_list_template.docx
+- test/fixtures/xml/about_me_snippet.xml
 - test/fixtures/xml/complex_field.xml
 - test/fixtures/xml/conditional.xml
 - test/fixtures/xml/conditional_with_predicate.xml
@@ -175,6 +180,8 @@ signing_key:
 specification_version: 4
 summary: docx tempalte processor
 test_files:
+- test/content_test.rb
+- test/context_test.rb
 - test/executable_test.rb
 - test/expression_test.rb
 - test/fixtures/sablon_sample.docx
@@ -182,6 +189,7 @@ test_files:
 - test/fixtures/shopping_list_context.json
 - test/fixtures/shopping_list_sample.docx
 - test/fixtures/shopping_list_template.docx
+- test/fixtures/xml/about_me_snippet.xml
 - test/fixtures/xml/complex_field.xml
 - test/fixtures/xml/conditional.xml
 - test/fixtures/xml/conditional_with_predicate.xml