get non capitalized content-type

fog · Jan 23, 2014 · 27ecbc2 · 27ecbc2
1 parent 3c7eb60
commit 27ecbc2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/lib/fog/openstack/models/storage/directories.rb b/lib/fog/openstack/models/storage/directories.rb
@@ -25,7 +25,6 @@ def get(key, options = {})
           directory.files.merge_attributes(options)
           directory.files.instance_variable_set(:@loaded, true)
 
-          data.body = Fog::JSON.decode(data.body) unless data.body.is_a? Array
           data.body.each do |file|
             directory.files << directory.files.new(file)
           end

diff --git a/lib/fog/openstack/storage.rb b/lib/fog/openstack/storage.rb
@@ -172,7 +172,7 @@ def request(params, parse_json = true)
               error
             end
           end
-          if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
+          if !response.body.empty? && parse_json && response.get_header('Content-Type') =~ %r{application/json}
             response.body = Fog::JSON.decode(response.body)
           end
           response