docxify 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9feb2e005b3722bb91013f2b319a93da1f7ee49cbce3d28491dc279f1a06776a
-  data.tar.gz: 792b462f78fb7c03dc73f12ef9c9ab9359e55ab09d06a3cbcf10bd65b332cac9
+  metadata.gz: 71db0768a21fe9c99eaca1fe8835db8f0619530f3b111fc767afd1bbd15c5da5
+  data.tar.gz: 46507a64f582f7f6486556ab68e26baf93a4d3c1353293b0c1aa9068cbe9a0cf
 SHA512:
-  metadata.gz: fe9457df0501983598674783c781ebf2cc8b964e540aadc90645d8a1132a62ed0a28c2cbec56931d069b2435cb5e6419cca4a7e4232afb22f0b4a08bac2687ee
-  data.tar.gz: 0a8d8fb56b6f88350885cb0afadf8100fa31b682c3bef5c1cdba90ce0c039fdb9fc2f00aa3024723c9add5bb7cc97b288378def2f0ccf4ab85287f72d4f65408
+  metadata.gz: eaecad61bffa383575bc36536ac8c39d66e745e22fd2b26f509f39325b1faeecb66904ac9184b179e3e27883065ebd7dfe982667bb68c9b6cbdb7dfacb866055
+  data.tar.gz: 1bd65897a04c0a22ff34b7d1224c8d39a1421219d4d6e4abf7e187bd14764e493c72fb205a7b4f33699866d1f018d5c420989123b6a05542e57c962acb83721b

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.1.5
+
+Bugfix:
+
+- Should insert image with correct aspect ratio if only one dimension is specified
+
 ## 0.1.4
 
 Bugfix:

data/lib/docxify/element/file.rb

@@ -7,7 +7,7 @@ module DocXify
       JPEG_START = "\xFF\xD8".b.freeze
       JPEG_END = "\xFF\xD9".b.freeze
 
-      attr_accessor :data, :filename
+      attr_accessor :data, :filename, :width, :height
 
       def initialize(file_path_or_data)
         super()
@@ -15,16 +15,16 @@ module DocXify
       end
 
       def load_file_data(file_path_or_data)
-        if ::File.exist?(file_path_or_data)
+        if (::File.exist?(file_path_or_data) rescue false)
           file_path_or_data = ::File.read(file_path_or_data, mode: "rb")
         end
 
-        if contains_png_image?(file_path_or_data)
-          @data = file_path_or_data
-          @filename = "#{Digest::SHA1.hexdigest(@data)}.png"
-        elsif contains_jpeg_image?(file_path_or_data)
-          @data = file_path_or_data
-          @filename = "#{Digest::SHA1.hexdigest(@data)}.jpg"
+        @data = file_path_or_data
+
+        if contains_png_image?(data)
+          @filename = "#{Digest::SHA1.hexdigest(data)}.png"
+        elsif contains_jpeg_image?(data)
+          @filename = "#{Digest::SHA1.hexdigest(data)}.jpg"
         else
           raise ArgumentError.new("Unsupported file type - images must be PNG or JPEG")
         end

data/lib/docxify/element/image.rb

@@ -1,3 +1,5 @@
+require "image_size"
+
 module DocXify
   module Element
     class Image < Base
@@ -9,8 +11,25 @@ module DocXify
 
         @align = options[:align] || :left
         @after = options[:after]
-        @height_cm = options[:height_cm] || 5
-        @width_cm = options[:width_cm] || 5
+        @height_cm = options[:height_cm]
+        @width_cm = options[:width_cm]
+
+        image_size = ImageSize.new(StringIO.new(file.data))
+
+        if @height_cm.nil? || @width_cm.nil?
+          @width = image_size.width
+          @height = image_size.height
+        end
+
+        if @height_cm.nil? && @width_cm.nil?
+          @height_cm = 5
+        end
+
+        if @height_cm.nil?
+          @height_cm = @width_cm * image_size.height / image_size.width
+        elsif @width_cm.nil?
+          @width_cm = @height_cm * image_size.width / image_size.height
+        end
       end
 
       def id

data/lib/docxify/version.rb

@@ -1,3 +1,3 @@
 module DocXify
-  VERSION = "0.1.4".freeze
+  VERSION = "0.1.5".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docxify
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Andy Jeffries
@@ -11,6 +11,20 @@ bindir: exe
 cert_chain: []
 date: 2024-09-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: image_size
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement