sablon 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e21664d93631483d0c03a94ef0e459c386487e0d
-  data.tar.gz: ea8c86cb3c1b325c88ea696d622fed0286f1c068
+  metadata.gz: 5407a184ceb161ef62b83c2df14b219cb6711f6b
+  data.tar.gz: fa4c9f089dc648d75ef8b2be51c53c5702c0541a
 SHA512:
-  metadata.gz: 1f64f332f7cd6c2831cae719fce8eb4bced5ce6c71e427e7a0fb316d21a361aedc95bb8fca9ca7920da0147ad17f4d0f5cfa8b29b8651a16d4b4ee0004b82eeb
-  data.tar.gz: 52c537c73248d4c9bb578864786e42849389ed90785645d72ebb848f205b950bdf1159fec73f58583f1578715c86680bb0a6e2e04e1a848038b9bff3158b647a
+  metadata.gz: f6da7577308e61e55a61c8f544ecc985d6c3f929d9adb47f07e7ff7fd2ba0e2aecf800765a55beb87434d19cfb096c569cc42e8ecacde6ad7adc2dbcc74830f6
+  data.tar.gz: 3810028838dc0b53deda64ff0d24e8773f917783092b3cce70d725d097a3e9104b63e1c98be3cf724342f57b9176fa99551a7f577ecc260ff7dfd4a1e622d567

data/Gemfile.lock

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

data/lib/sablon/parser/mail_merge.rb

@@ -15,10 +15,14 @@ module Sablon
         private
         def replace_field_display(node, content)
           paragraph = node.ancestors(".//w:p").first
-          display_node = node.search(".//w:t").first
+          display_node = get_display_node(node)
           content.append_to(paragraph, display_node)
           display_node.remove
         end
+
+        def get_display_node(node)
+          node.search(".//w:t").first
+        end
       end
 
       class ComplexField < MergeField
@@ -28,7 +32,7 @@ module Sablon
         end
 
         def valid?
-          separate_node && expression
+          separate_node && get_display_node(pattern_node) && expression
         end
 
         def replace(content)

data/lib/sablon/version.rb

@@ -1,3 +1,3 @@
 module Sablon
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/test/mail_merge_parser_test.rb

@@ -146,6 +146,39 @@ xml
     end
   end
 
+  class FldCharWithoutDisplayNodeTest < Sablon::TestCase
+    include SharedBehavior
+
+    def test_is_ignoredd
+      assert_equal [], fields.map(&:class)
+    end
+
+    private
+    def xml
+      xml = <<-xml.strip
+<w:p>
+<w:r w:rsidR="00AE229C">
+<w:rPr></w:rPr>
+<w:fldChar w:fldCharType="begin"/>
+</w:r>
+<w:r w:rsidR="00AE229C">
+<w:rPr></w:rPr>
+<w:instrText xml:space="preserve"> MERGEFIELD  =client.lname  \\* MERGEFORMAT </w:instrText>
+</w:r>
+<w:r w:rsidR="00AE229C">
+<w:rPr></w:rPr>
+<w:fldChar w:fldCharType="separate"/>
+</w:r>
+<w:r w:rsidR="00AE229C">
+<w:rPr></w:rPr>
+<w:fldChar w:fldCharType="end"/>
+</w:r>
+</w:p>
+xml
+      wrap(xml)
+    end
+  end
+
   class NonSablonFieldTest < Sablon::TestCase
     include SharedBehavior
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sablon
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Yves Senn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri