fog-softlayer 0.3.22 → 0.3.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDRjMGMzNTJlOWViMmI4OWYyNDEzZmYzNjFjNmEzYWE4OTQ1ZjZlYw==
+    MzcxZGUzMTQwNmEzZTIyOGY2Zjk1YjI4ODQ2NjBkODU1OGFhYzE2Mw==
   data.tar.gz: !binary |-
-    NWRhODgwN2M5MjliZGUzODNjOTRkZTNhZWE2YzkxYTQ0ODFmOTYxNA==
+    MjljOTY0ZmVmNzBkMzY5ZmFhZWRjYTA1MTIwMWQzM2UyNDQzYmI5YQ==
 SHA512:
   metadata.gz: !binary |-
-    MjZmOTE2YjQyYjdhNjk5NDA0NWFlMDMxYjgxNzJhZTQ1NDIyYTUxZTkxOGI0
-    NWMzZGE2MmQ4ZWE1NjViNDNiMTM2MjE3YzRiMGIzYTYwNjgzODU3NjkyOTRm
-    NDVmZmI3Njc2MzZlZTgzZjEwNWNmNWRlNTg2MDZjOGExZWQyNzQ=
+    NzRmZDc3YWU0MzUxMDkxMmU0OTIyNWNmNzEzZDkwMDRhYjA1ZTNlMjVmMmMx
+    ZGI5ZWE3NjhmMjY4Y2YxYWRkNWY2MjZkOGM3MWE2YmQ5NGIyMmUyNTZlNGU3
+    NTFkNWMyMWJmZjc4YjgyNzA2NGViZDdjMTc4MmY4NGMwYWY4NmE=
   data.tar.gz: !binary |-
-    MzNiZjk5N2U5NTYwYzAzNGMwNTAwYWYwYmRlN2NhZGYyMTdkZjYyYzdiZmYy
-    YjhjMWVjOTM2ZjljOGFjMmM5NDQyNDI5NGI0Y2E4MWRiZmRiY2E0ZDQwZWYz
-    YWUxYjU2MDA1YTEzZGFiNjM5MTJlMzFiMjA4MDkxZmJkM2VlYWY=
+    MjJkZTM2ODM3NjYzNjIxOWFkOTI3OGQzODliY2Q0OTg5Y2IxMjNmNjU4ZjU0
+    ODc1OGU3ZjY1MTc4YzM1ZDM4NWYwYzhiNjVmYzhkOWFkYThjMTczOGU0MmRm
+    MjJmMjZkNDEyM2M2ZWUxYTFkN2NjZmQ2ZWQwMzljYWRhOTk4YTc=

data/CONTRIBUTORS.md

@@ -2,4 +2,5 @@
 * Hiroyuki Urasoko <ura.58.58@gmail.com>
 * Konstantin Krauss <konstantin@propertybase.com>
 * Matt Eldridge <matt.eldridge@us.ibm.com>
+* Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
 * geemus <geemus@gmail.com>

data/lib/fog/softlayer/storage.rb

@@ -148,8 +148,8 @@ module Fog
 
           output[:path] = params[:path] ? "#{@path}/#{params.delete(:path)}".sub(/\/$/, '') : @path
 
-          output = output.deep_merge(params)
-          output.deep_merge(_headers)
+          output = output.deep_merge(_headers)
+          output.deep_merge(params)
         end
 
         def _headers

data/lib/fog/softlayer/version.rb

@@ -7,6 +7,6 @@
 
 module Fog
   module Softlayer
-    VERSION = "0.3.22"
+    VERSION = "0.3.23"
   end
 end

data/tests/softlayer/storage_tests.rb

@@ -0,0 +1,27 @@
+#
+# Author:: Paulo Henrique Lopes Ribeiro (<plribeiro3000@gmail.com>)
+# © Copyright IBM Corporation 2014.
+#
+# LICENSE: MIT (http://opensource.org/licenses/MIT)
+#
+
+Shindo.tests('Fog::Storage[:softlayer]', ['softlayer']) do
+  tests('#_build_params') do
+    tests('sending image/png files') do
+      mocking = Fog.mocking?
+      Fog.unmock!
+      # Stubs Real Connection
+      class Fog::Storage::Softlayer::Real
+        def initialize(_options = {});end
+      end
+      @service = Fog::Storage::Softlayer.new(softlayer_username: 'name',
+                                             softlayer_api_key: 'key',
+                                             softlayer_cluster: 'cluster',
+                                             softlayer_storage_account: 'account')
+      # Testing header setup
+      header = @service.send(:_build_params, { :headers => { 'Content-Type' => 'image/png' }})
+      returns('image/png', 'properly sets the header') { header[:headers]['Content-Type'] }
+      Fog.mock! if mocking
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
 platform: ruby
 authors:
 - Matt Eldridge
@@ -359,6 +359,7 @@ files:
 - tests/softlayer/requests/storage/auth_tests.rb
 - tests/softlayer/requests/storage/container_tests.rb
 - tests/softlayer/requests/storage/object_tests.rb
+- tests/softlayer/storage_tests.rb
 homepage: https://github.com/fog/fog-softlayer
 licenses:
 - MIT