easyimg_utils 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b1dfaea58127ef88f5b78e46e00146d925b9cc9e05c7c8836d9d934a9cb87b5
-  data.tar.gz: d54061b87a0864110935762bfcd8558552fdaf0e925b3446aa1c22667a8ef41f
+  metadata.gz: 491f7066a8af2e40049a6986c894498d507d99b2b02caf4321f59abb25a05dd1
+  data.tar.gz: e6d42410ed62a4a0829c648b5622b28845930fa18853202e6ac507d0e7e34186
 SHA512:
-  metadata.gz: c66d8a62d782f4a1535df8351984c05701c6bfb0868cc42c266983054de86b70dc1238888108aa0492bd689d27b3485058fee7c1fe57175c495bc4bcad884c92
-  data.tar.gz: c1ddf021ed6e85154dc13d3b1dbcc59c47d8bac8066acbd8502d5f4704aa7296b3d713e0b9171c796e6bbe4e4530684d1e3c8d1bfe83c73aac055535cb6e6304
+  metadata.gz: 57a595c6b1b171e44600bcdd043a36f90ce89453fc5d57e40fd8016a5f6518be8753c247bd613b2e5318ee6db05ababb9735a0c47b928775b96a4ef5bd99dac0
+  data.tar.gz: aa6f56c7307732c2f4f93f2298d32d0e2de8d164a2cee099f5ebdc18e433bccb162e43c5b3bd2e4ad9d2c87d0398c131531d10dcceb8099bbce4873d19d5fd19

data/lib/easyimg_utils.rb

@@ -94,20 +94,35 @@ class EasyImgUtils
   
   # 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
+  # the asterisk denotes a guarantee the image will be resized to a 
+  # minimum size on either dimension
   #
-  def self.calc_resize(geometry, new_geometry, force: false)
+  # e.g. calc_resize '1920x1088', '*518x*500' #=> "882x500" 
+  # 2 asterisks denotes a guaranteed minumum size on both dimensions
+  #
+  def self.calc_resize(geometry, new_geometry)
     
     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 =~ /^\*/}
+    locks = xy2.select {|x| x =~ /^\*/}        
 
     a = xy.map {|x| x[/\d+/].to_i}
     a2 = xy2.map {|x| x[/\d+/].to_i}
+    
+    i = if locks.length > 1 then
 
-    i = lock ? a2.index(lock[1..-1].to_i) : a.index(a.max)
+      a.index(a.min)
+      
+    elsif locks.any? 
+      
+      lock = locks.first
+      a2.index(lock[1..-1].to_i)
+      
+    else      
+      a.index(a.max)
+    end
 
     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.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   KY48n99T12IOioQ4ghCO1L/UAg2taLOcZbMv4WpV1p9bXKhnrow81zeogZjjiNGS
   OmTAjCfyGFPC/1eXnSV5Smv8
   -----END CERTIFICATE-----
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick