sablon 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9f30b8c71f8068b669af374a708a63039162acc
-  data.tar.gz: 8919f43c274ae3658713f1e22cb1b74592dfe303
+  metadata.gz: 5c89f16491fe648434fab084af48d3d0892cfe60
+  data.tar.gz: 3676259e88c5f7a1b9daa6e1deddc1f01d5f2d43
 SHA512:
-  metadata.gz: 3c415aeaf878d091a3e76d582df066418749b55939974e1fc42847b38ab7fcefe8f7133e58e2e3dc6f8cafdafc3473998f9f9b27d6105c80d452c882ac1c066e
-  data.tar.gz: 3f5cc76c24c67ec9eb359110fbb96d2bed070ba8dfc3eacb10a5c27d33ed3c75f9778ecf283efc30521b65ef74352da6d21ca06780dc60fd7b35ca65474adb31
+  metadata.gz: e16c0f9ff697f9ec35a724c5787c9e68070dd7be4b30f290cd14d8a3952d072c4b173acbe2a6f03c82933d5ef230c18d47cfe777e383477bab489992fe431ee8
+  data.tar.gz: d9b4409319a19998fc719d00319676ba1cd5e409d04e42471d7b20704ef4597f848d63a59f09249bd893a17fff52b02d0f21d3b5f52e2dde753b95f1c9638e6a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sablon (0.0.14)
+    sablon (0.0.15)
       nokogiri (>= 1.6.0)
       redcarpet (>= 3.2)
       rubyzip (>= 1.1)
@@ -10,11 +10,11 @@ GEM
   remote: https://rubygems.org/
   specs:
     mini_portile (0.6.2)
-    minitest (5.5.1)
+    minitest (5.7.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     rake (10.4.2)
-    redcarpet (3.2.2)
+    redcarpet (3.3.2)
     rubyzip (1.1.7)
     xml-simple (1.1.5)
 
@@ -27,3 +27,6 @@ DEPENDENCIES
   rake (~> 10.0)
   sablon!
   xml-simple
+
+BUNDLED WITH
+   1.10.6

data/lib/sablon/parser/mail_merge.rb

@@ -3,6 +3,11 @@ module Sablon
     class MailMerge
       class MergeField
         KEY_PATTERN = /^\s*MERGEFIELD\s+([^ ]+)\s+\\\*\s+MERGEFORMAT\s*$/
+
+        def valid?
+          expression
+        end
+
         def expression
           $1 if @raw_expression =~ KEY_PATTERN
         end
@@ -22,6 +27,10 @@ module Sablon
           @raw_expression = @nodes.flat_map {|n| n.search(".//w:instrText").map(&:content) }.join
         end
 
+        def valid?
+          separate_node && expression
+        end
+
         def replace(content)
           replace_field_display(pattern_node, content)
           (@nodes - [pattern_node]).each(&:remove)
@@ -65,7 +74,7 @@ module Sablon
           elsif node.name == "fldChar" && node["w:fldCharType"] == "begin"
             field = build_complex_field(node)
           end
-          fields << field if field && field.expression
+          fields << field if field && field.valid?
         end
         fields
       end

data/lib/sablon/version.rb

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

data/test/mail_merge_parser_test.rb

@@ -119,6 +119,33 @@ xml
     end
   end
 
+  class InvalidFldCharTest < Sablon::TestCase
+    include SharedBehavior
+
+    def test_is_ignored
+      assert_equal [], fields.map(&:class)
+    end
+
+    private
+    def xml
+      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:r>
+<w:r w:rsidR="00BE47B1" w:rsidRPr="00BE47B1">
+<w:rPr><w:b/></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.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Yves Senn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri