swift_client 0.0.7 → 0.0.8

data/lib/swift_client.rb

@@ -93,7 +93,12 @@ class SwiftClient
     mime_type = MIME::Types.of(object_name).first
 
     extended_headers = (headers || {}).dup
-    extended_headers["Content-Type"] ||= mime_type.content_type if mime_type
+
+    unless find_header_key(extended_headers, "Content-Type")
+      extended_headers["Content-Type"] = mime_type.content_type if mime_type
+      extended_headers["Content-Type"] ||= "application/octet-stream"
+    end
+
     extended_headers["Transfer-Encoding"] = "chunked"
 
     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
@@ -153,6 +158,10 @@ class SwiftClient
 
   private
 
+  def find_header_key(headers, key)
+    headers.keys.detect { |k| k.downcase == key.downcase }
+  end
+
   def request(method, path, opts = {})
     headers = (opts[:headers] || {}).dup
     headers["X-Auth-Token"] = auth_token

data/lib/swift_client/version.rb

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

data/test/swift_client_test.rb

@@ -131,11 +131,23 @@ class SwiftClientTest < MiniTest::Test
   end
 
   def test_put_object
-    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 => {})
+    stub_request(:put, "https://example.com/v1/AUTH_account/container/object").with(:body => "data", :headers => { "Transfer-Encoding" => "chunked", "Content-Type" => "application/octet-stream", "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_without_mime_type
+    stub_request(:put, "https://example.com/v1/AUTH_account/container/object.jpg").with(:body => "data", :headers => { "Transfer-Encoding" => "chunked", "Accept" => "application/json", "Content-Type" => "image/jpeg", "X-Auth-Token" => "Token", "X-Object-Meta-Test" => "Test" }).to_return(:status => 201, :body => "", :headers => {})
+
+    assert_equal 201, @swift_client.put_object("object.jpg", "data", "container", "X-Object-Meta-Test" => "Test").code
+  end
+
+  def test_put_object_with_mime_type
+    stub_request(:put, "https://example.com/v1/AUTH_account/container/object.jpg").with(:body => "data", :headers => { "Transfer-Encoding" => "chunked", "Accept" => "application/json", "Content-Type" => "content/type", "X-Auth-Token" => "Token", "X-Object-Meta-Test" => "Test" }).to_return(:status => 201, :body => "", :headers => {})
+
+    assert_equal 201, @swift_client.put_object("object.jpg", "data", "container", "X-Object-Meta-Test" => "Test", "Content-Type" => "content/type").code
+  end
+
   def test_put_object_with_io
     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 => {})
 

metadata

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