Changeset 131

Timestamp:

May 29, 2009, 4:09:47 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #51

Location:

ruby/trunk/lib/models

Files:

• rm.rb (modified) (1 diff)
• rm/common/archetyped.rb (modified) (1 diff)
• rm/data_types/encapsulated.rb (moved) (moved from ruby/trunk/lib/models/rm/data_types/encapslated.rb ) (4 diffs)
• tests/rm/test_data_types.rb (modified) (1 diff)

ruby/trunk/lib/models/rm.rb

@@ -35 +35 @@
       autoload :URI, "rm/data_types/uri.rb"
       autoload :Quantity, "rm/data_types/quantity.rb"
+      autoload :Encapsulated, "rm/data_types/encapsulated.rb"
     end
 

ruby/trunk/lib/models/rm/common/archetyped.rb

@@ -132 +132 @@
           end
         end # of Link
+
+        class Feeder_Audit
+          
+        end # of Feeder_Audit
+
+        class Feeder_Audit_Details
+
+        end # of Feeder_Audit_Details
       end # of Archetyped
     end # of Common

ruby/trunk/lib/models/rm/data_types/encapsulated.rb

@@ -11 +11 @@
         class DV_Encapsulated  < OpenEHR::RM::Data_Types::Basic::Data_Value
           attr_reader :language, :charset
+          def initialize(charset, language)
+            self.charset = charset
+            self.language = language
+          end
 
           def size
@@ -17 +21 @@
 
           def language=(language)
-            unless Language::Info.valid_language?(language.code_string)
+            if language.nil? ||
+                !Locale::Info.language_code?(language.code_string)
               raise ArgumentError, 'invalid language code'
             end
@@ -24 +29 @@
 
           def charset=(charset)
-            unless charset_valid?(charset)
+            if charset.nil? || !charset_valid?(charset.code_string)
               raise ArgumentError, 'invalid charset'
             end
-            @charset=charset
+            @charset = charset
           end
 
@@ -36 +41 @@
 
           def charset_valid?(charset)
-            open('charset.list') do |file|
+            result = false
+            open('rm/data_types/charset.lst') do |file|
               while line = file.gets
-                if charset == line
-                  file.close
-                  return true
+                if charset == line.chomp
+                  result = true
+                  break
                 end
               end
             end
-            return false
+            return result
           end
         end

ruby/trunk/lib/models/tests/rm/test_data_types.rb

@@ -197 +197 @@
   end
 end
+
+class EncapsulatedTest < Test::Unit::TestCase
+  def setup
+    charset = OpenEHR::RM::Data_Types::Text::Code_Phrase.new('UTF-8','character-sets')
+    language = OpenEHR::RM::Data_Types::Text::Code_Phrase.new('ja', 'languages')
+    assert_nothing_raised(Exception){
+      @dv_encapsulated = OpenEHR::RM::Data_Types::Encapsulated::DV_Encapsulated.new(charset, language)}
+  end
+
+  def test_init
+    assert_instance_of OpenEHR::RM::Data_Types::Encapsulated::DV_Encapsulated, @dv_encapsulated
+  end
+end