docx_tools 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5a2434c4452cf3eb2b6602513bbac7da765114d
-  data.tar.gz: 3e5d338708722a05adb60937b6ebc161dce2a2e9
+  metadata.gz: 5d8d2712433f3db952944c6e9838e8e43fab2f4a
+  data.tar.gz: d2b37ef44857c24d13377ce081c8762b1581ff7a
 SHA512:
-  metadata.gz: 1864672d009f8bc460c2730aabb4f9fa5818957b04c80d020cf8b0fd6e428a4272e1c1f9ef70165b93ca4a96a1d260606a31a8f897144d2a3a50a05e95cfb001
-  data.tar.gz: 7b904651582f0ac616d291ce0b751478fee02945c0228d0a47c481cb5da99972574df4c407b803528037aac31e522eb34129d60bf80b4a65283f14e511c470de
+  metadata.gz: 9a3db409b76d4910bbd591cee2f61e6a8d7995fd6cc3aa5656e4510e8b1cc70c95ee2a36d0572eea1f4ed429f0c50df7bb60b5cac622d708ea87cd4e5f608143
+  data.tar.gz: 0e68fbac12573ae6923346164c67ad615b2c1f1fd1622e8a74112a4da24bc05ee34fc25c837506850c175ff1e70939253fbde283de14c98833ba27356cb08019

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    docx_tools (0.0.1)
+    docx_tools (0.0.2)
       nokogiri (~> 1.6, >= 1.6.6)
       rubyzip (~> 1.1, >= 1.1.7)
 

data/lib/docx_tools/mail_merge.rb

@@ -61,15 +61,14 @@ module DocxTools
 
       def merge_field(part, field, text)
         part.xpath(".//w:MergeField[text()=\"#{field}\"]").each do |merge_field|
-          r_elem = Nokogiri::XML::Node.new('r', part)
           t_elem = Nokogiri::XML::Node.new('t', part)
           t_elem.content = text
-          t_elem.parent = r_elem
-          merge_field.replace(r_elem)
+          t_elem.parent = merge_field.parent
+          merge_field.replace(t_elem)
         end
       end
 
-      # replace the original convoluted tag with a simplified tag for easy searching a processing
+      # replace the original convoluted tag with a simplified tag for easy searching and processing
       def process_merge_fields
         self.part_list.each_part do |part|
           part.root.remove_attribute('Ignorable')
@@ -88,21 +87,26 @@ module DocxTools
           part.xpath('.//w:instrText/../..').each do |parent|
             begin_tags = parent.xpath('w:r/w:fldChar[@w:fldCharType="begin"]/..')
             end_tags = parent.xpath('w:r/w:fldChar[@w:fldCharType="end"]/..')
-            instr_tags = parent.xpath('w:r/w:instrText').map(&:content)
+            instr_tags = parent.xpath('w:r/w:instrText')
+            instr_tag_content = instr_tags.map(&:content)
 
-            instr_tags.take(begin_tags.length).each_with_index do |instr, idx|
+            instr_tag_content.take(begin_tags.length).each_with_index do |instr, idx|
               next unless match_data = REGEXP.match(instr)
 
+              new_tag = Nokogiri::XML::Node.new('MergeField', part)
+              new_tag.content = match_data[1]
+
               children = parent.children
               start_idx = children.index(begin_tags[idx]) + 1
               end_idx = children.index(end_tags[idx])
               children[start_idx..end_idx].each do |child|
-                child.remove
+                instr_node = child.xpath('w:instrText')
+                if instr_node.empty?
+                  child.remove
+                else
+                  instr_node.first.replace(new_tag)
+                end
               end
-
-              new_tag = Nokogiri::XML::Node.new('MergeField', part)
-              new_tag.content = match_data[1]
-              begin_tags[idx].replace(new_tag)
             end
           end
         end

data/lib/docx_tools/version.rb

@@ -1,4 +1,4 @@
 module DocxTools
 
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docx_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri