sablon 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2ac0ffd05db94be984b1526dfc131069ec6e1e9
-  data.tar.gz: 20c5be46b492e483ca80adb0ab2c12369b013e09
+  metadata.gz: a9f30b8c71f8068b669af374a708a63039162acc
+  data.tar.gz: 8919f43c274ae3658713f1e22cb1b74592dfe303
 SHA512:
-  metadata.gz: 8d2389d94d4a2e491b22409e2eb3c398dc8214396db5bc4021a799c741aa9fc1f38dec0d83a69cfc5ea470a53e6eb8b24f8470e146400a8cc273fd25d3379c63
-  data.tar.gz: 1e9b42b3cd443d3bcd33b2b64a3a16eaa959215972441ebf55e973b096bb86c9c3f6440da8dbc269eec289ea34e898fce852900e1d210f9536710361c2d386ad
+  metadata.gz: 3c415aeaf878d091a3e76d582df066418749b55939974e1fc42847b38ab7fcefe8f7133e58e2e3dc6f8cafdafc3473998f9f9b27d6105c80d452c882ac1c066e
+  data.tar.gz: 3f5cc76c24c67ec9eb359110fbb96d2bed070ba8dfc3eacb10a5c27d33ed3c75f9778ecf283efc30521b65ef74352da6d21ca06780dc60fd7b35ca65474adb31

data/Gemfile.lock

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

data/README.md

@@ -135,7 +135,8 @@ 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.
+supported. Normal text paragraphs use the style `Paragraph`. It's not necessary
+to have that style in the template. Word will fall back to using the `Normal` style.
 
 IMPORTANT: This feature is very much *experimental*. Currently, the insertion
     will replace the containing paragraph. This means that other content in the same

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

@@ -2,18 +2,26 @@ 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:p><w:p>"
+          "<w:r><w:br/></w:r>"
         end
 
         def header(title, level)
-          style = "Heading#{level}"
-
-          "<w:p><w:pPr><w:pStyle w:val=\"#{style}\"/></w:pPr>#{title}</w:p>"
+          heading_style = "Heading#{level}"
+          PARAGRAPH_PATTERN % [heading_style, title]
         end
 
         def paragraph(text)
-          "<w:p>#{text}</w:p>"
+          PARAGRAPH_PATTERN % ["Paragraph", text]
         end
 
         def normal_text(text)
@@ -34,14 +42,6 @@ module Sablon
           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"
@@ -49,7 +49,7 @@ XML
 
         def list_item(content, list_type)
           list_style = LIST_STYLE_MAPPING[list_type]
-          LIST_PATTERN % [list_style, content]
+          PARAGRAPH_PATTERN % [list_style, content]
         end
       end
     end

data/lib/sablon/version.rb

@@ -1,3 +1,3 @@
 module Sablon
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/test/content_test.rb

@@ -174,6 +174,7 @@ class ContentMarkdownTest < Sablon::TestCase
 
     output = <<-XML.strip.gsub("\n", "")
 <w:p>
+<w:pPr><w:pStyle w:val=\"Paragraph\"/></w:pPr>
 <w:r><w:t xml:space=\"preserve\">yay </w:t></w:r>
 <w:r>
 <w:rPr><w:b/></w:rPr>

data/test/fixtures/recipe_context.json

@@ -8,7 +8,7 @@
   },
   "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)",
+  "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*\n\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.\n\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.\n\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,  \nespecially 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"},

data/test/redcarpet_render_word_ml_test.rb

@@ -9,6 +9,7 @@ class RedcarpetRenderWordMLTest < Sablon::TestCase
   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
@@ -26,9 +27,9 @@ XML
   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:p>
-<w:p>
+<w:r><w:br/></w:r>
 <w:r><w:t xml:space=\"preserve\">text</w:t></w:r>
 </w:p>
 XML
@@ -38,6 +39,7 @@ XML
   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>
@@ -50,6 +52,7 @@ XML
   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>
@@ -62,6 +65,7 @@ XML
   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>
 

data/test/sablon_test.rb

@@ -65,7 +65,7 @@ class SablonTest < Sablon::TestCase
                   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**."),
+      about_me: Sablon.content(:markdown, "I am fond of writing *short stories* and *poems* in my spare time,  \nand have won several literary contests in pursuit of my **passion**."),
       activities: ["Writing", "Photography", "Traveling"],
       referees: [
                  referee.new("Mary P. Larsen", "Strongbod",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sablon
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Yves Senn