fog-brightbox 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 496e29fce89925667624be224c1f667295ee92fc
-  data.tar.gz: 86fca89817bccee070cdb86701a811cdb604cfa7
+  metadata.gz: 1ceab58130b1687c75932bd53be5455950a3f7f8
+  data.tar.gz: 851bb3bed538588fbbdc0ee9827afcf8ac02e2eb
 SHA512:
-  metadata.gz: e0725ecbd7084c492e79ef187183b1adebde76de09ac082d61b748784bb30fe73a91c47d7272c2cd96a28f27d78ff6462c0df951e1e898a88bf85e5bba56dae5
-  data.tar.gz: fbe5f43f457c4d2306bd8bbdcff03edb5dd002a07cb7bb7ffdbf65c20e092459dd93de159395543a15e4727cc4adaa8da3f8aa3f152cb6d0336eb000a851dc7b
+  metadata.gz: 374a94033bb49c034ba1db1f8f62ed899243e3e28d6b79975806b403e573d4b9757278e96d2354e11ae476dcd43ed51f7f38d26feabc5e367af10296ac11a544
+  data.tar.gz: 4a80fc6844ce04cd65d4f5e3d9274d4f0f7b6d4add941560ce3451f01ddcfa9ccd5c7d7f4436b07328ea73b5a0b0fcd5397345b9fb2f288f490b9d770e3b2d13

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.7.1 / 2014-12-05
+
+Bug fixes:
+
+* Fixed implementation of `Storage#create_temp_url` (except on Ruby 1.8.7)
+
 ### 0.7.0 / 2014-11-27
 
 Enhancements:

data/lib/fog/brightbox/requests/storage/get_object_https_url.rb

@@ -18,25 +18,23 @@ module Fog
 
         # creates a temporary url
         #
-        # ==== Parameters
-        # * container<~String> - Name of container containing object
-        # * object<~String> - Name of object to get expiring url for
-        # * expires<~Time> - An expiry time for this url
-        # * method<~String> - The method to use for accessing the object (GET, PUT, HEAD)
-        # * scheme<~String> - The scheme to use (http, https)
-        # * options<~Hash> - An optional options hash
+        # @param container [String] Name of container containing object
+        # @param object [String] Name of object to get expiring url for
+        # @param expires_at [Time] An expiry time for this url
+        # @param method [String] The method to use for accessing the object (GET, PUT, HEAD)
+        # @param options [Hash] An optional options hash
+        # @option options [String] :scheme The scheme to use (http, https)
+        # @option options [String] :port A non standard port to use
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~String> - url for object
+        # @return [String] url for object
         #
-        # ==== See Also
-        # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
-        def create_temp_url(container, object, expires, method, options = {})
-          raise ArgumentError, "Insufficient parameters specified." unless container && object && expires && method
-          raise ArgumentError, "Storage must be instantiated with the :brightbox_temp_url_key option" if @brightbox_temp_url_key.nil?
-
-          scheme = options[:scheme] || @scheme
+        # @raise [ArgumentError] if +storage_temp_key+ is not set in configuration
+        # @raise [ArgumentError] if +method+ is not valid
+        #
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
+        #
+        def create_temp_url(container, object, expires_at, method, options = {})
+          raise ArgumentError, "Storage must be instantiated with the :brightbox_temp_url_key option" if @config.storage_temp_key.nil?
 
           # POST not allowed
           allowed_methods = %w(GET PUT HEAD)
@@ -44,25 +42,25 @@ module Fog
             raise ArgumentError.new("Invalid method '#{method}' specified. Valid methods are: #{allowed_methods.join(", ")}")
           end
 
-          expires        = expires.to_i
-          object_path_escaped   = "#{@path}/#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object, "/")}"
-          object_path_unescaped = "#{@path}/#{Fog::Storage::Brightbox.escape(container)}/#{object}"
-          string_to_sign = "#{method}\n#{expires}\n#{object_path_unescaped}"
+          # This assumes we have access to the management URL at this point
+          destination_url = management_url.dup
+          object_path = destination_url.path
+
+          destination_url.scheme = options[:scheme] if options[:scheme]
+          destination_url.port = options[:port] if options[:port]
+
+          object_path_escaped = "#{object_path}/#{Fog::Storage::Brightbox.escape(container)}/#{Fog::Storage::Brightbox.escape(object, "/")}"
+          object_path_unescaped = "#{object_path}/#{Fog::Storage::Brightbox.escape(container)}/#{object}"
+
+          expiry_timestamp = expires_at.to_i
+          string_to_sign = [method, expiry_timestamp, object_path_unescaped].join("\n")
 
-          hmac = Fog::HMAC.new("sha1", @brightbox_temp_url_key)
-          sig  = sig_to_hex(hmac.sign(string_to_sign))
+          hmac = Fog::HMAC.new("sha1", @config.storage_temp_key)
+          sig = sig_to_hex(hmac.sign(string_to_sign))
 
-          temp_url_options = {
-            :scheme => scheme,
-            :host => @host,
-            :port => @port,
-            :path => object_path_escaped,
-            :query => URI.encode_www_form(
-              :temp_url_sig => sig,
-              :temp_url_expires => expires
-            )
-          }
-          URI::Generic.build(temp_url_options).to_s
+          destination_url.path = object_path_escaped
+          destination_url.query = URI.encode_www_form(:temp_url_sig => sig, :temp_url_expires => expiry_timestamp)
+          destination_url.to_s
         end
 
         private

data/lib/fog/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Brightbox
-    VERSION = "0.7.0"
+    VERSION = "0.7.1"
   end
 end

data/spec/fog/storage/brightbox_spec.rb

@@ -266,4 +266,57 @@ describe Fog::Storage::Brightbox do
       pass
     end
   end
+
+  describe "when not initialised with temporary URL key" do
+    let(:settings) do
+      {
+        :brightbox_client_id => "cli-12345",
+        :brightbox_secret => "12345"
+      }
+    end
+
+    it "returns nil" do
+      assert_nil config.storage_temp_key
+    end
+
+    it "fails to generate temporary URLs" do
+      assert_raises(ArgumentError) { service.create_temp_url("container", "object", Time.now, "GET") }
+    end
+  end
+
+  describe "when initialised with temporary URL key" do
+    before { skip unless RUBY_VERSION > "1.9.3" }
+    let(:temp_url_key) { "1234567890" }
+    let(:settings) do
+      {
+        :brightbox_client_id => "cli-12345",
+        :brightbox_secret => "12345",
+        :brightbox_storage_management_url => "https://example.brightbox.com",
+        :brightbox_temp_url_key => temp_url_key
+      }
+    end
+    let(:container) { "container" }
+    let(:object) { "file.ext" }
+    let(:expiry_time) { Time.utc(2012) }
+    let(:request_method) { "GET" }
+
+    it "returns the key" do
+      assert_equal temp_url_key, config.storage_temp_key
+    end
+
+    it "can generate temporary HTTPS URLs" do
+      assert_equal "https://example.brightbox.com/container/file.ext?temp_url_sig=86dcfd2cf9d501936abab2badc152e90d6b3b133&temp_url_expires=1325376000",
+        service.create_temp_url(container, object, expiry_time, request_method, :scheme => "https")
+    end
+
+    it "can generate temporary HTTP URLs" do
+      assert_equal "http://example.brightbox.com/container/file.ext?temp_url_sig=86dcfd2cf9d501936abab2badc152e90d6b3b133&temp_url_expires=1325376000",
+        service.create_temp_url(container, object, expiry_time, request_method, :scheme => "http")
+    end
+
+    it "can generate temporary HTTP URLs on non standard ports" do
+      assert_equal "http://example.brightbox.com:401/container/file.ext?temp_url_sig=86dcfd2cf9d501936abab2badc152e90d6b3b133&temp_url_expires=1325376000",
+        service.create_temp_url(container, object, expiry_time, request_method, :scheme => "http", :port => 401)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-brightbox
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Paul Thornthwaite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core