ruby-thumbor 1.1.0 → 1.1.1

data/README.rdoc

@@ -28,7 +28,7 @@ No dependencies required for regular usage.
 
     require 'ruby-thumbor'
 
-    crypto = Thumbor::CryptoURL.new :key => 'my-security-key'
+    crypto = Thumbor::CryptoURL.new 'my-security-key'
 
     url = crypto.generate :width => 200, :height => 300, :image => 'my.server.com/path/to/image.jpg'
 

data/lib/thumbor/crypto_url.rb

@@ -129,13 +129,17 @@ module Thumbor
         end
 
         def generate_new(options)
-            url_options = url_for(options, false)
-            url = "#{url_options}/#{options[:image]}"
+            thumbor_path = ""
 
-            signature = OpenSSL::HMAC.digest('sha1', Thumbor.key, url)
-            signature = url_safe_base64(signature)
+            image_options = url_for(options, false)
+            thumbor_path << image_options + '/' unless image_options.empty?
 
-            "/#{signature}/#{url}"
+            thumbor_path << options[:image]
+
+            signature = url_safe_base64(OpenSSL::HMAC.digest('sha1', Thumbor.key, thumbor_path))
+            thumbor_path.insert(0, "/#{signature}/")
+
+            thumbor_path
         end
 
         def generate(options)
@@ -143,4 +147,4 @@ module Thumbor
             generate_new(options)
         end
     end
-end
+end

data/lib/thumbor/version.rb

@@ -1,3 +1,3 @@
 module Thumbor
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/spec/thumbor/crypto_url_spec.rb

@@ -144,6 +144,11 @@ describe Thumbor::CryptoURL do
   end
 
   describe '#generate' 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}"
+    end
 
     it "should create a new instance passing key and keep it" do
       url = subject.generate :width => 300, :height => 200, :image => image_url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-thumbor
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec