joerivandervelde-molgenis-gem 0.0.2 → 0.0.3

data/lib/molgenis_model.rb

@@ -39,7 +39,7 @@ module MOLGENIS # :nodoc:
   
   #Definition of an Entity in MOLGENIS model
   class EntityModel
-    attr_accessor :name, :label, :fields, :abstract,:implements,:extends,:module_name,:color
+    attr_accessor :name,:label, :fields, :abstract,:implements,:extends,:module_name,:color,:description
     
     # Creates an empty entity 
     def initialize
@@ -50,6 +50,6 @@ module MOLGENIS # :nodoc:
   end
   
   class FieldModel
-    attr_accessor :name,:type,:system,:xref_entity,:xref_field      
+    attr_accessor :name,:label,:type,:system,:xref_entity,:xref_field,:description      
   end
 end

data/lib/molgenis_parser.rb

@@ -9,12 +9,13 @@ module MOLGENIS
     # foo = ... # stuff to initialize foo here
     # bar = MOLGENIS_MODEL:Parser.new.parse(foo)
     def parse(molgenis_src)
+      puts "tests"
       case molgenis_src.class.to_s
         when /^string$/i
-        document = LibXML::XML::Parser.string(molgenis_src).parse
+        document = LibXML::XML::Parser.string(molgenis_src,:encoding => LibXML::XML::Encoding::UTF_8).parse
         when /^stringio|file$/i
         molgenis_src.rewind
-        document = LibXML::XML::Parser.string(molgenis_src.read).parse
+        document = LibXML::XML::Parser.string(molgenis_src.read,:encoding => LibXML::XML::Encoding::UTF_8).parse
       else
         raise "Error parsing file."
       end
@@ -44,7 +45,7 @@ module MOLGENIS
       parse_entities(element.find("entity"),model, color)
       
       element.find("module").each { |module_xml|
-      
+        
         module_obj = ModuleModel.new
         module_attributes = module_xml.attributes
         module_obj.name = module_attributes["name"]
@@ -56,28 +57,38 @@ module MOLGENIS
         
         model.modules << module_obj
       }
-     
+      
       return model
     end
     
     def parse_entities(entities,module_obj,colorno)
-       if entities
+      if entities
         entities.each do |entity_xml|
           entity = EntityModel.new
           entity.module_name = module_obj.name
           entity_attributes = entity_xml.attributes
           entity.name = entity_attributes["name"]
           entity.color = colorno
+          
+          entity.description =""
+          entity_xml.find("description").each { |desc| 
+            desc.children.each { |el| 
+              entity.description = entity.description + el.to_s
+            }
+          }    
+          
           entity_attributes["implements"].split(",").each { |interface|
             entity.implements << interface
           } if !entity_attributes["implements"].nil?
           entity.extends = entity_attributes["extends"]
-
+          
           entity_xml.find("field").each do |field_xml|
             field = FieldModel.new
             field_attributes = field_xml.attributes
             field.name = field_attributes["name"]
             field.type = field_attributes["type"]
+            field.label = field_attributes["label"]
+            field.description = field_attributes["description"]
             if(field_attributes["xref_field"])
               split = field_attributes["xref_field"].split(".")
               if(split.size == 2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: joerivandervelde-molgenis-gem
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Morris Swertz
@@ -59,7 +59,6 @@ files:
 - LICENCE
 has_rdoc: true
 homepage: http://gbic.target.rug.nl/trac/molgenis
-licenses: 
 post_install_message: 
 rdoc_options: 
 - -N
@@ -82,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 1
 summary: A Ruby implementation of the interaction of MOLGENIS datamodels (XML).