azure-storage 0.10.0.preview → 0.10.1.preview

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81d51da25ec4fc5a5f0bf93a3c071b255f94e3e2
-  data.tar.gz: e4f064f2875bc72613c86c92ae31cfe18e534bec
+  metadata.gz: 68f699e6dbd6ceed52d8c35694a78d9c852ea5a0
+  data.tar.gz: 21e079f0fab409af5260dd228e1a3ec7e05d180c
 SHA512:
-  metadata.gz: c44444db774de77bf408448be653708a0e678d2fd57a2610a44204c185c0a38878c467c6f9a5831e4852322c57dbe8745b231e6c3890fa847a24d98851117478
-  data.tar.gz: afddf25b3f04414d2842fcb718efa05af2bd270ea137dafc6bdb4470c8894f2e60eba17442cf688ced49ad3ad2ac7cb5b3ff6ebf26b72579a3c8f33c0e5c380d
+  metadata.gz: c15b3eb7927d1856e98f0a36cfd543885d5bfedc6d4986d01147a234f0b016169683a66974126aa1b22bf9341547ad6f89708c4b848526d128666c5222433701
+  data.tar.gz: 4f9cf1548ad8e0761671dfba0835a71367544e3018c02b06b44ccd185af42ff0056a181f029aa291a8c79fe4e6b555a227cc85ca882618b1a0777873f4cc8caa

data/lib/azure/storage/autoload.rb

@@ -29,15 +29,13 @@ module Azure
   autoload :Storage,                      'azure/storage/core'
 
   module Storage
-    autoload :Default,                    'azure/storage/core/constants'
+    autoload :Default,                    'azure/storage/default'
     autoload :Configurable,               'azure/storage/configurable'
     autoload :Client,                     'azure/storage/client'
-    autoload :ClientOptions,              'azure/storage/core/client_options'
+    autoload :ClientOptions,              'azure/storage/client_options'
     
     module Auth
       autoload :SharedAccessSignature,    'azure/storage/core/auth/shared_access_signature'
-      autoload :SharedKey,                'azure/storage/core/auth/shared_key'
-      autoload :SharedKeyLite,            'azure/storage/core/auth/shared_key_lite'
     end
 
     module Service

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

@@ -30,17 +30,14 @@ require 'azure/storage/blob/append'
 
 module Azure::Storage
   include Service
+  
   module Blob
     class BlobService < StorageService
       include Azure::Storage::Blob
       include Azure::Storage::Blob::Container
       
       def initialize(options = {})
-        client_config = options[:client] || Azure::Storage
-        signer = options[:signer] || Auth::SharedKey.new(
-          client_config.storage_account_name,
-          client_config.storage_access_key)
-        super(signer, client_config.storage_account_name, options)
+        super(nil, nil, options)
         @host = client.storage_blob_host
       end
       

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

@@ -545,7 +545,11 @@ module Azure::Storage::Blob
       response = call(:get, uri)
       
       # Result
-      Serialization.blob_enumeration_results_from_xml(response.body)
+      if response.success?
+        Serialization.blob_enumeration_results_from_xml(response.body)
+      else
+        response.exception
+      end
     end
 
   end

data/lib/azure/storage/client.rb

@@ -22,10 +22,10 @@
 # THE SOFTWARE.
 #--------------------------------------------------------------------------
 
+require 'azure/storage/core'
 require 'azure/storage/core/http_client'
 
-require 'azure/storage/core'
-require 'azure/storage/core/client_options'
+require 'azure/storage/client_options'
 
 require 'azure/storage/blob/blob_service'
 require 'azure/storage/table/table_service'
@@ -35,7 +35,7 @@ module Azure::Storage
   class Client
     include Azure::Storage::Configurable
     include Azure::Storage::ClientOptions
-    include Azure::Core::HttpClient
+    include Azure::Storage::Core::HttpClient
 
     # Public: Creates an instance of [Azure::Storage::Client]
     #
@@ -178,7 +178,7 @@ module Azure::Storage
     private
 
     def default_client(opts)
-      {client: self}.merge(opts || {})
+      !opts.empty? ? {client: Azure::Storage.client(opts)} : {client: self} 
     end
 
   end

data/lib/azure/storage/{core/client_options.rb → client_options.rb}

@@ -23,8 +23,7 @@
 #--------------------------------------------------------------------------
 
 require 'uri'
-require 'azure/storage/core'
-require 'azure/storage/core/client_options_error'
+require 'azure/storage/client_options_error'
 
 module Azure::Storage
   module ClientOptions

data/lib/azure/storage/{core/client_options_error.rb → client_options_error.rb}

@@ -24,13 +24,13 @@
 
 module Azure::Storage
 
-  class InvalidConnectionStringError < StorageError
+  class InvalidConnectionStringError < Core::StorageError
     def initialize(message = SR::INVALID_CONNECTION_STRING)
     	super(message)
     end
   end
 
-  class InvalidOptionsError < StorageError
+  class InvalidOptionsError < Core::StorageError
     def initialize(message = SR::INVALID_CLIENT_OPTIONS)
       super(message)
     end

data/lib/azure/storage/core.rb

@@ -28,6 +28,6 @@ module Azure
 end
 
 require 'azure/storage/core/error'
-require 'azure/storage/core/constants'
+require 'azure/storage/default'
 require 'azure/storage/core/sr'
 require 'azure/storage/core/utility'

data/lib/azure/storage/core/auth/shared_access_signature.rb

@@ -22,6 +22,7 @@
 # THE SOFTWARE.
 #--------------------------------------------------------------------------
 
-
 require 'azure/storage/core/auth/shared_access_signature_generator'
-require 'azure/storage/core/auth/shared_access_signature_signer'
+require 'azure/storage/core/auth/shared_access_signature_signer'
+
+include Azure::Storage::Auth

data/lib/azure/storage/core/auth/shared_access_signature_generator.rb

@@ -23,8 +23,8 @@
 #--------------------------------------------------------------------------
 
 require 'azure/storage/core'
-require 'azure/storage/core/client_options_error'
-require 'azure/storage/core/auth/signer'
+require 'azure/storage/client_options_error'
+require 'azure/core/auth/signer'
 require 'time'
 require 'uri'
 
@@ -104,47 +104,60 @@ module Azure::Storage
         service_type = options[:service_type] || Azure::Storage::ServiceType::BLOB
         options.delete(:service_type) if options.key?(:service_type)
 
+        options[:start] = Time.parse(options[:start]).utc.iso8601 if options[:start] 
+        options[:expiry] = Time.parse(options[:expiry]).utc.iso8601 if options[:expiry] 
         options[:expiry] ||= (Time.now + 60*30).utc.iso8601
 
         raise InvalidOptionsError,"SAS version cannot be set" if options[:version]
 
-        defs = DEFAULTS
+        options = DEFAULTS.merge(options)
         valid_mappings = KEY_MAPPINGS
         if service_type == Azure::Storage::ServiceType::BLOB
-          defs.merge!(resource: 'b')
+          options.merge!(resource: 'b')
           valid_mappings.merge!(BLOB_KEY_MAPPINGS)
         elsif service_type == Azure::Storage::ServiceType::TABLE
-          defs.merge!(tablename: path)
+          options.merge!(tablename: path)
           valid_mappings.merge!(TABLE_KEY_MAPPINGS)
         end
 
         invalid_options = options.reject { |k,v| valid_mappings.key?(k) }
         raise InvalidOptionsError,"invalid options #{invalid_options} provided for SAS token generate" if invalid_options.length > 0
 
-        options.merge!(defs)
-
+        query_hash = Hash[options.map { |k, v| [KEY_MAPPINGS[k], v] }]
+        .reject { |k, v| OPTIONAL_QUERY_PARAMS.include?(k) && v.to_s == '' }
+        .merge( sig: @signer.sign(signable_string(service_type, path, options)) )
+        
+        sas_params = URI.encode_www_form(query_hash)
+      end
+      
+      # Construct the plaintext to the spec required for signatures
+      # @return [String]
+      def signable_string(service_type, path, options)
         # Order is significant
         # The newlines from empty strings here are required
+        options[:start] = Time.parse(options[:start]).utc.iso8601 if options[:start]
+        options[:expiry] = Time.parse(options[:expiry]).utc.iso8601 if options[:expiry]
+        
         signable_string =
         [
           options[:permissions],
           options[:start],
           options[:expiry],
-          "/#{service_type}/#{account_name}#{path.start_with?('/') ? '' : '/'}#{path}",
+          canonicalized_resource(service_type, path),
           options[:identifier],
-          options[:version],
+          Azure::Storage::Default::STG_VERSION,
           options[:cache_control],
           options[:content_disposition],
           options[:content_encoding],
           options[:content_language],
           options[:content_type]
         ].join("\n")
-
-        query_hash = Hash[options.map { |k, v| [KEY_MAPPINGS[k], v] }]
-        .reject { |k, v| OPTIONAL_QUERY_PARAMS.include?(k) && v.to_s == '' }
-        .merge( sig: @signer.sign(signable_string) )
-
-        sas_params = URI.encode_www_form(query_hash)
+      end
+      
+      # Return the cononicalized resource representation of the blob resource
+      # @return [String]
+      def canonicalized_resource(service_type, path)
+        "/#{service_type}/#{account_name}#{path.start_with?('/') ? '' : '/'}#{path}"
       end
 
       # A customised URI reflecting options for the resource signed with Shared Access Signature
@@ -172,14 +185,14 @@ module Azure::Storage
       # * +:endpk+               - String. The end partition key of a specified partition key range. Optional but endpk must accompany endrk.
       # * +:startrk+             - String. The start row key of a specified row key range. Optional.
       # * +:endrk+               - String. The end row key of a specified row key range. Optional.
-      def sign_uri(uri, options)
+      def signed_uri(uri, options)
         parsed_query = CGI::parse(uri.query || '').inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
-
+        
         if parsed_query.has_key?(:restype)
           options[:resource] = parsed_query[:restype].first == 'container' ? 'c' : 'b'
         end
 
-        if options[:service_type] == nil
+        if options[:service_type] == nil and uri.host != nil
           host_splits = uri.host.split('.')
           options[:service_type] = host_splits[1] if host_splits.length > 1 && host_splits[0] == account_name
         end

data/lib/azure/storage/core/auth/shared_access_signature_signer.rb

@@ -22,7 +22,7 @@
 # THE SOFTWARE.
 #--------------------------------------------------------------------------
 
-require 'azure/storage/core/auth/signer'
+require 'azure/core/auth/signer'
 
 module Azure::Storage
   module Auth

data/lib/azure/storage/core/auth/shared_key.rb

@@ -22,53 +22,11 @@
 # THE SOFTWARE.
 #--------------------------------------------------------------------------
 require 'cgi'
-require 'azure/storage/core/auth/signer'
+require 'azure/core/auth/signer'
 
-module Azure::Storage
+module Azure::Storage::Core
   module Auth
-    class SharedKey < Azure::Core::Auth::Signer
-      # The Azure account's name.
-      attr :account_name
-
-      # Initialize the Signer.
-      #
-      # @param account_name [String] The account name. Defaults to the one in the
-      #                global configuration.
-      # @param access_key   [String] The access_key encoded in Base64. Defaults to the
-      #                one in the global configuration.
-      def initialize(account_name=Azure::Storage.config.storage_account_name, access_key=Azure::Storage.config.storage_access_key)
-        @account_name = account_name
-        super(access_key)
-      end
-
-      # The name of the strategy.
-      #
-      # @return [String]
-      def name
-        'SharedKey'
-      end
-
-      # Create the signature for the request parameters
-      #
-      # @param method     [Symbol] HTTP request method.
-      # @param uri        [URI] URI of the request we're signing.
-      # @param headers    [Hash] HTTP request headers.
-      #
-      # @return           [String] base64 encoded signature
-      def sign(method, uri, headers)
-        "#{account_name}:#{super(signable_string(method, uri, headers))}"
-      end
-
-      # Sign the request
-      #
-      # @param req    [Azure::Core::Http::HttpRequest] HTTP request to sign
-      #
-      # @return       [Azure::Core::Http::HttpRequest]
-      def sign_request(req)
-        req.headers['Authorization'] = "#{name} #{sign(req.method, req.uri, req.headers)}"
-        req
-      end
-
+    class SharedKey < Azure::Core::Auth::SharedKey
       # Generate the string to sign.
       #
       # @param method     [Symbol] HTTP request method.
@@ -94,32 +52,6 @@ module Azure::Storage
           canonicalized_resource(uri)
         ].join("\n")
       end
-
-      # Calculate the Canonicalized Headers string for a request.
-      #
-      # @param headers    [Hash] HTTP request headers.
-      #
-      # @return [String] a string with the canonicalized headers.
-      def canonicalized_headers(headers)
-        headers = headers.map { |k,v| [k.to_s.downcase, v] }
-        headers.select! { |k,v| k =~ /^x-ms-/ }
-        headers.sort_by! { |(k,v)| k }
-        headers.map! { |k,v| '%s:%s' % [k, v] }
-        headers.map! { |h| h.gsub(/\s+/, ' ') }.join("\n")
-      end
-
-      # Calculate the Canonicalized Resource string for a request.
-      #
-      # @param uri        [URI] URI of the request we're signing.
-      #
-      # @return           [String] a string with the canonicalized resource.
-      def canonicalized_resource(uri)
-        resource = '/' + account_name + (uri.path.empty? ? '/' : uri.path)
-        params = CGI.parse(uri.query.to_s).map { |k,v| [k.downcase, v] }
-        params.sort_by! { |k,v| k }
-        params.map! { |k,v| '%s:%s' % [k, v.map(&:strip).sort.join(',')] }
-        [resource, *params].join("\n")
-      end
     end
   end
-end
+end

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

@@ -23,13 +23,22 @@
 #--------------------------------------------------------------------------
 
 module Azure
-  module Core
-    autoload :HttpClient,                     'azure/storage/core/http_client'
-    autoload :Utility,                        'azure/storage/core/utility'
-    autoload :Logger,                         'azure/storage/core/utility'
-    autoload :Error,                          'azure/storage/core/error'
-    autoload :Service,                        'azure/storage/core/service'
-    autoload :FilteredService,                'azure/storage/core/filtered_service'
-    autoload :SignedService,                  'azure/storage/core/signed_service'
+  module Storage
+    module Core
+      autoload :HttpClient,                     'azure/storage/core/http_client'
+      autoload :Utility,                        'azure/storage/core/utility'
+      autoload :Logger,                         'azure/storage/core/utility'
+      autoload :Error,                          'azure/storage/core/error'
+      
+      module Auth
+        autoload :SharedKey,                    'azure/storage/core/auth/shared_key.rb'
+      end
+      
+      module Filter
+        autoload :RetryPolicyFilter,            'azure/storage/core/filter/retry_filter'
+        autoload :LinearRetryPolicyFilter,      'azure/storage/core/filter/linear_retry_filter'
+        autoload :ExponentialRetryPolicyFilter, 'azure/storage/core/filter/exponential_retry_filter'
+      end
+    end
   end
 end

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

@@ -21,15 +21,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #--------------------------------------------------------------------------
-module Azure
-  module Core
-    # Superclass for errors generated from this library, so people can
-    # just rescue this for generic error handling
-    class Error < StandardError;end
-  end
-end
+require 'azure/core'
 
-module Azure::Storage
+module Azure::Storage::Core
   # Superclass for errors generated from this library, so people can
   # just rescue this for generic error handling
   class StorageError < StandardError

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

@@ -0,0 +1,62 @@
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# The MIT License(MIT)
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files(the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions :
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#--------------------------------------------------------------------------
+require 'azure/core'
+require 'azure/core/http/retry_policy'
+
+module Azure::Storage::Core::Filter
+  class ExponentialRetryPolicyFilter < RetryPolicyFilter
+    def initialize(retry_count=nil, min_retry_interval=nil, max_retry_interval=nil)
+      @retry_count = retry_count || ExponentialRetryPolicyFilter::DEFAULT_RETRY_COUNT
+      @min_retry_interval = min_retry_interval || ExponentialRetryPolicyFilter::DEFAULT_MIN_RETRY_INTERVAL
+      @max_retry_interval = max_retry_interval || ExponentialRetryPolicyFilter::DEFAULT_MAX_RETRY_INTERVAL
+      
+      super @retry_count, @min_retry_interval
+    end
+    
+    attr_reader :min_retry_interval,
+                :max_retry_interval
+    
+    DEFAULT_RETRY_COUNT = 3
+    DEFAULT_MIN_RETRY_INTERVAL = 10
+    DEFAULT_MAX_RETRY_INTERVAL = 90
+    
+    # Overrides the base class implementation of call to determine 
+    # how the HTTP request should continue retrying
+    #
+    # retry_data - Hash. Stores stateful retry data
+    #
+    # The retry_data is a Hash which can be used to store
+    # stateful data about the request execution context (such as an
+    # incrementing counter, timestamp, etc). The retry_data object
+    # will be the same instance throughout the lifetime of the request
+    def apply_retry_policy(retry_data)
+      # Adjust retry count
+      retry_data[:count] = retry_data[:count] === nil ? 1 : retry_data[:count] + 1
+      
+      # Adjust retry interval
+      increment_delta = (@max_retry_interval - @min_retry_interval).fdiv(2 ** (@retry_count - 1)) * (2 ** (retry_data[:count] - 1));
+      retry_data[:interval] = retry_data[:interval] === nil ? @min_retry_interval : [@min_retry_interval + increment_delta, @max_retry_interval].min;
+    end
+  end
+end