standard-procedure-consolidate 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5647faddeab8829e8494e02b4b87acc33276e7f293fa147f3b15b1dd2a6d4c09
-  data.tar.gz: e867ef111010caa13eef6da80f11ccaa7ee0d780f82309a8f4d976bcff058545
+  metadata.gz: b2d1794f2a364e867d285325c3a0dd9b5c6b4716145d5eaf964c91c44e937e5c
+  data.tar.gz: 6622d19bc3de12fe8d77775b579c1531a057a27bacf227b0b119a252e7fd0003
 SHA512:
-  metadata.gz: 3f7e9ebff0ec1706b59983eb8b1f32132e58af066f3e4de56a4e05c55ea2f365a236cc513e5571930cd0173ddaebd6329a7d628cb5a137b0ac1b1b365f1d5672
-  data.tar.gz: cab09a1aa8f2338b24397fd2eb2252c4244b4890dd965581657fcd025197948a9290896e0fa519ab782719f25b34f292e17f44de3c15f13329b1fe964550162b
+  metadata.gz: bb6944c739e5d772a45076b86f5c08d299913575027845ba505aa76b4ade18e3ecb47efe77f4499ac2a01f8782fcbf797b7dde9d00fb479716ac0b927288c9b4
+  data.tar.gz: b9c10360e43007c6cd523ad238664786f2aa0884e524349d451989646e05f3f59569821e7361a8f4c553dad182ca61588629d108359b08953287bddf62f8533c

data/CHANGELOG.md

@@ -1,15 +1,26 @@
+## [0.1.3] - 2023-09-07
 
-## [Unreleased]
+Customer had an issue where some fields were not merging correctly
 
-## [0.1.0] - 2023-07-25
+- Altered the code so it tries to perform the substitution in all .xml files that aren't obviously configuration data
+- Added verbose option to show what the code was doing
+- Added a list of files to `examine`
+- Still no tests for the header/footer support
 
-- Initial release
+## [0.1.2] - 2023-08-23
+
+- Added untested support for headers and footers
+- this work was done in a rush to deal with a customer requirement - tests to come soon
 
 ## [0.1.1] - 2023-08-02
 
 - Added `examine` to list the merge fields within a document
 
-## [0.1.2] - 2023-08-23
+## [0.1.0] - 2023-07-25
+
+- Initial release
+
+## [Unreleased]
+
+
 
-- Added untested support for headers and footers
-- this work was done in a rush to deal with a customer requirement - tests to come soon

data/checksums/standard-procedure-consolidate-0.1.3.gem.sha512

@@ -0,0 +1 @@
+fcf685ae67c99908b9d67a57e9bd4bfe6dc8f61c3e421e167d0c9912ab6ac32fd4ad9a273cbbee47e9157cafb311aaecb8db0995eb227aa0afe0bdcc3bc01ee3

data/lib/consolidate/docx/merge.rb

@@ -6,12 +6,14 @@ require "nokogiri"
 module Consolidate
   module Docx
     class Merge
-      def self.open(path, force_settings: true, &block)
-        new(path, force_settings: force_settings, &block)
+      def self.open(path, verbose: false, &block)
+        new(path, verbose: verbose, &block)
+        path
       end
 
       def examine
-        extract_field_names
+        puts "Documents: #{extract_document_names}"
+        puts "Merge fields: #{extract_field_names}"
       end
 
       def data fields = {}
@@ -38,37 +40,46 @@ module Consolidate
 
       protected
 
+      attr_reader :verbose
       attr_reader :zip
       attr_reader :xml
       attr_reader :documents
       attr_accessor :output
 
-      def initialize(path, force_settings: true, &block)
+      EXCLUSIONS = %w{_rels/.rels [Content_Types].xml word/_rels/document.xml.rels word/theme/theme1.xml word/settings.xml word/_rels/settings.xml.rels word/styles.xml word/webSettings.xml word/fontTable.xml docProps/core.xml docProps/app.xml}
+
+      def initialize(path, verbose: false, &block)
         raise "No block given" unless block
+        @verbose = verbose
         @output = {}
         @documents = {}
-        set_standard_settings if force_settings
         begin
           @zip = Zip::File.open(path)
-          ["word/document.xml", "word/header1.xml", "word/footer1.xml"].each do |document|
-            next unless @zip.find_entry(document)
-            xml = @zip.read document
-            @documents[document] = Nokogiri::XML(xml) { |x| x.noent }
-            yield self
+          @zip.entries.each do |entry|
+            next if EXCLUSIONS.include? entry.name
+            puts "Reading #{entry.name}" if verbose
+            xml = @zip.get_input_stream entry
+            @documents[entry.name] = Nokogiri::XML(xml) { |x| x.noent }
           end
+          yield self
         ensure
           @zip.close
         end
       end
 
+      def extract_document_names
+        @zip.entries.collect { |entry| entry.name }.join(", ")
+      end
+
       def extract_field_names
-        (extract_style_one + extract_style_two).uniq
+        (extract_style_one + extract_style_two).uniq.join(", ")
       end
 
       def extract_style_one
         documents.collect do |name, document|
           (document / "//w:fldSimple").collect do |field|
             value = field.attributes["instr"].value.strip
+            puts "...found #{value} (v1) in #{name}" if verbose
             value.include?("MERGEFIELD") ? value.gsub("MERGEFIELD", "").strip : nil
           end.compact
         end.flatten
@@ -78,6 +89,7 @@ module Consolidate
         documents.collect do |name, document|
           (document / "//w:instrText").collect do |instr|
             value = instr.inner_text
+            puts "...found #{value} (v2) in #{name}" if verbose
             value.include?("MERGEFIELD") ? value.gsub("MERGEFIELD", "").strip : nil
           end.compact
         end.flatten
@@ -89,6 +101,7 @@ module Consolidate
           if field.attributes["instr"].value =~ /MERGEFIELD (\S+)/
             text_node = (field / ".//w:t").first
             next unless text_node
+            puts "...substituting v1 #{field.attributes["instr"]} with #{fields[$1]}" if verbose
             text_node.inner_html = fields[$1].to_s
           end
         end
@@ -102,17 +115,13 @@ module Consolidate
             text_node = instr.parent.next_sibling.next_sibling.xpath(".//w:t").first
             text_node ||= instr.parent.next_sibling.next_sibling.next_sibling.xpath(".//w:t").first
             next unless text_node
+            puts "...substituting v2 #{instr.inner_text} with #{fields[$1]}" if verbose
             text_node.inner_html = fields[$1].to_s
           end
         end
         document
       end
 
-      def set_standard_settings
-        output["word/settings.xml"] = %(<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:settings xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main"><w:zoom w:percent="100"/></w:settings>)
-      end
-
       def close
         zip.close
       end

data/lib/consolidate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Consolidate
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard-procedure-consolidate
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Rahoul Baruah
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -57,6 +57,7 @@ files:
 - Rakefile
 - checksums/standard-procedure-consolidate-0.1.0.gem.sha512
 - checksums/standard-procedure-consolidate-0.1.2.gem.sha512
+- checksums/standard-procedure-consolidate-0.1.3.gem.sha512
 - exe/consolidate
 - lib/consolidate.rb
 - lib/consolidate/docx/merge.rb
@@ -71,7 +72,7 @@ metadata:
   homepage_uri: https://github.com/standard-procedure/standard-procedure-consolidate
   source_code_uri: https://github.com/standard-procedure/standard-procedure-consolidate
   changelog_uri: https://github.com/standard-procedure/standard-procedure-consolidate/blob/main/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Simple ruby mailmerge for Microsoft Word .docx files.
 test_files: []