diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-11-02 00:21:28 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-11-02 00:21:28 +0000 |
commit | 84e2f5268a4844d7999a9424c7f6a94fd4a68cb7 (patch) | |
tree | 9bfd2df5a5e574ddae6685e70d720dcae09fcbb6 /lib/soap | |
parent | 92ca42cb3e2fcfcee94a1f9718fcf94a9b31d947 (diff) | |
download | ruby-84e2f5268a4844d7999a9424c7f6a94fd4a68cb7.tar.gz |
* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): Symbol should
come earlier than String.
* lib/soap/mapping/rubytypeFactory.rb (RubytypeFactory::obj2soap):
ditto.
* lib/set.rb (TC_Set::test_s_new): strings are no longer
Enumerable
* lib/soap/property.rb (Property::load): ditto.
* lib/webrick/httputils.rb (WEBrick::HTTPUtils::parse_header): ditto.
* lib/soap/mimemessage.rb (MIMEMessage::Headers::parse): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/soap')
-rw-r--r-- | lib/soap/mapping/rubytypeFactory.rb | 16 | ||||
-rw-r--r-- | lib/soap/mimemessage.rb | 2 | ||||
-rw-r--r-- | lib/soap/property.rb | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/lib/soap/mapping/rubytypeFactory.rb b/lib/soap/mapping/rubytypeFactory.rb index 6c30f23a7b..4c629e10d6 100644 --- a/lib/soap/mapping/rubytypeFactory.rb +++ b/lib/soap/mapping/rubytypeFactory.rb @@ -38,6 +38,14 @@ class RubytypeFactory < Factory def obj2soap(soap_class, obj, info, map) param = nil case obj + when ::Symbol + unless @allow_original_mapping + return nil + end + param = SOAPStruct.new(TYPE_SYMBOL) + mark_marshalled_obj(obj, param) + param.add('id', SOAPString.new(obj.id2name)) + addiv2soapattr(param, obj, map) when ::String unless @allow_original_mapping return nil @@ -185,14 +193,6 @@ class RubytypeFactory < Factory mark_marshalled_obj(obj, param) param.add('name', SOAPString.new(obj.name)) addiv2soapattr(param, obj, map) - when ::Symbol - unless @allow_original_mapping - return nil - end - param = SOAPStruct.new(TYPE_SYMBOL) - mark_marshalled_obj(obj, param) - param.add('id', SOAPString.new(obj.id2name)) - addiv2soapattr(param, obj, map) when ::Struct unless @allow_original_mapping # treat it as an user defined class. [ruby-talk:104980] diff --git a/lib/soap/mimemessage.rb b/lib/soap/mimemessage.rb index acb4322e11..4e151e320a 100644 --- a/lib/soap/mimemessage.rb +++ b/lib/soap/mimemessage.rb @@ -49,7 +49,7 @@ class MIMEMessage def parse(str) header_cache = nil - str.each do |line| + str.lines.each do |line| case line when /^\A[^\: \t]+:\s*.+$/ parse_line(header_cache) if header_cache diff --git a/lib/soap/property.rb b/lib/soap/property.rb index 882dcc6e28..51f2e82628 100644 --- a/lib/soap/property.rb +++ b/lib/soap/property.rb @@ -70,7 +70,7 @@ class Property LINE_REGEXP = Regexp.new("^#{DEF_REGSRC}$") def load(stream) key_prefix = "" - stream.each_with_index do |line, lineno| + stream.lines.each_with_index do |line, lineno| line.sub!(/\r?\n\z/, '') case line when COMMENT_REGEXP |