Changeset 134 for ruby/trunk

Timestamp:

Jun 3, 2009, 9:55:40 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

fixed #51
DV_Multimedia class is too complecated, but it will be used
far future.
So, I fixed temporally.

Location:

ruby/trunk/lib/models

Files:

• rm/data_types/encapsulated.rb (modified) (1 diff)
• tests/rm/test_data_types.rb (modified) (1 diff)

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

@@ -60 +60 @@
 # media type http://www.iana.org/assignments/media-types/text/
         class DV_Multimedia < DV_Encapsulated
+          attr_reader :media_type
+          attr_accessor :uri, :data, :compression_algorithm,
+          :integrity_check, :integrity_check_algorithm, :alternate_text
           def initialize(charset, language, size, media_type, uri=nil,
                          data=nil, compression_algorithm=nil,
                          integrity_check=nil, integrity_check_algorithm=nil,
                          alternate_text=nil)
-
+            super(charset, language, size)
+            self.media_type = media_type
+            @uri = uri
+            @data = data
+            @compression_algorithm = compression_algorithm
+            @integrity_check = integrity_check
+            @integrity_check_algorithm = integrity_check_algorithm
+            @alternate_text = alternate_text
           end
-          
+          def media_type=(media_type)
+            if media_type.code_string.nil?
+              raise ArgumentError, 'media_type should not be nil'
+            end
+            @media_type = media_type
+          end
         end
 

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

@@ -254 +254 @@
     assert_equal '<H1>test</H1>', @dv_parsable.value
   end
-end
+
+  def test_dv_multimedia
+    assert_equal 'UTF-8', @dv_multimedia.charset.code_string
+    assert_equal 'ja', @dv_multimedia.language.code_string
+    assert_equal 10, @dv_multimedia.size
+    assert_equal 'text/html', @dv_multimedia.media_type.code_string
+    assert_equal 'http://www.openehr.jp/changeset/test?cmd=93#file0', @dv_multimedia.uri.value
+  end
+end