ruby-thumbor 1.1.1 → 1.1.2

data/lib/ruby-thumbor.rb

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

data/lib/thumbor/crypto_url.rb

@@ -9,7 +9,10 @@ module Thumbor
 
         def initialize(key)
             Thumbor.key = key
-            @computed_key = (Thumbor.key * 16)[0..15]
+        end
+
+        def computed_key
+            (Thumbor.key * 16)[0..15]
         end
 
         def pad(s)
@@ -121,7 +124,7 @@ module Thumbor
         def generate_old(options)
             url = pad(url_for(options))
             cipher = OpenSSL::Cipher::Cipher.new('aes-128-ecb').encrypt
-            cipher.key = @computed_key
+            cipher.key = computed_key
             encrypted = cipher.update(url)
             based = url_safe_base64(encrypted)
 

data/lib/thumbor/version.rb

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

data/spec/thumbor/cascade_spec.rb

@@ -8,13 +8,17 @@ describe Thumbor::Cascade do
   let(:image_md5) { 'f33af67e41168e80fcc5b00f8bd8061a' }
   let(:key) { 'my-security-key' }
 
-  before do
-    Thumbor.key = key 
-  end
-
   subject { Thumbor::Cascade.new image_url }
 
+  after(:each) do
+    Thumbor.key = nil
+  end
+
   describe '#new' do
+    before do
+      Thumbor.key = key
+    end
+
     it "should create a new instance passing key and keep it" do
       subject.computed_key.should == 'my-security-keym'
     end
@@ -36,7 +40,7 @@ describe Thumbor::Cascade do
     end
 
     it "should return proper url for width-only" do
-      url = subject.width(300).url_for 
+      url = subject.width(300).url_for
       url.should == '300x0/' << image_md5
     end
 
@@ -172,12 +176,23 @@ 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
       url.should == '/TQfyd3H36Z3srcNcLOYiM05YNO8=/300x200/my.domain.com/some/image/url.jpg'
     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.should_not == 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'
@@ -210,6 +225,10 @@ describe Thumbor::Cascade do
   end
 
   describe "#generate :old => true" do
+    before do
+      Thumbor.key = key
+    end
+
     subject { Thumbor::Cascade.new(image_url).old(true) }
 
     it "should create a new instance passing key and keep it" do

metadata

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