openstack 3.3.9 → 3.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cf5b9c2abe7046ed912fcd7157e5e381dd604c2
-  data.tar.gz: d64ab8da5df36ef8d1dc89298f8954a5fbb9202c
+  metadata.gz: 3fb68d7f9147cf6dc29f5d36bfa443be3a2fb3f6
+  data.tar.gz: 694eea781abc3e6ea82945414527158472c954ec
 SHA512:
-  metadata.gz: 67c5b5cdc72ebc746039961915078a0421de3fb1af51ad57c340cc19c1d8c292c52425c92129521fe80b09ccf2bde8ee0a5e00ac55b2582e4b6dd24599c94d58
-  data.tar.gz: abc8b00eb3856807632fe95a7388bc53afb461cffa99d579a2518dfbe049a47dd194db9f510f94a873e3bf12d12bfcb7e64875ce8d8807cf13ae8b14fb6f6ae4
+  metadata.gz: a93bcde725c12dfa82eeb7d8401fed7cfe4dbef688708ac1e627a4bb480758b994642a0a7bf75f4581a2eddfcc2fad45b68f724ad8b7ce05c9cbf9ffe44a07bd
+  data.tar.gz: 12acf4b7090ac202d66d663d59e75c5c6c360b18539e749e25bb27cf9759267a960b29cae3f50e6f70daea2e34ee036b6f1bf7c4af1a1d713aec4f4b421bdae7

data/VERSION

@@ -1 +1 @@
-3.3.9
+3.3.10

data/lib/openstack/swift/storage_object.rb

@@ -37,6 +37,7 @@ module Swift
     #                    :metadata=>{key=>value, key1=>value1, ...}
     #                    :content_type=>content type of created object
     #                    :etag=>MD5 checksum of object data to be compared to that on server side
+    #                    :cache_control=>cache control header
     #                    :manifest=>set manifest header for segmented large object
     #                   }
     #
@@ -49,6 +50,7 @@ module Swift
       provided_headers = (headers[:metadata] || {}).inject({}){|res, (k,v)| ((k.to_s.match /^X-Object-Meta-/i) ? res[k.to_s]=v : res["X-Object-Meta-#{k.to_s}"]=v) ;res}
       provided_headers["content-type"] = headers[:content_type] unless headers[:content_type].nil?
       provided_headers["ETag"] = headers[:etag] unless headers[:etag].nil?
+      provided_headers["Cache-Control"] = headers[:cache_control] unless headers[:cache_control].nil?
       provided_headers["X-Object-Manifest"] = headers[:manifest] unless headers[:manifest].nil?
       if data.nil? #just create an empty object
         path = "/#{container.name}/#{objectname}"
@@ -64,7 +66,7 @@ module Swift
     #  object = container.object("conversion_helper.rb")
     #  => #<OpenStack::Swift::StorageObject:0xb7692488  ....
     #  object.object_metadata
-    #  => {:manifest=>nil, :bytes=>"1918", :content_type=>"application/octet-stream", :metadata=>{"foo"=>"bar, "herpa"=>"derp"}, :etag=>"1e5b089a1d92052bcf759d86465143f8", :last_modified=>"Tue, 17 Apr 2012 08:46:35 GMT"}
+    #  => {:manifest=>nil, :bytes=>"1918", :content_type=>"application/octet-stream", :metadata=>{"foo"=>"bar, "herpa"=>"derp"}, :etag=>"1e5b089a1d92052bcf759d86465143f8", :last_modified=>"Tue, 17 Apr 2012 08:46:35 GMT", :cache_control=>nil}
     #
     def object_metadata
       path = "/#{@containername}/#{@name}"
@@ -74,6 +76,7 @@ module Swift
                :content_type=>resphash["content-type"][0],
                :last_modified=>resphash["last-modified"][0],
                :etag=>resphash["etag"][0],
+               :cache_control=> (resphash.has_key?("cache-control") ? resphash["cache-control"][0] : nil),
                :manifest=> (resphash.has_key?("x-object-manifest") ? resphash["x-object-manifest"][0] : nil),
                :metadata=>{}}
       resphash.inject({}){|res, (k,v)| meta[:metadata].merge!({ k.gsub("x-object-meta-", "") => v.first }) if k.match(/^x-object-meta-/)}
@@ -115,6 +118,13 @@ module Swift
       self.object_metadata[:content_type]
     end
 
+    # Cache-Control header of the object
+    # obj.cache_control
+    # => "application/json"
+    def cache_control
+      self.object_metadata[:cache_control]
+    end
+
     # Retrieves the data from an object and stores the data in memory.  The data is returned as a string.
     # Throws a OpenStack::Exception::ItemNotFound if the object doesn't exist.
     #

data/lib/openstack/volume/snapshot.rb

@@ -12,7 +12,7 @@ module OpenStack
 
       def initialize(snap_info)
         @id = snap_info["id"]
-        @display_name = snap_info["display_name"] || snap_info["displayName"]
+        @display_name = snap_info["display_name"] || snap_info["displayName"] || snap_info["name"]
         @display_description = snap_info["display_description"] || snap_info["displayDescription"]
         @volume_id = snap_info["volume_id"] || snap_info["volumeId"]
         @status = snap_info["status"]

data/lib/openstack/volume/volume.rb

@@ -28,7 +28,7 @@ module OpenStack
       end
 
       @id  = volume_info["id"]
-      @display_name  = volume_info["display_name"] || volume_info["displayName"]
+      @display_name  = volume_info["display_name"] || volume_info["displayName"] || volume_info["name"]
       @display_description  = volume_info["display_description"] || volume_info["displayDescription"]
       @size  = volume_info["size"]
       @volume_type  = volume_info["volume_type"] || volume_info["volumeType"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstack
 version: !ruby/object:Gem::Version
-  version: 3.3.9
+  version: 3.3.10
 platform: ruby
 authors:
 - Dan Prince