Welcome to the "trac"-ing site of soap4r!
[soap4r] [httpclient] [openpgp4u] [pkcs1] [logger] [csv] [vtr]

Changeset 2008

Show
Ignore:
Timestamp:
02/10/08 10:48:23 (7 months ago)
Author:
nahi
Message:
  • enabled Sriver#generate_explicit_type for literal services. closes #449.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1_5/lib/soap/baseData.rb

    r1970 r2008  
    4949  attr_reader :extraattr 
    5050  attr_accessor :definedtype 
     51  attr_accessor :force_typed 
    5152 
    5253  def initialize(*arg) 
    …… 
    6162    @definedtype = nil 
    6263    @extraattr = {} 
     64    @force_typed = false 
    6365  end 
    6466 

  • branches/1_5/lib/soap/encodingstyle/literalHandler.rb

    r1975 r2008  
    3030    attrs = {} 
    3131    name = generator.encode_name(ns, data, attrs) 
     32    if data.type and data.type.name and 
     33        (@generate_explicit_type or data.force_typed) 
     34      data.extraattr[XSD::AttrTypeName] = data.type 
     35    end 
    3236    data.extraattr.each do |key, value| 
    33       next if !@generate_explicit_type and key == XSD::AttrTypeName 
    3437      keytag = key 
    3538      if key.is_a?(XSD::QName) 

  • branches/1_5/lib/soap/generator.rb

    r1975 r2008  
    142142    else 
    143143      if obj.is_a?(SOAPEnvelope) 
    144         # xsi:nil="true" can appear even if dumping without explicit type. 
    145144        Generator.assign_ns(attrs, ns, XSD::InstanceNamespace) 
    146         if @generate_explicit_type 
    147           Generator.assign_ns(attrs, ns, XSD::Namespace) 
    148         end 
     145        Generator.assign_ns(attrs, ns, XSD::Namespace) 
    149146      end 
    150147      obj.encode(self, ns, attrs) do |child| 

  • branches/1_5/lib/soap/mapping/literalregistry.rb

    r1991 r2008  
    137137    end 
    138138    ele.qualified = definition.qualified 
    139     if definition.type and (definition.basetype or Mapping.root_type_hint) 
    140       Mapping.reset_root_type_hint 
    141       ele.extraattr[XSD::AttrTypeName] = definition.type 
     139    if definition.type 
     140      ele.type = definition.type 
     141      if definition.basetype or Mapping.root_type_hint 
     142        Mapping.reset_root_type_hint 
     143        ele.force_typed = true 
     144      end 
    142145    end 
    143146    if qname.nil? and definition.elename 

  • branches/1_5/lib/soap/mapping/wsdlliteralregistry.rb

    r1949 r2008  
    110110      else 
    111111        ele = complexobj2soap(obj, type) 
     112      end 
     113      ele.type = type.name 
     114      if type.base or Mapping.root_type_hint 
     115        Mapping.reset_root_type_hint 
     116        ele.force_typed = true 
    112117      end 
    113118      add_definedattributes2soap(obj, ele, type) 

  • branches/1_5/lib/soap/rpc/proxy.rb

    r1983 r2008  
    5757    @allow_unqualified_element = true 
    5858    @default_encodingstyle = nil 
    59     @generate_explicit_type = true 
     59    @generate_explicit_type = nil 
    6060    @use_default_namespace = false 
    6161    @return_response_as_xml = false 
    …… 
    141141        @default_encodingstyle || op_info.response_default_encodingstyle 
    142142    ) 
     143    if reqopt[:generate_explicit_type].nil? 
     144      reqopt[:generate_explicit_type] = (op_info.request_use == :encoded) 
     145    end 
     146    if resopt[:generate_explicit_type].nil? 
     147      resopt[:generate_explicit_type] = (op_info.response_use == :encoded) 
     148    end 
    143149    env = route(req_header, req_body, reqopt, resopt) 
    144150    if op_info.response_use.nil? 

  • branches/1_5/lib/xsd/mapping.rb

    r1936 r2008  
    3131    MAPPING_OPT = { 
    3232      :default_encodingstyle => SOAP::LiteralNamespace, 
     33      :generate_explicit_type => false, 
    3334      :root_type_hint => true 
    3435    }.freeze 

  • branches/1_5/test/wsdl/rpc/test_rpc_lit.rb

    r1983 r2008  
    156156  ECHO_STRING_ARRAY_REQUEST = 
    157157%q[<?xml version="1.0" encoding="utf-8" ?> 
    158 <env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
     158<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     159    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
    159160    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
    160161  <env:Body> 
    …… 
    171172  ECHO_STRING_ARRAY_RESPONSE = 
    172173%q[<?xml version="1.0" encoding="utf-8" ?> 
    173 <env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
     174<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     175    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
    174176    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
    175177  <env:Body> 
    …… 
    199201  ECHO_STRING_ARRAY_INLINE_REQUEST = 
    200202%q[<?xml version="1.0" encoding="utf-8" ?> 
    201 <env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
     203<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     204    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
    202205    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
    203206  <env:Body> 
    …… 
    214217  ECHO_STRING_ARRAY_INLINE_RESPONSE = 
    215218%q[<?xml version="1.0" encoding="utf-8" ?> 
    216 <env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
     219<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     220    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
    217221    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
    218222  <env:Body> 
    …… 
    241245  ECHO_NESTED_STRUCT_REQUEST = 
    242246%q[<?xml version="1.0" encoding="utf-8" ?> 
    243 <env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
     247<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     248    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
    244249    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
    245250  <env:Body> 
    …… 
    261266  ECHO_NESTED_STRUCT_RESPONSE = 
    262267%q[<?xml version="1.0" encoding="utf-8" ?> 
    263 <env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
     268<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     269    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
    264270    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
    265271  <env:Body> 
    …… 
    300306  ECHO_NESTED_STRUCT_REQUEST_NIL = 
    301307%q[<?xml version="1.0" encoding="utf-8" ?> 
    302 <env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
     308<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     309    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
    303310    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
    304311  <env:Body> 
    …… 
    319326  ECHO_NESTED_STRUCT_RESPONSE_NIL = 
    320327%q[<?xml version="1.0" encoding="utf-8" ?> 
    321 <env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
     328<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     329    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
    322330    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
    323331  <env:Body> 
    …… 
    379387  ECHO_STRUCT_ARRAY_REQUEST = 
    380388%q[<?xml version="1.0" encoding="utf-8" ?> 
    381 <env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
     389<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     390    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
    382391    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
    383392  <env:Body> 
    …… 
    401410  ECHO_STRUCT_ARRAY_RESPONSE = 
    402411%q[<?xml version="1.0" encoding="utf-8" ?> 
    403 <env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
     412<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     413    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/" 
    404414    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 
    405415  <env:Body>