azure-armrest 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b38ce81faf1e7a3998d3d6cd13eb2b0355ba74a5
-  data.tar.gz: bed848faad0986fbaf58291d40786064ece38bbf
+  metadata.gz: c69e270a5d35df9198153455a690ada22d513f4c
+  data.tar.gz: 67ef3824766ab4ebf5a8b5926acf58a4d34fed8b
 SHA512:
-  metadata.gz: 3d3c9da030fd7fbd38a255569898effe664a5018ebde842c2b174cd9a68cecdac89346098190ad052e4439afc461ac4a529a6b9e7c7c73910834b19abb644b3c
-  data.tar.gz: 015da585475887f7b3e223dbcf798608555de9b277f05aab3af95d9b23b024946b46bd0ef0ff930f4d87940d22df78b7c6b2d4519bc497ab099892cbf720ccfe
+  metadata.gz: 08513ba9e0ae24282d58be10bf04b5ae9aa1a98bffee330d0678de5c4afd7ec4bd3be5b83ca12c02aabe5dd13a132155ba91df17cf049b6b4ae2ac64424b35d0
+  data.tar.gz: c21f1908abb2d89055db2aea97a57cdac1c080789e844538aa406e20cd8bce853e745f1efa024f13632a0ba17432506573352092c63301f7bb4dba999c2d69ac

data/CHANGES

@@ -1,3 +1,10 @@
+= 0.2.1 - 15-Mar-2016
+* The ssl_version and ssl_verify options are now supported by, and
+  automatically passed on to, StorageAccount model objects.
+* Added the get_blob_raw method to get at raw blob data. Use wisely.
+* Nested model objects are now named based on the attribute name rather
+  than anonymous.
+
 = 0.2.0 - 10-Mar-2016
 * The Armrest.configure method now supports the :ssl_verify and :ssl_version
   options. By default, the ssl_version option is set to TLSv1 instead of

data/lib/azure/armrest/model/base_model.rb

@@ -46,12 +46,9 @@ module Azure
         # Find the exclusion list for the model of next level (@embed_model)
         # '#' is the separator between levels. Remove attributes
         # before the first separator.
-        child_excl_list = self.class.send(:excl_list).map do |e|
+        @child_excl_list = self.class.send(:excl_list).map do |e|
           e.index('#') ? e[e.index('#') + 1..-1] : ''
         end
-        @embed_model = Class.new(BaseModel) do
-          attr_hash(*child_excl_list)
-        end
 
         if json.kind_of?(Hash)
           @hash = json
@@ -136,10 +133,10 @@ module Azure
           snake = snake_case(key)
           unless excl_list.include?(snake) # Must deal with nested models
             if value.kind_of?(Array)
-              newval = value.map { |elem| elem.kind_of?(Hash) ? @embed_model.new(elem) : elem }
+              newval = value.map { |elem| elem.kind_of?(Hash) ? nested_object(snake.camelize.singularize, elem) : elem }
               obj[key] = newval
             elsif value.kind_of?(Hash)
-              obj[key] = @embed_model.new(value)
+              obj[key] = nested_object(snake.camelize, value)
             end
           end
 
@@ -147,6 +144,14 @@ module Azure
         end
       end
 
+      def nested_object(klass_name, value)
+        unless self.class.const_defined?(klass_name)
+          child_excl_list = @child_excl_list
+          self.class.const_set(klass_name, Class.new(BaseModel) { attr_hash(*child_excl_list) })
+        end
+        self.class.const_get(klass_name).new(value)
+      end
+
       def add_accessor_methods(method, key)
         method.prepend('_') if methods.include?(method.to_sym)
         instance_eval { define_singleton_method(method) { __getobj__[key] } }

data/lib/azure/armrest/model/storage_account.rb

@@ -27,10 +27,18 @@ module Azure
       # An http proxy to use per request. Defaults to ENV['http_proxy'] if set.
       attr_accessor :proxy
 
+      # The SSL version to use per request. Defaults to TLSv1.
+      attr_accessor :ssl_version
+
+      # The SSL verification method used for each request. The default is VERIFY_PEER.
+      attr_accessor :ssl_verify
+
       def initialize(json)
         super
         @storage_api_version = '2015-02-21'
         @proxy = ENV['http_proxy']
+        @ssl_version = 'TLSv1'
+        @ssl_verify = nil
       end
 
       # Returns a list of tables for the given storage account +key+. Note
@@ -134,9 +142,11 @@ module Azure
         headers = build_headers(url, key, :blob, :verb => 'HEAD')
 
         response = ArmrestService.rest_head(
-          :url     => url,
-          :headers => headers,
-          :proxy   => proxy
+          :url         => url,
+          :headers     => headers,
+          :proxy       => proxy,
+          :ssl_version => ssl_version,
+          :ssl_verify  => ssl_verify
         )
 
         BlobProperty.new(response.headers)
@@ -155,9 +165,11 @@ module Azure
         headers = build_headers(url, key)
 
         response = ArmrestService.rest_get(
-          :url     => url,
-          :headers => headers,
-          :proxy   => proxy
+          :url         => url,
+          :headers     => headers,
+          :proxy       => proxy,
+          :ssl_version => ssl_version,
+          :ssl_verify  => ssl_verify
         )
 
         doc = Nokogiri::XML(response.body)
@@ -244,10 +256,12 @@ module Azure
         headers = build_headers(dst_url, key, :blob, options)
 
         response = ArmrestService.rest_put(
-          :url     => dst_url,
-          :payload => '',
-          :headers => headers,
-          :proxy   => proxy
+          :url         => dst_url,
+          :payload     => '',
+          :headers     => headers,
+          :proxy       => proxy,
+          :ssl_version => ssl_version,
+          :ssl_verify  => ssl_verify
         )
 
         Blob.new(response.headers)
@@ -264,9 +278,11 @@ module Azure
         headers = build_headers(url, key, :blob, :verb => 'DELETE')
 
         response = ArmrestService.rest_delete(
-          :url      => url,
-          :headers  => headers,
-          :proxy    => proxy
+          :url         => url,
+          :headers     => headers,
+          :proxy       => proxy,
+          :ssl_version => ssl_version,
+          :ssl_verify  => ssl_verify
         )
 
         true
@@ -292,10 +308,12 @@ module Azure
         headers = build_headers(url, key, :blob, options)
 
         response = ArmrestService.rest_put(
-          :url     => url,
-          :payload => '',
-          :headers => headers,
-          :proxy   => proxy
+          :url         => url,
+          :payload     => '',
+          :headers     => headers,
+          :proxy       => proxy,
+          :ssl_version => ssl_version,
+          :ssl_verify  => ssl_verify
         )
 
         Blob.new(response.headers)
@@ -310,10 +328,12 @@ module Azure
         headers = build_headers(url, key, :blob, :verb => 'PUT')
 
         response = ArmrestService.rest_put(
-          :url     => url,
-          :payload => '',
-          :headers => headers,
-          :proxy   => proxy
+          :url         => url,
+          :payload     => '',
+          :headers     => headers,
+          :proxy       => proxy,
+          :ssl_version => ssl_version,
+          :ssl_verify  => ssl_verify
         )
 
         BlobSnapshot.new(
@@ -323,6 +343,76 @@ module Azure
         )
       end
 
+      # Get the contents of the given +blob+ found in +container+ using the
+      # given +options+. This is a low level method to read a range of bytes
+      # from the blob directly. The possible options are:
+      #
+      # * range        - A range of bytes to collect.
+      # * start_byte   - The starting byte for collection.
+      # * end_byte     - The end byte for collection. Use this or :length with :start_byte.
+      # * length       - The number of bytes to collect starting at +start_byte+.
+      # * entire_image - Read all bytes for the blob.
+      # * md5          - If true, the response headers will include MD5 checksum information.
+      # * date         - Get the blob snapshot for the given date.
+      #
+      # If you do not specify a :range or :start_byte, then an error will be
+      # raised unless you explicitly set the :entire_image option to true.
+      # However, that is not recommended because the blobs can be huge.
+      #
+      # Unlike other methods, this method returns a raw response object rather
+      # than a wrapper model. Get the information you need using:
+      #
+      # * response.body    - blob data.
+      # * response.headers - blob metadata.
+      #
+      # Example:
+      #
+      #   ret = @storage_acct.get_blob(@container, @blob, key, :start_byte => start_byte, :length => length)
+      #   content_md5  = ret.headers[:content_md5].unpack("m0").first.unpack("H*").first
+      #   returned_md5 = Digest::MD5.hexdigest(ret.body)
+      #   raise "Checksum error: #{range_str}, blob: #{@container}/#{@blob}" unless content_md5 == returned_md5
+      #   return ret.body
+      #
+      def get_blob_raw(container, blob, key = nil, options = {})
+        key ||= properties.key1
+
+        url = File.join(properties.primary_endpoints.blob, container, blob)
+        url += "?snapshot=" + options[:date] if options[:date]
+
+        additional_headers = {
+          'verb' => 'GET'
+        }
+
+        range_str = nil
+        if options[:range]
+          range_str = "bytes=#{options[:range].min}-#{options[:range].max}"
+        elsif options[:start_byte]
+          range_str = "bytes=#{options[:start_byte]}-"
+          if options[:end_byte]
+            range_str << options[:end_byte].to_s
+          elsif options[:length]
+            range_str << (options[:start_byte] + options[:length] - 1).to_s
+          end
+        end
+
+        if range_str
+          additional_headers['x-ms-range'] = range_str
+          additional_headers['x-ms-range-get-content-md5'] = true if options[:md5]
+        else
+          raise ArgumentError, "must specify byte range or entire_image flag" unless options[:entire_image]
+        end
+
+        headers = build_headers(url, key, :blob, additional_headers)
+
+        ArmrestService.rest_get(
+          :url         => url,
+          :headers     => headers,
+          :proxy       => proxy,
+          :ssl_version => ssl_version,
+          :ssl_verify  => ssl_verify,
+        )
+      end
+
       private
 
       # Using the blob primary endpoint as a base, join any arguments to the
@@ -331,7 +421,14 @@ module Azure
       def blob_response(key, query, *args)
         url = File.join(properties.primary_endpoints.blob, *args) + "?#{query}"
         headers = build_headers(url, key, 'blob')
-        ArmrestService.rest_get(:url => url, :headers => headers, :proxy => proxy)
+
+        ArmrestService.rest_get(
+          :url         => url,
+          :headers     => headers,
+          :proxy       => proxy,
+          :ssl_version => ssl_version,
+          :ssl_verify  => ssl_verify,
+        )
       end
 
       # Using the blob primary endpoint as a base, join any arguments to the
@@ -344,7 +441,13 @@ module Azure
 
         url << "?#{query}" if query # Must happen after headers are built
 
-        ArmrestService.rest_get(:url => url, :headers => headers, :proxy => proxy)
+        ArmrestService.rest_get(
+          :url         => url,
+          :headers     => headers,
+          :proxy       => proxy,
+          :ssl_version => ssl_version,
+          :ssl_verify  => ssl_verify,
+        )
       end
 
       # Set the headers needed, including the Authorization header.

data/lib/azure/armrest/storage_account_service.rb

@@ -23,19 +23,31 @@ module Azure
       # Same as other resource based get methods, but also sets the proxy on the model object.
       #
       def get(name, resource_group = configuration.resource_group)
-        super.tap { |m| m.proxy = configuration.proxy }
+        super.tap do |m|
+          m.proxy       = configuration.proxy
+          m.ssl_version = configuration.ssl_version
+          m.ssl_verify  = configuration.ssl_verify
+        end
       end
 
       # Same as other resource based list methods, but also sets the proxy on each model object.
       #
       def list(resource_group = configuration.resource_group)
-        super.each { |m| m.proxy = configuration.proxy }
+        super.each do |m|
+          m.proxy       = configuration.proxy
+          m.ssl_version = configuration.ssl_version
+          m.ssl_verify  = configuration.ssl_verify
+        end
       end
 
       # Same as other resource based list_all methods, but also sets the proxy on each model object.
       #
       def list_all
-        super.each { |m| m.proxy = configuration.proxy }
+        super.each do |m|
+          m.proxy       = configuration.proxy
+          m.ssl_version = configuration.ssl_version
+          m.ssl_verify  = configuration.ssl_verify
+        end
       end
 
       # Creates a new storage account, or updates an existing account with the
@@ -156,6 +168,38 @@ module Azure
         results.flatten
       end
 
+      def accounts_by_name
+        @accounts_by_name ||= list_all.each_with_object({}) { |sa, sah| sah[sa.name] = sa }
+      end
+
+      def parse_uri(uri)
+        uri = URI.parse(uri)
+        host_components = uri.host.split('.')
+
+        rh = {
+          :scheme        => uri.scheme,
+          :account_name  => host_components[0],
+          :service_name  => host_components[1],
+          :resource_path => uri.path
+        }
+
+        # TODO: support other service types.
+        return rh unless rh[:service_name] == "blob"
+
+        blob_components = uri.path.split('/', 3)
+        if blob_components[2]
+          rh[:container] = blob_components[1]
+          rh[:blob]      = blob_components[2]
+        else
+          rh[:container] = '$root'
+          rh[:blob]      = blob_components[1]
+        end
+
+        return rh unless uri.query && uri.query.start_with?("snapshot=")
+        rh[:snapshot] = uri.query.split('=', 2)[1]
+        rh
+      end
+
       private
 
       def validate_account_type(account_type)

data/lib/azure/armrest/version.rb

@@ -1,5 +1,5 @@
 module Azure
   module Armrest
-    VERSION = "0.2.0"
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure-armrest
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json