ruby-thumbor 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed4ebe8f3b222814e1c6657501b576742203490a
-  data.tar.gz: b7d93fdda95026dbde9d01a2ae6943ffbe9be526
+  metadata.gz: bf79ac9182e85f40ddc5c7366b08cd62bc662ad5
+  data.tar.gz: 2473d2976870e9a63ca1beb976106a1d4ceb2f94
 SHA512:
-  metadata.gz: 3bb31b237dd4fe02e625d81f4b803e98df02fa16a019c96d9831984a27b64ec95513312c8e193cac4614b56de875ced3d265d81c10420c60f18310bd7241d269
-  data.tar.gz: 616b5aa7ac01e9c3f0380d65528ba5d18fc590b971353b4ec1102ff0dd0d9b4f2e9765a879615a348a2c3c142d40efb5cc4c6793ee8d25be3cfd2757476453ed
+  metadata.gz: e039b98cc404a999c945c515db22b8c81641b27186b035d77bcbd19d91a79f412f6273eb4ef9978b081a1393092cc7347d57e754ab172d7c43bb313b621cfe86
+  data.tar.gz: 9cabebf6eac09cca9129b667322809485c67282dae83f6450b242d1dd190b7caa6e84fb56560db5bba34dfb618459e4c34886459190a7b692ade3598e34f258d

data/lib/thumbor/cascade.rb

@@ -30,11 +30,11 @@ module Thumbor
     end
 
     def url_for
-      @old_crypto.url_for prepare_options(@options).merge({:image => @image, :filters => @filters})
+      @old_crypto.url_for prepare_options(@options).merge({image: @image, filters: @filters})
     end
 
     def generate
-      @old_crypto.generate prepare_options(@options).merge({:image => @image, :filters => @filters})
+      @old_crypto.generate prepare_options(@options).merge({image: @image, filters: @filters})
     end
 
     def method_missing(m, *args)
@@ -67,4 +67,4 @@ module Thumbor
       end
     end
   end
-end
+end

data/lib/thumbor/crypto_url.rb

@@ -136,6 +136,12 @@ module Thumbor
 
             url_parts = Array.new
 
+            if options[:trim]
+                trim_options  = ['trim']
+                trim_options << options[:trim] unless options[:trim] == true or options[:trim][0] == true
+                url_parts.push(trim_options.join(':'))
+            end
+
             if options[:meta]
                 url_parts.push('meta')
             end
@@ -172,12 +178,6 @@ module Thumbor
                 url_parts.push('smart')
             end
 
-            if options[:trim]
-                trim_options  = ['trim']
-                trim_options << options[:trim] unless options[:trim] == true or options[:trim][0] == true
-                url_parts.push(trim_options.join(':'))
-            end
-
             if options[:filters] && !options[:filters].empty?
               filter_parts = []
               options[:filters].each do |filter|

data/lib/thumbor/version.rb

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

data/spec/spec_helper.rb

@@ -1,15 +1,11 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'simplecov'
 
-if /^1\.9/ === RUBY_VERSION
-  require 'simplecov'
-
-  SimpleCov.start do
-    add_filter '/spec/'
-  end
+SimpleCov.start do
+add_filter '/spec/'
 end
 
-RSpec.configure do |c| 
+
+RSpec.configure do |c|
   c.filter_run :focus => true
   c.run_all_when_everything_filtered = true
 end

data/spec/thumbor/crypto_url_spec.rb

@@ -142,6 +142,13 @@ describe Thumbor::CryptoURL do
       url.should == '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'
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-thumbor
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Bernardo Heynemann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: ruby-thumbor is the client to the thumbor imaging service (http://github.com/globocom/thumbor).