sablon 0.0.19.beta3 → 0.0.19.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43e4aa5cc44824e41d65481d0b32a1f97a94ea2c
-  data.tar.gz: 9fb8f9890f54cd1169ade7b178a2f995bc12d37b
+  metadata.gz: ac235d2921b38ea77aa5aef274e73aa34e84ffcf
+  data.tar.gz: 9ce6a08012f8540e2a1998d35a177a9e6b95a909
 SHA512:
-  metadata.gz: 04ed4067045f1067cf36f98bc9139b869e66179a75f009d774e547df9a138b029ca2d47266e2e5019c70592b1e3821a921e01d93dfc22e74a377fc7f14647c9f
-  data.tar.gz: 40435b0860b374a75e07343793d55d66b6a880b9df3b0951206171cdc961146f79204c5e7fd0988655ad3867a46b26720bfc6874b7cc588ac7852c85ddeeae07
+  metadata.gz: 219cb0acb4fdbf3eedc347577dc4c42996e78eb792a51394261e60a48d7b8114cd6d3668d91bcd00f0bdeb6406d0e0f3a2fb4ff63f12e12454bb5682cdbe967d
+  data.tar.gz: 51128d4324f508395837d57cf8330dabed48729ebe8518bacafd18416fa502b0e2a8dfbf4e980ab763a93f5f49c50f5330739dde185780d8f02ac83f66776b59

data/Gemfile.lock

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

data/lib/sablon/html/ast.rb

@@ -26,18 +26,22 @@ module Sablon
       def to_docx
         nodes.map(&:to_docx).join
       end
-    end
 
-    class Root < Collection
-      def to_a
-        nodes
+      def inspect
+        "[#{nodes.map(&:inspect).join(', ')}]"
       end
+    end
 
+    class Root < Collection
       def grep(pattern)
         visitor = GrepVisitor.new(pattern)
         accept(visitor)
         visitor.result
       end
+
+      def inspect
+        "<Root: #{super}>"
+      end
     end
 
     class Paragraph < Node
@@ -65,6 +69,10 @@ XML
         runs.accept(visitor)
       end
 
+      def inspect
+        "<Paragraph{#{style}}: #{runs.inspect}>"
+      end
+
       private
       def ppr_docx
       end
@@ -90,34 +98,61 @@ XML
       end
     end
 
-    class Text < Node
-      attr_reader :string
-      def initialize(string)
-        @string = string
+    class TextFormat
+      def initialize(bold, italic)
+        @bold = bold
+        @italic = italic
+      end
+
+      def inspect
+        parts = []
+        parts << 'bold' if @bold
+        parts << 'italic' if @italic
+        parts.join('|')
       end
 
       def to_docx
-        "<w:r>#{style_docx}<w:t xml:space=\"preserve\">#{normalized_string}</w:t></w:r>"
+        styles = []
+        styles << '<w:b />' if @bold
+        styles << '<w:i />' if @italic
+        if styles.any?
+          "<w:rPr>#{styles.join}</w:rPr>"
+        else
+          ''
+        end
       end
 
-      private
-      def style_docx
+      def self.default
+        @default ||= new(false, false)
       end
 
-      def normalized_string
-        string.tr("\u00A0", ' ')
+      def with_bold
+        TextFormat.new(true, @italic)
       end
-    end
 
-    class Bold < Text
-      def style_docx
-        '<w:rPr><w:b /></w:rPr>'
+      def with_italic
+        TextFormat.new(@bold, true)
       end
     end
 
-    class Italic < Text
-      def style_docx
-        '<w:rPr><w:i /></w:rPr>'
+    class Text < Node
+      attr_reader :string
+      def initialize(string, format)
+        @string = string
+        @format = format
+      end
+
+      def to_docx
+        "<w:r>#{@format.to_docx}<w:t xml:space=\"preserve\">#{normalized_string}</w:t></w:r>"
+      end
+
+      def inspect
+        "<Text{#{@format.inspect}}: #{string}>"
+      end
+
+      private
+      def normalized_string
+        string.tr("\u00A0", ' ')
       end
     end
 
@@ -125,6 +160,10 @@ XML
       def to_docx
         "<w:r><w:br/></w:r>"
       end
+
+      def inspect
+        "<Newline>"
+      end
     end
   end
 end

data/lib/sablon/html/converter.rb

@@ -88,10 +88,10 @@ module Sablon
       node = @builder.next
       if node.name == 'div'
         @builder.new_layer
-        @builder.emit Paragraph.new('Normal', text(node.children))
+        @builder.emit Paragraph.new('Normal', ast_text(node.children))
       elsif node.name == 'p'
         @builder.new_layer
-        @builder.emit Paragraph.new('Paragraph', text(node.children))
+        @builder.emit Paragraph.new('Paragraph', ast_text(node.children))
       elsif node.name == 'ul'
         @builder.new_layer ilvl: true
         unless @builder.nested?
@@ -106,7 +106,7 @@ module Sablon
         @builder.push_all(node.children)
       elsif node.name == 'li'
         @builder.new_layer
-        @builder.emit ListParagraph.new(@definition.style, text(node.children), @definition.numid, @builder.ilvl)
+        @builder.emit ListParagraph.new(@definition.style, ast_text(node.children), @definition.numid, @builder.ilvl)
       elsif node.text?
         # SKIP?
       else
@@ -114,16 +114,16 @@ module Sablon
       end
     end
 
-    def text(nodes)
-      runs = nodes.map do |node|
+    def ast_text(nodes, format: TextFormat.default)
+      runs = nodes.flat_map do |node|
         if node.text?
-          Text.new(node.text)
+          Text.new(node.text, format)
         elsif node.name == 'br'
           Newline.new
         elsif node.name == 'strong'
-          Bold.new(node.text)
+          ast_text(node.children, format: format.with_bold).nodes
         elsif node.name == 'em'
-          Italic.new(node.text)
+          ast_text(node.children, format: format.with_italic).nodes
         elsif ['ul', 'ol', 'p', 'div'].include?(node.name)
           @builder.push(node)
           nil

data/lib/sablon/operations.rb

@@ -3,7 +3,11 @@ module Sablon
   module Statement
     class Insertion < Struct.new(:expr, :field)
       def evaluate(context)
-        field.replace(Sablon::Content.wrap(expr.evaluate(context)))
+        if content = expr.evaluate(context)
+          field.replace(Sablon::Content.wrap(expr.evaluate(context)))
+        else
+          field.remove
+        end
       end
     end
 

data/lib/sablon/version.rb

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

data/test/html/converter_test.rb

@@ -83,6 +83,25 @@ DOCX
     assert_equal normalize_wordml(expected_output), @converter.process(input)
   end
 
+  def test_convert_br_tags_inside_strong
+    input = '<div><strong><br />Lorem ipsum<br />dolor sit amet</strong></div>'
+    expected_output = <<-DOCX
+<w:p>
+  <w:pPr><w:pStyle w:val="Normal" /></w:pPr>
+  <w:r><w:br/></w:r>
+  <w:r>
+    <w:rPr><w:b /></w:rPr>
+    <w:t xml:space="preserve">Lorem ipsum</w:t></w:r>
+    <w:r><w:br/></w:r>
+    <w:r>
+      <w:rPr><w:b /></w:rPr>
+      <w:t xml:space="preserve">dolor sit amet</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
@@ -263,42 +282,56 @@ class HTMLConverterASTTest < Sablon::TestCase
 
   def test_div
     input = '<div>Lorem ipsum dolor sit amet</div>'
-    ast = @converter.processed_ast(input).to_a
-    assert_equal [Sablon::HTMLConverter::Paragraph], ast.map(&:class)
-    assert_equal ['Normal'], ast.map(&:style)
+    ast = @converter.processed_ast(input)
+    assert_equal '<Root: [<Paragraph{Normal}: [<Text{}: Lorem ipsum dolor sit amet>]>]>', ast.inspect
   end
 
   def test_p
     input = '<p>Lorem ipsum dolor sit amet</p>'
-    ast = @converter.processed_ast(input).to_a
-    assert_equal [Sablon::HTMLConverter::Paragraph], ast.map(&:class)
-    assert_equal ['Paragraph'], ast.map(&:style)
+    ast = @converter.processed_ast(input)
+    assert_equal '<Root: [<Paragraph{Paragraph}: [<Text{}: Lorem 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
+    assert_equal "[<Text{bold}: Lorem>, <Newline>, <Text{bold}: ipsum>, <Newline>, <Text{bold}: dolor>]", par.runs.inspect
+  end
+
+  def test_br_in_em
+    input = '<div><em>Lorem<br />ipsum<br />dolor</em></div>'
+    par = @converter.processed_ast(input).grep(Sablon::HTMLConverter::Paragraph).first
+    assert_equal "[<Text{italic}: Lorem>, <Newline>, <Text{italic}: ipsum>, <Newline>, <Text{italic}: dolor>]", par.runs.inspect
+  end
+
+  def test_nested_strong_and_em
+    input = '<div><strong>Lorem <em>ipsum</em> dolor</strong></div>'
+    par = @converter.processed_ast(input).grep(Sablon::HTMLConverter::Paragraph).first
+    assert_equal "[<Text{bold}: Lorem >, <Text{bold|italic}: ipsum>, <Text{bold}:  dolor>]", par.runs.inspect
   end
 
   def test_ignore_last_br_in_div
     input = '<div>Lorem ipsum dolor sit amet<br /></div>'
-    par = @converter.processed_ast(input).to_a.first
-    assert_equal [Sablon::HTMLConverter::Text], par.runs.nodes.map(&:class)
+    par = @converter.processed_ast(input).grep(Sablon::HTMLConverter::Paragraph).first
+    assert_equal "[<Text{}: Lorem ipsum dolor sit amet>]", par.runs.inspect
   end
 
   def test_ignore_br_in_blank_div
     input = '<div><br /></div>'
-    par = @converter.processed_ast(input).to_a.first
-    assert_equal [], par.runs.nodes.map(&:class)
+    par = @converter.processed_ast(input).grep(Sablon::HTMLConverter::Paragraph).first
+    assert_equal "[]", par.runs.inspect
   end
 
   def test_ul
     input = '<ul><li>Lorem</li><li>ipsum</li></ul>'
-    ast = @converter.processed_ast(input).to_a
-    assert_equal [Sablon::HTMLConverter::ListParagraph, Sablon::HTMLConverter::ListParagraph], ast.map(&:class)
-    assert_equal ["ListBullet", "ListBullet"], ast.map(&:style)
+    ast = @converter.processed_ast(input)
+    assert_equal "<Root: [<Paragraph{ListBullet}: [<Text{}: Lorem>]>, <Paragraph{ListBullet}: [<Text{}: ipsum>]>]>", ast.inspect
   end
 
   def test_ol
     input = '<ol><li>Lorem</li><li>ipsum</li></ol>'
-    ast = @converter.processed_ast(input).to_a
-    assert_equal [Sablon::HTMLConverter::ListParagraph, Sablon::HTMLConverter::ListParagraph], ast.map(&:class)
-    assert_equal ["ListNumber", "ListNumber"], ast.map(&:style)
+    ast = @converter.processed_ast(input)
+    assert_equal "<Root: [<Paragraph{ListNumber}: [<Text{}: Lorem>]>, <Paragraph{ListNumber}: [<Text{}: ipsum>]>]>", ast.inspect
   end
 
   def test_num_id

data/test/html_test.rb

@@ -39,7 +39,7 @@ 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. Praesent ultrices purus eu quam elementum, sit amet faucibus elit interdum. In lectus orci, elementum quis dictum ac, porta ac ante. Fusce tempus ac mauris id cursus. Phasellus a erat nulla. Mauris dolor orci, malesuada auctor dignissim non, posuere nec odio. Etiam hendrerit justo nec diam ullamcorper, nec blandit elit sodales.</strong></div>
+<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>
 HTML
   end
 end

data/test/processor/document_test.rb

@@ -28,6 +28,18 @@ class ProcessorDocumentTest < Sablon::TestCase
     document
   end
 
+  def test_simple_field_replacement_with_nil
+    result = process(snippet("simple_field"), {"first_name" => nil})
+
+    assert_equal "Hello! My Name is , 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="00BE47B1"><w:t xml:space="preserve">, nice to meet you.</w:t></w:r>
+    </w:p>
+    document
+  end
+
   def test_context_can_contain_string_and_symbol_keys
     result = process(snippet("simple_fields"), {"first_name" => "Jack", last_name: "Davis"})
     assert_equal "Jack Davis", text(result)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sablon
 version: !ruby/object:Gem::Version
-  version: 0.0.19.beta3
+  version: 0.0.19.beta4
 platform: ruby
 authors:
 - Yves Senn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri