swift_client 0.0.1 → 0.0.2

data/lib/swift_client/version.rb

@@ -1,5 +1,5 @@
 
 class SwiftClient
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end
 

data/lib/swift_client.rb

@@ -3,11 +3,13 @@ require "swift_client/version"
 
 require "httparty"
 require "mime-types"
+require "openssl"
 
 class SwiftClient
   class AuthenticationError < StandardError; end
   class OptionError < StandardError; end
   class EmptyNameError < StandardError; end
+  class TempUrlKeyMissing < StandardError; end
 
   class ResponseError < StandardError
     attr_accessor :code, :message
@@ -38,69 +40,69 @@ class SwiftClient
     request :get, "/", :query => query
   end
 
-  def get_container(name, query = {})
-    raise(EmptyNameError) if name.empty?
+  def get_container(container, query = {})
+    raise(EmptyNameError) if container.empty?
 
-    request :get, "/#{name}", :query => query
+    request :get, "/#{container}", :query => query
   end
 
-  def head_container(name)
-    raise(EmptyNameError) if name.empty?
+  def head_container(container)
+    raise(EmptyNameError) if container.empty?
 
-    request :head, "/#{name}"
+    request :head, "/#{container}"
   end
 
-  def put_container(name, headers = {})
-    raise(EmptyNameError) if name.empty?
+  def put_container(container, headers = {})
+    raise(EmptyNameError) if container.empty?
 
-    request :put, "/#{name}", :headers => headers
+    request :put, "/#{container}", :headers => headers
   end
 
-  def post_container(name, headers = {})
-    raise(EmptyNameError) if name.empty?
+  def post_container(container, headers = {})
+    raise(EmptyNameError) if container.empty?
 
-    request :post, "/#{name}", :headers => headers
+    request :post, "/#{container}", :headers => headers
   end
 
-  def delete_container(name)
-    raise(EmptyNameError) if name.empty?
+  def delete_container(container)
+    raise(EmptyNameError) if container.empty?
 
-    request :delete, "/#{name}"
+    request :delete, "/#{container}"
   end
 
-  def put_object(name, data_or_io, container, headers = {})
-    raise(EmptyNameError) if name.empty? || container.empty?
+  def put_object(object, data_or_io, container, headers = {})
+    raise(EmptyNameError) if object.empty? || container.empty?
 
-    mime_type = MIME::Types.of(name).first
+    mime_type = MIME::Types.of(object).first
 
     extended_headers = headers.dup
     extended_headers["Content-Type"] ||= mime_type.content_type if mime_type
 
-    request :put, "/#{container}/#{name}", :body => data_or_io.respond_to?(:read) ? data_or_io.read : data_or_io, :headers => extended_headers
+    request :put, "/#{container}/#{object}", :body => data_or_io.respond_to?(:read) ? data_or_io.read : data_or_io, :headers => extended_headers
   end
 
-  def post_object(name, container, headers = {})
-    raise(EmptyNameError) if name.empty? || container.empty?
+  def post_object(object, container, headers = {})
+    raise(EmptyNameError) if object.empty? || container.empty?
 
-    request :post, "/#{container}/#{name}", :headers => headers
+    request :post, "/#{container}/#{object}", :headers => headers
   end
 
-  def get_object(name, container)
-    raise(EmptyNameError) if name.empty? || container.empty?
+  def get_object(object, container)
+    raise(EmptyNameError) if object.empty? || container.empty?
 
-    request :get, "/#{container}/#{name}"
+    request :get, "/#{container}/#{object}"
   end
 
-  def head_object(name, container)
-    raise(EmptyNameError) if name.empty? || container.empty?
+  def head_object(object, container)
+    raise(EmptyNameError) if object.empty? || container.empty?
 
-    request :head, "/#{container}/#{name}"
+    request :head, "/#{container}/#{object}"
   end
 
-  def delete_object(name, container)
-    raise(EmptyNameError) if name.empty? || container.empty?
+  def delete_object(object, container)
+    raise(EmptyNameError) if object.empty? || container.empty?
 
-    request :delete, "/#{container}/#{name}"
+    request :delete, "/#{container}/#{object}"
   end
 
   def get_objects(container, query = {})
@@ -109,6 +111,24 @@ class SwiftClient
     request :get, "/#{container}", :query => query
   end
 
+  def public_url(object, container)
+    raise(EmptyNameError) if object.empty? || container.empty?
+
+    "#{storage_url}/#{container}/#{object}"
+  end
+
+  def temp_url(object, container, opts = {})
+    raise(EmptyNameError) if object.empty? || container.empty?
+    raise(TempUrlKeyMissing) unless options[:temp_url_key]
+
+    expires = (Time.now + (options[:expires_in] || 3600).to_i).to_i
+    path = "/#{container}/#{object}"
+
+    signature = OpenSSL::HMAC.hexdigest("sha1", options[:temp_url_key], "GET\n#{expires}\n#{path}")
+
+    "#{storage_url}#{path}?temp_url_sig=#{signature}&temp_url_expires=#{expires}"
+  end
+
   private
 
   def request(method, path, opts = {})
@@ -135,9 +155,7 @@ class SwiftClient
     raise(AuthenticationError, "#{response.code}: #{response.message}") unless response.success?
 
     self.auth_token = response.headers["X-Auth-Token"]
-    self.storage_url = response.headers["X-Storage-Url"]
-
-    storage_url.gsub!(/^http:/, "https:") if options[:auth_url] =~ /^https:/
+    self.storage_url = options[:storage_url] || response.headers["X-Storage-Url"]
   end
 end
 

data/test/swift_client_test.rb

@@ -5,12 +5,21 @@ class SwiftClientTest < MiniTest::Test
   def setup
     stub_request(:get, "https://example.com/auth/v1.0").with(:headers => { "X-Auth-Key" => "secret", "X-Auth-User" => "account:username" }).to_return(:status => 200, :body => "", :headers => { "X-Auth-Token" => "Token", "X-Storage-Url" => "https://example.com/v1/AUTH_account" })
 
-    @swift_client = SwiftClient.new(:auth_url => "https://example.com/auth/v1.0", :username => "account:username", :api_key => "secret")
+    @swift_client = SwiftClient.new(:auth_url => "https://example.com/auth/v1.0", :username => "account:username", :api_key => "secret", :temp_url_key => "Temp url key")
 
     assert_equal "Token", @swift_client.auth_token
     assert_equal "https://example.com/v1/AUTH_account", @swift_client.storage_url
   end
 
+  def test_storage_url
+    stub_request(:get, "https://example.com/auth/v1.0").with(:headers => { "X-Auth-Key" => "secret", "X-Auth-User" => "account:username" }).to_return(:status => 200, :body => "", :headers => { "X-Auth-Token" => "Token", "X-Storage-Url" => "https://example.com/v1/AUTH_account" })
+
+    @swift_client = SwiftClient.new(:auth_url => "https://example.com/auth/v1.0", :username => "account:username", :api_key => "secret", :storage_url => "https://storage-url.com/path")
+
+    assert_equal "Token", @swift_client.auth_token
+    assert_equal "https://storage-url.com/path", @swift_client.storage_url
+  end
+
   def test_get_containers
     containers = [
       { "count" => 1, "bytes" => 1, "name" => "container-1" },
@@ -114,5 +123,13 @@ class SwiftClientTest < MiniTest::Test
       assert_equal "Not Found", e.message
     end
   end
+
+  def test_public_url
+    assert_equal "https://example.com/v1/AUTH_account/container/object", @swift_client.public_url("object", "container")
+  end
+
+  def test_temp_url
+    assert @swift_client.temp_url("object", "container", :expires_in => 3600) =~ %r{https://example.com/v1/AUTH_account/container/object\?temp_url_sig=[a-f0-9]{40}&temp_url_expires=[0-9]+}
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors: