standard-procedure-consolidate 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3a7f02d5159a44a47af30100fe1743b2b5bff5ab845a0da2170ffaf44302f03
-  data.tar.gz: b041806b3d682a4c5ccc0011025a1d3d5b25a7c1a65fda56e9b3fcce34b364a9
+  metadata.gz: f54b1e9134c3e9ec1a9a87ba47dd0a0842e430f9bc2ad2801fdaaecb6d4784c1
+  data.tar.gz: 881e583371a1cc58b7742ea74cb90e47b934198d03a6d76d538a7c48330378cf
 SHA512:
-  metadata.gz: 2bc84355758ef68cd525c684fe1ef6973858eb3ba360f4a37a026cc54a11c9eb143cc364bd034cdd4452bec75a91a768b7f96ccbb727039da5e6ba727fb643bd
-  data.tar.gz: b8061eb3ff1a61deb3c1b153be11d9c5b416be6a576d559c0846236a1e8dabdf9dcf339f33479e39589d3c247930cb28d437a360becbe5e498e90b99eb26ffea
+  metadata.gz: a48b68b17ba644b23b4bd81ff30a195260a00343aeba22cfcfd77151e1d22f4d13dff7b54409d87737b9610f888fd574b624a4aac5bcd3c114500be3626f9267
+  data.tar.gz: 14acf38a2067475f7a5cd25e2783aed5f2299d764b051906c833dba4d1ae4f515ab2929606990bdb87da74a139aa587ef23682d5297d896a6f9293d6c16dcdd1

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

@@ -0,0 +1 @@
+c1a13d3d2b2c50741b839e2ca20c730b2689fac090e9c67660950a506ce83b3b9e07e31f3de205ec67dcbf4b1eff462f8fc507468fdb378e864e9a5952b9decf

data/lib/consolidate/docx/image.rb

@@ -18,15 +18,16 @@ module Consolidate
       # Convert height from pixels to EMU
       def height = super * emu_per_height_pixel
 
-      # Get the width of this image in EMU up to a maximum page width (also in EMU)
-      def clamped_width(maximum = 7_772_400) = [width, maximum].min
+      def emu_per_width_pixel = EMU_PER_PIXEL * 72 / dpi[:x]
 
-      # Get the height of this image in EMU adjusted for a maximum page width (also in EMU)
-      def clamped_height(maximum = 7_772_400) = (height * clamped_width(maximum).to_f / width.to_f).to_i
+      def emu_per_height_pixel = EMU_PER_PIXEL * 72 / dpi[:y]
 
-      def emu_per_width_pixel = 914_400 / dpi[:x]
-
-      def emu_per_height_pixel = 914_400 / dpi[:y]
+      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 US Letter size
+      DEFAULT_PAGE_HEIGHT_IN_EMU = DEFAULT_PAGE_HEIGHT * TWENTIETHS_OF_A_POINT_TO_EMU
     end
   end
 end

data/lib/consolidate/docx/image_reference_node_builder.rb

@@ -116,24 +116,17 @@ module Consolidate
         end
       end
 
-      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
+        page_width = (document.at_xpath("//w:sectPr/w:pgSz/@w:w")&.value || Image::DEFAULT_PAGE_WIDTH).to_i
+        page_width * Image::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
+        page_width = (document.at_xpath("//w:sectPr/w:pgSz/@w:w")&.value || Image::DEFAULT_PAGE_WIDTH).to_i
+        page_height = (document.at_xpath("//w:sectPr/w:pgSz/@w:h")&.value || Image::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 = page_width * Image::TWENTIETHS_OF_A_POINT_TO_EMU
+        height_emu = page_height * Image::TWENTIETHS_OF_A_POINT_TO_EMU
 
         [width_emu, height_emu]
       end

data/lib/consolidate/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standard-procedure-consolidate
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Rahoul Baruah
@@ -67,6 +67,7 @@ files:
 - 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
+- checksums/standard-procedure-consolidate-0.4.4.gem.sha512
 - exe/consolidate
 - exe/examine
 - lib/consolidate.rb