Changeset 413 for ruby/trunk

Timestamp:

May 22, 2010, 12:57:55 PM (14 years ago)

Author:

KOBAYASHI, Shinji

Message:

My X window system corrupsed.
However, only character is not so bad.

Location:

ruby/trunk

Files:

• config/environment.rb (modified) (1 diff)
• lib/open_ehr/serializer.rb (modified) (3 diffs)
• spec/lib/open_ehr/serializer/openEHR-EHR-SECTION.test.v1.xml (modified) (1 diff)
• spec/lib/open_ehr/serializer/xml_serializer_spec.rb (modified) (2 diffs)

ruby/trunk/config/environment.rb

@@ -6 +6 @@
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-#RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION
+#RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration

ruby/trunk/lib/open_ehr/serializer.rb

@@ -121 +121 @@
       end
 
-      def envelope
-      end
-
       def merge
-        return header + description + definition + ontology
+        return header + NL + description + NL + definition + NL + ontology
       end
 
@@ -138 +135 @@
 
     class XMLSerializer < BaseSerializer
-
       def header
         header = ''
@@ -216 +212 @@
           xml.node_id ad.node_id
         end
+        return definition
+      end
+
+      def ontology
+        ontology = ''
+        ao = @archetype.ontology
+        xml = Builder::XmlMarkup.new(:indent => 2, :target => ontology)
+        xml.ontology do
+          xml.specialisation_depth ao.specialisation_depth
+          xml.term_definitions do
+            ao.term_definitions.each do |lang, terms|
+              xml.language lang
+              xml.terms do
+                terms.each do |term|
+                  xml.code term.code
+                  xml.items do
+                    term.items.each do |key, value|
+                      xml.item do
+                        xml.key key
+                        xml.value value
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
       end
 
       def merge
-
+        archetype = "<?xml version='1.0' encoding='UTF-8'?>" + NL +
+          "<archetype xmlns=\"http://schemas.openehr.org/v1\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" + NL +
+          header + description + definition +
+          ontology + '</archetype>'
+        return archetype
       end
     end

ruby/trunk/spec/lib/open_ehr/serializer/openEHR-EHR-SECTION.test.v1.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <archetype xmlns="http://schemas.openehr.org/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <archetype_id>

ruby/trunk/spec/lib/open_ehr/serializer/xml_serializer_spec.rb

@@ -19 +19 @@
     @sample_description = xml.unindent(12, 27, 2)
     @sample_definition = xml.unindent(28, 37, 2)
+    @sample_ontology = xml.unindent(38, 56, 2)
+    @sample_xml = xml.join
     xml_file.close
   end
@@ -42 +44 @@
   end
 
-  def unindent(lines,n)
-    return lines.collect{|line| line[n..-1]}.join
+  it 'should return XML formatted ontology' do
+    @xml_serializer.ontology.should == @sample_ontology
+  end
+
+  it 'should equal sample hash' do
+    hashed_xml = Hash.from_xml @xml_serializer.serialize
+    archetype_hash = hashed_xml['archetype']
+    hashed_sample = Hash.from_xml @sample_xml
+    sample_hash = hashed_sample['archetype']
+    archetype_hash.should be_eql sample_hash
   end
 end