azure-storage 0.11.1.preview → 0.11.2.preview

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93583b9726a105be0a8a14bfd6ccd9abf3050617
-  data.tar.gz: ca52bd4560c7c0623bda0549845eb2dd6809c5d9
+  metadata.gz: 92ecd94693e7588079b928351edc1b8f8f9befc9
+  data.tar.gz: 504fedfb82e16dee909bba757984f8e788faa7b3
 SHA512:
-  metadata.gz: 131e208024935b48d19f7a28ec80ba86f50a23894fb37087e11ea382c521986a0e0bcdddb74119b7ebe35ea5b093766bb59c0bd777c4be002a1592080a348238
-  data.tar.gz: b99f307c7a166babcf00da58d87ed7aefdc171d97cce2ad314ea3ab4846dedb17b7787f2d969d9727b69f4ec124cc785339147bfd8d9670b18d011c8a2da9ab0
+  metadata.gz: a9c473917d6af7d6055b7b7ebb0d2f8339dd3cf99cd5e4a205cbc43edc18325c5e3697d6b452622eb60b993066ccc48b4f5d1c501ebb2dd18cc7f0a22ee71f19
+  data.tar.gz: 098c8642665754bbf630e83f5fcaf0132a90d15017575e3e3cb305b4e6ab1c2575d5a6c4e2a1c9dc5faa9305a9756f63bf332c6109870176e29cef8c81f4d130

data/lib/azure/storage/blob/blob_service.rb

@@ -34,6 +34,7 @@ module Azure::Storage
   
   module Blob
     class BlobService < StorageService
+      include Azure::Storage::Core::Utility
       include Azure::Storage::Blob
       include Azure::Storage::Blob::Container
       
@@ -43,24 +44,25 @@ module Azure::Storage
         super(signer, client_config.storage_account_name, options)
         @host = client.storage_blob_host
       end
-      
+
       def call(method, uri, body=nil, headers={}, options={})
         # Force the request.body to the content encoding of specified in the header
-        # (content encoding probably shouldn't be used this way)
-        if headers && !body.nil?
-          if headers['Content-Encoding'].nil?
-            Service::StorageService.with_header headers, 'Content-Encoding', body.encoding.to_s
+        if headers && !body.nil? && !(body.encoding.to_s <=> 'ASCII_8BIT')
+          if headers['x-ms-blob-content-type'].nil?
+            Service::StorageService.with_header headers, 'x-ms-blob-content-type', "text/plain; charset=#{body.encoding.to_s}"
           else
-            body.force_encoding(headers['Content-Encoding'])
+            charset = parse_charset_from_content_type(headers['x-ms-blob-content-type'])
+            body.force_encoding(charset)
           end
         end
 
         response = super
 
-        # Force the response.body to the content encoding of specified in the header.
-        # content-encoding is echo'd back for the blob and is used to store the encoding of the octet stream
-        if !response.nil? && !response.body.nil? && response.headers['content-encoding']
-          response.body.force_encoding(response.headers['content-encoding'])
+        # Force the response.body to the content charset of specified in the header.
+        # Content-Type is echo'd back for the blob and is used to store the encoding of the octet stream
+        if !response.nil? && !response.body.nil? && response.headers['Content-Type']
+          charset = parse_charset_from_content_type(response.headers['Content-Type'])
+          response.body.force_encoding(charset) if charset && charset.length > 0
         end
 
         response
@@ -99,12 +101,12 @@ module Azure::Storage
       # * +:request_id+              - String. Provides a client-generated, opaque value with a 1 KB character limit that is recorded 
       #                                in the analytics logs when storage analytics logging is enabled.
       #
+      # See: https://msdn.microsoft.com/en-us/library/azure/dd179352.aspx
+      #
       # NOTE: Metadata requested with the :metadata parameter must have been stored in
       # accordance with the naming restrictions imposed by the 2009-09-19 version of the Blob
       # service. Beginning with that version, all metadata names must adhere to the naming
-      # conventions for C# identifiers.
-      #
-      # See: http://msdn.microsoft.com/en-us/library/aa664670(VS.71).aspx
+      # conventions for C# identifiers. See: https://msdn.microsoft.com/en-us/library/aa664670(VS.71).aspx
       #
       # Any metadata with invalid names which were previously stored, will be returned with the
       # key "x-ms-invalid-name" in the metadata hash. This may contain multiple values and be an

data/lib/azure/storage/core/filter/retry_filter.rb

@@ -115,11 +115,12 @@ module Azure::Storage::Core::Filter
     # incrementing counter, timestamp, etc). The retry_data object
     # will be the same instance throughout the lifetime of the request.
     def should_retry_on_error?(response, retry_data)
+      response = response || retry_data[:error].http_response if retry_data[:error] && retry_data[:error].respond_to?('http_response')
       unless response
         retry_data[:retryable] = false unless retry_data[:error]
         return retry_data[:retryable]
       end
-      
+
       # If a request sent to the secondary location fails with 404 (Not Found), it is possible
       # that the resource replication is not finished yet. So, in case of 404 only in the secondary
       # location, the failure should still be retryable.
@@ -133,7 +134,7 @@ module Azure::Storage::Core::Filter
         else
           retry_data[:status_code] = nil
         end
-      end 
+      end
       
       # Non-timeout Cases
       if (retry_data[:status_code] >= 300 && retry_data[:status_code] != 408)
@@ -142,26 +143,26 @@ module Azure::Storage::Core::Filter
           retry_data[:retryable] = false;
           return false;
         end
-      end
-    
-      # When absorb_conditional_errors_on_retry is set (for append blob)
-      if (retry_data[:request_options] && retry_data[:request_options][:absorb_conditional_errors_on_retry])
-        if (retry_data[:status_code] == 412)
-          # When appending block with precondition failure and their was a server error before, we ignore the error.
-          if (retry_data[:last_server_error])
-            retry_data[:error] = nil;
+
+        # When absorb_conditional_errors_on_retry is set (for append blob)
+        if (retry_data[:request_options] && retry_data[:request_options][:absorb_conditional_errors_on_retry])
+          if (retry_data[:status_code] == 412)
+            # When appending block with precondition failure and their was a server error before, we ignore the error.
+            if (retry_data[:last_server_error])
+              retry_data[:error] = nil;
+              retry_data[:retryable] = true;
+            else
+              retry_data[:retryable] = false;
+            end
+          elsif (retry_data[:retryable] && retry_data[:status_code] >= 500 && retry_data[:status_code] < 600)
+            # Retry on the server error
             retry_data[:retryable] = true;
-          else
-            retry_data[:retryable] = false;
+            retry_data[:last_server_error] = true;
           end
-        elsif (retry_data[:retryable] && retry_data[:status_code] >= 500 && retry_data[:status_code] < 600)
-          # Retry on the server error
-          retry_data[:retryable] = true;
-          retry_data[:last_server_error] = true;
+        elsif (retry_data[:status_code] < 500)
+          # No retry on the client error
+          retry_data[:retryable] = false;
         end
-      elsif (retry_data[:status_code] < 500)
-        # No retry on the client error
-        retry_data[:retryable] = false;
       end
     end
     

data/lib/azure/storage/core/utility.rb

@@ -107,6 +107,13 @@ module Azure::Storage
       def initialize_external_logger(logger)
         Loggerx.initialize_external_logger(logger)
       end
+
+      def parse_charset_from_content_type(content_type)
+        if (content_type && content_type.length > 0)
+          charset = content_type.split(';').delete_if { |attribute| !attribute.lstrip.start_with?('charset=') }.map { |x| x.lstrip }[0]
+          charset['charset='.length...charset.length] if charset
+        end
+      end
     end
 
     # Logger

data/lib/azure/storage/version.rb

@@ -28,7 +28,7 @@ module Azure
       # Fields represent the parts defined in http://semver.org/
       MAJOR = 0 unless defined? MAJOR
       MINOR = 11 unless defined? MINOR
-      UPDATE = 1 unless defined? UPDATE
+      UPDATE = 2 unless defined? UPDATE
       PRE = 'preview' unless defined? PRE
 
       class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: azure-storage
 version: !ruby/object:Gem::Version
-  version: 0.11.1.preview
+  version: 0.11.2.preview
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable