Changeset 131 for ruby/trunk/lib/models/rm/data_types/encapsulated.rb

Timestamp:

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

Author:

KOBAYASHI, Shinji

Message:

refs #51

File:

• ruby/trunk/lib/models/rm/data_types/encapsulated.rb (moved) (moved from ruby/trunk/lib/models/rm/data_types/encapslated.rb ) (4 diffs)

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