lib/fog/terremark/parsers/shared/instantiate_vapp_template.rb in fog-maestrodev-1.8.0.20130114204828 vs lib/fog/terremark/parsers/shared/instantiate_vapp_template.rb in fog-maestrodev-1.14.0.20130806165225

@@ -1,35 +1,24 @@
 module Fog
   module Parsers
     module Terremark
       module Shared
 
-        class InstantiateVappTemplate < Fog::Parsers::Base
+        class InstantiateVappTemplate < TerremarkParser
 
           def reset
             @property_key
             @response = { 'Links' => [] }
           end
 
           def start_element(name, attributes)
             super
             case name
             when 'Link'
-              link = {}
-              until attributes.empty?
-                link[attributes.shift] = attributes.shift
-              end
+              link = extract_attributes(attributes)
               @response['Links'] << link
             when 'VApp'
-              vapp_template = {}
-              until attributes.empty?
-                if attributes.first.is_a?(Array)
-                  attribute = attributes.shift
-                  vapp_template[attribute.first] = attribute.last
-                else
-                  vapp_template[attributes.shift] = attributes.shift
-                end
-              end
+              vapp_template = extract_attributes(attributes)
               @response.merge!(vapp_template.reject {|key, value| !['href', 'name', 'size', 'status', 'type'].include?(key)})
             end
           end
 
         end