serialization.rb in azurex-0.6.7

- old
+ new

@@ -49,15 +49,13 @@
 
           storage_account.url = xml_content(storage_service_xml, 'Url')
           storage_account.name = xml_content(
             storage_service_xml, 'ServiceName'
           )
-
           storage_service_properties = storage_service_xml.css(
             'StorageServiceProperties'
           )
-
           storage_account.description = xml_content(
             storage_service_properties, 'Description'
           )
           storage_account.affinity_group = xml_content(
             storage_service_properties, 'AffinityGroup'
@@ -75,10 +73,13 @@
             'Endpoints Endpoint'
           ).map { |endpoint| endpoint.content }
           storage_account.geo_replication_enabled = xml_content(
             storage_service_properties, 'GeoReplicationEnabled'
           )
+          storage_account.account_type = xml_content(
+            storage_service_properties, 'AccountType'
+          )
           storage_account.geo_primary_region = xml_content(
             storage_service_properties, 'GeoPrimaryRegion'
           )
           storage_account.status_of_primary = xml_content(
             storage_service_properties, 'StatusOfPrimary'
@@ -110,11 +111,11 @@
         storage_accounts.compact
       end
 
       def self.storage_update_to_xml(options)
         # Cannot update if options is nil or empty
-        fail 'No options specified' if options.nil? || options.empty?
+        fail 'No options specified' if options.empty?
 
         # Either one of Label, or Description is required.
         if (options[:label].nil? || options[:label].empty?) &&
             (options[:description].nil? || options[:description].empty?)
           fail 'Either one of Label or Description'\
@@ -127,19 +128,17 @@
         options.each do |option, value|
           case option
           when :description, :label
             is_empty = value.nil? || value.empty?
           when :geo_replication_enabled
-            is_empty = !(value.kind_of?(TrueClass)\
-                || value.kind_of?(FalseClass))
+            is_empty = !(value.is_a?(TrueClass) || value.is_a?(FalseClass))
           when :extended_properties
             value.each do |p, v|
               is_empty = ((p.nil? || p.empty?) || (v.nil? || v.empty?))
               break unless is_empty
             end
           end
-
           break unless is_empty
         end
 
         # Raise a RuntimeError if no options were provided
         fail 'No Options Specified' if is_empty
@@ -164,21 +163,19 @@
 
       def self.add_options_to_xml(xml, options = {})
         gre = options[:geo_replication_enabled]
         xml.GeoReplicationEnabled(
           gre
-        ) unless gre.nil?\
-          || !(gre.kind_of?(TrueClass) || gre.kind_of?(FalseClass))
+        ) unless gre.nil? || !(gre.is_a?(TrueClass) || gre.is_a?(FalseClass))
         xml.ExtendedProperties do
           options[:extended_properties].each do |name, value|
             xml.ExtendedProperty do
               xml.Name name
               xml.Value value
-            end unless (name.nil? || name.empty?)\
-              || (value.nil? || value.empty?)
+            end unless (name.to_s.empty?) || (value.to_s.empty?)
           end
-        end unless options[:extended_properties].nil?\
-          || options[:extended_properties].empty?
+        end unless options[:extended_properties].to_s.empty?
+        xml.AccountType options[:account_type] if options[:account_type]
       end
 
       def self.storage_account_keys_from_xml(storage_xml)
         storage_xml.css('StorageService')
         storage_service_xml = storage_xml.css('StorageService').first