Changeset 221

Timestamp:

Aug 21, 2009, 12:02:44 AM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

CodePhrase modified

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/data_types/text.rb (modified) (4 diffs)
• spec/lib/open_ehr/rm/data_types/basic/dv_state_spec.rb (modified) (2 diffs)
• spec/lib/open_ehr/rm/data_types/text (added)
• spec/lib/open_ehr/rm/data_types/text/dv_text_spec.rb (added)

ruby/branches/0.5/lib/open_ehr/rm/data_types/text.rb

@@ -48 +48 @@
         class CodePhrase
           attr_reader :terminology_id, :code_string
-          def initialize(code_string, terminology_id)
-            self.code_string = code_string
-            self.terminology_id = terminology_id
+
+          def initialize(args = {})
+            self.code_string = args[:code_string]
+            self.terminology_id = args[:terminology_id]
           end
 
@@ -86 +87 @@
 
           def formatting=(formatting)
-            unless formatting.nil? or formatting.empty?
+            if !formatting.nil? and formatting.empty?
               raise ArgumentError, "formatting is not valid"
             end
@@ -93 +94 @@
 
           def encoding=(encoding)
-            unless encoding.nil? or encoding.empty?
+            if !encoding.nil? and encoding.empty?
               raise ArgumentError, "encoding is not valid"
             end
@@ -108 +109 @@
           end
           def language=(language)
-            unless language.nil? or language.empty?
+            if !@language.nil? and language.empty?
               raise ArgumentError, "langage is not valid"
             end

ruby/branches/0.5/spec/lib/open_ehr/rm/data_types/basic/dv_state_spec.rb

@@ -7 +7 @@
   before(:each) do
     @terminology_id = TerminologyId.new('openher')
-    code_phrase = CodePhrase.new('524', @terminology_id)
+    code_phrase = CodePhrase.new(:code_string => '524',
+                                 :terminology_id => @terminology_id)
     dv_coded_text = DvCodedText.new(:value => "initial",
                                     :defining_code => code_phrase)
@@ -23 +24 @@
 
   it 'should change other value assigned' do
-    code_phrase = CodePhrase.new('526',@terminology_id)
+    code_phrase = CodePhrase.new(:code_string => '526',
+                                 :terminology_id => @terminology_id)
     dv_coded_text = DvCodedText.new(:value =>'planned',
                                     :defining_code => code_phrase)