Changeset 237

Timestamp:

Aug 28, 2009, 1:34:41 AM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

move from Test to Rspec

Location:

ruby/branches/0.5

Files:

• lib/open_ehr/rm/data_types/encapsulated.rb (modified) (3 diffs)
• spec/lib/open_ehr/rm/data_types/encapsulated/dv_parsable_spec.rb (added)

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

@@ -23 +23 @@
 
           def language=(language)
-            if language.nil? ||
+            if !language.nil? &&
                 !Locale::Info.language_code?(language.code_string)
               raise ArgumentError, 'invalid language code'
@@ -31 +31 @@
 
           def charset=(charset)
-            if charset.nil? || !charset_valid?(charset.code_string)
+            if !charset.nil? && !charset_valid?(charset.code_string)
               raise ArgumentError, 'invalid charset'
             end
@@ -81 +81 @@
         class DvParsable < DvEncapsulated
           attr_reader :value, :formalism
-          def initialize(charset, language, size, formalism, value)
-            super(charset, language, size)
-            self.formalism = formalism
-            self.value = value
-          end
 
-          def value=(value)
-            raise ArgumentError, 'value must not be nil' if value.nil?
-            @value = value
+          def initialize(args = {})
+            super(args)
+            self.formalism = args[:formalism]
           end