easyimg_utils 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12a8d7ad03689334172c8068730efef5acd22474b4f3b3a0d0f73994fa6f0c3
-  data.tar.gz: a2e24819dc0efd620fa16797286034f0cce333d1ef360eb6bb2e6a4b106ca36e
+  metadata.gz: 931f6444de27b1df65cfe7e9f4b3c296e2f826f42cdb58f5bb6dc2c5f597e284
+  data.tar.gz: 119ef63fee91fd0ac7fc8402b6be7ff362a65b567279819c739449730af5d0d8
 SHA512:
-  metadata.gz: 2d5acd5bfef69e8cec1dc304f92e440070be9412d189fee2ce6d6c2b884593d9776b1bf04978dd572d62aea372fc0f636c6bf68c5dfd5338dcafbb9742647620
-  data.tar.gz: 4ea3afa5a48559a84d38e7806cf7ab27b3827ffcd1f6d2ef9cfbe0240f0d06e71987e9b2ef9316a2b510f8584ad605c67aa0512e41bd973c745d9c82ede407b1
+  metadata.gz: 18e8ec2efe4c0c7f0c0ada668f78bc5952c90b44ae7b85d9c10f121375f5752f8ddfe74709e5fdc8ff516dddd43325c084241048cd7c36d904fdae0b613fec79
+  data.tar.gz: f4e5176eb71d1aaf6e3898ec68fd823568ea4d73bcf51cf3ce176ff57f0c71ecf9678e719f1cb422ebcd0eb47663c4a005060c82c2eee4d50ec9f976ef48abed

data/lib/easyimg_utils.rb

@@ -88,12 +88,21 @@ class EasyImgUtils
   end
   
   # e.g. calc_resize '1449x1932', '640x480' #=> 480x640
+  # e.g. calc_resize '518x1024', '*518x500' #=> "518x1024" 
+  # the asterisk denotes a guaranteed the image will be resized using x or y
   #
-  def self.calc_resize(s, s2)
+  def self.calc_resize(geometry, new_geometry, force: false)
     
-    a = s.split('x',2).map(&:to_i)
-    a2 = s2.split('x',2).map(&:to_i)
-    i = a.index a.max
+    xy = geometry.split('x',2)
+    xy2 = new_geometry.split('x',2)
+
+    # find any locked geometry which guarantees the resize on either x or y
+    lock = xy2.find {|x| x =~ /^\*/}
+
+    a = xy.map {|x| x[/\d+/].to_i}
+    a2 = xy2.map {|x| x[/\d+/].to_i}
+
+    i = lock ? a2.index(lock[1..-1].to_i) : a.index(a.max)
 
     factor = a2[i] / a[i].to_f
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easyimg_utils
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   KY48n99T12IOioQ4ghCO1L/UAg2taLOcZbMv4WpV1p9bXKhnrow81zeogZjjiNGS
   OmTAjCfyGFPC/1eXnSV5Smv8
   -----END CERTIFICATE-----
-date: 2021-03-20 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick