standard-procedure-consolidate 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39e8b33a8f43ddb4a3bff6ccfb91ee9608d741dc9dff3759ea7c45b1c3cf3d3c
-  data.tar.gz: 71d357d9e60a98f199c7d67ab3f6a0b5ee8999218162fabf43a4fc4283f04a85
+  metadata.gz: 0ffce925315399bd4432936d929e995114acc2dea081f3835eb437fe2787f612
+  data.tar.gz: b64ae5181ae92d5e66be79e5861787c3355fe08870dbb4ee3ab8355ef4ce149d
 SHA512:
-  metadata.gz: e68a557b00ecb43feb93cdc9a5c9a4c09edd93f8421206be3372e617809bc9ce01cb9ad4928e6f97f49b6db64fd9a329dd2ff7360d5d7b618ce455d0f080c6b1
-  data.tar.gz: 94417403770d855c0df0d1927b3de00235a668503790e06388de83cadb3b3d2b533f394fab3ddcda5ace164bbe7394810c8ad6b00092eb553552f74fabaa2e5e
+  metadata.gz: e56547c32223cf66f807c804cdfff2897f63887729dcf1ff80d51c35a0615115f47b16347b582d58a6ae128c3ecad91a67ca128e0d7c89b6e55a3e88b2d5a6c9
+  data.tar.gz: 4b351ad3a367dd4382abc18e18fbc978095fec92aa8b258a90feb82f2e0a65ffbcca26a8177383d75fab07d711a170b10b541e48c195c4b8b7db0eea2cfd1b26

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# [0.4.1] - 2024-12-18
+
+Replace image merge fields with blanks if the image data is not provided 
+
 # [0.4.0] - 2024-12-16
 
 Image embedding works

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

@@ -0,0 +1 @@
+dfd2ec36154a632f86dd8f99a2b85c59ed6048dbb6b8100f84645ea1cf49e3e77ad73b3367ef89d46e055c860f1b1e82c5b0d0d37c969a19c2644a3e42ebbe21

data/lib/consolidate/docx/merge.rb

@@ -70,6 +70,7 @@ module Consolidate
           @output[contents_xml] = @contents_xml.serialize save_with: 0
 
           @images.each do |field_name, image|
+            next if image.nil?
             puts "...  writing image #{field_name} to #{image.storage_path}" if verbose
             out.get_output_stream(image.storage_path) { |o| o.write image.contents }
           end
@@ -120,7 +121,7 @@ module Consolidate
       def relation_number_for(field_name) = @mapping.keys.index(field_name) + 1000
 
       # Identifier to use when linking a merge field to the actual image file contents
-      def relation_id_for(field_name) = "rId#{relation_number_for(field_name)}"
+      def relation_id_for(field_name) = "rId#{field_name}"
 
       # Empty elations document for documents that do not already have one
       def default_relations_document = %(<?xml version="1.0" encoding="UTF-8"?><Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"></Relationships>)
@@ -156,8 +157,8 @@ module Consolidate
       # Build a mapping of image paths to the image data so that the image data can be stored in the output docx
       def load_images
         image_field_names.each_with_object({}) do |field_name, result|
-          result[field_name] = Consolidate::Docx::Image.new(@mapping[field_name])
-          puts "...   #{field_name} => #{result[field_name].media_path}" if verbose
+          result[field_name] = @mapping[field_name].nil? ? nil : Consolidate::Docx::Image.new(@mapping[field_name])
+          puts "...   #{field_name} => #{result[field_name]&.media_path}" if verbose
         end
       end
 
@@ -166,6 +167,8 @@ module Consolidate
         @relations.each do |name, xml|
           puts "...   linking images in #{name}" if verbose
           images.each do |field_name, image|
+            # Has an actual image file been supplied?
+            next if image.nil? 
             # Is this image already referenced in this relationship document?
             next unless xml.at_xpath("//Relationship[@Target=\"#{image.media_path}\"]").nil?
             puts "...      #{relation_id_for(field_name)} => #{image.media_path}" if verbose
@@ -245,8 +248,15 @@ module Consolidate
             field_name = piece.strip
             if field_names.include? field_name
               image = @images[field_name]
-              puts "...   substituting '#{field_name}' with '<#{relation_id_for(field_name)}/>'" if verbose
-              ImageReferenceNodeBuilder.new(field_name: field_name, image: image, node_id: relation_id_for(field_name), image_number: relation_number_for(field_name), document: document).call
+              # if no image was provided then insert blank text
+              # otherwise insert a w:drawing node that references the image contents
+              if image.nil? 
+                puts "...   substituting '#{field_name}' with blank as no image was provided" if verbose
+                Nokogiri::XML::Node.new("w:t", document) { |t| t.content = "" }
+              else
+                puts "...   substituting '#{field_name}' with '<#{relation_id_for(field_name)}/>'" if verbose
+                ImageReferenceNodeBuilder.new(field_name: field_name, image: image, node_id: relation_id_for(field_name), image_number: relation_number_for(field_name), document: document).call
+              end
             else
               Nokogiri::XML::Node.new("w:t", document) { |t| t.content = piece }
             end

data/lib/consolidate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard-procedure-consolidate
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Rahoul Baruah
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 2024-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -65,6 +65,7 @@ files:
 - checksums/standard-procedure-consolidate-0.3.1.gem.sha512
 - checksums/standard-procedure-consolidate-0.3.9.gem.sha512
 - checksums/standard-procedure-consolidate-0.4.0.gem.sha512
+- checksums/standard-procedure-consolidate-0.4.1.gem.sha512
 - exe/consolidate
 - exe/examine
 - lib/consolidate.rb