ruby-thumbor 0.0.2 → 0.3.0

data/lib/ruby-thumbor.rb

@@ -6,7 +6,7 @@ require 'base64'
 require 'digest/md5'
 
 module Thumbor
-    VERSION = '0.0.2'
+    VERSION = '0.3.0'
 
     class CryptoURL
         attr_accessor :key
@@ -19,13 +19,93 @@ module Thumbor
             s + ("{" * (16 - s.length % 16))
         end
 
-        def generate(options)
+        def calculate_width_and_height(url_parts, options)
+            width = options[:width]
+            height = options[:height]
+
+            if width and options[:flip]
+                width = width * -1
+            end
+            if height and options[:flop]
+                height = height * -1
+            end
+
+            if width or height
+                width = 0 if not width
+                height = 0 if not height
+            end
+
+            has_width = width
+            has_height = height
+            if options[:flip] and not has_width and not has_height
+                width = "-0"
+                height = '0' if not has_height and not options[:flop]
+            end
+            if options[:flop] and not has_width and not has_height
+                height = "-0"
+                width = '0' if not has_width and not options[:flip]
+            end
+
+            if width or height
+                width = width.to_s
+                height = height.to_s
+                url_parts.push(width << 'x' << height)
+            end
+        end
+
+        def url_for(options)
+            if not options[:image]
+                raise 'image is a required argument.'
+            end
+
+            url_parts = Array.new
+
+            if options[:meta]
+                url_parts.push('meta')
+            end
+
+            crop = options[:crop]
+            if crop:
+                crop_left = crop[0]
+                crop_top = crop[1]
+                crop_right = crop[2]
+                crop_bottom = crop[3]
+
+                if crop_left > 0 or crop_top > 0 or crop_bottom > 0 or crop_right > 0
+                    url_parts.push(crop_left.to_s << 'x' << crop_top.to_s << ':' << crop_right.to_s << 'x' << crop_bottom.to_s)
+                end
+            end
+
+            calculate_width_and_height(url_parts, options)
+
+            if options[:halign] and options[:halign] != 'center'
+                url_parts.push(options[:halign])
+            end
+
+            if options[:valign] and options[:valign] != 'middle'
+                url_parts.push(options[:valign])
+            end
+
+            if options[:smart]
+                url_parts.push('smart')
+            end
+
             image_hash = Digest::MD5.hexdigest(options[:image])
-            url = pad(options[:width].to_s << 'x' << options[:height].to_s << '/' << image_hash)
+            url_parts.push(image_hash)
+
+            return url_parts.join('/')
+        end
+
+        def url_safe_base64(str)
+            Base64.encode64(str).gsub('+', '-').gsub('/', '_').gsub!(/[\n]/, '')
+        end
+
+        def generate(options)
+            url = pad(url_for(options))
             cipher = OpenSSL::Cipher::Cipher.new('aes-128-ecb').encrypt
             cipher.key = @key
             encrypted = cipher.update(url)
-            based = Base64.encode64(encrypted).gsub('+', '-').gsub('/', '_').gsub!(/[\n]/, '')
+            based = url_safe_base64(encrypted)
 
             '/' << based << '/' << options[:image]
         end

data/spec/ruby-thumbor_spec.rb

@@ -1,22 +1,359 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'json'
+
+image_url = 'my.domain.com/some/image/url.jpg'
+image_md5 = 'f33af67e41168e80fcc5b00f8bd8061a'
+key = 'my-security-key'
+
+def decrypt_in_thumbor(str)
+    command = "python -c 'from thumbor.crypto import Crypto; cr = Crypto(\"my-security-keymy\"); print cr.decrypt(\"" << str << "\")'"
+    result = Array.new
+    IO.popen(command) { |f| result.push(f.gets) } 
+    result = result.join('').strip
+    JSON.parse(result.gsub('"', "@@@").gsub("'", '"').gsub("@@@", '\\"').gsub('True', 'true').gsub('False', 'false'))
+end
 
 describe Thumbor::CryptoURL, "#new" do
-  
-  it "should create a new instance passing key and keep it" do
-    crypto = Thumbor::CryptoURL.new 'my-security-key'
-    crypto.key.should == 'my-security-keymy'
-  end
-  
+
+    it "should create a new instance passing key and keep it" do
+        crypto = Thumbor::CryptoURL.new key
+        crypto.key.should == 'my-security-keymy'
+    end
+
+end
+
+describe Thumbor::CryptoURL, "#url_for" do
+    it "should return just the image hash if no arguments passed" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url
+
+        url.should == image_md5
+    end
+
+    it "should raise if no image passed" do
+        crypto = Thumbor::CryptoURL.new key
+
+        expect { crypto.url_for Hash.new }.to raise_error(RuntimeError)
+    end
+
+    it "should return proper url for width-only" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :width => 300
+
+        url.should == '300x0/' << image_md5
+    end
+
+    it "should return proper url for height-only" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :height => 300
+
+        url.should == '0x300/' << image_md5
+    end
+
+    it "should return proper url for width and height" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :width => 200, :height => 300
+
+        url.should == '200x300/' << image_md5
+    end
+
+    it "should return proper smart url" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :width => 200, :height => 300, :smart => true
+
+        url.should == '200x300/smart/' << image_md5
+    end
+
+    it "should return proper flip url if no width and height" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :flip => true
+
+        url.should == '-0x0/' << image_md5
+    end
+
+    it "should return proper flop url if no width and height" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :flop => true
+
+        url.should == '0x-0/' << image_md5
+    end
+
+    it "should return proper flip-flop url if no width and height" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :flip => true, :flop => true
+
+        url.should == '-0x-0/' << image_md5
+    end
+
+    it "should return proper flip url if width" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :width => 300, :flip => true
+
+        url.should == '-300x0/' << image_md5
+    end
+
+    it "should return proper flip url if width" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :height => 300, :flop => true
+
+        url.should == '0x-300/' << image_md5
+    end
+
+    it "should return horizontal align" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :halign => 'left'
+
+        url.should == 'left/' << image_md5
+    end
+
+    it "should not return horizontal align if it is center" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :halign => 'center'
+
+        url.should == image_md5
+    end
+
+    it "should return vertical align" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :valign => 'top'
+
+        url.should == 'top/' << image_md5
+    end
+
+    it "should not return vertical align if it is middle" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :valign => 'middle'
+
+        url.should == image_md5
+    end
+
+    it "should return halign and valign properly" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :halign => 'left', :valign => 'top'
+
+        url.should == 'left/top/' << image_md5
+    end
+
+    it "should return meta properly" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :meta => true
+
+        url.should == 'meta/' << image_md5
+    end
+
+    it "should return proper crop url" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :crop => [10, 20, 30, 40]
+
+        url.should == '10x20:30x40/' << image_md5
+    end
+
+    it "should ignore crop if all zeros" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :crop => [0, 0, 0, 0]
+
+        url.should == image_md5
+    end
+
+    it "should have smart after halign and valign" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.url_for :image => image_url, :halign => 'left', :valign => 'top', :smart => true
+
+        url.should == 'left/top/smart/' << image_md5
+    end
+
 end
 
 describe Thumbor::CryptoURL, "#generate" do
-  
-  it "should create a new instance passing key and keep it" do
-    crypto = Thumbor::CryptoURL.new 'my-security-key'
 
-    url = crypto.generate :width => 300, :height => 200, :image => 'my.domain.com/some/image/url.jpg'
+    it "should create a new instance passing key and keep it" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.generate :width => 300, :height => 200, :image => image_url
+
+        url.should == '/qkLDiIbvtiks0Up9n5PACtmpOfX6dPXw4vP4kJU-jTfyF6y1GJBJyp7CHYh1H3R2/' << image_url
+    end
+
+    it "should allow thumbor to decrypt it properly" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.generate :width => 300, :height => 200, :image => image_url
+
+        encrypted = url.split('/')[1]
+
+        decrypted = decrypt_in_thumbor(encrypted)
+
+        decrypted["horizontal_flip"].should == false
+        decrypted["vertical_flip"].should == false
+        decrypted["smart"].should == false
+        decrypted["meta"].should == false
+        decrypted["crop"]["left"].should == 0
+        decrypted["crop"]["top"].should == 0
+        decrypted["crop"]["right"].should == 0
+        decrypted["crop"]["bottom"].should == 0
+        decrypted["valign"].should == 'middle'
+        decrypted["halign"].should == 'center'
+        decrypted["image_hash"].should == image_md5
+        decrypted["width"].should == 300
+        decrypted["height"].should == 200
+
+    end
+
+    it "should allow thumbor to decrypt it properly with meta" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.generate :width => 300, :height => 200, :meta => true, :image => image_url
+
+        encrypted = url.split('/')[1]
+
+        decrypted = decrypt_in_thumbor(encrypted)
+
+        decrypted["meta"].should == true
+        decrypted["image_hash"].should == image_md5
+        decrypted["width"].should == 300
+        decrypted["height"].should == 200
+
+    end
+
+    it "should allow thumbor to decrypt it properly with smart" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.generate :width => 300, :height => 200, :meta => true, :image => image_url, :smart => true
+
+        encrypted = url.split('/')[1]
+
+        decrypted = decrypt_in_thumbor(encrypted)
+
+        decrypted["meta"].should == true
+        decrypted["smart"].should == true
+        decrypted["image_hash"].should == image_md5
+        decrypted["width"].should == 300
+        decrypted["height"].should == 200
+
+    end
+
+    it "should allow thumbor to decrypt it properly with flip" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.generate :width => 300, :height => 200, :meta => true, :image => image_url, :smart => true, :flip => true
+
+        encrypted = url.split('/')[1]
+
+        decrypted = decrypt_in_thumbor(encrypted)
+
+        decrypted["meta"].should == true
+        decrypted["smart"].should == true
+        decrypted["image_hash"].should == image_md5
+        decrypted["width"].should == 300
+        decrypted["height"].should == 200
+        decrypted["flip_horizontally"] == true
+
+    end
+
+    it "should allow thumbor to decrypt it properly with flop" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.generate :width => 300, :height => 200, :meta => true, :image => image_url, :smart => true, :flip => true, :flop => true
+
+        encrypted = url.split('/')[1]
+
+        decrypted = decrypt_in_thumbor(encrypted)
+
+        decrypted["meta"].should == true
+        decrypted["smart"].should == true
+        decrypted["image_hash"].should == image_md5
+        decrypted["width"].should == 300
+        decrypted["height"].should == 200
+        decrypted["flip_horizontally"] == true
+        decrypted["flip_vertically"] == true
+
+    end
+
+    it "should allow thumbor to decrypt it properly with halign" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.generate :width => 300, :height => 200, :meta => true, :image => image_url, :smart => true, :flip => true, :flop => true,
+                              :halign => 'left'
+
+        encrypted = url.split('/')[1]
+
+        decrypted = decrypt_in_thumbor(encrypted)
+
+        decrypted["meta"].should == true
+        decrypted["smart"].should == true
+        decrypted["image_hash"].should == image_md5
+        decrypted["width"].should == 300
+        decrypted["height"].should == 200
+        decrypted["flip_horizontally"] == true
+        decrypted["flip_vertically"] == true
+        decrypted["halign"] == "left"
+
+    end
+
+    it "should allow thumbor to decrypt it properly with valign" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.generate :width => 300, :height => 200, :meta => true, :image => image_url, :smart => true, :flip => true, :flop => true,
+                              :halign => 'left', :valign => 'top'
+
+        encrypted = url.split('/')[1]
+
+        decrypted = decrypt_in_thumbor(encrypted)
+
+        decrypted["meta"].should == true
+        decrypted["smart"].should == true
+        decrypted["image_hash"].should == image_md5
+        decrypted["width"].should == 300
+        decrypted["height"].should == 200
+        decrypted["flip_horizontally"] == true
+        decrypted["flip_vertically"] == true
+        decrypted["halign"] == "left"
+        decrypted["valign"] == "top"
+
+    end
+
+    it "should allow thumbor to decrypt it properly with cropping" do
+        crypto = Thumbor::CryptoURL.new key
+
+        url = crypto.generate :width => 300, :height => 200, :image => image_url, :crop => [10, 20, 30, 40]
+
+        encrypted = url.split('/')[1]
+
+        decrypted = decrypt_in_thumbor(encrypted)
+
+        decrypted["horizontal_flip"].should == false
+        decrypted["vertical_flip"].should == false
+        decrypted["smart"].should == false
+        decrypted["meta"].should == false
+        decrypted["crop"]["left"].should == 10
+        decrypted["crop"]["top"].should == 20
+        decrypted["crop"]["right"].should == 30
+        decrypted["crop"]["bottom"].should == 40
+        decrypted["valign"].should == 'middle'
+        decrypted["halign"].should == 'center'
+        decrypted["image_hash"].should == image_md5
+        decrypted["width"].should == 300
+        decrypted["height"].should == 200
+
+    end
 
-    url.should == '/qkLDiIbvtiks0Up9n5PACtmpOfX6dPXw4vP4kJU-jTfyF6y1GJBJyp7CHYh1H3R2/my.domain.com/some/image/url.jpg'
-  end
-  
 end

data/tasks/rspec.rake

@@ -1,7 +1,7 @@
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = ['color']
+  t.rspec_opts = ['--color']
   t.rcov = false
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-thumbor
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 19
   prerelease: 
   segments: 
   - 0
+  - 3
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Bernardo Heynemann
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 Z
+date: 2011-04-03 00:00:00 -03:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -59,6 +60,7 @@ files:
 - spec/spec_helper.rb
 - tasks/rspec.rake
 - .gemtest
+has_rdoc: true
 homepage: http://github.com/heynemann/ruby-thumbor
 licenses: []
 
@@ -89,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-thumbor
-rubygems_version: 1.7.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: ruby-thumbor is the client to the thumbor imaging service (http://github.com/globocom/thumbor).