swift_client 0.0.6 → 0.0.7

data/lib/swift_client.rb

@@ -4,6 +4,7 @@ require "swift_client/version"
 require "httparty"
 require "mime-types"
 require "openssl"
+require "stringio"
 
 class SwiftClient
   class AuthenticationError < StandardError; end
@@ -91,10 +92,11 @@ class SwiftClient
 
     mime_type = MIME::Types.of(object_name).first
 
-    extended_headers = headers.dup
+    extended_headers = (headers || {}).dup
     extended_headers["Content-Type"] ||= mime_type.content_type if mime_type
+    extended_headers["Transfer-Encoding"] = "chunked"
 
-    request :put, "/#{container_name}/#{object_name}", :body => data_or_io.respond_to?(:read) ? data_or_io.read : data_or_io, :headers => extended_headers
+    request :put, "/#{container_name}/#{object_name}", :body_stream => data_or_io.respond_to?(:read) ? data_or_io : StringIO.new(data_or_io), :headers => extended_headers
   end
 
   def post_object(object_name, container_name, headers = {})
@@ -152,11 +154,11 @@ class SwiftClient
   private
 
   def request(method, path, opts = {})
-    opts[:headers] ||= {}
-    opts[:headers]["X-Auth-Token"] = auth_token
-    opts[:headers]["Accept"] = "application/json"
+    headers = (opts[:headers] || {}).dup
+    headers["X-Auth-Token"] = auth_token
+    headers["Accept"] = "application/json"
 
-    response = HTTParty.send(method, "#{storage_url}#{path}", opts)
+    response = HTTParty.send(method, "#{storage_url}#{path}", opts.merge(:headers => headers))
 
     if response.code == 401
       authenticate

data/lib/swift_client/version.rb

@@ -1,5 +1,5 @@
 
 class SwiftClient
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end
 

data/test/swift_client_test.rb

@@ -131,13 +131,13 @@ class SwiftClientTest < MiniTest::Test
   end
 
   def test_put_object
-    stub_request(:put, "https://example.com/v1/AUTH_account/container/object").with(:body => "data", :headers => { "Accept" => "application/json", "X-Auth-Token" => "Token", "X-Object-Meta-Test" => "Test" }).to_return(:status => 201, :body => "", :headers => {})
+    stub_request(:put, "https://example.com/v1/AUTH_account/container/object").with(:body => "data", :headers => { "Transfer-Encoding" => "chunked", "Accept" => "application/json", "X-Auth-Token" => "Token", "X-Object-Meta-Test" => "Test" }).to_return(:status => 201, :body => "", :headers => {})
 
     assert_equal 201, @swift_client.put_object("object", "data", "container", "X-Object-Meta-Test" => "Test").code
   end
 
   def test_put_object_with_io
-    stub_request(:put, "https://example.com/v1/AUTH_account/container/object").with(:body => "data", :headers => { "Accept" => "application/json", "X-Auth-Token" => "Token", "X-Object-Meta-Test" => "Test" }).to_return(:status => 201, :body => "", :headers => {})
+    stub_request(:put, "https://example.com/v1/AUTH_account/container/object").with(:body => "data", :headers => { "Transfer-Encoding" => "chunked", "Accept" => "application/json", "X-Auth-Token" => "Token", "X-Object-Meta-Test" => "Test" }).to_return(:status => 201, :body => "", :headers => {})
 
     assert_equal 201, @swift_client.put_object("object", StringIO.new("data"), "container", "X-Object-Meta-Test" => "Test").code
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swift_client
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty