diff options
Diffstat (limited to 'actionwebservice/lib/action_web_service')
9 files changed, 83 insertions, 35 deletions
diff --git a/actionwebservice/lib/action_web_service/api.rb b/actionwebservice/lib/action_web_service/api.rb index a0d0af6267..7193bd8a51 100644 --- a/actionwebservice/lib/action_web_service/api.rb +++ b/actionwebservice/lib/action_web_service/api.rb @@ -14,6 +14,10 @@ module ActionWebService # :nodoc: # See ActionWebService::Container::Direct::ClassMethods for an example # of use. class Base + # Action WebService API subclasses should be reloaded by the dispatcher in Rails + # when Dependencies.mechanism = :load. + include Reloadable::Subclasses + # Whether to transform the public API method names into camel-cased names class_inheritable_option :inflect_names, true diff --git a/actionwebservice/lib/action_web_service/base.rb b/actionwebservice/lib/action_web_service/base.rb index 16e4d87f41..5675a5bd2b 100644 --- a/actionwebservice/lib/action_web_service/base.rb +++ b/actionwebservice/lib/action_web_service/base.rb @@ -25,12 +25,16 @@ module ActionWebService # :nodoc: # api_method :delete_person, :expects => [:int] # end # - # class SearchCriteria < ActionStruct::Base + # class SearchCriteria < ActionWebService::Struct # member :firstname, :string # member :lastname, :string # member :email, :string # end class Base + # Action WebService subclasses should be reloaded by the dispatcher in Rails + # when Dependencies.mechanism = :load. + include Reloadable::Subclasses + # Whether to report exceptions back to the caller in the protocol's exception # format class_inheritable_option :web_service_exception_reporting, true diff --git a/actionwebservice/lib/action_web_service/casting.rb b/actionwebservice/lib/action_web_service/casting.rb index 3c0afbe9f9..8ccc7797ac 100644 --- a/actionwebservice/lib/action_web_service/casting.rb +++ b/actionwebservice/lib/action_web_service/casting.rb @@ -41,6 +41,11 @@ module ActionWebService # :nodoc: def cast(value, signature_type) # :nodoc: return value if signature_type.nil? # signature.length != params.length return nil if value.nil? + # XMLRPC protocol doesn't support nil values. It uses false instead. + # It should never happen for SOAP. + if signature_type.structured? && value.equal?(false) + return nil + end unless signature_type.array? || signature_type.structured? return value if canonical_type(value.class) == signature_type.type end @@ -108,6 +113,8 @@ module ActionWebService # :nodoc: value.each_pair do |name, val| type = klass.respond_to?(:member_type) ? klass.member_type(name) : nil val = cast(val, type) if type + # See http://dev.rubyonrails.com/ticket/3567 + val = val.to_time if val.is_a?(XMLRPC::DateTime) obj.__send__("#{name}=", val) if obj.respond_to?(name) end elsif value.respond_to?(:attributes) diff --git a/actionwebservice/lib/action_web_service/client/soap_client.rb b/actionwebservice/lib/action_web_service/client/soap_client.rb index f5ebe1629c..c7f3b9d594 100644 --- a/actionwebservice/lib/action_web_service/client/soap_client.rb +++ b/actionwebservice/lib/action_web_service/client/soap_client.rb @@ -80,12 +80,20 @@ module ActionWebService # :nodoc: if expects expects.each do |type| type_binding = @protocol.marshaler.lookup_type(type) - param_def << ['in', type.name, type_binding.mapping] + if SOAP::Version >= "1.5.5" + param_def << ['in', type.name.to_s, [type_binding.type.type_class.to_s]] + else + param_def << ['in', type.name, type_binding.mapping] + end end end if returns type_binding = @protocol.marshaler.lookup_type(returns[0]) - param_def << ['retval', 'return', type_binding.mapping] + if SOAP::Version >= "1.5.5" + param_def << ['retval', 'return', [type_binding.type.type_class.to_s]] + else + param_def << ['retval', 'return', type_binding.mapping] + end end driver.add_method(qname, action, method.name.to_s, param_def) end diff --git a/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb b/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb index b36e029669..fa917ad4a5 100644 --- a/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb +++ b/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb @@ -32,7 +32,9 @@ module ActionWebService end def ruby_to_soap(obj) - SOAP::Mapping.obj2soap(obj, @registry) + soap = SOAP::Mapping.obj2soap(obj, @registry) + soap.elename = XSD::QName.new if SOAP::Version >= "1.5.5" && soap.elename == XSD::QName::EMPTY + soap end def register_type(type) @@ -63,12 +65,21 @@ module ActionWebService end @type2binding[type] = array_binding ? array_binding : type_binding + + if type.structured? + type.each_member do |m_name, m_type| + register_type(m_type) + end + end + @type2binding[type] end alias :lookup_type :register_type def annotate_arrays(binding, value) - if binding.type.array? + if value.nil? + return + elsif binding.type.array? mark_typed_array(value, binding.element_binding.qname) if binding.element_binding.type.custom? value.each do |element| diff --git a/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb b/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb index 53b67ced4c..64992e7754 100644 --- a/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb +++ b/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb @@ -50,10 +50,10 @@ module ActionWebService # :nodoc: end def encode_response(method_name, return_value, return_type, protocol_options={}) - return_value = true if return_value.nil? - if return_type + if return_value && return_type return_value = value_to_xmlrpc_wire_format(return_value, return_type) end + return_value = false if return_value.nil? raw_response = XMLRPC::Marshal.dump_response(return_value) Response.new(raw_response, 'text/xml', return_value) end diff --git a/actionwebservice/lib/action_web_service/scaffolding.rb b/actionwebservice/lib/action_web_service/scaffolding.rb index 59fec0ef76..3f958df3ab 100644 --- a/actionwebservice/lib/action_web_service/scaffolding.rb +++ b/actionwebservice/lib/action_web_service/scaffolding.rb @@ -65,14 +65,23 @@ module ActionWebService when :xmlrpc @protocol = Protocol::XmlRpc::XmlRpcProtocol.create(self) end - @invocation_cgi = request.respond_to?(:cgi) ? request.cgi : nil bm = Benchmark.measure do @protocol.register_api(@scaffold_service.api) post_params = params['method_params'] ? params['method_params'].dup : nil params = [] if @scaffold_method.expects - @scaffold_method.expects.length.times do |i| - params << post_params[i.to_s] + @scaffold_method.expects.each_with_index do |spec, i| + case spec.type + when :date + date = post_params[i.to_s] + params << (date['2'] + '/' + date['3'] + '/' + date['1']) + when :datetime, :time + date = post_params[i.to_s] + params << (date['2'] + '/' + date['3'] + '/' + date['1'] + ' ' + + date['4'] + ':' + date['5'] + ':' + date['6']) + else + params << post_params[i.to_s] + end end end params = @scaffold_method.cast_expects(params) @@ -130,14 +139,8 @@ module ActionWebService end def reset_invocation_response - template = response.template - if @invocation_cgi - @response = ::ActionController::CgiResponse.new(@invocation_cgi) - else - @response = ::ActionController::TestResponse.new - end - response.template = template - @performed_render = false + erase_render_results + @response.headers = ::ActionController::AbstractResponse::DEFAULT_HEADERS.merge("cookie" => []) end def public_method_name(service_name, method_name) @@ -173,7 +176,7 @@ module ActionWebService end module Helpers # :nodoc: - def method_parameter_input_fields(method, type, field_name_base) + def method_parameter_input_fields(method, type, field_name_base, idx) if type.array? return content_tag('em', "Typed array input fields not supported yet (#{type.name})") end @@ -184,7 +187,7 @@ module ActionWebService nested_content = method_parameter_input_fields( method, member_type, - field_name_base + '[' + member_name.to_s + ']') + "#{field_name_base}[#{idx}][#{member_name}]") if member_type.custom? parameters << content_tag('li', label) parameters << content_tag('ul', nested_content) @@ -196,18 +199,30 @@ module ActionWebService else case type.type when :int - text_field_tag field_name_base + text_field_tag "#{field_name_base}[#{idx}]" when :string - text_field_tag field_name_base + text_field_tag "#{field_name_base}[#{idx}]" + when :base64 + text_area_tag "#{field_name_base}[#{idx}]", nil, :size => "40x5" when :bool - radio_button_tag(field_name_base, "true") + " True" + - radio_button_tag(field_name_base, "false") + "False" + radio_button_tag("#{field_name_base}[#{idx}]", "true") + " True" + + radio_button_tag("#{field_name_base}[#{idx}]", "false") + "False" when :float - text_field_tag field_name_base - when :time - select_datetime Time.now, 'name' => field_name_base + text_field_tag "#{field_name_base}[#{idx}]" + when :time, :datetime + time = Time.now + i = 0 + %w|year month day hour minute second|.map do |name| + i += 1 + send("select_#{name}", time, :prefix => "#{field_name_base}[#{idx}][#{i}]", :discard_type => true) + end.join when :date - select_date Date.today, 'name' => field_name_base + date = Date.today + i = 0 + %w|year month day|.map do |name| + i += 1 + send("select_#{name}", date, :prefix => "#{field_name_base}[#{idx}][#{i}]", :discard_type => true) + end.join end end end diff --git a/actionwebservice/lib/action_web_service/support/signature_types.rb b/actionwebservice/lib/action_web_service/support/signature_types.rb index 2100eab131..36224c645e 100644 --- a/actionwebservice/lib/action_web_service/support/signature_types.rb +++ b/actionwebservice/lib/action_web_service/support/signature_types.rb @@ -53,9 +53,9 @@ module ActionWebService # :nodoc: case name when :int, :integer, :fixnum, :bignum :int - when :string + when :string, :text :string - when :base64 + when :base64, :binary :base64 when :bool, :boolean :bool @@ -203,7 +203,7 @@ module ActionWebService # :nodoc: elsif @type_class.respond_to?(:columns) i = -1 @type_class.columns.each do |column| - yield column.name, canonical_signature_entry(column.klass, i += 1) + yield column.name, canonical_signature_entry(column.type, i += 1) end end end diff --git a/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.rhtml b/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.rhtml index a9d295aeee..ce755f7870 100644 --- a/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.rhtml +++ b/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.rhtml @@ -10,20 +10,19 @@ </p> <% if @scaffold_method.expects %> -<% i = 0 %> <strong>Method Parameters:</strong><br /> -<% @scaffold_method.expects.each do |type| %> +<% @scaffold_method.expects.each_with_index do |type, i| %> <p> <label for="method_params[<%= i %>]"><%= method_parameter_label(type.name, type) %> </label><br /> - <%= method_parameter_input_fields(@scaffold_method, type, "method_params[#{i}]") %> + <%= method_parameter_input_fields(@scaffold_method, type, "method_params", i) %> </p> - <% i += 1 %> <% end %> <% end %> <%= submit_tag "Invoke" %> +<%= end_form_tag %> <p> <%= link_to "Back", :action => @scaffold_action_name %> |