ruby-thumbor 1.1.2 → 1.1.3

data/lib/thumbor/cascade.rb

@@ -8,7 +8,7 @@ module Thumbor
   class Cascade
     attr_accessor :image, :old_crypto, :options, :filters
 
-    @available_options = [:meta, :crop, :width, :height, :flip,:flop, :halign, :valign, :smart, :fit_in, :old, :trim]
+    @available_options = [:meta, :crop, :center, :original_width, :original_height, :width, :height, :flip,:flop, :halign, :valign, :smart, :fit_in, :old, :trim]
 
     extend Forwardable
 

data/lib/thumbor/crypto_url.rb

@@ -53,6 +53,82 @@ module Thumbor
             end
         end
 
+        def calculate_centered_crop(options)
+            width = options[:width]
+            height = options[:height]
+            original_width = options[:original_width]
+            original_height = options[:original_height]
+            center = options[:center]
+
+            return unless original_width &&
+                            original_height &&
+                            center &&
+                            (width || height)
+
+            unless center.kind_of?(Array) && center.length == 2
+                raise 'center must be an array of x,y'
+            end
+
+            center_x, center_y = center
+            width ||= original_width
+            height ||= original_height
+            width = width.abs
+            height = height.abs
+            new_aspect_ratio = width / height.to_f
+            original_aspect_ratio = original_width/original_height.to_f
+
+            crop = nil
+            # We're going wider, vertical crop
+            if new_aspect_ratio > original_aspect_ratio
+              # How tall should we be? because new_aspect_ratio is > original_aspect_ratio we can be sure
+              # that cropped_height is always less than original_height (original). This is assumed below.
+              cropped_height = (original_width / new_aspect_ratio).round
+              # Calculate coordinates around center
+              top_crop_point = (center_y - (cropped_height * 0.5)).round
+              bottom_crop_point = (center_y + (cropped_height * 0.5)).round
+
+              # If we've gone above the top of the image, take all from the bottom
+              if top_crop_point < 0
+                top_crop_point = 0
+                bottom_crop_point = cropped_height
+              # If we've gone below the top of the image, take all from the top
+              elsif bottom_crop_point > original_height
+                top_crop_point = original_height - cropped_height
+                bottom_crop_point = original_height
+              # Because cropped_height < original_height, top_crop_point and
+              # bottom_crop_point will never both be out of bounds
+              end
+
+              # Put it together
+              crop = [0, top_crop_point, original_width, bottom_crop_point]
+            # We're going taller, horizontal crop
+            elsif new_aspect_ratio < original_aspect_ratio
+              # How wide should we be? because new_aspect_ratio is < original_aspect_ratio we can be sure
+              # that cropped_width is always less than original_width (original). This is assumed below.
+              cropped_width = (original_height * new_aspect_ratio).round
+              # Calculate coordinates around center
+              left_crop_point = (center_x - (cropped_width * 0.5)).round
+              right_crop_point = (center_x + (cropped_width * 0.5)).round
+
+              # If we've gone beyond the left of the image, take all from the right
+              if left_crop_point < 0
+                left_crop_point = 0
+                right_crop_point = cropped_width
+              # If we've gone beyond the right of the image, take all from the left
+              elsif right_crop_point > original_width
+                left_crop_point = original_width - cropped_width
+                right_crop_point = original_width
+              # Because cropped_width < original_width, left_crop_point and
+              # right_crop_point will never both be out of bounds
+              end
+
+              # Put it together
+              crop = [left_crop_point, 0, right_crop_point, original_height]
+            end
+
+            options[:crop] = crop
+        end
+
         def url_for(options, include_hash = true)
             if not options[:image]
                 raise 'image is a required argument.'
@@ -64,6 +140,8 @@ module Thumbor
                 url_parts.push('meta')
             end
 
+            calculate_centered_crop(options)
+
             crop = options[:crop]
             if crop
                 crop_left = crop[0]

data/lib/thumbor/version.rb

@@ -1,3 +1,3 @@
 module Thumbor
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/spec/thumbor/cascade_spec.rb

@@ -173,6 +173,85 @@ describe Thumbor::Cascade do
       url = subject.trim('bottom-right', 15).url_for
       url.should == 'trim:bottom-right:15/' << image_md5
     end
+
+    it "should have the right crop when cropping horizontally and given a left center" do
+      url = subject.original_width(100).original_height(100).width(40).height(50).center(0, 50).url_for
+      url.should == '0x0:80x100/40x50/' << image_md5
+    end
+
+    it "should have the right crop when cropping horizontally and given a right center" do
+      url = subject.original_width(100).original_height(100).width(40).height(50).center(100, 50).url_for
+      url.should == '20x0:100x100/40x50/' << image_md5
+    end
+
+    it "should have the right crop when cropping horizontally and given the actual center" do
+      url = subject.original_width(100).original_height(100).width(40).height(50).center(50, 50).url_for
+      url.should == '10x0:90x100/40x50/' << image_md5
+    end
+
+    it "should have the right crop when cropping vertically and given a top center" do
+      url = subject.original_width(100).original_height(100).width(50).height(40).center(50, 0).url_for
+      url.should == '0x0:100x80/50x40/' << image_md5
+    end
+
+    it "should have the right crop when cropping vertically and given a bottom center" do
+      url = subject.original_width(100).original_height(100).width(50).height(40).center(50, 100).url_for
+      url.should == '0x20:100x100/50x40/' << image_md5
+    end
+
+    it "should have the right crop when cropping vertically and given the actual center" do
+      url = subject.original_width(100).original_height(100).width(50).height(40).center(50, 50).url_for
+      url.should == '0x10:100x90/50x40/' << image_md5
+    end
+
+    it "should have the no crop when not necessary" do
+      url = subject.original_width(100).original_height(100).width(50).height(50).center(50, 0).url_for
+      url.should == '50x50/' << image_md5
+    end
+
+    it "should blow up with a bad center" do
+      expect { subject.original_width(100).original_height(100).width(50).height(50).center(50).url_for }.to raise_error(RuntimeError)
+    end
+
+    it "should have no crop with a missing original_height" do
+      url = subject.original_width(100).width(50).height(40).center(50, 0).url_for
+      url.should == '50x40/' << image_md5
+    end
+
+    it "should have no crop with a missing original_width" do
+      url = subject.original_height(100).width(50).height(40).center(50, 0).url_for
+      url.should == '50x40/' << image_md5
+    end
+
+    it "should have no crop with out a width and height" do
+      url = subject.original_width(100).original_height(100).center(50, 50).url_for
+      url.should == image_md5
+    end
+
+    it "should use the original width with a missing width" do
+      url = subject.original_width(100).original_height(100).height(80).center(50, 50).url_for
+      url.should == '0x10:100x90/0x80/' << image_md5
+    end
+
+    it "should use the original height with a missing height" do
+      url = subject.original_width(100).original_height(100).width(80).center(50, 50).url_for
+      url.should == '10x0:90x100/80x0/' << image_md5
+    end
+
+    it "should have the right crop with a negative width" do
+      url = subject.original_width(100).original_height(100).width(-50).height(40).center(50, 50).url_for
+      url.should == '0x10:100x90/-50x40/' << image_md5
+    end
+
+    it "should have the right crop with a negative height" do
+      url = subject.original_width(100).original_height(100).width(50).height(-40).center(50, 50).url_for
+      url.should == '0x10:100x90/50x-40/' << image_md5
+    end
+
+    it "should have the right crop with a negative height and width" do
+      url = subject.original_width(100).original_height(100).width(-50).height(-40).center(50, 50).url_for
+      url.should == '0x10:100x90/-50x-40/' << image_md5
+    end
   end
 
   describe '#generate' do

data/spec/thumbor/crypto_url_spec.rb

@@ -141,6 +141,85 @@ describe Thumbor::CryptoURL do
       url = subject.url_for :image => image_url, :trim => ['bottom-right', 15]
       url.should == 'trim:bottom-right:15/' << image_md5
     end
+
+    it "should have the right crop when cropping horizontally and given a left center" do
+      url = subject.url_for :image => image_url, :original_width => 100, :original_height => 100, :width => 40, :height => 50, :center => [0, 50]
+      url.should == '0x0:80x100/40x50/' << image_md5
+    end
+
+    it "should have the right crop when cropping horizontally and given a right center" do
+      url = subject.url_for :image => image_url, :original_width => 100, :original_height => 100, :width => 40, :height => 50, :center => [100, 50]
+      url.should == '20x0:100x100/40x50/' << image_md5
+    end
+
+    it "should have the right crop when cropping horizontally and given the actual center" do
+      url = subject.url_for :image => image_url, :original_width => 100, :original_height => 100, :width => 40, :height => 50, :center => [50, 50]
+      url.should == '10x0:90x100/40x50/' << image_md5
+    end
+
+    it "should have the right crop when cropping vertically and given a top center" do
+      url = subject.url_for :image => image_url, :original_width => 100, :original_height => 100, :width => 50, :height => 40, :center => [50, 0]
+      url.should == '0x0:100x80/50x40/' << image_md5
+    end
+
+    it "should have the right crop when cropping vertically and given a bottom center" do
+      url = subject.url_for :image => image_url, :original_width => 100, :original_height => 100, :width => 50, :height => 40, :center => [50, 100]
+      url.should == '0x20:100x100/50x40/' << image_md5
+    end
+
+    it "should have the right crop when cropping vertically and given the actual center" do
+      url = subject.url_for :image => image_url, :original_width => 100, :original_height => 100, :width => 50, :height => 40, :center => [50, 50]
+      url.should == '0x10:100x90/50x40/' << image_md5
+    end
+
+    it "should have the no crop when not necessary" do
+      url = subject.url_for :image => image_url, :original_width => 100, :original_height => 100, :width => 50, :height => 50, :center => [50, 0]
+      url.should == '50x50/' << image_md5
+    end
+
+    it "should blow up with a bad center" do
+      expect { subject.url_for :image => image_url, :original_width => 100, :original_height => 100, :width => 50, :height => 40, :center => 50 }.to raise_error(RuntimeError)
+    end
+
+    it "should have no crop with a missing original_height" do
+      url = subject.url_for :image => image_url, :original_width => 100, :width => 50, :height => 40, :center => [50, 50]
+      url.should == '50x40/' << image_md5
+    end
+
+    it "should have no crop with a missing original_width" do
+      url = subject.url_for :image => image_url, :original_height => 100, :width => 50, :height => 40, :center => [50, 50]
+      url.should == '50x40/' << image_md5
+    end
+
+    it "should have no crop with out a width and height" do
+      url = subject.url_for :image => image_url, :original_width => 100, :original_height => 100, :center => [50, 50]
+      url.should == image_md5
+    end
+
+    it "should use the original width with a missing width" do
+      url = subject.url_for :image => image_url, :original_width => 100, :original_height => 100, :height => 80, :center => [50, 50]
+      url.should == '0x10:100x90/0x80/' << image_md5
+    end
+
+    it "should use the original height with a missing height" do
+      url = subject.url_for :image => image_url,:original_width => 100, :original_height => 100, :width => 80, :center => [50, 50]
+      url.should == '10x0:90x100/80x0/' << image_md5
+    end
+
+    it "should have the right crop with a negative width" do
+      url = subject.url_for :image => image_url, :original_width => 100, :original_height => 100, :width => -50, :height => 40, :center => [50, 50]
+      url.should == '0x10:100x90/-50x40/' << image_md5
+    end
+
+    it "should have the right crop with a negative height" do
+      url = subject.url_for :image => image_url, :original_width => 100, :original_height => 100, :width => 50, :height => -40, :center => [50, 50]
+      url.should == '0x10:100x90/50x-40/' << image_md5
+    end
+
+    it "should have the right crop with a negative height and width" do
+      url = subject.url_for :image => image_url, :original_width => 100, :original_height => 100, :width => -50, :height => -40, :center => [50, 50]
+      url.should == '0x10:100x90/-50x-40/' << image_md5
+    end
   end
 
   describe '#generate' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-thumbor
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec