open_ehr 0.9.5 → 1.0.0

data/lib/open_ehr/parser/shared_token_grammar.tt

@@ -1072,9 +1072,12 @@ module OpenEHR
       end
 
       rule V_QUALIFIED_TERM_CODE_REF
-        '[' qtc:(NAMECHAR_PAREN+ '::' NAMECHAR+) ']' {
+        '[' ti:(NAMECHAR_PAREN+) '::' cs:(NAMECHAR+) ']' {
           def value
-            qtc.text_value
+            term_id = OpenEHR::RM::Support::Identification::TerminologyID.new(
+              :value => ti.text_value)
+            OpenEHR::RM::DataTypes::Text::CodePhrase.new(
+              :terminology_id => term_id, :code_string => cs.text_value)
           end
         }
       end
@@ -1125,7 +1128,13 @@ module OpenEHR
       end
 
       rule V_ISO8601_DURATION
-        'P' ([0-9]+ [yY])? ([0-9]+ [mM])? ([0-9]+ [wW])? ([0-9]+ [dD])? ('T' ([0-9]+ [hH])? ([0-9]+ [mM])? ([0-9]+ ('.' [0-9]+)? [sS])?)?
+        'P' ([0-9]+ [yY])? ([0-9]+ [mM])? ([0-9]+ [wW])? ([0-9]+ [dD])? 'T' ([0-9]+ [hH]) ([0-9]+ [mM])? ([0-9]+ ('.' [0-9]+)? [sS])?
+      / 'P' ([0-9]+ [yY])? ([0-9]+ [mM])? ([0-9]+ [wW])? ([0-9]+ [dD])? 'T' ([0-9]+ [hH])? ([0-9]+ [mM]) ([0-9]+ ('.' [0-9]+)? [sS])?
+      / 'P' ([0-9]+ [yY])? ([0-9]+ [mM])? ([0-9]+ [wW])? ([0-9]+ [dD])? 'T' ([0-9]+ [hH])? ([0-9]+ [mM])? ([0-9]+ ('.' [0-9]+)? [sS])?
+      / 'P' ([0-9]+ [yY]) ([0-9]+ [mM])? ([0-9]+ [wW])? ([0-9]+ [dD])?
+      / 'P' ([0-9]+ [yY])? ([0-9]+ [mM]) ([0-9]+ [wW])? ([0-9]+ [dD])? 
+      / 'P' ([0-9]+ [yY])? ([0-9]+ [mM])? ([0-9]+ [wW]) ([0-9]+ [dD])?
+      / 'P' ([0-9]+ [yY])? ([0-9]+ [mM])? ([0-9]+ [wW])? ([0-9]+ [dD])
       end
 
       rule V_ISO8601_DATE_CONSTRAINT_PATTERN
@@ -1209,9 +1218,9 @@ module OpenEHR
       end
 
       rule V_STRING
-        '"' str:((!'"' . / '\"')*) '"' {
+        '"' str:(('\"' / !'"' .)*) '"' {
           def value
-            str.text_value
+            str.text_value.tr_s('\\\\', '\\')
           end
         }
       end

data/lib/open_ehr/rm.rb

@@ -1,5 +1,4 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+$:.unshift(File.dirname(__FILE__))
 
 module OpenEHR
   module RM

data/lib/open_ehr/rm/composition/content/entry.rb

@@ -3,6 +3,7 @@
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109264528523_312165_346Report.html
 # refs #56
 include OpenEHR::RM::Composition::Content
+require 'locale/info'
 
 module OpenEHR
   module RM
@@ -24,11 +25,17 @@ module OpenEHR
 
             def language=(language)
               raise ArgumentError, 'language is mandatory' if language.nil?
+              unless Locale::Info.language_code? language.code_string
+                raise ArgumentError, 'language code is invalid'
+              end
               @language = language
             end
 
             def encoding=(encoding)
-              raise ArgumentError, 'encoding is mandatory' if encoding.nil?
+              if encoding.nil?
+                raise ArgumentError, 'encoding is mandatory'
+              end
+              Encoding.find(encoding.code_string)
               @encoding = encoding
             end
 

data/lib/open_ehr/rm/data_types.rb

@@ -1,5 +1,5 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+$:.unshift(File.dirname(__FILE__))
+
 module OpenEHR
   module RM
     module DataTypes

data/lib/open_ehr/rm/data_types/quantity.rb

@@ -1,5 +1,4 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+$:.unshift(File.dirname(__FILE__))
 # This modules are implemented from the UML shown bellow
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109599337877_94556_1510Report.html
 # Ticket refs #50

data/lib/open_ehr/rm/data_types/quantity/date_time.rb

@@ -1,16 +1,17 @@
 # This module is implementation of the UML:
 # http://www.openehr.org/uml/release-1.0.1/Browsable/_9_0_76d0249_1109696321450_28117_5362Report.html
 # Ticket refs #49
-#require 'assumed_library_types'
+require 'open_ehr/assumed_library_types'
 require 'date'
-include OpenEHR::RM::DataTypes::Quantity
-include OpenEHR::AssumedLibraryTypes
+require 'open_ehr/rm/data_types/quantity'
 
 module OpenEHR
   module RM
     module DataTypes
       module Quantity
         module DateTime
+          include OpenEHR::RM::DataTypes::Quantity
+
           class DvTemporal < DvAbsoluteQuantity
             def initialize(args = {})
               self.value = args[:value]
@@ -32,7 +33,8 @@ module OpenEHR
           end
 
           class DvDate < DvTemporal
-            include ISO8601DateModule
+            include OpenEHR::AssumedLibraryTypes::ISO8601DateModule
+            include OpenEHR::AssumedLibraryTypes
 
             DAYS_IN_MONTH = [0,31,28,31,30,31,30,31,31,30,31,30,31]
 
@@ -87,6 +89,7 @@ module OpenEHR
           end
           
           class DvTime < DvTemporal
+            include OpenEHR::AssumedLibraryTypes
             include ISO8601TimeModule
 
             def value=(value)
@@ -193,7 +196,7 @@ module OpenEHR
           end
 
           class DvDuration < DvTemporal
-            include AssumedLibraryTypes::ISO8601DurationModule
+            include OpenEHR::AssumedLibraryTypes::ISO8601DurationModule
             attr_reader :value
             
             def initialize(args = { })

data/lib/open_ehr/rm/data_types/text.rb

@@ -83,6 +83,7 @@ module OpenEHR
         class DvText < OpenEHR::RM::DataTypes::Basic::DataValue
           attr_reader :formatting, :hyperlink, :mappings,
                       :language, :encoding
+          attr_accessor :hyperlink
 
           def initialize(args = {})
             super(args)
@@ -90,6 +91,7 @@ module OpenEHR
             self.encoding = args[:encoding]
             self.mappings = args[:mappings]
             self.language = args[:language]
+            self.hyperlink = args[:hyperlink]
           end
 
           def value=(value)
@@ -114,17 +116,16 @@ module OpenEHR
             end
             @encoding = encoding
           end
+
           def mappings=(mappings)
-            if !mappings.nil? and !mappings.instance_of? Set
-              raise ArgumentError, "mapping(s) is(are) not valid"
-            elsif !mappings.nil? and mappings.instance_of? Set and
-                mappings.empty?
-              raise ArgumentError, "mapping(s) is(are) not valid"
+            if !mappings.nil? && mappings.empty?
+              raise ArgumentError, 'mappings should not be empty'
             end
             @mappings = mappings
           end
+
           def language=(language)
-            if !@language.nil? and language.empty?
+            if !language.nil? and language.code_string.empty?
               raise ArgumentError, "langage is not valid"
             end
             @language = language

data/lib/open_ehr/rm/support/identification.rb

@@ -18,8 +18,8 @@ module OpenEHR
             @value = value            
           end
 
-          def ==(object_id)
-            self.value == object_id.value
+          def ==(oid)
+            self.value == oid.value
           end
         end # of ObjectID
 
@@ -239,15 +239,15 @@ module OpenEHR
         end
 
         class ObjectVersionID < UIDBasedID
-          attr_reader :object_id, :creating_system_id, :version_tree_id
+          attr_reader :creating_system_id, :version_tree_id
 
           def initialize(args= {})
-            super(args)
+            super
           end
 
           def value=(value)
             if /^(\S+)::(\S+)::((\d|\.)+)$/ =~ value
-              self.object_id = UID.new(:value => $1)
+              self.objectid = UID.new(:value => $1)
               self.creating_system_id = UID.new(:value => $2)
               self.version_tree_id = VersionTreeID.new(:value => $3)
             else
@@ -256,14 +256,18 @@ module OpenEHR
           end
 
           def value
-            return @object_id.value + '::' + 
+            return @oid.value + '::' + 
               @creating_system_id.value + '::' +
               @version_tree_id.value
           end
 
-          def object_id=(object_id)
-            raise ArgumentError, 'object_id is mandatory' if object_id.nil?
-            @object_id = object_id
+          def objectid
+            return @oid
+          end
+
+          def objectid=(oid)
+            raise ArgumentError, 'objectid is mandatory' if oid.nil?
+            @oid = oid
           end
 
           def creating_system_id=(creating_system_id)

data/open_ehr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "open_ehr"
-  s.version = "0.9.5"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shinji KOBAYASHI", "Akimichi Tatsukawa"]
-  s.date = "2011-12-02"
+  s.date = "2011-12-24"
   s.description = "This project is an implementation of the openEHR specification on Ruby."
   s.email = "skoba@moss.gr.jp"
   s.extra_rdoc_files = [
@@ -125,6 +125,15 @@ Gem::Specification.new do |s|
     "spec/lib/open_ehr/am/archetype/ontology/archetype_ontology_spec.rb",
     "spec/lib/open_ehr/am/archetype/ontology/archetype_term_spec.rb",
     "spec/lib/open_ehr/am/archetype/validity_kind_spec.rb",
+    "spec/lib/open_ehr/am/openehr_profile/data_types/basic/c_dv_state_spec.rb",
+    "spec/lib/open_ehr/am/openehr_profile/data_types/basic/non_terminal_state_spec.rb",
+    "spec/lib/open_ehr/am/openehr_profile/data_types/basic/state_machine_spec.rb",
+    "spec/lib/open_ehr/am/openehr_profile/data_types/basic/state_spec.rb",
+    "spec/lib/open_ehr/am/openehr_profile/data_types/basic/terminal_state_spec.rb",
+    "spec/lib/open_ehr/am/openehr_profile/data_types/basic/transition_spec.rb",
+    "spec/lib/open_ehr/am/openehr_profile/data_types/quantity/c_dv_ordinal_spec.rb",
+    "spec/lib/open_ehr/am/openehr_profile/data_types/quantity/c_dv_quantity_spec.rb",
+    "spec/lib/open_ehr/am/openehr_profile/data_types/quantity/c_quantity_item_spec.rb",
     "spec/lib/open_ehr/am/openehr_profile/data_types/text/c_code_phrase_spec.rb",
     "spec/lib/open_ehr/assumed_library_types/interval_spec.rb",
     "spec/lib/open_ehr/assumed_library_types/iso8601_date_spec.rb",
@@ -244,10 +253,31 @@ Gem::Specification.new do |s|
     "spec/lib/open_ehr/parser/base_spec.rb",
     "spec/lib/open_ehr/parser/basic_generic_type_spec.rb",
     "spec/lib/open_ehr/parser/basic_type_spec.rb",
+    "spec/lib/open_ehr/parser/c_dv_quantity_any_allowed_spec.rb",
+    "spec/lib/open_ehr/parser/c_dv_quantity_shared_example_for_lacked_items_spec.rb",
+    "spec/lib/open_ehr/parser/c_dv_quantity_shared_example_spec.rb",
+    "spec/lib/open_ehr/parser/cdv_ordinal_parse_spec.rb",
     "spec/lib/open_ehr/parser/code_phrase_spec.rb",
+    "spec/lib/open_ehr/parser/constraint_binding_spec.rb",
+    "spec/lib/open_ehr/parser/constraint_ref_spec.rb",
     "spec/lib/open_ehr/parser/date_time_spec.rb",
     "spec/lib/open_ehr/parser/duration_spec.rb",
+    "spec/lib/open_ehr/parser/dv_coded_text_parse_spec.rb",
+    "spec/lib/open_ehr/parser/empty_other_contributors_spec.rb",
+    "spec/lib/open_ehr/parser/missing_language_spec.rb",
+    "spec/lib/open_ehr/parser/missing_purpose_spec.rb",
+    "spec/lib/open_ehr/parser/mixed_node_types_spec.rb",
+    "spec/lib/open_ehr/parser/most_minimal_adl_spec.rb",
+    "spec/lib/open_ehr/parser/multi_language_spec.rb",
     "spec/lib/open_ehr/parser/parser_spec_helper.rb",
+    "spec/lib/open_ehr/parser/path_based_terminology_binding_spec.rb",
+    "spec/lib/open_ehr/parser/special_string_spec.rb",
+    "spec/lib/open_ehr/parser/structure_comment_spec.rb",
+    "spec/lib/open_ehr/parser/structure_nested_comments_spec.rb",
+    "spec/lib/open_ehr/parser/structure_spec.rb",
+    "spec/lib/open_ehr/parser/term_binding_spec.rb",
+    "spec/lib/open_ehr/parser/unicode_bom_spec.rb",
+    "spec/lib/open_ehr/parser/unicode_support_spec.rb",
     "spec/lib/open_ehr/rm/common/archetyped/archetyped_spec.rb",
     "spec/lib/open_ehr/rm/common/archetyped/feeder_audit_details_spec.rb",
     "spec/lib/open_ehr/rm/common/archetyped/feeder_audit_spec.rb",
@@ -306,7 +336,7 @@ Gem::Specification.new do |s|
     "spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_date_spec.rb",
     "spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_date_time_spec.rb",
     "spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_duration_spec.rb",
-    "spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_tempral_spec.rb",
+    "spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_temporal_spec.rb",
     "spec/lib/open_ehr/rm/data_types/quantity/date_time/dv_time_spec.rb",
     "spec/lib/open_ehr/rm/data_types/quantity/dv_absolute_quantity_spec.rb",
     "spec/lib/open_ehr/rm/data_types/quantity/dv_amount_spec.rb",
@@ -369,7 +399,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/skoba/ruby-impl-openehr"
   s.licenses = ["The openEHR Open Source Software license(mozilla tri-license)"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.12"
   s.summary = "Ruby implementation of the openEHR specification"
 
   if s.respond_to? :specification_version then

data/spec/lib/open_ehr/am/openehr_profile/data_types/basic/c_dv_state_spec.rb

@@ -0,0 +1,34 @@
+# ticket 192
+require File.dirname(__FILE__) + '/../../../../../../spec_helper'
+require 'open_ehr/am/openehr_profile/data_types/basic'
+include ::OpenEHR::AM::OpenEHRProfile::DataTypes::Basic
+include ::OpenEHR::AssumedLibraryTypes
+require 'set'
+
+describe CDvState do
+  before(:each) do
+    proposed_state = State.new(:name => 'PROPOSED')
+    complete_state = TerminalState.new(:name => 'COMPLETED')
+    finish = Transition.new(:event => 'finish', :next_state => complete_state)
+    transitions = Set[finish]
+    non_terminal_state = NonTerminalState.new(:name => 'IN_EXECUTION',
+                                              :transitions => transitions)
+    states = Set[proposed_state, non_terminal_state, complete_state]
+    state_machine = StateMachine.new(:states => states)
+    occurrences = Interval.new(:upper => 1, :lower => 1)
+    @c_dv_state = CDvState.new(:value => state_machine, :path => '/',
+                               :occurrences => occurrences)
+  end
+
+  it 'is an instance of StateMachine' do
+    @c_dv_state.should be_an_instance_of CDvState
+  end
+
+  it 'states size should be 3' do
+    @c_dv_state.value.states.size.should be 3
+  end
+
+  it 'raise error if value is nil' do
+    expect {@c_dv_state.value = nil}.to raise_error
+  end
+end

data/spec/lib/open_ehr/am/openehr_profile/data_types/basic/non_terminal_state_spec.rb

@@ -0,0 +1,36 @@
+# ticket 195
+require File.dirname(__FILE__) + '/../../../../../../spec_helper'
+require 'open_ehr/am/openehr_profile/data_types/basic'
+include ::OpenEHR::AM::OpenEHRProfile::DataTypes::Basic
+require 'set'
+
+describe NonTerminalState do
+  before(:each) do
+    proposed_state = State.new(:name => 'PROPOSED')
+    complete_state = TerminalState.new(:name => 'COMPLETED')
+    finish = Transition.new(:event => 'finish', :next_state => complete_state)
+    transitions = Set[finish]
+    @non_terminal_state = NonTerminalState.new(:name => 'IN_EXECUTION',
+                                               :transitions => transitions)
+  end
+
+  it 'is an instance of NonTerminalState' do
+    @non_terminal_state.should be_an_instance_of NonTerminalState
+  end
+
+  it 'name is IN_EXECUTION' do
+    @non_terminal_state.name.should == 'IN_EXECUTION'
+  end
+
+  it 'size of transitions is 2' do
+    @non_terminal_state.transitions.size.should == 1
+  end
+
+  it 'raise error if traisitions is empty' do
+    expect {@non_terminal_state.transitions = Set.new}.to raise_error
+  end
+
+  it 'raise error if transitions is nil' do
+    expect {@non_terminal_state.transitions = nil}.to raise_error
+  end
+end

data/spec/lib/open_ehr/am/openehr_profile/data_types/basic/state_machine_spec.rb

@@ -0,0 +1,34 @@
+# ticket 193
+require File.dirname(__FILE__) + '/../../../../../../spec_helper'
+require 'open_ehr/am/openehr_profile/data_types/basic'
+include ::OpenEHR::AM::OpenEHRProfile::DataTypes::Basic
+require 'set'
+
+describe StateMachine do
+  before(:each) do
+    proposed_state = State.new(:name => 'PROPOSED')
+    complete_state = TerminalState.new(:name => 'COMPLETED')
+    finish = Transition.new(:event => 'finish', :next_state => complete_state)
+    transitions = Set[finish]
+    non_terminal_state = NonTerminalState.new(:name => 'IN_EXECUTION',
+                                              :transitions => transitions)
+    states = Set[proposed_state, non_terminal_state, complete_state]
+    @state_machine = StateMachine.new(:states => states)
+  end
+
+  it 'is an instance of StateMachine' do
+    @state_machine.should be_an_instance_of StateMachine
+  end
+
+  it 'states size is 3' do
+    @state_machine.states.size.should be 3
+  end
+
+  it 'raise error if states are nil' do
+    expect {@state_machine.states = nil}.to raise_error
+  end
+
+  it 'raise error if states is empty' do
+    expect {@state_machine.states = Set.new}.to raise_error
+  end
+end

data/spec/lib/open_ehr/am/openehr_profile/data_types/basic/state_spec.rb

@@ -0,0 +1,26 @@
+# ticket 191
+require File.dirname(__FILE__) + '/../../../../../../spec_helper'
+require 'open_ehr/am/openehr_profile/data_types/basic'
+include ::OpenEHR::AM::OpenEHRProfile::DataTypes::Basic
+
+describe State do
+  before(:all) do
+    @state = State.new(:name => 'PROPOSED')
+  end
+
+  it 'is an instance of State' do
+    @state.should be_an_instance_of State
+  end
+
+  it 'name is PROPOSED' do
+    @state.name.should == 'PROPOSED'
+  end
+
+  it 'raise error name is empty' do
+    expect {@state.name = ''}.to raise_error
+  end
+
+  it 'raise error name is nil' do
+    expect {@state.name = nil}.to raise_error
+  end
+end

data/spec/lib/open_ehr/am/openehr_profile/data_types/basic/terminal_state_spec.rb

@@ -0,0 +1,18 @@
+# ticket 196
+require File.dirname(__FILE__) + '/../../../../../../spec_helper'
+require 'open_ehr/am/openehr_profile/data_types/basic'
+include ::OpenEHR::AM::OpenEHRProfile::DataTypes::Basic
+
+describe TerminalState do
+  before(:all) do
+    @terminal_state = TerminalState.new(:name => 'PROPOSED')
+  end
+
+  it 'is an instance of TerminalState' do
+    @terminal_state.should be_an_instance_of TerminalState
+  end
+
+  it 'name is PROPOSED' do
+    @terminal_state.name.should == 'PROPOSED'
+  end
+end