Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

* (merged from branches/1_5: -r1993:1995)

   * avoid NameError if an Array definition has soapenc:Array as a restriction base and no soapenc:arrayType inside. (#441)
   * avoid name crash in generated classdef for simpleType enumeration. (#442)


git-svn-id: http://dev.ctor.org/svn/soap4r/trunk@1996 23c4dcf6-64ea-0310-84d7-d424c7495ec0
  • Loading branch information...
commit 9ea374266c2e906b09e3a5cc890ea042c55b3cef 1 parent 82478d4
nahi authored
View
2  lib/wsdl/soap/classDefCreator.rb
@@ -216,7 +216,7 @@ def define_classenum_restriction(c, classname, enumeration)
if (const[constname] += 1) > 1
constname += "_#{const[constname]}"
end
- c.def_const(constname, "#{classname}.new(#{ndq(value)})")
+ c.def_const(constname, "new(#{ndq(value)})")
end
end
View
1  lib/wsdl/soap/complexType.rb
@@ -106,6 +106,7 @@ def find_soapenc_arytype
end
end
end
+ nil
end
def find_arytype
View
10 test/wsdl/ref/expectedProduct.rb
@@ -126,9 +126,9 @@ def initialize(varStringExt = nil, varFloatExt = nil)
# {urn:ref}Rating
class Rating < ::String
- C_0 = Rating.new("0")
- C_1 = Rating.new("+1")
- C_1_2 = Rating.new("-1")
+ C_0 = new("0")
+ C_1 = new("+1")
+ C_1_2 = new("-1")
end
# {urn:ref}Product-Bag
@@ -235,8 +235,8 @@ def initialize(*arg)
# {urn:ref}yesno
class Yesno < ::String
- N = Yesno.new("N")
- Y = Yesno.new("Y")
+ N = new("N")
+ Y = new("Y")
end
View
10 test/wsdl/simpletype/rpc/expectedEchoVersion.rb
@@ -15,19 +15,19 @@ def initialize(version = nil, msg = nil)
# {urn:example.com:simpletype-rpc-type}version
class Version < ::String
- C_16 = Version.new("1.6")
- C_18 = Version.new("1.8")
- C_19 = Version.new("1.9")
+ C_16 = new("1.6")
+ C_18 = new("1.8")
+ C_19 = new("1.9")
end
# {urn:example.com:simpletype-rpc-type}stateType
class StateType < ::String
- StateType = StateType.new("stateType")
+ StateType = new("stateType")
end
# {urn:example.com:simpletype-rpc-type}zipIntType
class ZipIntType < ::String
- C_123 = ZipIntType.new("123")
+ C_123 = new("123")
end
# {urn:example.com:simpletype-rpc-type}zipUnion
View
6 test/wsdl/soap/wsdl2ruby/expectedClassdef.rb
@@ -15,7 +15,7 @@ def initialize(version = nil, msg = nil)
# {urn:example.com:simpletype-rpc-type}version
class Version < ::String
- C_16 = Version.new("1.6")
- C_18 = Version.new("1.8")
- C_19 = Version.new("1.9")
+ C_16 = new("1.6")
+ C_18 = new("1.8")
+ C_19 = new("1.9")
end
Please sign in to comment.
Something went wrong with that request. Please try again.