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

Timestamp:

Jun 3, 2009, 9:24:53 PM (15 years ago)

Author:

KOBAYASHI, Shinji

Message:

refs #51

File:

• ruby/trunk/lib/models/rm/data_types/encapsulated.rb (modified) (2 diffs)

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

@@ -58 +58 @@
         end
 
+# media type http://www.iana.org/assignments/media-types/text/
         class DV_Multimedia < DV_Encapsulated
+          def initialize(charset, language, size, media_type, uri=nil,
+                         data=nil, compression_algorithm=nil,
+                         integrity_check=nil, integrity_check_algorithm=nil,
+                         alternate_text=nil)
+
+          end
           
         end
@@ -64 +71 @@
         class DV_Parsable < DV_Encapsulated
           attr_reader :value, :formalism
-          def initialize(value, formalism, charset = nil, language = nil)
+          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
-            size_positive
-            formalism_validity(formalism)
-            @formalism = formalism
-            @charset, @language = charset, language
           end
-          private
-          def formalism_validity(formalism)
-            if formalism.nil
+
+          def formalism=(formalism)
+            if formalism.nil?
               raise ArgumentError, "formalism must not be nil"
             elsif formalism.empty?
               raise ArgumentError, "formalism must nto be empty"
             end
+            @formalism = formalism
           end
         end