standard-procedure-consolidate 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ffce925315399bd4432936d929e995114acc2dea081f3835eb437fe2787f612
-  data.tar.gz: b64ae5181ae92d5e66be79e5861787c3355fe08870dbb4ee3ab8355ef4ce149d
+  metadata.gz: c3a7f02d5159a44a47af30100fe1743b2b5bff5ab845a0da2170ffaf44302f03
+  data.tar.gz: b041806b3d682a4c5ccc0011025a1d3d5b25a7c1a65fda56e9b3fcce34b364a9
 SHA512:
-  metadata.gz: e56547c32223cf66f807c804cdfff2897f63887729dcf1ff80d51c35a0615115f47b16347b582d58a6ae128c3ecad91a67ca128e0d7c89b6e55a3e88b2d5a6c9
-  data.tar.gz: 4b351ad3a367dd4382abc18e18fbc978095fec92aa8b258a90feb82f2e0a65ffbcca26a8177383d75fab07d711a170b10b541e48c195c4b8b7db0eea2cfd1b26
+  metadata.gz: 2bc84355758ef68cd525c684fe1ef6973858eb3ba360f4a37a026cc54a11c9eb143cc364bd034cdd4452bec75a91a768b7f96ccbb727039da5e6ba727fb643bd
+  data.tar.gz: b8061eb3ff1a61deb3c1b153be11d9c5b416be6a576d559c0846236a1e8dabdf9dcf339f33479e39589d3c247930cb28d437a360becbe5e498e90b99eb26ffea

data/.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/ruby
 {
   "name": "Ruby",
-  "image": "mcr.microsoft.com/devcontainers/ruby:1-3.2-bullseye",
+  "image": "ghcr.io/rails/devcontainer/images/ruby:3.3.5",
   "postCreateCommand": "bundle install",
   "customizations": {
     "vscode": {

data/.ruby-version

@@ -1 +1 @@
-3.2.5
+3.3.5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# [0.4.3] - 2025-02-24
+
+Use wp:anchor tags instead of wp:inline tags for embedding images
+
 # [0.4.1] - 2024-12-18
 
 Replace image merge fields with blanks if the image data is not provided 

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

@@ -0,0 +1 @@
+391a0d85024adf2a5866f0dabab3d601e6865c482e4fff5e780af0a6dc6ca36aade243a9e97cdb68552b00fce51d763ed94e89a701ce466428a64df9f4d574a0

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

@@ -0,0 +1 @@
+646e5a14ad25738c476cb587c9012fff12687fc7e26e555b6d17a61d69ae1477bdf1a55326b952bbc05dde988d945c3a9504ebeb58b2ff6598c10be5be26c6cb

data/lib/consolidate/docx/image_reference_node_builder.rb

@@ -7,29 +7,63 @@ module Consolidate
   module Docx
     class ImageReferenceNodeBuilder < Data.define(:field_name, :image, :node_id, :image_number, :document)
       def call
+        max_width, max_height = max_dimensions_from(document)
+        scaled_width, scaled_height = scale_dimensions(image.width, image.height, max_width, max_height)
+
         Nokogiri::XML::Node.new("w:drawing", document).tap do |drawing|
           drawing["xmlns:a"] = "http://schemas.openxmlformats.org/drawingml/2006/main"
-          drawing << Nokogiri::XML::Node.new("wp:inline", document).tap do |inline|
-            inline["distT"] = "0"
-            inline["distB"] = "0"
-            inline["distL"] = "0"
-            inline["distR"] = "0"
-            inline << Nokogiri::XML::Node.new("wp:extent", document).tap do |extent|
-              extent["cx"] = image.clamped_width(max_width_from(document))
-              extent["cy"] = image.clamped_height(max_width_from(document))
+          drawing << Nokogiri::XML::Node.new("wp:anchor", document).tap do |anchor|
+            anchor["behindDoc"] = "0"
+            anchor["distT"] = "0"
+            anchor["distB"] = "0"
+            anchor["distL"] = "0"
+            anchor["distR"] = "0"
+            anchor["simplePos"] = "0"
+            anchor["locked"] = "0"
+            anchor["layoutInCell"] = "0"
+            anchor["allowOverlap"] = "1"
+            anchor["relativeHeight"] = "2"
+            anchor << Nokogiri::XML::Node.new("wp:simplePos", document).tap do |pos|
+              pos["x"] = "0"
+              pos["y"] = "0"
+            end
+            anchor << Nokogiri::XML::Node.new("wp:positionH", document).tap do |posh|
+              posh["relativeFrom"] = "column"
+              posh << Nokogiri::XML::Node.new("wp:align", document).tap do |align|
+                align.content = "center"
+              end
+            end
+            anchor << Nokogiri::XML::Node.new("wp:positionV", document).tap do |posv|
+              posv["relativeFrom"] = "paragraph"
+              posv << Nokogiri::XML::Node.new("wp:posOffset", document).tap do |offset|
+                offset.content = "635"
+              end
             end
-            inline << Nokogiri::XML::Node.new("wp:effectExtent", document).tap do |effect_extent|
+            anchor << Nokogiri::XML::Node.new("wp:extent", document).tap do |extent|
+              extent["cx"] = scaled_width
+              extent["cy"] = scaled_height
+            end
+            anchor << Nokogiri::XML::Node.new("wp:effectExtent", document).tap do |effect_extent|
               effect_extent["l"] = "0"
               effect_extent["t"] = "0"
               effect_extent["r"] = "0"
               effect_extent["b"] = "0"
             end
-            inline << Nokogiri::XML::Node.new("wp:cNvGraphicFramePr", document).tap do |c_nv_graphic_frame_pr|
+            anchor << Nokogiri::XML::Node.new("wp:wrapSquare", document).tap do |wrap_square|
+              wrap_square["wrapText"] = "largest"
+            end
+            anchor << Nokogiri::XML::Node.new("wp:docPr", document).tap do |doc_pr|
+              doc_pr["id"] = image_number
+              doc_pr["name"] = image.name
+              doc_pr["descr"] = ""
+              doc_pr["title"] = ""
+            end
+            anchor << Nokogiri::XML::Node.new("wp:cNvGraphicFramePr", document).tap do |c_nv_graphic_frame_pr|
               c_nv_graphic_frame_pr << Nokogiri::XML::Node.new("a:graphicFrameLocks", document).tap do |graphic_frame_locks|
                 graphic_frame_locks["noChangeAspect"] = true
               end
             end
-            inline << Nokogiri::XML::Node.new("a:graphic", document).tap do |graphic|
+            anchor << Nokogiri::XML::Node.new("a:graphic", document).tap do |graphic|
               graphic["xmlns:a"] = "http://schemas.openxmlformats.org/drawingml/2006/main"
               graphic << Nokogiri::XML::Node.new("a:graphicData", document).tap do |graphic_data|
                 graphic_data["uri"] = "http://schemas.openxmlformats.org/drawingml/2006/picture"
@@ -41,7 +75,12 @@ module Consolidate
                       c_nv_pr["name"] = image.name
                       c_nv_pr["descr"] = image.name
                       c_nv_pr["hidden"] = false
-                      c_nv_pr << Nokogiri::XML::Node.new("pic:cNvPicPr", document)
+                      c_nv_pr << Nokogiri::XML::Node.new("pic:cNvPicPr", document).tap do |c_nv_pic_pr|
+                        c_nv_pic_pr << Nokogiri::XML::Node.new("a:picLocks", document).tap do |pic_locks|
+                          pic_locks["noChangeAspect"] = "1"
+                          pic_locks["noChangeArrowheads"] = "1"
+                        end
+                      end
                     end
                   end
                   pic << Nokogiri::XML::Node.new("pic:blipFill", document).tap do |blip_fill|
@@ -53,20 +92,22 @@ module Consolidate
                     end
                   end
                   pic << Nokogiri::XML::Node.new("pic:spPr", document).tap do |sp_pr|
+                    sp_pr["bwMode"] = "auto"
                     sp_pr << Nokogiri::XML::Node.new("a:xfrm", document).tap do |xfrm|
                       xfrm << Nokogiri::XML::Node.new("a:off", document).tap do |off|
                         off["x"] = "0"
                         off["y"] = "0"
                       end
                       xfrm << Nokogiri::XML::Node.new("a:ext", document).tap do |ext|
-                        ext["cx"] = image.clamped_width(max_width_from(document))
-                        ext["cy"] = image.clamped_height(max_width_from(document))
+                        ext["cx"] = scaled_width
+                        ext["cy"] = scaled_height
                       end
                     end
                     sp_pr << Nokogiri::XML::Node.new("a:prstGeom", document).tap do |prst_geom|
                       prst_geom["prst"] = "rect"
                       prst_geom << Nokogiri::XML::Node.new("a:avLst", document)
                     end
+                    sp_pr << Nokogiri::XML::Node.new("a:noFill", document)
                   end
                 end
               end
@@ -78,11 +119,32 @@ module Consolidate
       DEFAULT_PAGE_WIDTH = 12_240
       TWENTIETHS_OF_A_POINT_TO_EMU = 635
       DEFAULT_PAGE_WIDTH_IN_EMU = DEFAULT_PAGE_WIDTH * TWENTIETHS_OF_A_POINT_TO_EMU
+      EMU_PER_PIXEL = 9525
+      DEFAULT_PAGE_HEIGHT = DEFAULT_PAGE_WIDTH * 11 / 8.5 # Assuming standard page ratio
+      DEFAULT_PAGE_HEIGHT_IN_EMU = DEFAULT_PAGE_HEIGHT * TWENTIETHS_OF_A_POINT_TO_EMU
 
       private def max_width_from document
         page_width = (document.at_xpath("//w:sectPr/w:pgSz/@w:w")&.value || DEFAULT_PAGE_WIDTH).to_i
         page_width * TWENTIETHS_OF_A_POINT_TO_EMU
       end
+
+      private def max_dimensions_from(document)
+        page_width = (document.at_xpath("//w:sectPr/w:pgSz/@w:w")&.value || DEFAULT_PAGE_WIDTH).to_i
+        page_height = (document.at_xpath("//w:sectPr/w:pgSz/@w:h")&.value || DEFAULT_PAGE_HEIGHT).to_i
+
+        width_emu = page_width * TWENTIETHS_OF_A_POINT_TO_EMU
+        height_emu = page_height * TWENTIETHS_OF_A_POINT_TO_EMU
+
+        [width_emu, height_emu]
+      end
+
+      private def scale_dimensions(width, height, max_width, max_height)
+        width_ratio = max_width.to_f / width
+        height_ratio = max_height.to_f / height
+        scale = [width_ratio, height_ratio, 1.0].min # Never scale up
+
+        [(width * scale).to_i, (height * scale).to_i]
+      end
     end
   end
 end

data/lib/consolidate/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: standard-procedure-consolidate
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Rahoul Baruah
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-18 00:00:00.000000000 Z
+date: 2025-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -66,6 +65,8 @@ files:
 - 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
+- checksums/standard-procedure-consolidate-0.4.2.gem.sha512
+- checksums/standard-procedure-consolidate-0.4.3.gem.sha512
 - exe/consolidate
 - exe/examine
 - lib/consolidate.rb
@@ -84,7 +85,6 @@ 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:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,8 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Simple ruby mailmerge for Microsoft Word .docx files.
 test_files: []