ruby-thumbor 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf79ac9182e85f40ddc5c7366b08cd62bc662ad5
-  data.tar.gz: 2473d2976870e9a63ca1beb976106a1d4ceb2f94
+  metadata.gz: 893a41411617f13eb886aa0623348b8465367c2f
+  data.tar.gz: 4f987bbd23926f386cc6e360a10156007dafb159
 SHA512:
-  metadata.gz: e039b98cc404a999c945c515db22b8c81641b27186b035d77bcbd19d91a79f412f6273eb4ef9978b081a1393092cc7347d57e754ab172d7c43bb313b621cfe86
-  data.tar.gz: 9cabebf6eac09cca9129b667322809485c67282dae83f6450b242d1dd190b7caa6e84fb56560db5bba34dfb618459e4c34886459190a7b692ade3598e34f258d
+  metadata.gz: a7534f13bd29cda443f7b9338bf70b411ae6f4ce2802928d5c83e603272a1e3531f88ce4dd369adca224b2d5b59c7a0cbf1889e5d6097c2ea94f42993f242d28
+  data.tar.gz: 3353dcafc369ea2695b3e2883b7b6400bd63f810ead8557018a4ac313c08cb7dafa6fa5f5e1e1b597980d3c5d2ff9494112b53242d1d843b63ebad8712405ef2

data/README.rdoc

@@ -1,6 +1,6 @@
-= ruby-thumbor {<img src="https://secure.travis-ci.org/heynemann/ruby-thumbor.png?branch=master" alt="Build Status" />}[http://travis-ci.org/heynemann/ruby-thumbor] {<img src="https://gemnasium.com/heynemann/ruby-thumbor.png" alt="Dependency Status" />}[https://gemnasium.com/heynemann/ruby-thumbor]
+= ruby-thumbor {<img src="https://secure.travis-ci.org/thumbor/ruby-thumbor.png?branch=master" alt="Build Status" />}[http://travis-ci.org/thumbor/ruby-thumbor] {<img src="https://gemnasium.com/thumbor/ruby-thumbor.png" alt="Dependency Status" />}[https://gemnasium.com/thumbor/ruby-thumbor] {<img src="https://badge.fury.io/rb/ruby-thumbor.svg" alt="Gem Version" />}[http://badge.fury.io/rb/ruby-thumbor]
 
-* http://github.com/heynemann/ruby-thumbor
+* http://github.com/thumbor/ruby-thumbor
 
 == DESCRIPTION:
 

data/lib/thumbor/cascade.rb

@@ -8,7 +8,14 @@ module Thumbor
   class Cascade
     attr_accessor :image, :old_crypto, :options, :filters
 
-    @available_options = [:meta, :crop, :center, :original_width, :original_height, :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, :adaptive_fit_in,
+      :full_fit_in, :adaptive_full_fit_in,
+      :old, :trim]
 
     extend Forwardable
 

data/lib/thumbor/crypto_url.rb

@@ -160,8 +160,14 @@ module Thumbor
                 end
             end
 
-            if options[:fit_in]
-                url_parts.push('fit-in')
+            [:fit_in, :adaptive_fit_in, :full_fit_in, :adaptive_full_fit_in].each do |fit|
+                if options[fit]
+                    url_parts.push(fit.to_s.gsub('_','-'))
+                end
+            end
+
+            if options.include?(:fit_in) or options.include?(:full_fit_in) and not (options.include?(:width) or options.include?(:height))
+                raise ArgumentError, 'When using fit-in or full-fit-in, you must specify width and/or height.'
             end
 
             calculate_width_and_height(url_parts, options)
@@ -220,7 +226,7 @@ module Thumbor
             if Thumbor.key
                 signature = url_safe_base64(OpenSSL::HMAC.digest('sha1', Thumbor.key, thumbor_path))
                 thumbor_path.insert(0, "/#{signature}/")
-            else 
+            else
                 thumbor_path.insert(0, "/unsafe/")
             end
             thumbor_path

data/lib/thumbor/version.rb

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

data/spec/spec_helper.rb

@@ -8,4 +8,7 @@ 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

@@ -20,7 +20,7 @@ describe Thumbor::Cascade do
     end
 
     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
 
@@ -32,7 +32,7 @@ describe Thumbor::Cascade do
 
     it "should return just the image hash if no arguments passed" do
       url = subject.url_for
-      url.should == image_md5
+      expect(url).to eq image_md5
     end
 
     it "should raise if no image passed" do
@@ -41,172 +41,194 @@ describe Thumbor::Cascade do
 
     it "should return proper url for width-only" do
       url = subject.width(300).url_for
-      url.should == '300x0/' << image_md5
+      expect(url).to eq '300x0/' << image_md5
     end
 
     it "should return proper url for height-only" do
       url = subject.height(300).url_for
-      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.width(200).height(300).url_for
-      url.should == '200x300/' << image_md5
+      expect(url).to eq '200x300/' << image_md5
     end
 
     it "should return proper smart url" do
       url = subject.width(200).height(300).smart(true).url_for
-      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.width(200).height(300).fit_in(true).url_for
-      url.should == 'fit-in/200x300/' << image_md5
+      expect(url).to eq 'fit-in/200x300/' << image_md5
+    end
+
+    it "should return proper adaptive-fit-in url" do
+      url = subject.width(200).height(300).adaptive_fit_in(true).url_for
+      expect(url).to eq 'adaptive-fit-in/200x300/' << image_md5
+    end
+
+    it "should return proper full-fit-in url" do
+      url = subject.width(200).height(300).full_fit_in(true).url_for
+      expect(url).to eq 'full-fit-in/200x300/' << image_md5
+    end
+
+    it "should return proper adaptive-full-fit-in url" do
+      url = subject.width(200).height(300).adaptive_full_fit_in(true).url_for
+      expect(url).to eq 'adaptive-full-fit-in/200x300/' << image_md5
+    end
+
+    [:fit_in, :full_fit_in].each do |fit|
+      it "should raise error when using #{fit} without width or height" do
+        subject.send(fit, true)
+        expect{subject.url_for}.to raise_error(ArgumentError)
+      end
     end
 
     it "should return proper flip url if no width and height" do
       url = subject.flip(true).url_for
-      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.flop(true).url_for
-      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.flip(true).flop(true).url_for
-      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.width(300).flip(true).url_for
-      url.should == '-300x0/' << image_md5
+      expect(url).to eq '-300x0/' << image_md5
     end
 
     it "should return proper flop url if height" do
       url = subject.height(300).flop(true).url_for
-      url.should == '0x-300/' << image_md5
+      expect(url).to eq '0x-300/' << image_md5
     end
 
     it "should return horizontal align" do
       url = subject.halign(:left).url_for
-      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.halign(:center).url_for
-      url.should == image_md5
+      expect(url).to eq image_md5
     end
 
     it "should return vertical align" do
       url = subject.valign(:top).url_for
-      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.valign(:middle).url_for
-      url.should == image_md5
+      expect(url).to eq image_md5
     end
 
     it "should return halign and valign properly" do
       url = subject.halign(:left).valign(:top).url_for
-      url.should == 'left/top/' << image_md5
+      expect(url).to eq 'left/top/' << image_md5
     end
 
     it "should return meta properly" do
       url = subject.meta(true).url_for
-      url.should == 'meta/' << image_md5
+      expect(url).to eq 'meta/' << image_md5
     end
 
     it "should return proper crop url when param is array" do
       url = subject.crop([10, 20, 30, 40]).url_for
-      url.should == '10x20:30x40/' << image_md5
+      expect(url).to eq '10x20:30x40/' << image_md5
     end
 
     it "should return proper crop url" do
       url = subject.crop(10, 20, 30, 40).url_for
-      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.crop(0, 0, 0, 0).url_for
-      url.should == image_md5
+      expect(url).to eq image_md5
     end
 
     it "should have smart after halign and valign" do
       url = subject.halign(:left).valign(:top).smart(true).url_for
-      url.should == 'left/top/smart/' << image_md5
+      expect(url).to eq 'left/top/smart/' << image_md5
     end
 
     it "should have quality filter" do
       url = subject.quality_filter(20).url_for
-      url.should == 'filters:quality(20)/' << image_md5
+      expect(url).to eq 'filters:quality(20)/' << image_md5
     end
 
     it "should have brightness filter" do
       url = subject.brightness_filter(30).url_for
-      url.should == 'filters:brightness(30)/' << image_md5
+      expect(url).to eq 'filters:brightness(30)/' << image_md5
     end
 
     it "should have 2 filters" do
       url = subject.brightness_filter(30).quality_filter(20).url_for
-      url.should == 'filters:brightness(30):quality(20)/' << image_md5
+      expect(url).to eq 'filters:brightness(30):quality(20)/' << image_md5
     end
 
     it "should escape url args" do
       url = subject.watermark_filter('http://my-server.com/image.png', 30).quality_filter(20).url_for
-      url.should == 'filters:watermark(http%3A%2F%2Fmy-server.com%2Fimage.png,30):quality(20)/' << image_md5
+      expect(url).to eq 'filters:watermark(http%3A%2F%2Fmy-server.com%2Fimage.png,30):quality(20)/' << image_md5
     end
 
     it "should have trim without params" do
       url = subject.trim.url_for
-      url.should == 'trim/' << image_md5
+      expect(url).to eq 'trim/' << image_md5
     end
 
     it "should have trim with direction param" do
       url = subject.trim('bottom-right').url_for
-      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.trim('bottom-right', 15).url_for
-      url.should == 'trim:bottom-right:15/' << image_md5
+      expect(url).to eq '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
+      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.original_width(100).original_height(100).width(40).height(50).center(100, 50).url_for
-      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.original_width(100).original_height(100).width(40).height(50).center(50, 50).url_for
-      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.original_width(100).original_height(100).width(50).height(40).center(50, 0).url_for
-      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.original_width(100).original_height(100).width(50).height(40).center(50, 100).url_for
-      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.original_width(100).original_height(100).width(50).height(40).center(50, 50).url_for
-      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.original_width(100).original_height(100).width(50).height(50).center(50, 0).url_for
-      url.should == '50x50/' << image_md5
+      expect(url).to eq '50x50/' << image_md5
     end
 
     it "should blow up with a bad center" do
@@ -215,42 +237,42 @@ describe Thumbor::Cascade do
 
     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
+      expect(url).to eq '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
+      expect(url).to eq '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
+      expect(url).to eq 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
+      expect(url).to eq '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
+      expect(url).to eq '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
+      expect(url).to eq '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
+      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.original_width(100).original_height(100).width(-50).height(-40).center(50, 50).url_for
-      url.should == '0x10:100x90/-50x-40/' << image_md5
+      expect(url).to eq '0x10:100x90/-50x-40/' << image_md5
     end
   end
 
@@ -261,7 +283,7 @@ describe Thumbor::Cascade do
 
     it "should create a new instance passing key and keep it" do
       url = subject.width(300).height(200).generate
-      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 be able to change the Thumbor key" do
@@ -269,37 +291,37 @@ describe Thumbor::Cascade do
       url1 = thumbor.generate
       Thumbor.key = 'another-thumbor-key'
       url2 = thumbor.generate
-      url1.should_not == url2
+      expect(url1).not_to eq url2
     end
 
     it "should create a new instance passing key and keep it" do
       url = subject.width(300).height(200).meta(true).generate
-      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.width(300).height(200).meta(true).smart(true).generate
-      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.width(300).height(200).meta(true).smart(true).fit_in(true).generate
-      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.width(300).height(200).meta(true).smart(true).fit_in(true).flip(true).generate
-      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.width(300).height(200).meta(true).smart(true).fit_in(true).flip(true).flop(true).generate
-      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.quality_filter(20).brightness_filter(10).generate
-      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
 
@@ -312,7 +334,7 @@ describe Thumbor::Cascade do
 
     it "should create a new instance passing key and keep it" do
       url = subject.width(300).height(200).generate
-      url.should == '/qkLDiIbvtiks0Up9n5PACtmpOfX6dPXw4vP4kJU-jTfyF6y1GJBJyp7CHYh1H3R2/' << image_url
+      expect(url).to eq '/qkLDiIbvtiks0Up9n5PACtmpOfX6dPXw4vP4kJU-jTfyF6y1GJBJyp7CHYh1H3R2/' << image_url
     end
 
     it "should allow thumbor to decrypt it properly" do
@@ -322,20 +344,20 @@ describe Thumbor::Cascade 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 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["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
 
@@ -346,10 +368,10 @@ describe Thumbor::Cascade 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 eq true
+      expect(decrypted["image_hash"]).to eq image_md5
+      expect(decrypted["width"]).to eq 300
+      expect(decrypted["height"]).to eq 200
 
     end
 
@@ -360,11 +382,11 @@ describe Thumbor::Cascade 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 eq true
+      expect(decrypted["smart"]).to eq true
+      expect(decrypted["image_hash"]).to eq image_md5
+      expect(decrypted["width"]).to eq 300
+      expect(decrypted["height"]).to eq 200
 
     end
 
@@ -375,10 +397,10 @@ describe Thumbor::Cascade 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 eq true
+      expect(decrypted["image_hash"]).to eq image_md5
+      expect(decrypted["width"]).to eq 300
+      expect(decrypted["height"]).to eq 200
 
     end
 
@@ -389,12 +411,12 @@ describe Thumbor::Cascade 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
-      decrypted["flip_horizontally"] == true
+      expect(decrypted["meta"]).to eq true
+      expect(decrypted["smart"]).to eq true
+      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
 
     end
 
@@ -405,13 +427,13 @@ describe Thumbor::Cascade 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
-      decrypted["flip_horizontally"] == true
-      decrypted["flip_vertically"] == true
+      expect(decrypted["meta"]).to eq true
+      expect(decrypted["smart"]).to eq true
+      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
 
     end
 
@@ -423,14 +445,14 @@ describe Thumbor::Cascade 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
-      decrypted["flip_horizontally"] == true
-      decrypted["flip_vertically"] == true
-      decrypted["halign"] == "left"
+      expect(decrypted["meta"]).to eq true
+      expect(decrypted["smart"]).to eq true
+      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["halign"]).to eq "left"
 
     end
 
@@ -442,15 +464,15 @@ describe Thumbor::Cascade 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
-      decrypted["flip_horizontally"] == true
-      decrypted["flip_vertically"] == true
-      decrypted["halign"] == "left"
-      decrypted["valign"] == "top"
+      expect(decrypted["meta"]).to eq true
+      expect(decrypted["smart"]).to eq true
+      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["halign"]).to eq "left"
+      expect(decrypted["valign"]).to eq "top"
 
     end
 
@@ -461,19 +483,19 @@ describe Thumbor::Cascade 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 eq false
+      expect(decrypted["vertical_flip"]).to eq false
+      expect(decrypted["smart"]).to eq false
+      expect(decrypted["meta"]).to eq false
+      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
 
@@ -484,7 +506,7 @@ describe Thumbor::Cascade do
 
       decrypted = decrypt_in_thumbor(encrypted)
 
-      decrypted["filters"].should == "quality(20):brightness(10)"
+      expect(decrypted["filters"]).to eq "quality(20):brightness(10)"
     end
   end
 end

metadata

@@ -1,41 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: ruby-thumbor
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Bernardo Heynemann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-07-11 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
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+- !ruby/object:Gem::Dependency
+  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).
@@ -65,12 +121,12 @@ 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: []