From 61d521117a4b37865ca779f50901138aafc8334d Mon Sep 17 00:00:00 2001 From: ko1 Date: Sat, 24 Feb 2007 05:22:05 +0000 Subject: [PATCH] * lib/soap/mapping/factory.rb: catch up with spec changes (return Symbols instead of Strings). * lib/soap/mapping/mapping.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ lib/soap/mapping/factory.rb | 2 +- lib/soap/mapping/mapping.rb | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92fa655fc7..ada8242fa5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Feb 24 13:25:32 2007 Koichi Sasada + + * lib/soap/mapping/factory.rb: catch up with spec changes (return + Symbols instead of Strings). + + * lib/soap/mapping/mapping.rb: ditto. + Sat Feb 24 10:49:55 2007 Koichi Sasada * parse.y, node.h, compile.c: change node tree structure. a purpose diff --git a/lib/soap/mapping/factory.rb b/lib/soap/mapping/factory.rb index 978b303b3d..a237f330d2 100644 --- a/lib/soap/mapping/factory.rb +++ b/lib/soap/mapping/factory.rb @@ -51,7 +51,7 @@ class Factory else # should we sort instance_variables? obj.instance_variables.each do |var| - name = var.sub(/^@/, '') + name = var.to_s.sub(/^@/, '') elename = Mapping.name2elename(name) node.add(elename, Mapping._obj2soap(obj.instance_variable_get(var), map)) diff --git a/lib/soap/mapping/mapping.rb b/lib/soap/mapping/mapping.rb index 65d6bb4d5b..2b68601205 100644 --- a/lib/soap/mapping/mapping.rb +++ b/lib/soap/mapping/mapping.rb @@ -186,7 +186,7 @@ module Mapping # ex. a.b => a.2eb # def self.name2elename(name) - name.gsub(/([^a-zA-Z0-9:_\-]+)/n) { + name.to_s.gsub(/([^a-zA-Z0-9:_\-]+)/n) { '.' << $1.unpack('H2' * $1.size).join('.') }.gsub(/::/n, '..') end