easyimg_utils 0.6.1 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f46e4a30a8cbcfe7166727983d2930d8690aa58060016d63cff168202f11987
-  data.tar.gz: e7ff3d14f9c73b6b7af227e5f76689c294ed512c38823fcc96c452f0f964bfe8
+  metadata.gz: 4d9ac6449342efa070a858c26d96378947ca77231bcdc97339321b5dac0a316b
+  data.tar.gz: 22617abf8420c0cf4276e2198e02cae542aa29555d8579fcd66c60127e70afbe
 SHA512:
-  metadata.gz: 599600135545dee8880298a4c6cb2703a7da4d87530197ad08162a87f8cfd1ab1a5401aed04ebe15788abb18dd800c356f49b8d4c3e670f4f76de7b06d3818d2
-  data.tar.gz: ac7d4e7737fa56b5d03a450ef3bb619f827080c5b89810dc6a5aa3ca56b7495e93746aa4e22d858f42690d8617537dc9d2630c027102870288578818b9de4dbc
+  metadata.gz: 947e70b56bfeb36bf1c4d0e51bf5ba02bca9124083d46c27a55dd2669fcc3b06dbbfc48c9e2b0acfc6f42db89d6c71df1a125e30b6ff0d1f8431a5c535234828
+  data.tar.gz: a19e9e5da426cf4ab50f7040419158c30fede078f8545c6f6fa7e4fb4a3d3b2dfdcd3e41ebdce4ee3e43e6dfba2f8d75a76262e516190f7e8ee2ee0f45c4e41d

data/lib/easyimg_utils.rb

@@ -47,6 +47,7 @@ class EasyImgUtils
   extend CommandHelper
   include Magick
   include RXFHelperModule
+    
 
 @commands = "
 * add rectangle # usage: add_rectangle(color: 'green', x1: 12, y1: 12, x2: 24, y2: 24)
@@ -55,6 +56,7 @@ class EasyImgUtils
 * animate Creates an animated gif e.g. animate('/tmp/a%d.png', '/tmp/b.gif')
 * blur # e.g. blur(x: 231, y: 123, w: 85, h: 85)
 * capture_screen # takes a screenshot of the desktop
+* calc_resize # e.g. calc_resize '640x480' #=> 640x491
 * center_crop # crops from the centre of an image. Usage center_crop(width, height)
 * composite # overlay a smaller image on top of an image
 * contrast # changes the intensity between lighter and darker elements
@@ -85,6 +87,29 @@ 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(geometry, new_geometry, force: false)
+    
+    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
+
+    s3 = a.map {|x| (x * factor).round}.join('x')    
+    
+  end
+  
   def add_rectangle(a=[], quality: nil, color: 'green', stroke_width: 5, 
                     x1: 0, y1: 0, x2: 0, y2: 0)
     
@@ -169,6 +194,12 @@ class EasyImgUtils
     end
   end
   
+  # calculates the new geometry after a resize
+  #
+  def calc_resize(geometry)    
+    EasyImgUtils.calc_resize(info()[:geometry], geometry)
+  end
+  
   def capture_screen(quality: nil)
     
     # defaults (silent=false, frame=false, descend=false, 
@@ -321,8 +352,10 @@ class EasyImgUtils
 
   # defines the maximum size of an image while maintaining aspect ratio
   #
-  def resize(geometry='320x240', quality: nil)
+  def resize(raw_geometry='320x240', quality: nil)
     
+    geometry = calc_resize(raw_geometry
+                             )
     read() do |preview|
     
       preview.change_geometry!(geometry) do |cols, rows, img|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easyimg_utils
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.6
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   KY48n99T12IOioQ4ghCO1L/UAg2taLOcZbMv4WpV1p9bXKhnrow81zeogZjjiNGS
   OmTAjCfyGFPC/1eXnSV5Smv8
   -----END CERTIFICATE-----
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -43,60 +43,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.2
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: webp-ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: x4ss
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -143,7 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Makes manipulating images from 1 line of code easier.