ovfparse 0.0.95 → 0.0.97

data/lib/ovfparse/vmpackage.rb

@@ -123,36 +123,22 @@ class VmPackage
   def loadElementRefs
      children = @xml.root.children
 
-     @references = children[0]
-     if(@references.name != 'References')
-        @references = getChildByName(xml.root, 'References')
-     end
-
-     @diskSection = children[1]
-     if(@diskSection.name != 'DiskSection')
-        @diskSection = getChildByName(xml.root, 'DiskSection')
-     end
+     @references = getChildByName(xml.root, 'References')
+     @virtualSystem = getChildByName(xml.root, 'VirtualSystem')
 
-     @networkSection = children[2]
-     if(@networkSection.name != 'NetworkSection')
-        @networkSection = getChildByName(xml.root, 'NetworkSection')
-     end
-
-     @virtualSystem = children[3]
-     if(@virtualSystem.name != 'VirtualSystem')
-        @virtualSystem = getChildByName(xml.root, 'VirtualSystem')
-     end
+     @diskSection = getChildByName(xml.root, 'DiskSection') || @virtualSystem.add_previous_sibling(xml.create_element('DiskSection', {}))
+     @networkSection = getChildByName(xml.root, 'NetworkSection') || @virtualSystem.add_previous_sibling(xml.create_element('NetworkSection', {}))
 
   end
   
   # Returns the first child node of the passed node whose name matches the passed name.
   def getChildByName(node, childName)
-     return node.children.detect{ |element| element.name == childName}
+     return node.nil? ? nil : node.children.detect{ |element| element.name == childName}
   end
 
   # Returns every child node of the passed node whose name matches the passed name.
   def getChildrenByName(node, childName)
-     return node.children.select{ |element| element.name == childName}
+     return node.nil? ? [] : node.children.select{ |element| element.name == childName}
   end
 
   def referenced_file(element) 
@@ -190,7 +176,9 @@ class VmPackage
   end
 
   def checkschema(schema)
-    xsd = Nokogiri::XML::Schema(schema)
+puts "Starting schema parse"
+    xsd = Nokogiri::XML::Schema(File.open(schema))
+puts "Done with schema parse"
     response = ""
 
     isValid = true    
@@ -203,7 +191,7 @@ class VmPackage
   end
 
   def getVmName
-    return virtualSystem['id']
+    return virtualSystem['id'] || ''
   end
 
   def getVmDescription
@@ -212,11 +200,13 @@ class VmPackage
   end
 
   def getVmOS_ID
-    return getChildByName(virtualSystem, 'OperatingSystemSection')['id']
+    osNode = getChildByName(virtualSystem, 'OperatingSystemSection')
+    return osNode.nil? ? '' : osNode['id']
   end
 
   def getVmOS
-    return OS_ID_TABLE[getVmOS_ID.to_i]
+    os = getVmOS_ID
+    return os == '' ? '' : OS_ID_TABLE[os.to_i]
   end 
 
 
@@ -403,7 +393,9 @@ class VmPackage
      elsif(new_icon != '' && !new_icon.nil?)
         if(iconNode.nil?)
            productNode.add_child(xml.create_element('Icon', {'ovf:fileRef' => productNode['class'] + '_icon'}))
-           references.add_child(xml.create_element('File', {'ovf:id' => productNode['class'] + '_icon', 'ovf:href' => new_icon}))
+           iconRef = getChildrenByName(references, 'File').detect { |fileNode| fileNode['href'] == new_icon} ||
+              references.add_child(xml.create_element('File', {'ovf:href' => new_icon}))
+           iconRef['ovf:id'] = productNode['class'] + '_icon'
         else
            productNode.add_child(iconNode)
            getChildrenByName(references, 'File').detect { |fileNode| fileNode['id'] == iconNode['fileRef']}['ovf:href'] = new_icon
@@ -415,22 +407,23 @@ class VmPackage
      element_list.each { |element_details|
         updated_value = updated_element[element_details['element_ref']]
         element_node = parent_node.xpath(element_details['full_name'])[0]
-        if((updated_value == '' || updated_value.nil?) && !element_node.nil?)
-           element_node.unlink
-        elsif(updated_value != '' && !updated_value.nil?)
-           element_node = element_node.nil? ? parent_node.add_child(xml.create_element(element_details['node_ref'], updated_value)) : parent_node.add_child(element_node)
-           element_node.content = updated_value
+        #if((updated_value == '' || updated_value.nil?) && !element_node.nil?)
+        #   element_node.unlink
+        #elsif(updated_value != '' && !updated_value.nil?)
+           element_node = element_node.nil? ? parent_node.add_child(xml.create_element(element_details['node_ref'], {})) : parent_node.add_child(element_node)
+           element_node.content = updated_value || ''
            if(element_details['required'])
               element_node['ovf:required'] = 'false'
            end
-        end
+       # end
      }
   end
 
   def setAttributes(updated_element, parent_node, attribute_list)
      attribute_list.each { |attribute_details|
         updated_value = updated_element[attribute_details['attribute_ref']]
-        (updated_value == '' || updated_value.nil?) ? parent_node.delete(attribute_details['node_ref']) : parent_node[attribute_details['full_name']] = updated_value
+       # (updated_value == '' || updated_value.nil?) ? parent_node.delete(attribute_details['node_ref']) :
+        parent_node[attribute_details['full_name']] = updated_value || ''
      }
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ovfparse
 version: !ruby/object:Gem::Version 
-  hash: 161
+  hash: 221
   prerelease: 
   segments: 
   - 0
   - 0
-  - 95
-  version: 0.0.95
+  - 97
+  version: 0.0.97
 platform: ruby
 authors: 
 - Jim Barkley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -04:00
+date: 2011-04-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,20 +43,20 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- lib/ovfparse/esx4_vmrepository.rb
-- lib/ovfparse/esx_repository.rb
-- lib/ovfparse/file_vmrepository.rb
-- lib/ovfparse/ftp_vmrepository.rb
 - lib/ovfparse/http_vmrepository.rb
-- lib/ovfparse/https_vmrepository.rb
-- lib/ovfparse/marketplace_repository.rb
-- lib/ovfparse/os_id_table.rb
-- lib/ovfparse/vc4_vmrepository.rb
 - lib/ovfparse/vc_repository.rb
-- lib/ovfparse/vmpackage.rb
+- lib/ovfparse/os_id_table.rb
+- lib/ovfparse/file_vmrepository.rb
+- lib/ovfparse/marketplace_repository.rb
 - lib/ovfparse/vmrepository.rb
-- lib/ovfparse.rb
+- lib/ovfparse/vmpackage.rb
+- lib/ovfparse/esx4_vmrepository.rb
+- lib/ovfparse/vc4_vmrepository.rb
+- lib/ovfparse/https_vmrepository.rb
+- lib/ovfparse/ftp_vmrepository.rb
+- lib/ovfparse/esx_repository.rb
 - lib/test.rb
+- lib/ovfparse.rb
 - README
 has_rdoc: true
 homepage: http://github.com/ruby-ovf/ovfparse