azure-core 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9633ae4d67b96a41ca289286b59a6acfb3eada61
-  data.tar.gz: 6b13301832d6cd68b9c16f78b9eea614a78d93ab
+SHA256:
+  metadata.gz: 28eb15120a2cc99f76064d85594a4126e014ff83be784b7ee8b6c7bc1dcaed0c
+  data.tar.gz: 6ae6620c660aa76e47841fb01d3a7089c044fd404feebc187568c6bfc1d0980d
 SHA512:
-  metadata.gz: 4bec89582a3c07f810cb4874bf92c5313f9c0ba3ac78569031ceeee05524120822c46d2de3328b7a21ea9fb2cadecd7abb0c658bd29efdb1ac1d3a037b27f13d
-  data.tar.gz: 3e93068317140579daef9a4d931d4de91ad0f732221f1af0a7bb6c4c445f3242eff3453b6d4f7db5b6d164a67576e59c1703c63aad4479266c1dcaf16a13f6b0
+  metadata.gz: d182d7cb1c220bfb20dac275166c1d948b25ef6ca5a914c7b450829dc04ca2d90a7b2dec7814bd458d5eed76408ac3b659a919e8653058ce5076f8674caa73c2
+  data.tar.gz: 7e3f948e02cf99a942e1bb5199a1020b5b09c821a7683dd58da2221f46dadec6f9acd627ab212b6c140e2c9b020fd6a17d820ec7375277183f920638e8028ac2

data/ChangeLog.md

@@ -1,3 +1,7 @@
+# 2017.11.10 - azure-core gem @version 0.1.13
+* Added the call options in the retry data.
+* Added the support for retrying a request with a different URL.
+
 # 2017.08.31 - azure-core gem @version 0.1.12
 * Changed default value of header `MaxDataServiceVersion` to `3.0;NetFx` now that the service is available.
 * `Azure::Core::Http::HTTPError` now can also parse JSON format response body for error type and description.

data/lib/azure/core/filtered_service.rb

@@ -30,9 +30,9 @@ module Azure
 
       attr_accessor :filters
 
-      def call(method, uri, body=nil, headers=nil)
+      def call(method, uri, body=nil, headers=nil, options={})
         super(method, uri, body, headers) do |request|
-          filters.reverse.each { |filter| request.with_filter filter } if filters
+          filters.reverse.each { |filter| request.with_filter filter, options } if filters
         end
       end
 

data/lib/azure/core/http/http_request.rb

@@ -80,6 +80,9 @@ module Azure
         #          returns a HttpResponse eg. HttpFilter, Proc,
         #          lambda, etc. (optional)
         #
+        # options - The options that are used when call Azure::Core::FilteredService.call.
+        #           It can be used by retry policies to determine changes in the retry.
+        #
         # &block - An inline block may be used instead of a filter
         #
         #          example:
@@ -93,10 +96,13 @@ module Azure
         # The code block provided must call _next or the filter pipeline
         # will not complete and the HTTP request will never execute
         #
-        def with_filter(filter=nil, &block)
+        def with_filter(filter=nil, options={}, &block)
           filter = filter || block
           if filter
-            @has_retry_filter ||= filter.is_a?(Azure::Core::Http::RetryPolicy)
+            is_retry_policy = filter.is_a?(Azure::Core::Http::RetryPolicy)
+            filter.retry_data[:request_options] = options if is_retry_policy
+            @has_retry_filter ||= is_retry_policy
+            
             original_call = self._method(:call)
 
             # support 1.8.7 (define_singleton_method doesn't exist until 1.9.1)
@@ -151,27 +157,36 @@ module Azure
         private
 
         def apply_body_headers
-          if body
-            if IO === body
-              headers['Content-Length'] = body.size.to_s
-              headers['Content-MD5'] = Digest::MD5.file(body.path).base64digest unless headers['Content-MD5']
-            elsif StringIO === body
-              headers['Content-Length'] = body.size.to_s
-              unless headers['Content-MD5']
-                headers['Content-MD5'] = Digest::MD5.new.tap do |checksum|
-                                           while chunk = body.read(5242880)
-                                             checksum << chunk
-                                           end
-                                           body.rewind
-                                         end.base64digest
-              end
-            else
-              headers['Content-Length'] = body.bytesize.to_s
-              headers['Content-MD5'] = Base64.strict_encode64(Digest::MD5.digest(body)) unless headers['Content-MD5']
-            end
-          else
-            headers['Content-Length'] = '0'
+          return headers['Content-Length'] = '0' unless body
+
+          return apply_io_headers        if IO === body
+          return apply_string_io_headers if StringIO === body
+          return apply_miscellaneous_headers
+        end
+
+        def apply_io_headers
+          headers['Content-Length'] = body.size.to_s if body.respond_to?('size')
+          if headers['Content-Length'].nil?
+            raise ArgumentError, '\'Content-Length\' must be defined if size cannot be obtained from body IO.'
           end
+          headers['Content-MD5'] = Digest::MD5.file(body.path).base64digest unless headers['Content-MD5']
+        end
+
+        def apply_string_io_headers
+          headers['Content-Length'] = body.size.to_s
+          unless headers['Content-MD5']
+            headers['Content-MD5'] = Digest::MD5.new.tap do |checksum|
+                                       while chunk = body.read(5242880)
+                                         checksum << chunk
+                                       end
+                                       body.rewind
+                                     end.base64digest
+          end
+        end
+
+        def apply_miscellaneous_headers
+          headers['Content-Length'] = body.bytesize.to_s
+          headers['Content-MD5'] = Base64.strict_encode64(Digest::MD5.digest(body)) unless headers['Content-MD5']
         end
       end
     end

data/lib/azure/core/http/retry_policy.rb

@@ -24,6 +24,7 @@ module Azure
 
         def initialize(&block)
           @block = block
+          @retry_data = {}
         end
 
         attr_accessor :retry_data
@@ -35,17 +36,20 @@ module Azure
         # req   - HttpRequest. The HTTP request
         # _next - HttpFilter. The next filter in the pipeline
         def call(req, _next)
-          retry_data = {}
           response = nil
           begin
+            # URI could change in the retry, e.g. secondary endpoint
+            unless @retry_data[:uri].nil?
+              req.uri = @retry_data[:uri]
+            end
             response = _next.call
           rescue
-            retry_data[:error] = $!
-          end while should_retry?(response, retry_data)
+            @retry_data[:error] = $!
+          end while should_retry?(response, @retry_data)
           # Assign the error when HTTP error is not thrown from the previous filter
-          retry_data[:error] = response.error if response && !response.success?
-          if retry_data.has_key?(:error)
-            raise retry_data[:error]
+          @retry_data[:error] = response.error if response && !response.success?
+          if @retry_data.has_key?(:error)
+            raise @retry_data[:error]
           else
             response
           end

data/lib/azure/core/signed_service.rb

@@ -37,8 +37,8 @@ module Azure
       attr_accessor :account_name
       attr_accessor :signer
 
-      def call(method, uri, body=nil, headers=nil)
-        super(method, uri, body, headers)
+      def call(method, uri, body=nil, headers=nil, options={})
+        super(method, uri, body, headers, options)
       end
     end
   end

data/lib/azure/core/version.rb

@@ -18,7 +18,7 @@ module Azure
     class Version
       MAJOR = 0 unless defined? MAJOR
       MINOR = 1 unless defined? MINOR
-      UPDATE = 12 unless defined? UPDATE
+      UPDATE = 13 unless defined? UPDATE
       PRE = nil unless defined? PRE
 
       class << self

data/test/support/fixtures.rb

@@ -48,5 +48,18 @@ module Azure
       end
     end
 
+    class NewUriRetryPolicy < Azure::Core::Http::RetryPolicy
+      def initialize
+        @count = 1
+        super &:should_retry?
+      end
+
+      def should_retry?(response, retry_data)
+        retry_data[:uri] = URI.parse "http://bar.com"
+        @count = @count - 1
+        @count >= 0
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure-core
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Microsoft Corporation
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Core library to be consumed by Ruby SDK gems