ruby-thumbor 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 893a41411617f13eb886aa0623348b8465367c2f
-  data.tar.gz: 4f987bbd23926f386cc6e360a10156007dafb159
+  metadata.gz: 4fb9d400670315240363d6886302ee62da8b3b4b
+  data.tar.gz: 97818a3c1400417a4d2a0e3520069f547abf9e69
 SHA512:
-  metadata.gz: a7534f13bd29cda443f7b9338bf70b411ae6f4ce2802928d5c83e603272a1e3531f88ce4dd369adca224b2d5b59c7a0cbf1889e5d6097c2ea94f42993f242d28
-  data.tar.gz: 3353dcafc369ea2695b3e2883b7b6400bd63f810ead8557018a4ac313c08cb7dafa6fa5f5e1e1b597980d3c5d2ff9494112b53242d1d843b63ebad8712405ef2
+  metadata.gz: 20143d675dd3a3e9721e745f4992e3d5446547b29aa6ef6852a1702623b41010b4f6ca7dc0991d847182532f414438514753f77ba9f47348f4c1d386529f28fb
+  data.tar.gz: 49096c792b320fa1deb4ab4a5647367af39218ec80f1702245403b6f2d9a51410452c840948d251fcbb5325bddb6dd8c48eabd4b4643287040ecfb0ebb152624

data/README.rdoc

@@ -4,7 +4,7 @@
 
 == DESCRIPTION:
 
-ruby-thumbor is the client to the thumbor imaging service (http://github.com/globocom/thumbor).
+ruby-thumbor is the client to the thumbor imaging service (http://github.com/thumbor/thumbor).
 
 == FEATURES:
 
@@ -15,7 +15,7 @@ ruby-thumbor is the client to the thumbor imaging service (http://github.com/glo
 
 No dependencies required for regular usage.
 
-* thumbor (http://github.com/globocom/thumbor) for running ruby-thumbor tests.
+* thumbor (http://github.com/thumbor/thumbor) for running ruby-thumbor tests.
 
 == INSTALL:
 
@@ -23,6 +23,9 @@ No dependencies required for regular usage.
 
     gem 'ruby-thumbor'
 
+== BREAKING CHANGE ON 2.0:
+
+    Thumbor::Cascade.new now gets key, image
 
 == USAGE:
 
@@ -39,8 +42,7 @@ or
 
     require 'ruby-thumbor'
 
-    Thumbor.key = 'my-security-key'
-    image = Thumbor::Cascade.new('my.server.com/path/to/image.jpg')
+    image = Thumbor::Cascade.new('my-security-key', 'my.server.com/path/to/image.jpg')
     image.width(300).height(200).watermark_filter('http://my-server.com/image.png', 30).generate
 
 Available arguments to the generate method:
@@ -66,7 +68,7 @@ Available arguments to the generate method:
 
     :smart => <bool> - flag that indicates that thumbor should use smart cropping;
 
-If you need more info on what each option does, check thumbor's documentation at https://github.com/globocom/thumbor/wiki.
+If you need more info on what each option does, check thumbor's documentation at https://github.com/thumbor/thumbor/wiki.
 
 == CONTRIBUTIONS:
 

data/lib/ruby-thumbor.rb

@@ -2,14 +2,5 @@ require 'thumbor/crypto_url'
 require 'thumbor/cascade'
 
 module Thumbor
-  @@key = nil
-
-  def self.key=(key)
-    @@key = key
-  end
-
-  def self.key
-    @@key
-  end
 end
 

data/lib/thumbor/cascade.rb

@@ -29,11 +29,12 @@ module Thumbor
       end
     end
 
-    def initialize(image=nil)
+    def initialize(key=false, image=nil)
+      @key = key
       @image = image
       @options = {}
       @filters = []
-      @old_crypto = Thumbor::CryptoURL.new Thumbor.key
+      @old_crypto = Thumbor::CryptoURL.new @key
     end
 
     def url_for

data/lib/thumbor/crypto_url.rb

@@ -7,12 +7,12 @@ module Thumbor
     class CryptoURL
         attr_accessor :computed_key
 
-        def initialize(key)
-            Thumbor.key = key
+        def initialize(key=false)
+            @key = key
         end
 
         def computed_key
-            (Thumbor.key * 16)[0..15]
+            (@key * 16)[0..15]
         end
 
         def pad(s)
@@ -223,8 +223,8 @@ module Thumbor
 
             thumbor_path << options[:image]
 
-            if Thumbor.key
-                signature = url_safe_base64(OpenSSL::HMAC.digest('sha1', Thumbor.key, thumbor_path))
+            if @key
+                signature = url_safe_base64(OpenSSL::HMAC.digest('sha1', @key, thumbor_path))
                 thumbor_path.insert(0, "/#{signature}/")
             else
                 thumbor_path.insert(0, "/unsafe/")

data/lib/thumbor/version.rb

@@ -1,3 +1,3 @@
 module Thumbor
-  VERSION = '1.3.0'
+  VERSION = '2.0.0'
 end

data/spec/spec_helper.rb

@@ -1,14 +1,11 @@
 require 'simplecov'
 
 SimpleCov.start do
-add_filter '/spec/'
+  add_filter '/spec/'
 end
 
 
 RSpec.configure do |c|
   c.filter_run :focus => true
   c.run_all_when_everything_filtered = true
-  c.expect_with :rspec do |config|
-    config.syntax = [:should, :expect]
-  end
 end

data/spec/thumbor/cascade_spec.rb

@@ -8,16 +8,9 @@ describe Thumbor::Cascade do
   let(:image_md5) { 'f33af67e41168e80fcc5b00f8bd8061a' }
   let(:key) { 'my-security-key' }
 
-  subject { Thumbor::Cascade.new image_url }
-
-  after(:each) do
-    Thumbor.key = nil
-  end
+  subject { Thumbor::Cascade.new key, image_url }
 
   describe '#new' do
-    before do
-      Thumbor.key = key
-    end
 
     it "should create a new instance passing key and keep it" do
       expect(subject.computed_key).to eq 'my-security-keym'
@@ -277,9 +270,6 @@ describe Thumbor::Cascade do
   end
 
   describe '#generate' do
-    before do
-      Thumbor.key = key
-    end
 
     it "should create a new instance passing key and keep it" do
       url = subject.width(300).height(200).generate
@@ -287,10 +277,8 @@ describe Thumbor::Cascade do
     end
 
     it "should be able to change the Thumbor key" do
-      thumbor = subject.width(300).height(200)
-      url1 = thumbor.generate
-      Thumbor.key = 'another-thumbor-key'
-      url2 = thumbor.generate
+      url1 = subject.width(300).height(200).generate
+      url2 = Thumbor::Cascade.new('another-thumbor-key', image_url).width(300).height(200).generate
       expect(url1).not_to eq url2
     end
 
@@ -326,11 +314,8 @@ describe Thumbor::Cascade do
   end
 
   describe "#generate :old => true" do
-    before do
-      Thumbor.key = key
-    end
 
-    subject { Thumbor::Cascade.new(image_url).old(true) }
+    subject { Thumbor::Cascade.new(key, image_url).old(true) }
 
     it "should create a new instance passing key and keep it" do
       url = subject.width(300).height(200).generate
@@ -344,11 +329,11 @@ describe Thumbor::Cascade do
 
       decrypted = decrypt_in_thumbor(encrypted)
 
-      expect(decrypted["horizontal_flip"]).to eq false
-      expect(decrypted["vertical_flip"]).to eq false
-      expect(decrypted["smart"]).to eq false
-      expect(decrypted["meta"]).to eq false
-      expect(decrypted["fit_in"]).to eq false
+      expect(decrypted["horizontal_flip"]).to be_falsy
+      expect(decrypted["vertical_flip"]).to be_falsy
+      expect(decrypted["smart"]).to be_falsy
+      expect(decrypted["meta"]).to be_falsy
+      expect(decrypted["fit_in"]).to be_falsy
       expect(decrypted["crop"]["left"]).to eq 0
       expect(decrypted["crop"]["top"]).to eq 0
       expect(decrypted["crop"]["right"]).to eq 0
@@ -368,7 +353,7 @@ describe Thumbor::Cascade do
 
       decrypted = decrypt_in_thumbor(encrypted)
 
-      expect(decrypted["meta"]).to eq true
+      expect(decrypted["meta"]).to be_truthy
       expect(decrypted["image_hash"]).to eq image_md5
       expect(decrypted["width"]).to eq 300
       expect(decrypted["height"]).to eq 200
@@ -382,8 +367,8 @@ describe Thumbor::Cascade do
 
       decrypted = decrypt_in_thumbor(encrypted)
 
-      expect(decrypted["meta"]).to eq true
-      expect(decrypted["smart"]).to eq true
+      expect(decrypted["meta"]).to be_truthy
+      expect(decrypted["smart"]).to be_truthy
       expect(decrypted["image_hash"]).to eq image_md5
       expect(decrypted["width"]).to eq 300
       expect(decrypted["height"]).to eq 200
@@ -397,7 +382,7 @@ describe Thumbor::Cascade do
 
       decrypted = decrypt_in_thumbor(encrypted)
 
-      expect(decrypted["fit_in"]).to eq true
+      expect(decrypted["fit_in"]).to be_truthy
       expect(decrypted["image_hash"]).to eq image_md5
       expect(decrypted["width"]).to eq 300
       expect(decrypted["height"]).to eq 200
@@ -411,12 +396,12 @@ describe Thumbor::Cascade do
 
       decrypted = decrypt_in_thumbor(encrypted)
 
-      expect(decrypted["meta"]).to eq true
-      expect(decrypted["smart"]).to eq true
+      expect(decrypted["meta"]).to be_truthy
+      expect(decrypted["smart"]).to be_truthy
       expect(decrypted["image_hash"]).to eq image_md5
       expect(decrypted["width"]).to eq 300
       expect(decrypted["height"]).to eq 200
-      expect(decrypted["horizontal_flip"]).to eq true
+      expect(decrypted["horizontal_flip"]).to be_truthy
 
     end
 
@@ -427,13 +412,13 @@ describe Thumbor::Cascade do
 
       decrypted = decrypt_in_thumbor(encrypted)
 
-      expect(decrypted["meta"]).to eq true
-      expect(decrypted["smart"]).to eq true
+      expect(decrypted["meta"]).to be_truthy
+      expect(decrypted["smart"]).to be_truthy
       expect(decrypted["image_hash"]).to eq image_md5
       expect(decrypted["width"]).to eq 300
       expect(decrypted["height"]).to eq 200
-      expect(decrypted["horizontal_flip"]).to eq true
-      expect(decrypted["vertical_flip"]).to eq true
+      expect(decrypted["horizontal_flip"]).to be_truthy
+      expect(decrypted["vertical_flip"]).to be_truthy
 
     end
 
@@ -445,13 +430,13 @@ describe Thumbor::Cascade do
 
       decrypted = decrypt_in_thumbor(encrypted)
 
-      expect(decrypted["meta"]).to eq true
-      expect(decrypted["smart"]).to eq true
+      expect(decrypted["meta"]).to be_truthy
+      expect(decrypted["smart"]).to be_truthy
       expect(decrypted["image_hash"]).to eq image_md5
       expect(decrypted["width"]).to eq 300
       expect(decrypted["height"]).to eq 200
-      expect(decrypted["horizontal_flip"]).to eq true
-      expect(decrypted["vertical_flip"]).to eq true
+      expect(decrypted["horizontal_flip"]).to be_truthy
+      expect(decrypted["vertical_flip"]).to be_truthy
       expect(decrypted["halign"]).to eq "left"
 
     end
@@ -464,13 +449,13 @@ describe Thumbor::Cascade do
 
       decrypted = decrypt_in_thumbor(encrypted)
 
-      expect(decrypted["meta"]).to eq true
-      expect(decrypted["smart"]).to eq true
+      expect(decrypted["meta"]).to be_truthy
+      expect(decrypted["smart"]).to be_truthy
       expect(decrypted["image_hash"]).to eq image_md5
       expect(decrypted["width"]).to eq 300
       expect(decrypted["height"]).to eq 200
-      expect(decrypted["horizontal_flip"]).to eq true
-      expect(decrypted["vertical_flip"]).to eq true
+      expect(decrypted["horizontal_flip"]).to be_truthy
+      expect(decrypted["vertical_flip"]).to be_truthy
       expect(decrypted["halign"]).to eq "left"
       expect(decrypted["valign"]).to eq "top"
 
@@ -483,10 +468,10 @@ describe Thumbor::Cascade do
 
       decrypted = decrypt_in_thumbor(encrypted)
 
-      expect(decrypted["horizontal_flip"]).to eq false
-      expect(decrypted["vertical_flip"]).to eq false
-      expect(decrypted["smart"]).to eq false
-      expect(decrypted["meta"]).to eq false
+      expect(decrypted["horizontal_flip"]).to be_falsy
+      expect(decrypted["vertical_flip"]).to be_falsy
+      expect(decrypted["smart"]).to be_falsy
+      expect(decrypted["meta"]).to be_falsy
       expect(decrypted["crop"]["left"]).to eq 10
       expect(decrypted["crop"]["top"]).to eq 20
       expect(decrypted["crop"]["right"]).to eq 30

data/spec/thumbor/crypto_url_spec.rb

@@ -12,7 +12,7 @@ describe Thumbor::CryptoURL do
 
   describe '#new' do
     it "should create a new instance passing key and keep it" do
-      subject.computed_key.should == 'my-security-keym'
+      expect(subject.computed_key).to eq('my-security-keym')
     end
   end
 
@@ -20,7 +20,7 @@ describe Thumbor::CryptoURL do
 
     it "should return just the image hash if no arguments passed" do
       url = subject.url_for :image => image_url
-      url.should == image_md5
+      expect(url).to eq(image_md5)
     end
 
     it "should raise if no image passed" do
@@ -29,159 +29,159 @@ describe Thumbor::CryptoURL do
 
     it "should return proper url for width-only" do
       url = subject.url_for :image => image_url, :width => 300
-      url.should == '300x0/' << image_md5
+      expect(url).to eq('300x0/' << image_md5)
     end
 
     it "should return proper url for height-only" do
       url = subject.url_for :image => image_url, :height => 300
-      url.should == '0x300/' << image_md5
+      expect(url).to eq('0x300/' << image_md5)
     end
 
     it "should return proper url for width and height" do
       url = subject.url_for :image => image_url, :width => 200, :height => 300
-      url.should == '200x300/' << image_md5
+      expect(url).to eq('200x300/' << image_md5)
     end
 
     it "should return proper smart url" do
       url = subject.url_for :image => image_url, :width => 200, :height => 300, :smart => true
-      url.should == '200x300/smart/' << image_md5
+      expect(url).to eq('200x300/smart/' << image_md5)
     end
 
     it "should return proper fit-in url" do
       url = subject.url_for :image => image_url, :width => 200, :height => 300, :fit_in => true
-      url.should == 'fit-in/200x300/' << image_md5
+      expect(url).to eq('fit-in/200x300/' << image_md5)
     end
 
     it "should return proper flip url if no width and height" do
       url = subject.url_for :image => image_url, :flip => true
-      url.should == '-0x0/' << image_md5
+      expect(url).to eq('-0x0/' << image_md5)
     end
 
     it "should return proper flop url if no width and height" do
       url = subject.url_for :image => image_url, :flop => true
-      url.should == '0x-0/' << image_md5
+      expect(url).to eq('0x-0/' << image_md5)
     end
 
     it "should return proper flip-flop url if no width and height" do
       url = subject.url_for :image => image_url, :flip => true, :flop => true
-      url.should == '-0x-0/' << image_md5
+      expect(url).to eq('-0x-0/' << image_md5)
     end
 
     it "should return proper flip url if width" do
       url = subject.url_for :image => image_url, :width => 300, :flip => true
-      url.should == '-300x0/' << image_md5
+      expect(url).to eq('-300x0/' << image_md5)
     end
 
     it "should return proper flop url if height" do
       url = subject.url_for :image => image_url, :height => 300, :flop => true
-      url.should == '0x-300/' << image_md5
+      expect(url).to eq('0x-300/' << image_md5)
     end
 
     it "should return horizontal align" do
       url = subject.url_for :image => image_url, :halign => :left
-      url.should == 'left/' << image_md5
+      expect(url).to eq('left/' << image_md5)
     end
 
     it "should not return horizontal align if it is center" do
       url = subject.url_for :image => image_url, :halign => :center
-      url.should == image_md5
+      expect(url).to eq(image_md5)
     end
 
     it "should return vertical align" do
       url = subject.url_for :image => image_url, :valign => :top
-      url.should == 'top/' << image_md5
+      expect(url).to eq('top/' << image_md5)
     end
 
     it "should not return vertical align if it is middle" do
       url = subject.url_for :image => image_url, :valign => :middle
-      url.should == image_md5
+      expect(url).to eq(image_md5)
     end
 
     it "should return halign and valign properly" do
       url = subject.url_for :image => image_url, :halign => :left, :valign => :top
-      url.should == 'left/top/' << image_md5
+      expect(url).to eq('left/top/' << image_md5)
     end
 
     it "should return meta properly" do
       url = subject.url_for :image => image_url, :meta => true
-      url.should == 'meta/' << image_md5
+      expect(url).to eq('meta/' << image_md5)
     end
 
     it "should return proper crop url" do
       url = subject.url_for :image => image_url, :crop => [10, 20, 30, 40]
-      url.should == '10x20:30x40/' << image_md5
+      expect(url).to eq('10x20:30x40/' << image_md5)
     end
 
     it "should ignore crop if all zeros" do
       url = subject.url_for :image => image_url, :crop => [0, 0, 0, 0]
-      url.should == image_md5
+      expect(url).to eq(image_md5)
     end
 
     it "should have smart after halign and valign" do
       url = subject.url_for :image => image_url, :halign => :left, :valign => :top, :smart => true
-      url.should == 'left/top/smart/' << image_md5
+      expect(url).to eq('left/top/smart/' << image_md5)
     end
 
     it "should ignore filters if empty" do
       url = subject.url_for :image => image_url, :filters => []
-      url.should == image_md5
+      expect(url).to eq(image_md5)
     end
 
     it "should have trim without params" do
       url = subject.url_for :image => image_url, :trim => true
-      url.should == 'trim/' << image_md5
+      expect(url).to eq('trim/' << image_md5)
     end
 
     it "should have trim with direction param" do
       url = subject.url_for :image => image_url, :trim => ['bottom-right']
-      url.should == 'trim:bottom-right/' << image_md5
+      expect(url).to eq('trim:bottom-right/' << image_md5)
     end
 
     it "should have trim with direction and tolerance param" do
       url = subject.url_for :image => image_url, :trim => ['bottom-right', 15]
-      url.should == 'trim:bottom-right:15/' << image_md5
+      expect(url).to eq('trim:bottom-right:15/' << image_md5)
     end
 
     it "should have the trim option as the first one" do
       url = subject.url_for :image => image_url, :smart => true, :trim => true
 
-      url.should == 'trim/smart/f33af67e41168e80fcc5b00f8bd8061a'
+      expect(url).to eq('trim/smart/f33af67e41168e80fcc5b00f8bd8061a')
     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
+      expect(url).to eq('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
+      expect(url).to eq('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
+      expect(url).to eq('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
+      expect(url).to eq('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
+      expect(url).to eq('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
+      expect(url).to eq('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
+      expect(url).to eq('50x50/' << image_md5)
     end
 
     it "should blow up with a bad center" do
@@ -190,42 +190,42 @@ describe Thumbor::CryptoURL do
 
     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
+      expect(url).to eq('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
+      expect(url).to eq('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
+      expect(url).to eq(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
+      expect(url).to eq('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
+      expect(url).to eq('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
+      expect(url).to eq('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
+      expect(url).to eq('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
+      expect(url).to eq('0x10:100x90/-50x-40/' << image_md5)
     end
   end
 
@@ -233,49 +233,49 @@ describe Thumbor::CryptoURL do
     it "should generate a proper url when only an image url is specified" do
       url = subject.generate :image => image_url
 
-      url.should == "/964rCTkAEDtvjy_a572k7kRa0SU=/#{image_url}"
+      expect(url).to eq("/964rCTkAEDtvjy_a572k7kRa0SU=/#{image_url}")
     end
 
     it "should create a new instance passing key and keep it" do
       url = subject.generate :width => 300, :height => 200, :image => image_url
 
-      url.should == '/TQfyd3H36Z3srcNcLOYiM05YNO8=/300x200/my.domain.com/some/image/url.jpg'
+      expect(url).to eq('/TQfyd3H36Z3srcNcLOYiM05YNO8=/300x200/my.domain.com/some/image/url.jpg')
     end
 
     it "should create a new instance passing key and keep it" do
       url = subject.generate :width => 300, :height => 200, :meta => true, :image => image_url
 
-      url.should == '/YBQEWd3g_WRMnVEG73zfzcr8Zj0=/meta/300x200/my.domain.com/some/image/url.jpg'
+      expect(url).to eq('/YBQEWd3g_WRMnVEG73zfzcr8Zj0=/meta/300x200/my.domain.com/some/image/url.jpg')
     end
 
     it "should create a new instance passing key and keep it" do
       url = subject.generate :width => 300, :height => 200, :meta => true, :image => image_url, :smart => true
 
-      url.should == '/jP89J0qOWHgPlm_lOA28GtOh5GU=/meta/300x200/smart/my.domain.com/some/image/url.jpg'
+      expect(url).to eq('/jP89J0qOWHgPlm_lOA28GtOh5GU=/meta/300x200/smart/my.domain.com/some/image/url.jpg')
     end
 
     it "should create a new instance passing key and keep it" do
       url = subject.generate :width => 300, :height => 200, :meta => true, :image => image_url, :smart => true, :fit_in => true
 
-      url.should == '/zrrOh_TtTs4kiLLEQq1w4bcTYdc=/meta/fit-in/300x200/smart/my.domain.com/some/image/url.jpg'
+      expect(url).to eq('/zrrOh_TtTs4kiLLEQq1w4bcTYdc=/meta/fit-in/300x200/smart/my.domain.com/some/image/url.jpg')
     end
 
     it "should create a new instance passing key and keep it" do
       url = subject.generate :width => 300, :height => 200, :meta => true, :image => image_url, :smart => true, :fit_in => true, :flip => true
 
-      url.should == '/4t1XK1KH43cOb1QJ9tU00-W2_k8=/meta/fit-in/-300x200/smart/my.domain.com/some/image/url.jpg'
+      expect(url).to eq('/4t1XK1KH43cOb1QJ9tU00-W2_k8=/meta/fit-in/-300x200/smart/my.domain.com/some/image/url.jpg')
     end
 
     it "should create a new instance passing key and keep it" do
       url = subject.generate :width => 300, :height => 200, :meta => true, :image => image_url, :smart => true, :fit_in => true, :flip => true, :flop => true
 
-      url.should == '/HJnvjZU69PkPOhyZGu-Z3Uc_W_A=/meta/fit-in/-300x-200/smart/my.domain.com/some/image/url.jpg'
+      expect(url).to eq('/HJnvjZU69PkPOhyZGu-Z3Uc_W_A=/meta/fit-in/-300x-200/smart/my.domain.com/some/image/url.jpg')
     end
 
     it "should create a new instance passing key and keep it" do
       url = subject.generate :filters => ["quality(20)", "brightness(10)"], :image => image_url
 
-      url.should == '/q0DiFg-5-eFZIqyN3lRoCvg2K0s=/filters:quality(20):brightness(10)/my.domain.com/some/image/url.jpg'
+      expect(url).to eq('/q0DiFg-5-eFZIqyN3lRoCvg2K0s=/filters:quality(20):brightness(10)/my.domain.com/some/image/url.jpg')
     end
   end
 
@@ -284,7 +284,7 @@ describe Thumbor::CryptoURL do
     it "should create a new instance passing key and keep it" do
       url = subject.generate :width => 300, :height => 200, :image => image_url, :old => true
 
-      url.should == '/qkLDiIbvtiks0Up9n5PACtmpOfX6dPXw4vP4kJU-jTfyF6y1GJBJyp7CHYh1H3R2/' << image_url
+      expect(url).to eq('/qkLDiIbvtiks0Up9n5PACtmpOfX6dPXw4vP4kJU-jTfyF6y1GJBJyp7CHYh1H3R2/' << image_url)
     end
 
     it "should allow thumbor to decrypt it properly" do
@@ -294,20 +294,20 @@ describe Thumbor::CryptoURL do
 
       decrypted = decrypt_in_thumbor(encrypted)
 
-      decrypted["horizontal_flip"].should == false
-      decrypted["vertical_flip"].should == false
-      decrypted["smart"].should == false
-      decrypted["meta"].should == false
-      decrypted["fit_in"].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
+      expect(decrypted["horizontal_flip"]).to be_falsy
+      expect(decrypted["vertical_flip"]).to be_falsy
+      expect(decrypted["smart"]).to be_falsy
+      expect(decrypted["meta"]).to be_falsy
+      expect(decrypted["fit_in"]).to be_falsy
+      expect(decrypted["crop"]["left"]).to eq(0)
+      expect(decrypted["crop"]["top"]).to eq(0)
+      expect(decrypted["crop"]["right"]).to eq(0)
+      expect(decrypted["crop"]["bottom"]).to eq(0)
+      expect(decrypted["valign"]).to eq('middle')
+      expect(decrypted["halign"]).to eq('center')
+      expect(decrypted["image_hash"]).to eq(image_md5)
+      expect(decrypted["width"]).to eq(300)
+      expect(decrypted["height"]).to eq(200)
 
     end
 
@@ -318,10 +318,10 @@ describe Thumbor::CryptoURL do
 
       decrypted = decrypt_in_thumbor(encrypted)
 
-      decrypted["meta"].should == true
-      decrypted["image_hash"].should == image_md5
-      decrypted["width"].should == 300
-      decrypted["height"].should == 200
+      expect(decrypted["meta"]).to be_truthy
+      expect(decrypted["image_hash"]).to eq(image_md5)
+      expect(decrypted["width"]).to eq(300)
+      expect(decrypted["height"]).to eq(200)
 
     end
 
@@ -332,11 +332,11 @@ describe Thumbor::CryptoURL do
 
       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
+      expect(decrypted["meta"]).to be_truthy
+      expect(decrypted["smart"]).to be_truthy
+      expect(decrypted["image_hash"]).to eq(image_md5)
+      expect(decrypted["width"]).to eq(300)
+      expect(decrypted["height"]).to eq(200)
 
     end
 
@@ -347,10 +347,10 @@ describe Thumbor::CryptoURL do
 
       decrypted = decrypt_in_thumbor(encrypted)
 
-      decrypted["fit_in"].should == true
-      decrypted["image_hash"].should == image_md5
-      decrypted["width"].should == 300
-      decrypted["height"].should == 200
+      expect(decrypted["fit_in"]).to be_truthy
+      expect(decrypted["image_hash"]).to eq(image_md5)
+      expect(decrypted["width"]).to eq(300)
+      expect(decrypted["height"]).to eq(200)
 
     end
 
@@ -361,11 +361,11 @@ describe Thumbor::CryptoURL do
 
       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
+      expect(decrypted["meta"]).to be_truthy
+      expect(decrypted["smart"]).to be_truthy
+      expect(decrypted["image_hash"]).to eq(image_md5)
+      expect(decrypted["width"]).to eq(300)
+      expect(decrypted["height"]).to eq(200)
       decrypted["flip_horizontally"] == true
 
     end
@@ -377,11 +377,11 @@ describe Thumbor::CryptoURL do
 
       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
+      expect(decrypted["meta"]).to be_truthy
+      expect(decrypted["smart"]).to be_truthy
+      expect(decrypted["image_hash"]).to eq(image_md5)
+      expect(decrypted["width"]).to eq(300)
+      expect(decrypted["height"]).to eq(200)
       decrypted["flip_horizontally"] == true
       decrypted["flip_vertically"] == true
 
@@ -395,11 +395,11 @@ describe Thumbor::CryptoURL do
 
       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
+      expect(decrypted["meta"]).to be_truthy
+      expect(decrypted["smart"]).to be_truthy
+      expect(decrypted["image_hash"]).to eq(image_md5)
+      expect(decrypted["width"]).to eq(300)
+      expect(decrypted["height"]).to eq(200)
       decrypted["flip_horizontally"] == true
       decrypted["flip_vertically"] == true
       decrypted["halign"] == "left"
@@ -414,11 +414,11 @@ describe Thumbor::CryptoURL do
 
       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
+      expect(decrypted["meta"]).to be_truthy
+      expect(decrypted["smart"]).to be_truthy
+      expect(decrypted["image_hash"]).to eq(image_md5)
+      expect(decrypted["width"]).to eq(300)
+      expect(decrypted["height"]).to eq(200)
       decrypted["flip_horizontally"] == true
       decrypted["flip_vertically"] == true
       decrypted["halign"] == "left"
@@ -433,19 +433,19 @@ describe Thumbor::CryptoURL do
 
       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
+      expect(decrypted["horizontal_flip"]).to be_falsy
+      expect(decrypted["vertical_flip"]).to be_falsy
+      expect(decrypted["smart"]).to be_falsy
+      expect(decrypted["meta"]).to be_falsy
+      expect(decrypted["crop"]["left"]).to eq(10)
+      expect(decrypted["crop"]["top"]).to eq(20)
+      expect(decrypted["crop"]["right"]).to eq(30)
+      expect(decrypted["crop"]["bottom"]).to eq(40)
+      expect(decrypted["valign"]).to eq('middle')
+      expect(decrypted["halign"]).to eq('center')
+      expect(decrypted["image_hash"]).to eq(image_md5)
+      expect(decrypted["width"]).to eq(300)
+      expect(decrypted["height"]).to eq(200)
 
     end
 
@@ -456,7 +456,7 @@ describe Thumbor::CryptoURL do
 
       decrypted = decrypt_in_thumbor(encrypted)
 
-      decrypted["filters"].should == "quality(20):brightness(10)"
+      expect(decrypted["filters"]).to eq("quality(20):brightness(10)")
     end
   end
 
@@ -465,7 +465,7 @@ describe Thumbor::CryptoURL do
     it "should generate a unsafe url" do
       url = subject.generate :image => image_url
 
-      url.should == "/unsafe/#{image_url}"
+      expect(url).to eq("/unsafe/#{image_url}")
     end
   end
 end

metadata

@@ -1,55 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: ruby-thumbor
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Bernardo Heynemann
+- Guilherme Souza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,28 +85,29 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ruby-thumbor is the client to the thumbor imaging service (http://github.com/globocom/thumbor).
 email:
 - heynemann@gmail.com
+- guivideojob@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.rdoc
 - lib/ruby-thumbor.rb
 - lib/thumbor/cascade.rb
 - lib/thumbor/crypto_url.rb
 - lib/thumbor/version.rb
-- README.rdoc
 - spec/spec_helper.rb
 - spec/thumbor/cascade_spec.rb
 - spec/thumbor/crypto_url_spec.rb
@@ -121,17 +123,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: ruby-thumbor is the client to the thumbor imaging service (http://github.com/globocom/thumbor).