photo-cook 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ee9b263617fe5981ceced2edd99d80b934dcc94
-  data.tar.gz: b7803adfb283dc1ae2cf6e135ce0acbd107fa0ae
+  metadata.gz: 6e15cd4a81a3e2b2873faca2e0c1bc33788b230d
+  data.tar.gz: 96578e33f51efdf6b2300f3db3d5d815713883c9
 SHA512:
-  metadata.gz: f73d1813612dd47e1974d3463093fd4f5ec13ccb0d0cfd29853cd1e6f7dd10064de340c00ee2e46a5774d73c9a359d9eb6485ee503099356d123791a39b6fb34
-  data.tar.gz: 3d28240d6232c89f4c91ba206e064a01811953fd2d2d07526930374a2863f85c459861dce91077150931027d994d93c7c6cddf22b6be4fc94727ecbb8b29253d
+  metadata.gz: 6b14c7e899302a98bb69d667be131b960587f323bb6c60bd4dfbb1ba40c90287c5883465b2f751e32bf383d46373678a7c86c38803e4bf80d2ad752385296075
+  data.tar.gz: c26e25973b242036bca129b90b425321f223f714aa11688ec873940844b5aa703ba4adbfc0d446c33625f2d4876bbfbbaec13e8f3f0c0455f3b8cdf9e82683f2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    photo-cook (1.0.0)
+    photo-cook (1.0.1)
       mini_magick (~> 4.0)
       rack (~> 1.5)
 
@@ -9,7 +9,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     mini_magick (4.1.0)
-    rack (1.5.5)
+    rack (1.6.4)
 
 PLATFORMS
   ruby

data/lib/photo-cook/resizer.rb

@@ -1,15 +1,11 @@
-# Resize algorithms from
-# https://github.com/carrierwaveuploader/carrierwave/blob/71cb18bba4a2078524d1ea683f267d3a97aa9bc8/lib/carrierwave/processing/rmagick.rb
-
 require 'mini_magick'
 
 module PhotoCook
   class Resizer
     include Singleton
 
-    CENTER_GRAVITY = 'Center'
-    TRANSPARENT_BACKGROUND = 'rgba(255,255,255,0.0)'
-    PHOTO_QUALITY = 100
+    CENTER_GRAVITY          = 'Center'.freeze
+    TRANSPARENT_BACKGROUND  = 'rgba(255,255,255,0.0)'.freeze
 
     def resize(photo_path, width, height, crop = false)
       if crop
@@ -22,50 +18,66 @@ module PhotoCook
     # Resize the photo to fit within the specified dimensions:
     # - the original aspect ratio will be kept
     # - new dimensions will be not larger then the specified
+    #
+    # https://github.com/carrierwaveuploader/carrierwave/blob/71cb18bba4a2078524d1ea683f267d3a97aa9bc8/lib/carrierwave/processing/mini_magick.rb#L131
     def resize_to_fit(photo_path, width, height)
+
       # Do nothing if photo is not valid so exceptions will be not thrown
       return unless (photo = open(photo_path)).try(:valid?)
 
-      photo.combine_options do |cmd|
-        cmd.quality PHOTO_QUALITY
-        cmd.resize "#{width == 0 ? nil : width}x#{height == 0 ? nil : height}"
+      width, height = parse_dimensions(width, height)
+      store_path    = PhotoCook.assemble_path(photo_path, width, height, false)
+
+      if width > 0 || height > 0
+        photo.combine_options do |cmd|
+          cmd.resize "#{width == 0 ? nil : width}x#{height == 0 ? nil : height}>"
+        end
       end
 
-      store photo, PhotoCook.assemble_path(photo_path, width, height, false)
+      store(photo, store_path)
     end
 
     # Resize the photo to fit within the specified dimensions:
     # - new dimensions will be the same as specified
     # - the photo will be cropped if necessary
+    #
+    # https://github.com/carrierwaveuploader/carrierwave/blob/71cb18bba4a2078524d1ea683f267d3a97aa9bc8/lib/carrierwave/processing/mini_magick.rb#L176
     def resize_to_fill(photo_path, width, height)
+
       # Do nothing if photo is not valid so exceptions will be not thrown
       return unless (photo = open(photo_path)).try(:valid?)
 
-      cols, rows = photo[:dimensions]
-      photo.combine_options do |cmd|
-        if width != cols || height != rows
-          scale_x = width / cols.to_f
-          scale_y = height / rows.to_f
-          if scale_x >= scale_y
-            cols = (scale_x * (cols + 0.5)).round
-            rows = (scale_x * (rows + 0.5)).round
-            cmd.resize "#{cols}"
-          else
-            cols = (scale_y * (cols + 0.5)).round
-            rows = (scale_y * (rows + 0.5)).round
-            cmd.resize "x#{rows}"
+      width, height = parse_dimensions(width, height)
+      cols,  rows   = photo[:dimensions]
+      store_path    = PhotoCook.assemble_path(photo_path, width, height, true)
+
+      if width > 0 || height > 0
+        photo.combine_options do |cmd|
+          if width != cols || height != rows
+            scale_x = width / cols.to_f
+            scale_y = height / rows.to_f
+            if scale_x >= scale_y
+              cols = (scale_x * (cols + 0.5)).round
+              rows = (scale_x * (rows + 0.5)).round
+              cmd.resize "#{cols}>"
+            else
+              cols = (scale_y * (cols + 0.5)).round
+              rows = (scale_y * (rows + 0.5)).round
+              cmd.resize "x#{rows}>"
+            end
+          end
+          cmd.gravity CENTER_GRAVITY
+          cmd.background TRANSPARENT_BACKGROUND
+          if cols != width || rows != height
+            cmd.extent "#{width == 0 ? nil : width}x#{height == 0 ? nil : height}>"
           end
         end
-        cmd.gravity CENTER_GRAVITY
-        cmd.background TRANSPARENT_BACKGROUND
-        cmd.quality PHOTO_QUALITY
-        cmd.extent "#{width}x#{height}" if cols != width || rows != height
       end
 
-      store photo, PhotoCook.assemble_path(photo_path, width, height, true)
+      store(photo, store_path)
     end
 
-    private
+  protected
 
     def open(photo_path)
       begin
@@ -86,8 +98,15 @@ module PhotoCook
       resized_photo
     end
 
-    def normalize_dimensions(w, h)
-      [w.to_i == 0 ? nil : w.to_i, h.to_i == 0 ? nil : h.to_i]
+    def parse_dimensions(width, height)
+      width   = width == :auto ? 0 : width.to_i
+      height  = height == :auto ? 0 : height.to_i
+      check_dimensions!(width, height)
+      [width, height]
+    end
+
+    def check_dimensions!(width, height)
+      raise ArgumentError, 'Expected positive numbers ' if width < 0 || height < 0
     end
   end
 end

data/lib/photo-cook/version.rb

@@ -1,3 +1,3 @@
 module PhotoCook
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/photo-cook.rb

@@ -16,22 +16,22 @@ module PhotoCook
   end
 
   def self.assemble_path(path, width, height, crop = false)
-    File.join PhotoCook.assemble_dir(path), PhotoCook.assemble_name(path, width, height, crop)
+    File.join(assemble_dir(path), assemble_name(path, width, height, crop))
   end
 
   def self.assemble_dir(path)
-    File.join File.dirname(path), PhotoCook.resize_dir
+    File.join(File.dirname(path), resize_dir)
   end
 
   def self.assemble_name(path, width, height, crop = false)
-    File.basename(path, '.*') + PhotoCook.assemble_command(width, height, crop) + File.extname(path)
+    File.basename(path, '.*') + assemble_command(width, height, crop) + File.extname(path)
   end
 
   def self.assemble_command(width, height, crop = false)
-    prefix = "-#{width == 0 ? '' : width}x#{height == 0 ? '' : height}"
+    width, height = width.to_i, height.to_i
+    prefix = "-#{width == 0 ? nil : width}x#{height == 0 ? nil : height}"
     prefix + (crop ? 'crop' : '')
   end
-
 end
 
 require 'photo-cook/engine' if defined?(Rails)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photo-cook
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack