diff options
Diffstat (limited to 'actionwebservice/lib')
4 files changed, 52 insertions, 8 deletions
diff --git a/actionwebservice/lib/action_web_service/casting.rb b/actionwebservice/lib/action_web_service/casting.rb index 91f36d113a..c76dd84581 100644 --- a/actionwebservice/lib/action_web_service/casting.rb +++ b/actionwebservice/lib/action_web_service/casting.rb @@ -63,6 +63,12 @@ module ActionWebService # :nodoc: Integer(value) when :string value.to_s + when :base64 + if value.is_a?(ActionWebService::Base64) + value + else + ActionWebService::Base64.new(value.to_s) + end when :bool return false if value.nil? return value if value == true || value == false diff --git a/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb b/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb index 5d9a80b007..eb8f6f1147 100644 --- a/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb +++ b/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb @@ -11,6 +11,7 @@ module ActionWebService @type_namespace = type_namespace || 'urn:ActionWebService' @registry = SOAP::Mapping::Registry.new @type2binding = {} + register_static_factories end def soap_to_ruby(obj) @@ -43,13 +44,7 @@ module ActionWebService array_binding = nil if type.array? - array_mapping = @registry.find_mapped_soap_class(Array) rescue nil - if (array_mapping && !array_mapping[1].is_a?(SoapTypedArrayFactory)) || array_mapping.nil? - @registry.set(Array, - SOAP::SOAPArray, - SoapTypedArrayFactory.new) - array_mapping = @registry.find_mapped_soap_class(Array) - end + array_mapping = @registry.find_mapped_soap_class(Array) qname = XSD::QName.new(@type_namespace, soap_type_name(type.element_type.type_class.name) + 'Array') array_binding = SoapBinding.new(self, qname, type, array_mapping, type_binding) end @@ -104,6 +99,21 @@ module ActionWebService def soap_type_name(type_name) type_name.gsub(/::/, '..') end + + def register_static_factories + @registry.add(ActionWebService::Base64, + SOAP::SOAPBase64, + SoapBase64Factory.new, + nil) + mapping = @registry.find_mapped_soap_class(ActionWebService::Base64) + @type2binding[ActionWebService::Base64] = + SoapBinding.new(self, SOAP::SOAPBase64::Type, + ActionWebService::Base64, mapping) + @registry.add(Array, + SOAP::SOAPArray, + SoapTypedArrayFactory.new, + nil) + end end class SoapBinding @@ -130,6 +140,7 @@ module ActionWebService else ns = XSD::NS.new ns.assign(XSD::Namespace, SOAP::XSDNamespaceTag) + ns.assign(SOAP::EncodingNamespace, "soapenc") xsd_klass = mapping[0].ancestors.find{|c| c.const_defined?('Type')} return ns.name(XSD::AnyTypeName) unless xsd_klass ns.name(xsd_klass.const_get('Type')) @@ -192,6 +203,22 @@ module ActionWebService end end + class SoapBase64Factory < SOAP::Mapping::Factory + def obj2soap(soap_class, obj, info, map) + unless obj.is_a?(ActionWebService::Base64) + return nil + end + return soap_class.new(obj) + end + + def soap2obj(obj_class, node, info, map) + unless node.type == SOAP::SOAPBase64::Type + return false + end + return true, obj_class.new(node.string) + end + end + end end end diff --git a/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb b/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb index d20fe05726..dec94ccad0 100644 --- a/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb +++ b/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb @@ -67,6 +67,8 @@ module ActionWebService # :nodoc: struct[key.to_s] = member_value end struct + elsif value.is_a?(ActionWebService::Base64) + XMLRPC::Base64.new(value) elsif value.is_a?(Exception) && !value.is_a?(XMLRPC::FaultException) XMLRPC::FaultException.new(2, value.message) else diff --git a/actionwebservice/lib/action_web_service/support/signature_types.rb b/actionwebservice/lib/action_web_service/support/signature_types.rb index 253e9dcb6a..e0f0c2ecd8 100644 --- a/actionwebservice/lib/action_web_service/support/signature_types.rb +++ b/actionwebservice/lib/action_web_service/support/signature_types.rb @@ -40,8 +40,10 @@ module ActionWebService # :nodoc: case name when :int, :integer, :fixnum, :bignum :int - when :string, :base64 + when :string :string + when :base64 + :base64 when :bool, :boolean :bool when :float, :double @@ -73,6 +75,8 @@ module ActionWebService # :nodoc: :int elsif klass == String :string + elsif klass == Base64 + :base64 elsif klass == TrueClass || klass == FalseClass :bool elsif derived_from?(Float, klass) || derived_from?(Precision, klass) || derived_from?(Numeric, klass) @@ -94,6 +98,8 @@ module ActionWebService # :nodoc: Integer when :string String + when :base64 + Base64 when :bool TrueClass when :float @@ -197,4 +203,7 @@ module ActionWebService # :nodoc: true end end + + class Base64 < String + end end |