sablon 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c8b7cc35ce1718d11e3ebc44d2b50e5a03b1575
-  data.tar.gz: 003512773f3372b9ed1243a4a7fd88ac301dafcb
+  metadata.gz: 8a4d14328ddbea68fddbbc747b5a8e4fe89b7e1b
+  data.tar.gz: 45c9af0a71ce34c1c2211474bf75f0f60fd611fb
 SHA512:
-  metadata.gz: ad54b7f87dc83a60b77fb3559d756d1798197f264618195e11796c0cd0cd71bea955991b5f7d01aa2ad668c4afbed0f2c9eaf16c0b28a3d693b0bb2c4cbe891a
-  data.tar.gz: 4c45533f60f2cf77b7d17be0ad77a3180fc17c3c6257178963229d1374bc8eef0d31024a110e8a9b11b4b768e451a4d04f674d0113b696a6d102cc4f8b16cdd6
+  metadata.gz: d5d4a12a4ec9c75a08fb18a729775072ee96cd029cbd064a8295832be6c9a70409e27c80dfd0ea92354a10d2c4715946e03d414a52d1514bd8300ef56c6c00cf
+  data.tar.gz: 9525095be7b154d71e307ec3bdebb6a026c6b514b03323b09151a58ec2376c22f8c66921ac70525c1f87f0005e999670c6b2c12097f0b736fe642db6284627f4

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    sablon (0.0.10)
+    sablon (0.0.11)
       nokogiri (>= 1.6.0)
+      redcarpet (>= 3.2)
       rubyzip (>= 1.1)
 
 GEM
@@ -13,6 +14,7 @@ GEM
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     rake (10.4.2)
+    redcarpet (3.2.2)
     rubyzip (1.1.7)
     xml-simple (1.1.5)
 

data/README.md

@@ -32,8 +32,8 @@ template.render_to_file File.expand_path("~/Desktop/output.docx"), context
 
 ### Writing Templates
 
-Sablon templates are normal word documents (`.docx`) sprinkled with MergeFields
-to perform operations. The following section will use the notation `«=title»` to
+Sablon templates are normal Word documents (`.docx`) sprinkled with MailMerge fields
+to perform operations. The following section uses the notation `«=title»` to
 refer to [Word MailMerge](http://en.wikipedia.org/wiki/Mail_merge) fields.
 
 #### Content Insertion
@@ -70,34 +70,76 @@ 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:
+It's enough to use a simply insertion operation in the template:
 
 ```
 «=long_description»
 ```
 
-The thing that changes is the context passed when processing the template:
+To insert WordProcessingML prepare the context accordingly:
 
 ```ruby
-word_processing_ml = <<-XML
+word_processing_ml = <<-XML.gsub("\n", "")
 <w:p>
-  <w:r w:rsidRPr="00B97C39">
-    <w:rPr>
-      <w:b />
-    </w:rPr>
-    <w:t>this is bold text</w:t>
-  </w:r>
+<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.content(: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!
+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
+
+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
+is sufficient:
+
+```
+«=article.body»
+```
+
+To use Markdown insertion prepare the context like so:
+
+```ruby
+markdown_body = <<-MD
+This text can contain *additional formatting*
+according to the **Markdown** specification.
+MD
+context = {
+  article: { body: Sablon.content(:markdown, markdown_body) }
+}
+template.render_to_file File.expand_path("~/Desktop/output.docx"), context
+```
+
+Markdown insertion has built-in support for:
+
+* [Headers](http://spec.commonmark.org/0.17/#atx-header)
+* [Paragraphs](http://spec.commonmark.org/0.17/#paragraphs)
+* [Emphasis and strong emphasis](http://spec.commonmark.org/0.17/#emphasis-and-strong-emphasis)
+* [Hard line breaks](http://spec.commonmark.org/0.17/#hard-line-breaks)
+* [Lists](http://spec.commonmark.org/0.17/#lists)
+
+For headings and lists to function properly it is necessary that the template
+defines specific styles. Headings use styles called `Heading1`, `Heading2`,
+etc. according to the header level. Ordered lists will use the style
+`ListNumber` and unordered lists use `ListBullet`. Nested lists are not
+supported.
+
+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.
 
 #### Conditionals
 
@@ -136,7 +178,7 @@ Loops repeat parts of the document.
 Loops can be used to repeat table rows or list enumerations. The fields need to
 be placed in within table cells or enumeration items enclosing the rows or items
 to repeat. Have a look at the
-[example template](test/fixtures/sablon_sample.docx) for more details.
+[example template](test/fixtures/cv_template.docx) for more details.
 
 
 #### Nesting
@@ -160,25 +202,48 @@ Have a look at [this test](test/executable_test.rb) for examples.
 
 ### Examples
 
-There is a [sample template](test/fixtures/sablon_template.docx) in the
+#### Using a Ruby script
+
+There is a [sample template](test/fixtures/cv_template.docx) in the
 repository, which illustrates the functionality of sablon:
 
 <p align="center">
   <img
-  src="https://raw.githubusercontent.com/senny/sablon/master/misc/template.png"
+  src="https://raw.githubusercontent.com/senny/sablon/master/misc/cv_template.png"
   alt="Sablon Template"/>
 </p>
 
 Processing this template with some sample data yields the following
-[output document](test/fixtures/sablon_sample.docx).
+[output document](test/fixtures/cv_sample.docx).
 For more details, check out this [test case](test/sablon_test.rb).
 
 <p align="center">
   <img
-  src="https://raw.githubusercontent.com/senny/sablon/master/misc/output.png"
+  src="https://raw.githubusercontent.com/senny/sablon/master/misc/cv_sample.png"
   alt="Sablon Output"/>
 </p>
 
+#### Using the sablon executable
+
+The [executable test](test/executable_test.rb) showcases the `sablon`
+executable.
+
+The [template](test/fixtures/recipe_template.docx)
+
+<p align="center">
+  <img
+  src="https://raw.githubusercontent.com/senny/sablon/master/misc/recipe_template.png"
+  alt="Sablon Output"/>
+</p>
+
+is rendered using a [json context](test/fixtures/recipe_context.json) to provide
+the data. Following is the resulting [output](test/fixtures/recipe_sample.docx):
+
+<p align="center">
+  <img
+  src="https://raw.githubusercontent.com/senny/sablon/master/misc/recipe_sample.png"
+  alt="Sablon Output"/>
+</p>
 
 ## Contributing
 

data/lib/sablon.rb

@@ -9,6 +9,8 @@ require "sablon/content"
 
 require 'zip'
 require 'nokogiri'
+require 'redcarpet'
+require "sablon/redcarpet/render/word_ml"
 
 module Sablon
   class TemplateError < ArgumentError; end

data/lib/sablon/content.rb

@@ -77,7 +77,24 @@ module Sablon
       end
     end
 
+    class Markdown < Struct.new(:word_ml)
+      include Sablon::Content
+      def self.id; :markdown end
+      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))
+        super word_ml
+      end
+
+      def append_to(*args)
+        word_ml.append_to(*args)
+      end
+    end
+
     register Sablon::Content::String
     register Sablon::Content::WordML
+    register Sablon::Content::Markdown
   end
 end

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

@@ -0,0 +1,57 @@
+module Sablon
+  module Redcarpet
+    module Render
+      class WordML < ::Redcarpet::Render::Base
+        def linebreak
+          "</w:p><w:p>"
+        end
+
+        def header(title, level)
+          style = "Heading#{level}"
+
+          "<w:p><w:pPr><w:pStyle w:val=\"#{style}\"/></w:pPr>#{title}</w:p>"
+        end
+
+        def paragraph(text)
+          "<w:p>#{text}</w:p>"
+        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_PATTERN = <<-XML.gsub("\n", "")
+<w:p>
+<w:pPr>
+<w:pStyle w:val="%s" />
+</w:pPr>
+%s
+</w:p>
+XML
+        LIST_STYLE_MAPPING = {
+          ordered: "ListNumber",
+          unordered: "ListBullet"
+        }
+
+        def list_item(content, list_type)
+          list_style = LIST_STYLE_MAPPING[list_type]
+          LIST_PATTERN % [list_style, content]
+        end
+      end
+    end
+  end
+end

data/lib/sablon/version.rb

@@ -1,3 +1,3 @@
 module Sablon
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/sablon.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'nokogiri', ">= 1.6.0"
   spec.add_runtime_dependency 'rubyzip', ">= 1.1"
+  spec.add_runtime_dependency 'redcarpet', ">= 3.2"
 
   spec.add_development_dependency "bundler", ">= 1.6"
   spec.add_development_dependency "rake", "~> 10.0"

data/test/content_test.rb

@@ -158,3 +158,38 @@ class ContentWordMLTest < Sablon::TestCase
     skip "Content::WordML currently removes the paragraph..."
   end
 end
+
+
+class ContentMarkdownTest < Sablon::TestCase
+  include ContentTestSetup
+
+  def test_blank_markdown
+    Sablon.content(:markdown, "").append_to @paragraph, @node
+
+    assert_xml_equal "<w:p>AFTER</w:p>", @document
+  end
+
+  def test_inserts_markdown
+    Sablon.content(:markdown, "yay **bold** text").append_to @paragraph, @node
+
+    output = <<-XML.strip.gsub("\n", "")
+<w:p>
+<w:r><w:t xml:space=\"preserve\">yay </w:t></w:r>
+<w:r>
+<w:rPr><w:b/></w:rPr>
+<w:t xml:space=\"preserve\">bold</w:t>
+</w:r>
+<w:r>
+<w:t xml:space=\"preserve\"> text</w:t>
+</w:r>
+</w:p>
+<w:p>AFTER</w:p>
+    XML
+
+    assert_xml_equal output, @document
+  end
+
+  def test_inserting_markdown_multiple_times_into_same_paragraph
+    skip "Content::Markdown currently removes the paragraph..."
+  end
+end

data/test/executable_test.rb

@@ -6,23 +6,23 @@ class ExecutableTest < Sablon::TestCase
   def setup
     super
     @base_path = Pathname.new(File.expand_path("../", __FILE__))
-    @output_path = @base_path + "sandbox/shopping_list.docx"
-    @template_path = @base_path + "fixtures/shopping_list_template.docx"
-    @context_path = @base_path + "fixtures/shopping_list_context.json"
+    @output_path = @base_path + "sandbox/recipe.docx"
+    @template_path = @base_path + "fixtures/recipe_template.docx"
+    @sample_path = @base_path + "fixtures/recipe_sample.docx"
+    @context_path = @base_path + "fixtures/recipe_context.json"
     @executable_path = @base_path + '../exe/sablon'
-
     @output_path.delete if @output_path.exist?
   end
 
   def test_generate_document_from_template_output_to_file
     `cat #{@context_path} | #{@executable_path} #{@template_path} #{@output_path}`
 
-    assert_docx_equal @base_path + "fixtures/shopping_list_sample.docx", @output_path
+    assert_docx_equal @sample_path, @output_path
   end
 
   def test_generate_document_from_template_output_to_stdout
     `cat #{@context_path} | #{@executable_path} #{@template_path} > #{@output_path}`
 
-    assert_docx_equal @base_path + "fixtures/shopping_list_sample.docx", @output_path
+    assert_docx_equal @sample_path, @output_path
   end
 end

data/test/fixtures/recipe_context.json

@@ -0,0 +1,24 @@
+{
+  "metadata": {
+    "generator": "Sablon",
+    "author": {
+      "name": "Brett",
+      "profile": "http://www.opensourcefood.com/people/Brett"
+    }
+  },
+  "title": "Bruschetta",
+  "word_ml:intro": "<w:p><w:r><w:rPr><w:b/></w:rPr><w:t xml:space=\"preserve\">Bruschetta</w:t></w:r><w:r><w:t xml:space=\"preserve\"> </w:t></w:r><w:r><w:rPr><w:i/></w:rPr><w:t xml:space=\"preserve\">(Italian pronunciation: [bruˈsketta])</w:t></w:r><w:r><w:t xml:space=\"preserve\"> is an antipasto (starter dish) from Italy consisting of grilled bread rubbed with garlic and topped with tomatoes, olive oil, salt and pepper. Variations may include toppings of tomato, vegetables, beans, cured meat, or cheese, a popular dish is Bruschetta pomodoro; the most popular recipe outside of Italy involves basil, fresh tomato, garlic and onion or mozzarella. Bruschetta is usually served as a snack or appetizer. In some countries, a topping of chopped tomato, olive oil and herbs is marketed under the bruschetta name.</w:t></w:r></w:p>",
+  "markdown:preparation": "## How to make Baby's Bruschetta\n\n### Preparation\nMake the bruschetta mixture one day before the event and let it sit in the fridge overnight to absorb all the flavours(be aware your fridge will smell entirely like the *tomatoes* and *garlic*  \nI find it works best to slice the *baguette* on an angle to create more space. Put the broiler on the oven on to toast the bread. Line them up on a baking sheet and make a small mixture of chopped garlic and olive oil to lightly spread on the slices of *baguette*, then place into the oven.  \nOnce Half toasted remove bread and place bruschetta mixture on top (after draining off the majority of fluid). Then sprinkle the grated cheese on top and place back into the oven to broil/toast to your desired effect.  ~ Please note that if you prefer to not have your *cheese* melted you can skip this step and just toast the bread fully, add the mixture and *cheese* and serve.  \nOnce melted, remove and place directly on a serving platter and let rest for one minute while adding fresh chopped *basil* for garnish, and **ENJOY!**\n\n### Variations\n\n1. Use fresh oregano instead of basil.\n1. Other possible toppings: prosciutto, salami, bean spreads\n\n### Notes\n- In **Italy**, bruschetta is often prepared using a brustolina grill. In the Abruzzo region of Italy a variation of bruschetta made with a salame called *ventricina* is served.\n- In **Tuscany** it is called *fettunta* and it is usually served without toppings, especially in November, to taste the very first oil of the season.\n- The chinese translation of 'Bruschetta' is '大蒜麵包' (Google Translator)",
+  "ingredients": [
+    {"name": "Ripened, chopped, medium sized tomatoes ", "amount": "6"},
+    {"name": "medium sized red (Spanish) onion", "amount": "1"},
+    {"name": "finely chopped cloves of garlic", "amount": "3 or 4"},
+    {"name": "fresh basil leaves finely chopped", "amount": "5 or 6"},
+    {"name": "a lemon's juice", "amount": "half"},
+    {"name": "of dried Oregano", "amount": "a small dash"},
+    {"name": "of balsamic vinegar", "amount": "a small dash"},
+    {"name": "olive oil, sea salt and cracked pepper", "amount": "to taste;"},
+    {"name": "grated cheese of your choice (romano/parmigiano/mozzarella)", "amount": "some"},
+    {"name": "baguette", "amount": "one"}
+  ]
+}

data/test/redcarpet_render_word_ml_test.rb

@@ -0,0 +1,103 @@
+# -*- 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: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:r><w:t xml:space=\"preserve\">some  </w:t></w:r>
+</w:p>
+<w:p>
+<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: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: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: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

data/test/sablon_test.rb

@@ -9,34 +9,78 @@ class SablonTest < Sablon::TestCase
   def setup
     super
     @base_path = Pathname.new(File.expand_path("../", __FILE__))
-    @output_path = @base_path + "sandbox/sablon.docx"
+    @template_path = @base_path + "fixtures/cv_template.docx"
+    @output_path = @base_path + "sandbox/cv.docx"
+    @sample_path = @base_path + "fixtures/cv_sample.docx"
   end
 
   def test_generate_document_from_template
-    template = Sablon.template(@base_path + "fixtures/sablon_template.docx")
-    person = OpenStruct.new "first_name" => "Ronald", "last_name" => "Anderson", "address" => {"street" => "Panda Bay 4A"}
-    item = Struct.new(:index, :label, :rating)
-    position = Struct.new(:duration, :label, :description)
+    template = Sablon.template @template_path
+
+    skill = Struct.new(:index, :label, :rating)
+    position = Struct.new(:when, :where, :tasks, :description)
     language = Struct.new(:name, :skill)
+    education = Struct.new(:when, :where, :what)
+    referee = Struct.new(:name, :company, :position, :phone)
+
     context = {
       current_time: Time.now.strftime("%d.%m.%Y %H:%M"),
-      author: "Yves Senn",
-      title: "Letter of application",
-      person: person,
-      about_me: Sablon.content(: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."),
-               position.new("2013 - today", "Sales...", nil)],
-      technologies: ["HTML", "CSS", "SASS", "LESS", "JavaScript"],
-      languages: [language.new("German", "native speaker"), language.new("English", "fluent")],
-      training: "At vero eos et accusam et justo duo dolores et ea rebum.\n\nStet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."
+      metadata: { generator: "Sablon" },
+      title: "Resume",
+      person: OpenStruct.new("first_name" => "Ronald", "last_name" => "Anderson",
+                             "phone" => "630-384-2975",
+                             "email" => "ron.anderson@gmail.com",
+                             "address" => {
+                               "street" => "1009 Fraggle Drive",
+                               "municipality" => "Wheaton",
+                               "province_zip" => "IL 60187"}),
+      skills: [skill.new("1.", "Java", "★" * 5),
+               skill.new("2.", "Ruby", "★" * 3),
+               skill.new("3.", "Python", "★" * 1),
+               skill.new("4.", "XML, XSLT, JSP"),
+               skill.new("5.", "automated testing", "★" * 3),
+              ],
+      education: [
+                  education.new("2005 – 2008", "Birmingham University", "Degree: BSc Hons Computer Science. 2:1 Attained."),
+                  education.new("2003 – 2005", "Yale Sixth Form College, Bristol.", "3 A Levels - Mathematics (A), Science (A), History (B)"),
+                  education.new("1997 – 2003", "Berry High School, Bristol.", "11 GCSE’s – 5 As, 5 Bs, 1 C")
+                 ],
+      certifications: [],
+      career: [position.new("February 2013 - Present", "Apps Limited", [],
+                            "Ruby on Rails Web Developer for this retail merchandising company."),
+               position.new("June 2010 - December 2012", "Digital Design Limited",
+                            ["Ongoing ASP.NET website development using C#.",
+                             "Developed CRM web application using SQL Server 2008.",
+                             "SQL Server Reporting.",
+                             "Helped junior developers gain understanding of C# and .NET framework and apply this accordingly."],
+                            "Software Engineer for this financial services provider."),
+               position.new("June 2008 - June 2010", "Development Consultancy Limited",
+                            ["Development of new features and testing of functionality.",
+                             "Assisted in development and documentation of several ASP.NET based applications.",
+                             "Web application maintenance.",
+                             "Ensured development was signed off prior to unit testing.",
+                             "Liaised with various service providers."])
+              ],
+      languages: [language.new("English", "native speaker"),
+                  language.new("German", "fluent"),
+                  language.new("French", "basics"),
+                 ],
+      about_me: Sablon.content(:markdown, "I am fond of writing *short stories* and *poems* in my spare time, and have won several literary contests in pursuit of my **passion**."),
+      activities: ["Writing", "Photography", "Traveling"],
+      referees: [
+                 referee.new("Mary P. Larsen", "Strongbod",
+                             "Organizational development consultant", "509-471-9365"),
+                 referee.new("Jeanne P. Eldridge", "Widdmann",
+                             "Information designer", "530-376-1628")
+                ]
     }
+
     properties = {
       start_page_number: 7
     }
+
     template.render_to_file @output_path, context, properties
 
-    assert_docx_equal @base_path + "fixtures/sablon_sample.docx", @output_path
+    assert_docx_equal @sample_path, @output_path
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sablon
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Yves Senn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -119,23 +133,25 @@ files:
 - lib/sablon/parser/mail_merge.rb
 - lib/sablon/processor.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
 - lib/sablon/version.rb
-- misc/output.png
-- misc/template.png
+- misc/cv_sample.png
+- misc/cv_template.png
+- misc/recipe_sample.png
+- misc/recipe_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
-- test/fixtures/sablon_template.docx
-- 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/cv_sample.docx
+- test/fixtures/cv_template.docx
+- test/fixtures/recipe_context.json
+- test/fixtures/recipe_sample.docx
+- test/fixtures/recipe_template.docx
 - test/fixtures/xml/complex_field.xml
 - test/fixtures/xml/conditional.xml
 - test/fixtures/xml/conditional_with_predicate.xml
@@ -151,6 +167,7 @@ files:
 - test/fixtures/xml/table_row_loop.xml
 - test/mail_merge_parser_test.rb
 - test/processor_test.rb
+- test/redcarpet_render_word_ml_test.rb
 - test/sablon_test.rb
 - test/sandbox/.gitkeep
 - test/section_properties_test.rb
@@ -186,12 +203,11 @@ test_files:
 - test/context_test.rb
 - test/executable_test.rb
 - test/expression_test.rb
-- test/fixtures/sablon_sample.docx
-- test/fixtures/sablon_template.docx
-- 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/cv_sample.docx
+- test/fixtures/cv_template.docx
+- test/fixtures/recipe_context.json
+- test/fixtures/recipe_sample.docx
+- test/fixtures/recipe_template.docx
 - test/fixtures/xml/complex_field.xml
 - test/fixtures/xml/conditional.xml
 - test/fixtures/xml/conditional_with_predicate.xml
@@ -207,6 +223,7 @@ test_files:
 - test/fixtures/xml/table_row_loop.xml
 - test/mail_merge_parser_test.rb
 - test/processor_test.rb
+- test/redcarpet_render_word_ml_test.rb
 - test/sablon_test.rb
 - test/sandbox/.gitkeep
 - test/section_properties_test.rb

data/test/fixtures/shopping_list_context.json

@@ -1,15 +0,0 @@
-{
-  "title": "Shopping List",
-  "details": {
-    "author": {
-      "first_name": "John",
-      "last_name": "Doe"
-    },
-    "word_ml: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"},
-    {"name": "Sugar", "amount": "1kg"},
-    {"name": "Tomatoes", "amount": "500g"}
-  ]
-}

data/test/fixtures/xml/about_me_snippet.xml

@@ -1 +0,0 @@
-<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>