open_ehr 0.9.2 → 0.9.3

data/Gemfile.lock

@@ -1,17 +1,17 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.1)
+    activesupport (3.1.2)
       multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
     builder (3.0.0)
     columnize (0.3.4)
     diff-lcs (1.1.3)
-    ffi (1.0.10)
+    ffi (1.0.11)
     git (1.2.5)
     guard (0.8.8)
       thor (~> 0.14.6)
-    guard-rspec (0.5.2)
+    guard-rspec (0.5.4)
       guard (>= 0.8.4)
     guard-spork (0.3.1)
       guard (>= 0.8.4)

data/README.rdoc

@@ -5,7 +5,7 @@ Ruby openEHR implementation project.
 
 = Version
 
-Release-0.9.0b
+Release-0.9.3
 
 = Requirements
 
@@ -20,7 +20,7 @@ Release-0.9.0b
 
 == DESCRIPTION:
 
-This is the beta version 0.9.0 release of Ruby openEHR implementation
+This is the beta version 0.9.3 release of Ruby openEHR implementation
 project. This release is still experimental preview of our work based
 on openEHR specification release 1.0.2. We implemented almost of the
 specifications of the openEHR.  The work is still in progress. The
@@ -30,8 +30,8 @@ quickly with Ruby on Rails.
 Parser is nearly performing completely. We now consider to descrive
 archetype as another formalism such as YAML, instead of ADL.
 
-Almost all classes passed the test constructed by rspec2 (formaly used
-test/unit). These test specification are under /spec.
+Almost all classes passed the test constructed by RSpec2 (formaly used
+test/unit). These test specifications are under /spec.
 
 Some specifications are not well determined yet, such as rm/security
 and so on. We postponed to implement such classes.
@@ -44,7 +44,8 @@ project.
 Akimichi Tatsukawa, Shinji Kobayashi
 openEHR.jp, <http://openehr.jp>
 
-* ADL parser test cases are derived from Java and Eiffel.
+* ADL parser test cases are derived from Java and Eiffel
+reference implementation project of the openEHR.
 
 = Copyright
 The software, including all files in this directory and

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/lib/open_ehr/am/archetype/ontology.rb

@@ -3,11 +3,14 @@ module OpenEHR
     module Archetype
       module Ontology
         class ArchetypeOntology
-          attr_accessor :specialisation_depth
+          attr_accessor :specialisation_depth, :primary_language
           attr_accessor :term_attribute_names, :term_bindings
+          attr_accessor :languages_available
           attr_reader :term_definitions, :constraint_definitions
 
           def initialize(args = { })
+            self.primary_language = args[:primary_language]
+            self.languages_available = args[:languages_available]
             self.specialisation_depth = args[:specialisation_depth]
             self.term_definitions = args[:term_definitions]
             if args[:constraint_definitions]

data/lib/open_ehr/parser/adl_grammar.tt

@@ -33,7 +33,11 @@ module OpenEHR
 	  end
 
 	  def original_language
-            lang.original_language
+            tid, la = lang.original_language.split('::')
+            OpenEHR::RM::DataTypes::Text::CodePhrase.new(
+              :terminology_id => 
+                OpenEHR::RM::Support::Identification::TerminologyID.new(:value => tid),
+              :code_string => la)
           end
 
           def translations
@@ -41,7 +45,7 @@ module OpenEHR
           end
 
           def description
-            desc.values unless desc.empty?
+            desc.value unless desc.empty?
           end
 
           def definition
@@ -55,9 +59,9 @@ module OpenEHR
       end
 
       rule arch_identification
-        head:arch_head V_ARCHETYPE_ID space {
+        head:arch_head id:V_ARCHETYPE_ID space {
 	  def archetype_id
-            elements[1].text_value
+            id.value
 	  end
 
 	  def adl_version
@@ -102,9 +106,9 @@ module OpenEHR
       end
 
       rule arch_meta_data_item
-        SYM_ADL_VERSION SYM_EQ V_VERSION_STRING space {
+        SYM_ADL_VERSION SYM_EQ ver:V_VERSION_STRING space {
 	  def value
-            {:adl_version => elements[2].text_value}
+            {:adl_version => ver.value}
           end
         }
       / SYM_IS_CONTROLED space {
@@ -121,7 +125,7 @@ module OpenEHR
           end
 
 	  def archetype_id
-	    arch_id.text_value
+	    arch_id.value
 	  end
         }
       end
@@ -140,8 +144,43 @@ module OpenEHR
 
       rule arch_description
         SYM_DESCRIPTION desc:V_DADL_TEXT space {
-          def values
-            desc.value
+          def value
+            params = desc.value
+            details = { }
+            params[:details].each do |lang, attrs|
+              term_id, la = attrs[:language].split('::')
+              terminology_id = 
+                OpenEHR::RM::Support::Identification::TerminologyID.new(
+                  :value => term_id)
+              misuse = attrs[:misuse].empty? ? nil : attrs[:misuse]
+              item =
+                OpenEHR::RM::Common::Resource::ResourceDescriptionItem.new(
+                  :language => OpenEHR::RM::DataTypes::Text::CodePhrase.new(
+                                :terminology_id => terminology_id,
+                                :code_string => la),
+                  :purpose => attrs[:purpose],
+                  :keywords => attrs[:keywords],
+                  :use => attrs[:use],
+                  :misuse => misuse,
+                  :copyright => attrs[:copyright],
+                  :original_resource_uri => attrs[:original_resource_uri],
+                  :other_details => attrs[:other_details])
+              details[lang.to_s] = item
+            end
+            oc = params[:other_contributors].nil? ? nil : params[:other_contributors].values
+            original_author = key_s params[:original_author]
+            other_details = key_s params[:other_details] if params[:other_details] 
+            OpenEHR::RM::Common::Resource::ResourceDescription.new(
+              :original_author => original_author,
+              :other_contributors => oc,
+              :lifecycle_state => params[:lifecycle_state],
+              :details => details,
+              :resource_package_uri => params[:archetype_package_uri],
+              :other_details => other_details)
+          end
+
+          def key_s(hash)
+            hash.inject({ }) {|h,i| h.update Hash[i[0].to_s,i[1]]}
           end
         }
       end
@@ -163,7 +202,7 @@ module OpenEHR
           def value
             ao = ontology.value[:term_definitions]
             term_definitions = {}
-            ao.map do |lang, term_defs|
+            ao.each do |lang, term_defs|
               items = term_defs[:items]
               terms = items.map do |code, item|
                 OpenEHR::AM::Archetype::Ontology::ArchetypeTerm.new(

data/lib/open_ehr/parser/adl_parser.rb

@@ -25,10 +25,7 @@ module OpenEHR
       end
 
       def parse
-        terminology_id = TerminologyID.new(:value => 'ISO_639-1')
-        original_language = CodePhrase.new(
-          :terminology_id => terminology_id,
-          :code_string => @result.original_language)
+        original_language = @result.original_language
         archetype_id = ArchetypeID.new(:value => @result.archetype_id)
         definition = @result.definition
         ontology = @result.ontology
@@ -42,18 +39,6 @@ module OpenEHR
                                   :ontology => @result.ontology)
         return archetype
       end
-
-# temporary class for parser building
-
-      class ArchetypeMock
-        def initialize(args = { })
-          @params = args
-        end
-
-        def method_missing(name)
-          @params[name]
-        end
-      end
     end
   end # of Parser
 end # of OpenEHR

data/lib/open_ehr/parser/dadl_grammar.tt

@@ -23,23 +23,19 @@ module OpenEHR
       rule attr_vals
         first:attr_val second:(';'? space attr_val space)* {
           def value
-            val = {first.id.to_sym => first.value}
-            second.elements.each do |e|
-              val[e.attr_val.id.to_sym] = e.attr_val.value
-            end
-            val
-          end    
+            attrs.inject({ }) {|val, a| val.update a.value}
+          end
+
+          def attrs
+            [first] + second.elements.map {|e| e.attr_val}
+          end
         }
       end
 
       rule attr_val
         attr_id SYM_EQ object_block {
-          def id
-            attr_id.value
-          end
-
           def value
-            object_block.value
+            {attr_id.value.to_sym =>  object_block.value}
           end
         }
       end
@@ -99,25 +95,17 @@ module OpenEHR
       end
 
       rule keyed_objects
-        keyed_object+ {
+        keyed_object+  {
           def value
-            val = {}
-            elements.each do |e|
-              val[e.key.to_sym] = e.value
-            end
-            val
+            elements.inject({ }) {|val, e| val.update e.value}
           end
         }
       end
 
       rule keyed_object
         object_key SYM_EQ object_block {
-          def key
-            object_key.value
-          end
-
           def value
-            object_block.value
+            {object_key.value.to_sym => object_block.value}
           end
         }
       end
@@ -132,9 +120,9 @@ module OpenEHR
 
       rule single_attr_object_block
         type_identifier? untyped_single_attr_object_block {
-           def value
-             untyped_single_attr_object_block.value
-           end
+          def value
+            untyped_single_attr_object_block.value
+          end
         }
       end
 
@@ -182,12 +170,12 @@ module OpenEHR
             simple_list_value.value
           end
         }
-      / simple_interval_value {
+      / simple_interval_value '' {
           def value
             simple_interval_value.value
           end
         }
-      / term_code_list_value {
+      / term_code_list_value '' {
           def value
             term_code_list_value.value
           end
@@ -326,7 +314,7 @@ module OpenEHR
             date_time_interval_value.value
           end
         }
-      / duration_interval_value {
+      / duration_interval_value '' {
           def value
             duration_interval_value.value
           end
@@ -342,8 +330,20 @@ module OpenEHR
       end
 
       rule term_code_list_value
-        term_code (',' term_code)+ 
-      / term_code ',' SYM_LIST_CONTINUE
+        first:term_code more:(',' term_code)+ {
+          def value
+            term_codes.map {|t| t.value}
+          end
+
+          def term_codes
+            [first] + more.elements.map {|e| e.term_code}
+          end
+        }
+      / term_code ',' SYM_LIST_CONTINUE {
+          def value
+            [term_code.value]
+          end
+        }
       end
 
       rule uri_value

data/lib/open_ehr/parser/shared_token_grammar.tt

@@ -525,9 +525,9 @@ module OpenEHR
       end
 
       rule date_time_value
-        V_ISO8601_EXTENDED_DATE_TIME {
+        dt:V_ISO8601_EXTENDED_DATE_TIME '' {
           def value
-            OpenEHR::AssumedLibraryTypes::ISO8601DateTime.new(text_value)
+            OpenEHR::AssumedLibraryTypes::ISO8601DateTime.new(dt.text_value)
           end
         }
       end
@@ -626,9 +626,9 @@ module OpenEHR
       end
 
       rule duration_value
-        V_ISO8601_DURATION {
+        V_ISO8601_DURATION '' {
           def value
-            OpenEHR::AssumedLibraryTypes::ISO8601Duration(text_value)
+            OpenEHR::AssumedLibraryTypes::ISO8601Duration(V_ISO8601_DURATION.text_value)
           end
         }
       end

data/open_ehr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "open_ehr"
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shinji KOBAYASHI", "Akimichi Tatsukawa"]
-  s.date = "2011-11-16"
+  s.date = "2011-11-19"
   s.description = "This project is an implementation of the openEHR specification on Ruby."
   s.email = "skoba@moss.gr.jp"
   s.extra_rdoc_files = [
@@ -223,6 +223,8 @@ Gem::Specification.new do |s|
     "spec/lib/open_ehr/parser/adl14/openEHR-EHR-SECTION.reason_for_encounter.v1.adl",
     "spec/lib/open_ehr/parser/adl14/openEHR-EHR-SECTION.summary.v1.adl",
     "spec/lib/open_ehr/parser/adl14/openEHR-EHR-SECTION.vital_signs.v1.adl",
+    "spec/lib/open_ehr/parser/adl_description_spec.rb",
+    "spec/lib/open_ehr/parser/adl_identification_spec.rb",
     "spec/lib/open_ehr/parser/adl_parser_spec.rb",
     "spec/lib/open_ehr/parser/adl_path_spec.rb",
     "spec/lib/open_ehr/parser/base_spec.rb",

data/spec/lib/open_ehr/am/archetype/ontology/archetype_ontology_spec.rb

@@ -16,7 +16,9 @@ describe ArchetypeOntology do
     bind = {'at0000' => code_phrase}
     term_bindings = {'SNOMED-CT(2003)' => [bind]}
     @archetype_ontology =
-      ArchetypeOntology.new(:term_definitions => term_definitions,
+      ArchetypeOntology.new(:primary_language => "ja",
+                            :languages_available => ['ja', 'en'],
+                            :term_definitions => term_definitions,
                             :constraint_definitions => constraint_definitions,
                             :term_bindings => term_bindings,
                             :specialisation_depth => 0)
@@ -30,6 +32,14 @@ describe ArchetypeOntology do
     @archetype_ontology.specialisation_depth.should be_equal 0
   end
 
+  it 'primary language is ja' do
+    @archetype_ontology.primary_language.should == 'ja'
+  end
+
+  it 'languages available are ja, en' do
+    @archetype_ontology.languages_available.should == ['ja', 'en']
+  end
+
   it 'term_definition should be assigned properly' do
     @archetype_ontology.term_definition(:lang => 'ja', :code => 'at0000')[:text].should == 'Archetype Concept'
   end

data/spec/lib/open_ehr/parser/adl14/adl-test-entry.archetype_description.test.adl

@@ -1,5 +1,5 @@
 archetype 
-	adl-test-ENTRY.archetype_description.draft
+	adl-test-ENTRY.archetype_description.v1
 	
 concept 
 	[at0000]	--  test

data/spec/lib/open_ehr/parser/adl14/adl-test-entry.archetype_identification.test.adl

@@ -1,5 +1,5 @@
 archetype (adl_version=1.4)
-	adl-test-ENTRY.archetype_identification.draft
+	adl-test-ENTRY.archetype_identification.v1
 
 concept 
 	[at0000]	--  test

data/spec/lib/open_ehr/parser/adl_description_spec.rb

@@ -0,0 +1,153 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+include OpenEHR::Parser
+
+describe ADLParser do
+  context 'Description' do
+    before(:all) do
+      adl_dir = File.dirname(__FILE__) + '/adl14/'
+      ap = ADLParser.new(adl_dir + 'adl-test-entry.archetype_description.test.adl')
+      archetype = ap.parse
+      @description = archetype.description
+    end
+
+    it 'description is not null' do
+      @description.should_not be_nil
+    end
+
+    it 'lifecycle state is AuthorDraft' do
+      @description.lifecycle_state.should == 'AuthorDraft'
+    end
+    it 'resource package uri is www.aihw.org.au/data_sets/diabetic_archetypes.html' do
+      @description.resource_package_uri.should == 'www.aihw.org.au/data_sets/diabetic_archetypes.html'
+    end
+
+    context 'original author' do
+      before(:all) do
+        @original_author = @description.original_author
+      end
+
+      it 'name is Sam Heard' do
+        @original_author["name"].should == 'Sam Heard'
+      end
+
+      it 'organisation is Ocean Informatics' do
+        @original_author["organisation"].should == 'Ocean Informatics'
+      end
+
+      it 'date is 23/04/2006' do
+        @original_author["date"].should == '23/04/2006'
+      end
+
+      it 'email is sam.heard@oceaninformatics.biz' do
+        @original_author["email"].should == 'sam.heard@oceaninformatics.biz'
+      end
+    end
+
+    context 'details' do
+      before(:all) do
+        @details = @description.details
+      end
+
+      it 'details is not nil' do
+        @details.should_not be_nil
+      end
+
+      it 'details size is 1' do
+        @details.size.should be 1
+      end
+
+      context 'item' do
+        before(:all) do
+          @item = @details['en']
+        end
+
+        it 'is not nil' do
+          @item.should_not be_nil
+        end
+
+        it 'language is en' do
+          @item.language.code_string.should == 'en'
+        end
+
+        it 'terminolopgy id is ISO_639-1' do
+          @item.language.terminology_id.value.should == 'ISO_639-1'
+        end
+
+        it 'purpose is For recording...' do
+          @item.purpose.should == "For recording a problem, condition " +
+            "or issue that has ongoing significance to the person's health."
+        end
+
+        it 'use is Used for recording any....' do
+          @item.use.should == "Used for recording any problem, " + 
+            "present or past - so is used for recording past " +
+            "history as well as current problems. Used with changed " +
+            "'Subject of care' for recording problems of relatives " +
+            "and so for family history."
+        end
+
+        it 'misuse is Use specialisations for ...' do
+          @item.misuse.should == "Use specialisations for medical " +
+            "diagnoses, 'openEHR-EHR-EVALUATION.problem-diagnosis' and " +
+            "histological diagnoses 'openEHR-EHR-EVALUATION.problem-" +
+            "diagnosis-histological'"
+        end
+
+        it 'copyright is copyright (c) 2004 The openEHR Foundation' do
+          @item.copyright.should == 'copyright (c) 2004 The openEHR Foundation'
+        end
+
+        it 'keywords are issue and condition' do
+          @item.keywords.should == ['issue', 'condition']
+        end
+
+        context 'original resource uri' do
+          before(:all) do
+            @original_resource_uri = @item.original_resource_uri
+          end
+
+          it 'ligne guide is http://guidelines.are.us/wherever/fr' do
+            @original_resource_uri[:'ligne guide'].should ==
+              'http://guidelines.are.us/wherever/fr'
+          end
+
+          it 'medline is http://some%20medline%20ref' do
+            @original_resource_uri[:medline].should == 'http://some%20medline%20ref'
+          end
+        end
+      end
+    end
+
+    context 'other contributors' do
+      before(:all) do
+        @other_contributors = @description.other_contributors
+      end
+
+      it 'other contrubutor(s) are not nil' do
+        @other_contributors.should_not be_nil
+      end
+
+      it 'other contributor(s) is one' do
+        @other_contributors.size.should be 1
+      end
+
+      it 'other_contributor(s) is Ian McNicoll, MD' do
+        @other_contributors[0].should == 'Ian McNicoll, MD'
+      end
+    end
+
+    context 'other details' do
+      before(:all) do
+        @other_details = @description.other_details
+      end
+
+      it 'other 1 is details 1' do
+        @other_details['other 1'].should == 'details 1'
+      end
+
+      it 'other 2 is detals 2' do
+        @other_details['other 2'].should == 'details 2'
+      end
+    end
+  end
+end

data/spec/lib/open_ehr/parser/adl_identification_spec.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+include OpenEHR::Parser
+
+describe ADLParser do
+  context 'ADL identification' do
+    before(:all) do
+      adl_dir = File.dirname(__FILE__) + '/adl14/'
+      adl_id_test_file = 'adl-test-entry.archetype_identification.test.adl'
+      ap = ADLParser.new(adl_dir + adl_id_test_file)
+      archetype = ap.parse
+      @adl_version = archetype.adl_version
+    end
+
+    it 'ADL version is 1.4' do
+      @adl_version.should == '1.4'
+    end
+  end
+end

data/spec/lib/open_ehr/parser/adl_parser_spec.rb

@@ -13,7 +13,7 @@ describe ADLParser do
 
   context 'openEHR-EHR-SECTION-summary.v1.adl' do
     before(:all) do
-      @ap = OpenEHR::Parser::ADLParser.new(@adl_dir + 'openEHR-EHR-SECTION.summary.v1.adl')
+      @ap = ADLParser.new(@adl_dir + 'openEHR-EHR-SECTION.summary.v1.adl')
     end
 
     it 'is an instance fo ADLParser' do
@@ -43,9 +43,8 @@ describe ADLParser do
           @archetype.concept.should == 'at0000'
         end
 
-        it 'original language is ISO_639-1::en' do
-          @archetype.original_language.code_string.should ==
-            'ISO_639-1::en'
+        it 'original language is en' do
+          @archetype.original_language.code_string.should == 'en'
         end
 
         context 'description' do
@@ -55,63 +54,63 @@ describe ADLParser do
 
           context 'original author' do
             before(:all) do
-              @original_author = @description[:original_author]
+              @original_author = @description.original_author
             end
 
             it 'name is Sam Heard' do
-              @original_author[:name].should == 'Sam Heard'
+              @original_author['name'].should == 'Sam Heard'
             end
 
             it 'organisation is Ocean Informatics' do
-              @original_author[:organisation].should == 'Ocean Informatics'
+              @original_author['organisation'].should == 'Ocean Informatics'
             end
 
             it 'date is 9/01/2007' do
-              @original_author[:date].should == '9/01/2007'
+              @original_author['date'].should == '9/01/2007'
             end
 
             it 'email is sam.heard@oceaninformatics.biz' do
-              @original_author[:email].should == 'sam.heard@oceaninformatics.biz'
+              @original_author['email'].should == 'sam.heard@oceaninformatics.biz'
             end
           end
 
           context 'details' do
             before(:all) do
-              @details = @description[:details]
+              @details = @description.details
             end
 
             context 'en details' do
               before(:all) do
-                @en = @details[:en]
+                @en = @details['en']
               end
 
-              it 'language is ISO_639-1::en' do
-                @en[:language].should == 'ISO_639-1::en'
+              it 'language is en' do
+                @en.language.code_string.should == 'en'
               end 
 
               it 'purpose is A heading...' do
-                @en[:purpose].should == "A heading containing summary information based on particular evaluation entries"
+                @en.purpose.should == "A heading containing summary information based on particular evaluation entries"
               end
 
               it 'use is A heading for...' do
-                @en[:use].should == "A heading for organising clinical data under a heading of summary"
+                @en.use.should == "A heading for organising clinical data under a heading of summary"
               end
 
               it 'keywords are review, conclusions, risk' do
-                @en[:keywords].should == ['review', 'conclusions', 'risk']
+                @en.keywords.should == ['review', 'conclusions', 'risk']
               end
 
-              it 'misuse should empty' do
-                @en[:misuse].should == ''
+              it 'misuse should be nil' do
+                @en.misuse.should be_nil
               end
             end
 
             it 'lifecycle_state is Initial' do
-              @description[:lifecycle_state].should == 'Initial'
+              @description.lifecycle_state.should == 'Initial'
             end
 
             it 'other_contributors is nil' do
-              @description[:other_contributors].should be_nil
+              @description.other_contributors.should be_nil
             end
           end # of details
         end # of description

data/spec/lib/open_ehr/parser/adl_path_spec.rb

@@ -1,19 +1,15 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 include OpenEHR::Parser
-include OpenEHR::AM::Archetype
-include OpenEHR::AM::Archetype::ConstraintModel
-include OpenEHR::AM::Archetype::Assertion
-include OpenEHR::AM::Archetype::Ontology
+
 
 describe ADLParser do
   before(:all) do
     adl_dir = File.dirname(__FILE__) + '/adl14/'
     adl_path_test_file = 'adl-test-car.paths.test.adl'
-    ap = OpenEHR::Parser::ADLParser.new(adl_dir + adl_path_test_file)
+    ap = ADLParser.new(adl_dir + adl_path_test_file)
     @root = ap.parse.definition
   end
 
-  
   it 'root path is /' do
     @root.path.should == '/'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_ehr
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000Z
+date: 2011-11-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &17209785200 !ruby/object:Gem::Requirement
+  requirement: &17208044800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17209785200
+  version_requirements: *17208044800
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &17209784380 !ruby/object:Gem::Requirement
+  requirement: &17208044060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17209784380
+  version_requirements: *17208044060
 - !ruby/object:Gem::Dependency
   name: locale
-  requirement: &17209783400 !ruby/object:Gem::Requirement
+  requirement: &17208043420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17209783400
+  version_requirements: *17208043420
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &17209782900 !ruby/object:Gem::Requirement
+  requirement: &17208042600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17209782900
+  version_requirements: *17208042600
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17209782380 !ruby/object:Gem::Requirement
+  requirement: &17208041640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17209782380
+  version_requirements: *17208041640
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &17209781780 !ruby/object:Gem::Requirement
+  requirement: &17208040380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17209781780
+  version_requirements: *17208040380
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &17209781240 !ruby/object:Gem::Requirement
+  requirement: &17208038840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17209781240
+  version_requirements: *17208038840
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &17209780740 !ruby/object:Gem::Requirement
+  requirement: &17208038020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17209780740
+  version_requirements: *17208038020
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17209780240 !ruby/object:Gem::Requirement
+  requirement: &17208037180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17209780240
+  version_requirements: *17208037180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17209779620 !ruby/object:Gem::Requirement
+  requirement: &17208036100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17209779620
+  version_requirements: *17208036100
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &17209779040 !ruby/object:Gem::Requirement
+  requirement: &17208028880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17209779040
+  version_requirements: *17208028880
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &17209778280 !ruby/object:Gem::Requirement
+  requirement: &17208027180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17209778280
+  version_requirements: *17208027180
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &17209777380 !ruby/object:Gem::Requirement
+  requirement: &17208026100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: 0.9.0.rc2
   type: :development
   prerelease: false
-  version_requirements: *17209777380
+  version_requirements: *17208026100
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &17209776840 !ruby/object:Gem::Requirement
+  requirement: &17208025060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17209776840
+  version_requirements: *17208025060
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &17209775920 !ruby/object:Gem::Requirement
+  requirement: &17208024000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17209775920
+  version_requirements: *17208024000
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &17209774500 !ruby/object:Gem::Requirement
+  requirement: &17208023040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17209774500
+  version_requirements: *17208023040
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &17209773720 !ruby/object:Gem::Requirement
+  requirement: &17208022020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,7 +198,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17209773720
+  version_requirements: *17208022020
 description: This project is an implementation of the openEHR specification on Ruby.
 email: skoba@moss.gr.jp
 executables: []
@@ -413,6 +413,8 @@ files:
 - spec/lib/open_ehr/parser/adl14/openEHR-EHR-SECTION.reason_for_encounter.v1.adl
 - spec/lib/open_ehr/parser/adl14/openEHR-EHR-SECTION.summary.v1.adl
 - spec/lib/open_ehr/parser/adl14/openEHR-EHR-SECTION.vital_signs.v1.adl
+- spec/lib/open_ehr/parser/adl_description_spec.rb
+- spec/lib/open_ehr/parser/adl_identification_spec.rb
 - spec/lib/open_ehr/parser/adl_parser_spec.rb
 - spec/lib/open_ehr/parser/adl_path_spec.rb
 - spec/lib/open_ehr/parser/base_spec.rb
@@ -547,7 +549,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1913163895960804396
+      hash: -2889533999169533225
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: