Changeset 410

Timestamp:

Apr 15, 2010, 8:58:25 PM (14 years ago)

Author:

KOBAYASHI, Shinji

Message:

Simple definition implemented

Location:

ruby/trunk

Files:

• lib/open_ehr/serializer.rb (modified) (1 diff)
• spec/lib/open_ehr/serializer/adl-test-entry.most_minimal.test.adl (added)
• spec/lib/open_ehr/serializer/openEHR-EHR-SECTION.test.v1.xml (added)
• spec/lib/open_ehr/serializer/xml_serializer_spec.rb (modified) (2 diffs)

ruby/trunk/lib/open_ehr/serializer.rb

@@ -182 +182 @@
       end
 
+      def definition
+        definition = ''
+        ad = @archetype.definition
+        xml = Builder::XmlMarkup.new(:indent => 2, :target => definition)
+        xml.definition do
+          xml.rm_type_name ad.rm_type_name
+          xml.occurrence do
+            oc = ad.occurrences
+            xml.lower_included oc.lower_included? unless oc.lower_included?.nil?
+            xml.upper_included oc.upper_included? unless oc.upper_included?.nil?
+            xml.lower_unbounded oc.lower_unbounded?
+            xml.upper_unbounded oc.upper_unbounded?
+            xml.lower oc.lower
+            xml.upper oc.lower
+          end
+          xml.node_id ad.node_id
+        end
+      end
+
       def merge
 

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

@@ -6 +6 @@
 describe XMLSerializer do
   it_should_behave_like 'sample archetype'
+
+  before(:all) do
+    current_dir = File.dirname(__FILE__)
+    xml_file = File.open(current_dir + '/openEHR-EHR-SECTION.test.v1.xml')
+    xml = xml_file.readlines
+    class << xml
+      def unindent(s,e,num)
+        self[s..e].collect{|line| line[num..-1]}.join
+      end
+    end
+    @sample_header = xml.unindent(2, 11, 2)
+    @sample_description = xml.unindent(12, 27, 2)
+    @sample_definition = xml.unindent(28, 37, 2)
+    xml_file.close
+  end
 
   before(:each) do
@@ -16 +31 @@
 
   it 'should return XML formatted header' do
-    @xml_serializer.header.should == <<END
-<archetype_id>
-  <value>openEHR-EHR-SECTION.test.v1</value>
-</archetype_id>
-<concept>at0000</concept>
-<original_language>
-  <terminology_id>
-    <value>ISO_639-1</value>
-  </terminology_id>
-  <code_string>ja</code_string>
-</original_language>
-END
+    @xml_serializer.header.should == @sample_header
   end
 
   it 'should return XML formatted description' do
-    @xml_serializer.description.should == <<END
-<description>
-  <original_author id="name">Shinji KOBAYASHI</original_author>
-  <original_author id="organisation">openEHR.jp</original_author>
-  <original_author id="email">skoba@moss.gr.jp</original_author>
-  <lifecycle_state>draft</lifecycle_state>
-  <details>
-    <language>
-      <terminology_id>
-        <value>ISO_639-1</value>
-      </terminology_id>
-      <code_string>ja</code_string>
-    </language>
-    <purpose>Serializer test</purpose>
-    <misuse>evaluate message</misuse>
-  </details>
-</description>
-END
+    @xml_serializer.description.should == @sample_description
   end
 
-  it 'should return XML formatted definition'
+  it 'should return XML formatted definition' do
+    @xml_serializer.definition.should == @sample_definition
+  end
 
+  def unindent(lines,n)
+    return lines.collect{|line| line[n..-1]}.join
+  end
 end