Changeset 1931

Timestamp:

08/31/07 23:17:57 (1 year ago)

Author:

nahi

Message:

• allow the Fixnum which have an instance variable to be marshalled. For Fixnum, ivars are not marshalled but allowed to be marshalled in Ruby's marshal. closes #406
  

Files:

• trunk/lib/soap/mapping/encodedregistry.rb (modified) (3 diffs)
• trunk/lib/soap/mapping/factory.rb (modified) (1 diff)

trunk/lib/soap/mapping/encodedregistry.rb

@@ -124 +124 @@
-  StringFactory = StringFactory_.new
-  BasetypeFactory = BasetypeFactory_.new
+  FixnumFactory = FixnumFactory_.new
-  DateTimeFactory = DateTimeFactory_.new
-  ArrayFactory = ArrayFactory_.new
@@ -147 +148 @@
-    [::Float,        ::SOAP::SOAPFloat,      BasetypeFactory,
-      {:derived_class => true}],
+    [::Fixnum,       ::SOAP::SOAPInt,        FixnumFactory],
-    [::Integer,      ::SOAP::SOAPInt,        BasetypeFactory,
-      {:derived_class => true}],
@@ -210 +212 @@
-    [::Float,        ::SOAP::SOAPFloat,      BasetypeFactory,
-      {:derived_class => true}],
+    [::Fixnum,       ::SOAP::SOAPInt,        FixnumFactory],
-    [::Integer,      ::SOAP::SOAPInt,        BasetypeFactory,
-      {:derived_class => true}],

trunk/lib/soap/mapping/factory.rb

@@ -126 +126 @@
-end
-
+class FixnumFactory_ < Factory
+  def obj2soap(soap_class, obj, info, map)
+    soap_obj = nil
+    begin
+      soap_obj = soap_class.new(obj)
+    rescue XSD::ValueSpaceError
+      return nil
+    end
+    soap_obj
+  end
+
+  def soap2obj(obj_class, node, info, map)
+    obj = node.data
+    return true, obj
+  end
+end
+
-class BasetypeFactory_ < Factory
-  def initialize(allow_original_mapping = false)