gallerize-cli 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11dc0a78dfd751b1b510ac507825a4d15ef091e3
-  data.tar.gz: 446f94708dc90cf9cd4fd5398d329f381c163efc
+  metadata.gz: f139f5fd7ec173ae67a63fe36a94e2ecbcc1bb30
+  data.tar.gz: 66ff2ddb1abcbece1223698681e04dc75f41ce2a
 SHA512:
-  metadata.gz: 2f23f096b5e3faa8980068b4eb27337ef8e2285b506c5f907864f2c0de0a3ff1ea62299ca546e1cb6fbb4cb855fe95e0ec19510449b1ae1054e6ef065992fc4b
-  data.tar.gz: 8918d774bac3a4041343775324b24b76767241cef91f707eaba78f08c38f02688dbbf88f9f65b5b682265d5bed9c537e3fb9e8de411f58eb5172b510a7efa0b0
+  metadata.gz: dbee1495a2c08ff0fdeda1ff1aa5dc6dd13e1a8e743472e1a09f1f62d010186e8113b7c62a08bd9be7aa698e05e6b4a6959c0af43af5b99c8092ff75dbb10a95
+  data.tar.gz: 096d0478e2cad463e793fd6c5cc6b8d6c294e0c8f76fb4923d60b7a054e429b526b35470c23c37c9326453620738bfc8b51437bc2756edd718476f9bc396a08f

data/.gitignore

@@ -1,4 +1,5 @@
 .idea
 .DS_Store
 Gemfile.lock
-*.gem
+*.gem
+.zoho

data/lib/gallerize_cli/image/version.rb

@@ -8,6 +8,8 @@ module GallerizeCli
 
       attr_accessor :image, :name, :options
 
+      GRAVITY_TYPES = [:north_west, :north, :north_east, :east, :south_east, :south, :south_west, :west, :center]
+
       def initialize(image, name, options)
         @image = image
         @name = name
@@ -46,46 +48,80 @@ module GallerizeCli
       private
 
       def generate
-        # do we have width and height?
+
+
         if width <= 0 || height <= 0
           GallerizeCli.logger.debug "version: #{name} is missing width: #{width} or height: #{height}"
 
         elsif !File.exists?(file_path)
           GallerizeCli.logger.debug "generating #{options.approach} #{file_path}"
           # open it up
-          mini_image = MiniMagick::Image.open(image.file_path)
-          mini_image.auto_orient
-          if options.approach == 'crop'
-            crop(mini_image, width, height)
-          else
-            resize(mini_image, width, height)
-          end
+          # do we have width and height?
+          new_image = resize_with_crop(MiniMagick::Image.open(image.file_path), width, height)
           # landscape?
-          mini_image.write file_path
+          new_image.write file_path
         end
       rescue => err
         @valid = false
         GallerizeCli.logger.debug "#{err} image.file_name: #{image.file_name} name: #{name} options: #{options}"
       end
 
-      def resize(mini_image, width, height)
-        if mini_image[:width] > mini_image[:height]
-          mini_image.resize "#{width}x#{height}>"
+      def resize_with_crop(img, w, h, options = {})
+        gravity = options[:gravity] || :center
+
+        w_original, h_original = [img[:width].to_f, img[:height].to_f]
+
+        op_resize = ''
+
+        # check proportions
+        if w_original * h < h_original * w
+          op_resize = "#{w.to_i}x"
+          w_result = w
+          h_result = (h_original * w / w_original)
         else
-          # portrait
-          mini_image.resize "#{height}x#{width.to_i * 1.25}"
+          op_resize = "x#{h.to_i}"
+          w_result = (w_original * h / h_original)
+          h_result = h
         end
-      end
 
-      def crop(mini_image, width, height)
-        max = width > height ? width : height
-        if mini_image[:width] > mini_image[:height]
-          resize(mini_image, max * 2, height)
-        else
-          resize(mini_image, width, max * 2)
+        w_offset, h_offset = crop_offsets_by_gravity(gravity, [w_result, h_result], [w, h])
+
+        img.combine_options do |i|
+          i.resize(op_resize)
+          i.gravity(gravity)
+          i.crop "#{w.to_i}x#{h.to_i}+#{w_offset}+#{h_offset}!"
         end
 
-        mini_image.crop "#{width}x#{height}+0+0"
+        img
+      end
+
+      def crop_offsets_by_gravity(gravity, original_dimensions, cropped_dimensions)
+        raise(ArgumentError, "Gravity must be one of #{GRAVITY_TYPES.inspect}") unless GRAVITY_TYPES.include?(gravity.to_sym)
+        raise(ArgumentError, "Original dimensions must be supplied as a [ width, height ] array") unless original_dimensions.kind_of?(Enumerable) && original_dimensions.size == 2
+        raise(ArgumentError, "Cropped dimensions must be supplied as a [ width, height ] array") unless cropped_dimensions.kind_of?(Enumerable) && cropped_dimensions.size == 2
+
+        original_width, original_height = original_dimensions
+        cropped_width, cropped_height = cropped_dimensions
+
+        vertical_offset = case gravity
+                            when :north_west, :north, :north_east then
+                              0
+                            when :center, :east, :west then
+                              [((original_height - cropped_height) / 2.0).to_i, 0].max
+                            when :south_west, :south, :south_east then
+                              (original_height - cropped_height).to_i
+                          end
+
+        horizontal_offset = case gravity
+                              when :north_west, :west, :south_west then
+                                0
+                              when :center, :north, :south then
+                                [((original_width - cropped_width) / 2.0).to_i, 0].max
+                              when :north_east, :east, :south_east then
+                                (original_width - cropped_width).to_i
+                            end
+
+        [horizontal_offset, vertical_offset]
       end
 
       def load_file_path

data/lib/gallerize_cli.rb

@@ -6,7 +6,7 @@ require 'logger'
 
 module GallerizeCli
 
-  VERSION='0.3.2'
+  VERSION='0.4.0'
 
   class << self
     def perform

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gallerize-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick