kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix duplicate XSD entries for custom types (#1729), and prevent recursive type

Browse source 
traversing.


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2014 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Leon Breedt 2005-08-14 18:43:39 +00:00
parent 056838d2fc
commit 2eba713445
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionwebservice/CHANGELOG
View file

@ -1,5 +1,7 @@
*SVN* *SVN*
* Fix duplicate XSD entries for custom types shared across delegated/layered services #1729 [Tyler Kovacs]
* Allow multiple invocations in the same test method #1720 [dkhawk] * Allow multiple invocations in the same test method #1720 [dkhawk]
* Added ActionWebService::API::Base.soap_client and ActionWebService::API::Base.xmlrpc_client helper methods to create the internal clients for an API, useful for testing from ./script/console * Added ActionWebService::API::Base.soap_client and ActionWebService::API::Base.xmlrpc_client helper methods to create the internal clients for an API, useful for testing from ./script/console

21
actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
View file

@ -195,7 +195,7 @@ module ActionWebService # :nodoc:
custom_types = [] custom_types = []
apis.values.each do |api, bindings| apis.values.each do |api, bindings|
bindings.each do |b| bindings.each do |b|
custom_types << b custom_types << b unless custom_types.include?(b)
end end
end end
@ -347,29 +347,32 @@ module ActionWebService # :nodoc:
def register_api(api, marshaler) def register_api(api, marshaler)
bindings = {} bindings = {}
traverse_custom_types(api, marshaler) do |binding| traverse_custom_types(api, marshaler, bindings) do |binding|
bindings[binding] = nil unless bindings.has_key?(binding) bindings[binding] = nil unless bindings.has_key?(binding)
element_binding = binding.element_binding element_binding = binding.element_binding
bindings[binding.element_binding] = nil if element_binding && !bindings.has_key?(element_binding) bindings[element_binding] = nil if element_binding && !bindings.has_key?(element_binding)
end end
bindings.keys bindings.keys
end end
def traverse_custom_types(api, marshaler, &block) def traverse_custom_types(api, marshaler, bindings, &block)
api.api_methods.each do |name, method| api.api_methods.each do |name, method|
expects, returns = method.expects, method.returns expects, returns = method.expects, method.returns
expects.each{ |type| traverse_type(marshaler, type, &block) if type.custom? } if expects expects.each{ |type| traverse_type(marshaler, type, bindings, &block) if type.custom? } if expects
returns.each{ |type| traverse_type(marshaler, type, &block) if type.custom? } if returns returns.each{ |type| traverse_type(marshaler, type, bindings, &block) if type.custom? } if returns
end end
end end
def traverse_type(marshaler, type, &block) def traverse_type(marshaler, type, bindings, &block)
yield marshaler.register_type(type) binding = marshaler.register_type(type)
return if bindings.has_key?(binding)
bindings[binding] = nil
yield binding
if type.array? if type.array?
yield marshaler.register_type(type.element_type) yield marshaler.register_type(type.element_type)
type = type.element_type type = type.element_type
end end
type.each_member{ |name, type| traverse_type(marshaler, type, &block) } if type.structured? type.each_member{ |name, type| traverse_type(marshaler, type, bindings, &block) } if type.structured?
end end
end end
end end