actionwebservice 1.0.0 → 1.1.0

data/CHANGELOG

@@ -1,8 +1,34 @@
+*1.1.0* (March 27th, 2005)
+
+* Make ActiveWebService::Struct type reloadable
+
+* Fix scaffolding action when one of the members of a structural type has date or time type
+
+* Remove extra index hash when generating scaffold html for parameters of structural type #4374 [joe@mjg2.com]
+
+* Fix Scaffold Fails with Struct as a Parameter #4363 [joe@mjg2.com]
+
+* Fix soap type registration of multidimensional arrays (#4232)
+
+* Fix that marshaler couldn't handle ActiveRecord models defined in a different namespace (#2392).
+
+* Fix that marshaler couldn't handle structs with members of ActiveRecord type (#1889).
+
+* Fix that marshaler couldn't handle nil values for inner structs (#3576).
+
+* Fix that changes to ActiveWebService::API::Base required restarting of the server (#2390).
+
+* Fix scaffolding for signatures with :date, :time and :base64 types (#3321, #2769, #2078).
+
+* Fix for incorrect casting of TrueClass/FalseClass instances (#2633, #3421).
+
+* Fix for incompatibility problems with SOAP4R 1.5.5 (#2553) [Kent Sibilev]
+
+
 *1.0.0* (December 13th, 2005)
 
 * Become part of Rails 1.0
 
-
 *0.9.4* (December 7th, 2005)
 
 * Update from LGPL to MIT license as per Minero Aoki's permission. [Marcel Molina Jr.]
@@ -11,7 +37,6 @@
 
 * Fix that XML-RPC date/time values did not have well-defined behaviour (#2516, #2534). This fix has one caveat, in that we can't support pre-1970 dates from XML-RPC clients.
 
-
 *0.9.3* (November 7th, 2005)
 
 * Upgraded to Action Pack 1.11.0 and Active Record 1.13.0

data/Rakefile

@@ -30,12 +30,20 @@ Rake::TestTask.new { |t|
   t.verbose = true
 }
 
+SCHEMA_PATH = File.join(File.dirname(__FILE__), *%w(test fixtures db_definitions))
+
+desc 'Build the MySQL test database'
+task :build_database do 
+  %x( mysqladmin  create activewebservice_unittest )
+  %x( mysql  activewebservice_unittest < #{File.join(SCHEMA_PATH, 'mysql.sql')} )
+end
+
 
 # Generate the RDoc documentation
 Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Action Web Service -- Web services for Action Pack"
-  rdoc.options << '--line-numbers --inline-source --main README --accessor class_inheritable_option=RW'
+  rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.template = "#{ENV['template']}.rb" if ENV['template']
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('CHANGELOG')
@@ -63,8 +71,8 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "aws"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 1.11.2' + PKG_BUILD)
-  s.add_dependency('activerecord', '= 1.13.2' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 1.12.0' + PKG_BUILD)
+  s.add_dependency('activerecord', '= 1.14.0' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'

data/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
 

data/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

data/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
@@ -91,10 +96,13 @@ module ActionWebService # :nodoc:
           when :float
             Float(value)
           when :time
+            value = "#{value['2']}/#{value['3']}/#{value['1']} #{value['4']}:#{value['5']}:#{value['6']}" if value.kind_of?(Hash)
             Time.parse(value.to_s)
           when :date
+            value = "#{value['2']}/#{value['3']}/#{value['1']}" if value.kind_of?(Hash)
             Date.parse(value.to_s)
           when :datetime
+            value = "#{value['2']}/#{value['3']}/#{value['1']} #{value['4']}:#{value['5']}:#{value['6']}" if value.kind_of?(Hash)
             DateTime.parse(value.to_s)
           end
         end
@@ -108,6 +116,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)

data/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

data/lib/action_web_service/protocol/soap_protocol/marshaler.rb

@@ -32,43 +32,47 @@ 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)
           return @type2binding[type] if @type2binding.has_key?(type)
 
-          type_class = type.array?? type.element_type.type_class : type.type_class
-          type_type = type.array?? type.element_type : type
-          type_binding = nil
-          if (mapping = @registry.find_mapped_soap_class(type_class) rescue nil)
-            qname = mapping[2] ? mapping[2][:type] : nil
-            qname ||= soap_base_type_name(mapping[0])
-            type_binding = SoapBinding.new(self, qname, type_type, mapping)
-          else
-            qname = XSD::QName.new(@namespace, soap_type_name(type_class.name))
-            @registry.add(type_class,
-                          SOAP::SOAPStruct,
-                          typed_struct_factory(type_class),
-                          { :type => qname })
-            mapping = @registry.find_mapped_soap_class(type_class)
-            type_binding = SoapBinding.new(self, qname, type_type, mapping)
-          end
-
-          array_binding = nil
           if type.array?
             array_mapping = @registry.find_mapped_soap_class(Array)
             qname = XSD::QName.new(@namespace, soap_type_name(type.element_type.type_class.name) + 'Array')
-            array_binding = SoapBinding.new(self, qname, type, array_mapping, type_binding)
+            element_type_binding = register_type(type.element_type)
+            @type2binding[type] = SoapBinding.new(self, qname, type, array_mapping, element_type_binding)
+          elsif (mapping = @registry.find_mapped_soap_class(type.type_class) rescue nil)
+            qname = mapping[2] ? mapping[2][:type] : nil
+            qname ||= soap_base_type_name(mapping[0])
+            @type2binding[type] = SoapBinding.new(self, qname, type, mapping)
+          else
+            qname = XSD::QName.new(@namespace, soap_type_name(type.type_class.name))
+            @registry.add(type.type_class,
+              SOAP::SOAPStruct,
+              typed_struct_factory(type.type_class),
+              { :type => qname })
+            mapping = @registry.find_mapped_soap_class(type.type_class)
+            @type2binding[type] = SoapBinding.new(self, qname, type, mapping)
+          end
+
+          if type.structured?
+            type.each_member do |m_name, m_type|
+              register_type(m_type)
+            end
           end
-
-          @type2binding[type] = array_binding ? array_binding : type_binding
+          
           @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|

data/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

data/lib/action_web_service/scaffolding.rb

@@ -65,16 +65,13 @@ 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]
-                  end
-                end
+                @scaffold_method.expects.each_with_index do |spec, i|
+                  params << post_params[i.to_s]                                            
+                end if @scaffold_method.expects
                 params = @scaffold_method.cast_expects(params)
                 method_name = public_method_name(@scaffold_service.name, @scaffold_method.public_name)
                 @method_request_xml = @protocol.encode_request(method_name, params, @scaffold_method.expects)
@@ -130,14 +127,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,18 +164,21 @@ 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, was_structured=false)
         if type.array?
           return content_tag('em', "Typed array input fields not supported yet (#{type.name})")
         end
         if type.structured?
+          return content_tag('em', "Nested structural types not supported yet (#{type.name})") if was_structured
           parameters = ""
           type.each_member do |member_name, member_type|
             label = method_parameter_label(member_name, member_type)
             nested_content = method_parameter_input_fields(
               method,
               member_type,
-              field_name_base + '[' + member_name.to_s + ']')
+              "#{field_name_base}[#{idx}][#{member_name}]",
+              idx,
+              true)
             if member_type.custom?
               parameters << content_tag('li', label)
               parameters << content_tag('ul', nested_content)
@@ -194,20 +188,35 @@ module ActionWebService
           end
           content_tag('ul', parameters)
         else
+          # If the data source was structured previously we already have the index set          
+          field_name_base = "#{field_name_base}[#{idx}]" unless was_structured
+          
           case type.type
           when :int
-            text_field_tag field_name_base
+            text_field_tag "#{field_name_base}"
           when :string
-            text_field_tag field_name_base
+            text_field_tag "#{field_name_base}"
+          when :base64
+            text_area_tag "#{field_name_base}", 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}", "true") + " True" +
+            radio_button_tag("#{field_name_base}", "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}"
+          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}[#{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}[#{i}]", :discard_type => true)
+            end.join
           end
         end
       end

data/lib/action_web_service/struct.rb

@@ -19,6 +19,9 @@ module ActionWebService
   # Active Record model classes are already implicitly supported in method
   # signatures.
   class Struct
+    # Action WebService Struct subclasses should be reloaded by the dispatcher in Rails
+    # when Dependencies.mechanism = :load.
+    include Reloadable::Subclasses
     
     # If a Hash is given as argument to an ActionWebService::Struct constructor,
     # it can contain initial values for the structure member.

data/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

data/lib/action_web_service/templates/scaffolds/layout.rhtml

@@ -26,7 +26,7 @@
       display: table;
     }
 
-    #ErrorExplanation {
+    #errorExplanation {
       width: 400px;
     	border: 2px solid red;
     	padding: 7px;
@@ -35,7 +35,7 @@
     	background-color: #f0f0f0;
     }
 
-    #ErrorExplanation h2 {
+    #errorExplanation h2 {
     	text-align: left;
     	font-weight: bold;
     	padding: 5px 5px 5px 15px;
@@ -45,13 +45,13 @@
     	color: #fff;
     }
 
-    #ErrorExplanation p {
+    #errorExplanation p {
     	color: #333;
     	margin-bottom: 0;
     	padding: 5px;
     }
 
-    #ErrorExplanation ul li {
+    #errorExplanation ul li {
     	font-size: 12px;
     	list-style: square;
     }

data/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 %>

data/lib/action_web_service/version.rb

@@ -1,7 +1,7 @@
 module ActionWebService
-  module VERSION
+  module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/test/abstract_client.rb

@@ -12,17 +12,49 @@ module ClientTest
       firstnames == other.firstnames && lastname == other.lastname
     end
   end
+  
+  class Inner < ActionWebService::Struct
+    member :name, :string
+  end
+  
+  class Outer < ActionWebService::Struct
+    member :name, :string
+    member :inner, Inner
+  end
+
+  class User < ActiveRecord::Base
+  end
+  
+  module Accounting
+    class User < ActiveRecord::Base
+    end
+  end
+  
+  class WithModel < ActionWebService::Struct
+    member :user, User
+    member :users, [User]
+  end
+  
+  class WithMultiDimArray < ActionWebService::Struct
+    member :pref, [[:string]]
+  end
 
   class API < ActionWebService::API::Base
     api_method :void
-    api_method :normal,         :expects => [:int, :int], :returns => [:int]
-    api_method :array_return,   :returns => [[Person]]
-    api_method :struct_pass,    :expects => [[Person]], :returns => [:bool]
-    api_method :client_container, :returns => [:int]
-    api_method :named_parameters, :expects => [{:key=>:string}, {:id=>:int}]
+    api_method :normal,               :expects => [:int, :int], :returns => [:int]
+    api_method :array_return,         :returns => [[Person]]
+    api_method :struct_pass,          :expects => [[Person]], :returns => [:bool]
+    api_method :nil_struct_return,    :returns => [Person] 
+    api_method :inner_nil,            :returns => [Outer]
+    api_method :client_container,     :returns => [:int]
+    api_method :named_parameters,     :expects => [{:key=>:string}, {:id=>:int}]
     api_method :thrower
+    api_method :user_return,          :returns => [User]
+    api_method :with_model_return,    :returns => [WithModel]
+    api_method :scoped_model_return,  :returns => [Accounting::User]
+    api_method :multi_dim_return,     :returns => [WithMultiDimArray]
   end
-
+  
   class NullLogOut
     def <<(*args); end
   end
@@ -65,6 +97,14 @@ module ClientTest
       @value_struct_pass = @method_params
       true
     end
+    
+    def nil_struct_return
+      nil
+    end
+    
+    def inner_nil
+      Outer.new :name => 'outer', :inner => nil
+    end
 
     def client_container
       50
@@ -77,6 +117,22 @@ module ClientTest
     def thrower
       raise "Hi"
     end
+    
+    def user_return
+      User.find(1)
+    end
+    
+    def with_model_return
+      WithModel.new :user => User.find(1), :users => User.find(:all)
+    end
+    
+    def scoped_model_return
+      Accounting::User.find(1)
+    end
+    
+    def multi_dim_return
+      WithMultiDimArray.new :pref => [%w{pref1 value1}, %w{pref2 value2}]
+    end
   end
 
   class AbstractClientLet < WEBrick::HTTPServlet::AbstractServlet

data/test/abstract_unit.rb

@@ -5,10 +5,34 @@ $:.unshift(File.dirname(__FILE__) + '/../../actionpack/lib')
 $:.unshift(File.dirname(__FILE__) + '/../../activerecord/lib')
 
 require 'test/unit'
-require 'active_record'
 require 'action_web_service'
 require 'action_controller'
 require 'action_controller/test_process'
 
 ActionController::Base.logger = nil
 ActionController::Base.ignore_missing_templates = true
+
+begin
+  PATH_TO_AR = File.dirname(__FILE__) + '/../../activerecord'
+  require "#{PATH_TO_AR}/lib/active_record" unless Object.const_defined?(:ActiveRecord)
+  require "#{PATH_TO_AR}/lib/active_record/fixtures" unless Object.const_defined?(:Fixtures)
+rescue Object => e
+  fail "\nFailed to load activerecord: #{e}"
+end
+
+ActiveRecord::Base.establish_connection(
+  :adapter  => "mysql",
+  :username => "rails",
+  :encoding => "utf8",
+  :database => "activewebservice_unittest"
+)
+ActiveRecord::Base.connection
+
+Test::Unit::TestCase.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
+
+# restore default raw_post functionality
+class ActionController::TestRequest
+  def raw_post
+    super
+  end
+end

data/test/client_soap_test.rb

@@ -49,6 +49,8 @@ end
 class TC_ClientSoap < Test::Unit::TestCase
   include ClientTest
   include ClientSoapTest
+  
+  fixtures :users
 
   def setup
     @server = SoapServer.instance
@@ -88,6 +90,16 @@ class TC_ClientSoap < Test::Unit::TestCase
     assert_equal(true, @client.struct_pass([new_person]))
     assert_equal([[new_person]], @container.value_struct_pass)
   end
+  
+  def test_nil_struct_return
+    assert_nil @client.nil_struct_return
+  end
+  
+  def test_inner_nil
+    outer = @client.inner_nil
+    assert_equal 'outer', outer.name
+    assert_nil outer.inner
+  end
 
   def test_client_container
     assert_equal(50, ClientContainer.new.get_client.client_container)
@@ -106,4 +118,35 @@ class TC_ClientSoap < Test::Unit::TestCase
     assert_equal([5, 6], @container.value_normal)
     @container.value_normal = nil
   end
+  
+  def test_model_return
+    user = @client.user_return
+    assert_equal 1, user.id
+    assert_equal 'Kent', user.name
+    assert user.active?
+    assert_kind_of Date, user.created_on
+    assert_equal Date.today, user.created_on
+  end
+  
+  def test_with_model
+    with_model = @client.with_model_return
+    assert_equal 'Kent', with_model.user.name
+    assert_equal 2, with_model.users.size
+    with_model.users.each do |user|
+      assert_kind_of User, user
+    end
+  end
+  
+  def test_scoped_model_return
+    scoped_model = @client.scoped_model_return
+    assert_kind_of Accounting::User, scoped_model
+    assert_equal 'Kent', scoped_model.name
+  end
+  
+  def test_multi_dim_return
+    md_struct = @client.multi_dim_return
+    assert_kind_of Array, md_struct.pref
+    assert_equal 2, md_struct.pref.size
+    assert_kind_of Array, md_struct.pref[0]
+  end
 end

data/test/client_xmlrpc_test.rb

@@ -12,7 +12,7 @@ module ClientXmlRpcTest
       test_request.env['HTTP_CONTENT_TYPE'] = 'text/xml'
       test_request.env['RAW_POST_DATA'] = req.body
       response = ActionController::TestResponse.new
-      @controller.process(test_request, response)
+      @controller.process(test_request, response) 
       res.header['content-type'] = 'text/xml'
       res.body = response.body
       # puts res.body
@@ -44,6 +44,8 @@ end
 class TC_ClientXmlRpc < Test::Unit::TestCase
   include ClientTest
   include ClientXmlRpcTest
+  
+  fixtures :users
 
   def setup
     @server = XmlRpcServer.instance
@@ -83,6 +85,16 @@ class TC_ClientXmlRpc < Test::Unit::TestCase
     assert_equal(true, @client.struct_pass([new_person]))
     assert_equal([[new_person]], @container.value_struct_pass)
   end
+  
+  def test_nil_struct_return
+    assert_equal false, @client.nil_struct_return
+  end
+
+  def test_inner_nil
+    outer = @client.inner_nil
+    assert_equal 'outer', outer.name
+    assert_nil outer.inner
+  end
 
   def test_client_container
     assert_equal(50, ClientContainer.new.get_client.client_container)
@@ -90,7 +102,7 @@ class TC_ClientXmlRpc < Test::Unit::TestCase
 
   def test_named_parameters
     assert(@container.value_named_parameters.nil?)
-    assert_equal(true, @client.named_parameters("xxx", 7))
+    assert_equal(false, @client.named_parameters("xxx", 7))
     assert_equal(["xxx", 7], @container.value_named_parameters)
   end
 
@@ -105,4 +117,35 @@ class TC_ClientXmlRpc < Test::Unit::TestCase
       @client.normal
     end
   end
+
+  def test_model_return
+    user = @client.user_return
+    assert_equal 1, user.id
+    assert_equal 'Kent', user.name
+    assert user.active?
+    assert_kind_of Time, user.created_on
+    assert_equal Time.utc(Time.now.year, Time.now.month, Time.now.day), user.created_on
+  end
+
+  def test_with_model
+    with_model = @client.with_model_return
+    assert_equal 'Kent', with_model.user.name
+    assert_equal 2, with_model.users.size
+    with_model.users.each do |user|
+      assert_kind_of User, user
+    end
+  end
+  
+  def test_scoped_model_return
+    scoped_model = @client.scoped_model_return
+    assert_kind_of Accounting::User, scoped_model
+    assert_equal 'Kent', scoped_model.name
+  end
+
+  def test_multi_dim_return
+    md_struct = @client.multi_dim_return
+    assert_kind_of Array, md_struct.pref
+    assert_equal 2, md_struct.pref.size
+    assert_kind_of Array, md_struct.pref[0]
+  end
 end

data/test/fixtures/db_definitions/mysql.sql

@@ -0,0 +1,7 @@
+CREATE TABLE `users` (
+  `id` int(11) NOT NULL auto_increment,
+  `name` varchar(30) default NULL,
+  `active` tinyint(4) default NULL,
+  `created_on` date default NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;

data/test/fixtures/users.yml

@@ -0,0 +1,10 @@
+user1:
+  id: 1
+  name: Kent
+  active: 1
+  created_on: <%= Date.today %>
+user2:
+  id: 2
+  name: David
+  active: 1
+  created_on: <%= Date.today %>

data/test/scaffolded_controller_test.rb

@@ -2,11 +2,15 @@ require File.dirname(__FILE__) + '/abstract_unit'
 
 ActionController::Routing::Routes.draw do |map|
   map.connect '', :controller => 'scaffolded'
+  map.connect ':controller/:action/:id'
 end
 
+ActionController::Base.template_root = '.'
+
 class ScaffoldPerson < ActionWebService::Struct
-  member :id,   :int
-  member :name, :string
+  member :id,     :int
+  member :name,   :string
+  member :birth,  :date
 
   def ==(other)
     self.id == other.id && self.name == other.name
@@ -15,7 +19,12 @@ end
 
 class ScaffoldedControllerTestAPI < ActionWebService::API::Base
   api_method :hello, :expects => [{:integer=>:int}, :string], :returns => [:bool]
+  api_method :hello_struct_param, :expects => [{:person => ScaffoldPerson}], :returns => [:bool]
+  api_method :date_of_birth, :expects => [ScaffoldPerson], :returns => [:string]
   api_method :bye,   :returns => [[ScaffoldPerson]]
+  api_method :date_diff, :expects => [{:start_date => :date}, {:end_date => :date}], :returns => [:int]
+  api_method :time_diff, :expects => [{:start_time => :time}, {:end_time => :time}], :returns => [:int]
+  api_method :base64_upcase, :expects => [:base64], :returns => [:base64]
 end
 
 class ScaffoldedController < ActionController::Base
@@ -25,6 +34,14 @@ class ScaffoldedController < ActionController::Base
   def hello(int, string)
     0
   end
+  
+  def hello_struct_param(person)
+    0
+  end
+  
+  def date_of_birth(person)
+    person.birth.to_s
+  end
 
   def bye
     [ScaffoldPerson.new(:id => 1, :name => "leon"), ScaffoldPerson.new(:id => 2, :name => "paul")]
@@ -33,6 +50,18 @@ class ScaffoldedController < ActionController::Base
   def rescue_action(e)
     raise e
   end
+  
+  def date_diff(start_date, end_date)
+    end_date - start_date
+  end
+  
+  def time_diff(start_time, end_time)
+    end_time - start_time
+  end
+  
+  def base64_upcase(data)
+    data.upcase
+  end
 end
 
 class ScaffoldedControllerTest < Test::Unit::TestCase
@@ -51,6 +80,12 @@ class ScaffoldedControllerTest < Test::Unit::TestCase
     get :scaffold_invoke_method_params, :service => 'scaffolded', :method => 'Hello'
     assert_rendered_file 'parameters.rhtml'
   end
+  
+  def test_scaffold_invoke_method_params_with_struct
+    get :scaffold_invoke_method_params, :service => 'scaffolded', :method => 'HelloStructParam'
+    assert_rendered_file 'parameters.rhtml'
+    assert_tag :tag => 'input', :attributes => {:name => "method_params[0][name]"}
+  end
 
   def test_scaffold_invoke_submit_hello
     post :scaffold_invoke_submit, :service => 'scaffolded', :method => 'Hello', :method_params => {'0' => '5', '1' => 'hello world'}
@@ -64,4 +99,47 @@ class ScaffoldedControllerTest < Test::Unit::TestCase
     persons = [ScaffoldPerson.new(:id => 1, :name => "leon"), ScaffoldPerson.new(:id => 2, :name => "paul")]
     assert_equal persons, @controller.instance_eval{ @method_return_value }
   end
+  
+  def test_scaffold_date_params
+    get :scaffold_invoke_method_params, :service => 'scaffolded', :method => 'DateDiff'
+    (0..1).each do |param|
+      (1..3).each do |date_part|
+        assert_tag :tag => 'select', :attributes => {:name => "method_params[#{param}][#{date_part}]"}, 
+                   :children => {:greater_than => 1, :only => {:tag => 'option'}}
+      end
+    end
+    
+    post :scaffold_invoke_submit, :service => 'scaffolded', :method => 'DateDiff', 
+         :method_params => {'0' => {'1' => '2006', '2' => '2', '3' => '1'}, '1' => {'1' => '2006', '2' => '2', '3' => '2'}}
+    assert_equal 1, @controller.instance_eval{ @method_return_value }
+  end
+  
+  def test_scaffold_struct_date_params
+    post :scaffold_invoke_submit, :service => 'scaffolded', :method => 'DateOfBirth', 
+         :method_params => {'0' => {'birth' => {'1' => '2006', '2' => '2', '3' => '1'}, 'id' => '1', 'name' => 'person'}}
+    assert_equal '2006-02-01', @controller.instance_eval{ @method_return_value }
+  end
+
+  def test_scaffold_time_params
+    get :scaffold_invoke_method_params, :service => 'scaffolded', :method => 'TimeDiff'
+    (0..1).each do |param|
+      (1..6).each do |date_part|
+        assert_tag :tag => 'select', :attributes => {:name => "method_params[#{param}][#{date_part}]"}, 
+                   :children => {:greater_than => 1, :only => {:tag => 'option'}}
+      end
+    end
+
+    post :scaffold_invoke_submit, :service => 'scaffolded', :method => 'TimeDiff', 
+         :method_params => {'0' => {'1' => '2006', '2' => '2', '3' => '1', '4' => '1', '5' => '1', '6' => '1'}, 
+                            '1' => {'1' => '2006', '2' => '2', '3' => '2', '4' => '1', '5' => '1', '6' => '1'}}
+    assert_equal 86400, @controller.instance_eval{ @method_return_value }
+  end
+  
+  def test_scaffold_base64
+    get :scaffold_invoke_method_params, :service => 'scaffolded', :method => 'Base64Upcase'
+    assert_tag :tag => 'textarea', :attributes => {:name => 'method_params[0]'}
+    
+    post :scaffold_invoke_submit, :service => 'scaffolded', :method => 'Base64Upcase', :method_params => {'0' => 'scaffold'}
+    assert_equal 'SCAFFOLD', @controller.instance_eval{ @method_return_value }
+  end
 end

metadata

@@ -3,11 +3,11 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: actionwebservice
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2005-12-13 00:00:00 -06:00
+  version: 1.1.0
+date: 2006-03-27 00:00:00 -06:00
 summary: Web service support for Action Pack.
 require_paths: 
-  - lib
+- lib
 email: bitserf@gmail.com
 homepage: http://www.rubyonrails.org
 rubyforge_project: aws
@@ -18,129 +18,135 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-  - Leon Breedt
+- Leon Breedt
 files: 
-  - Rakefile
-  - setup.rb
-  - README
-  - TODO
-  - CHANGELOG
-  - MIT-LICENSE
-  - examples/googlesearch
-  - examples/metaWeblog
-  - examples/googlesearch/autoloading
-  - examples/googlesearch/delegated
-  - examples/googlesearch/direct
-  - examples/googlesearch/README
-  - examples/googlesearch/autoloading/google_search_api.rb
-  - examples/googlesearch/autoloading/google_search_controller.rb
-  - examples/googlesearch/delegated/google_search_service.rb
-  - examples/googlesearch/delegated/search_controller.rb
-  - examples/googlesearch/direct/google_search_api.rb
-  - examples/googlesearch/direct/search_controller.rb
-  - examples/metaWeblog/apis
-  - examples/metaWeblog/controllers
-  - examples/metaWeblog/README
-  - examples/metaWeblog/apis/blogger_api.rb
-  - examples/metaWeblog/apis/blogger_service.rb
-  - examples/metaWeblog/apis/meta_weblog_api.rb
-  - examples/metaWeblog/apis/meta_weblog_service.rb
-  - examples/metaWeblog/controllers/xmlrpc_controller.rb
-  - lib/action_web_service
-  - lib/action_web_service.rb
-  - lib/action_web_service/api.rb
-  - lib/action_web_service/base.rb
-  - lib/action_web_service/casting.rb
-  - lib/action_web_service/client
-  - lib/action_web_service/client.rb
-  - lib/action_web_service/container
-  - lib/action_web_service/container.rb
-  - lib/action_web_service/dispatcher
-  - lib/action_web_service/dispatcher.rb
-  - lib/action_web_service/invocation.rb
-  - lib/action_web_service/protocol
-  - lib/action_web_service/protocol.rb
-  - lib/action_web_service/scaffolding.rb
-  - lib/action_web_service/struct.rb
-  - lib/action_web_service/support
-  - lib/action_web_service/templates
-  - lib/action_web_service/test_invoke.rb
-  - lib/action_web_service/version.rb
-  - lib/action_web_service/client/base.rb
-  - lib/action_web_service/client/soap_client.rb
-  - lib/action_web_service/client/xmlrpc_client.rb
-  - lib/action_web_service/container/action_controller_container.rb
-  - lib/action_web_service/container/delegated_container.rb
-  - lib/action_web_service/container/direct_container.rb
-  - lib/action_web_service/dispatcher/abstract.rb
-  - lib/action_web_service/dispatcher/action_controller_dispatcher.rb
-  - lib/action_web_service/protocol/abstract.rb
-  - lib/action_web_service/protocol/discovery.rb
-  - lib/action_web_service/protocol/soap_protocol
-  - lib/action_web_service/protocol/soap_protocol.rb
-  - lib/action_web_service/protocol/xmlrpc_protocol.rb
-  - lib/action_web_service/protocol/soap_protocol/marshaler.rb
-  - lib/action_web_service/support/class_inheritable_options.rb
-  - lib/action_web_service/support/signature_types.rb
-  - lib/action_web_service/templates/scaffolds
-  - lib/action_web_service/templates/scaffolds/layout.rhtml
-  - lib/action_web_service/templates/scaffolds/methods.rhtml
-  - lib/action_web_service/templates/scaffolds/parameters.rhtml
-  - lib/action_web_service/templates/scaffolds/result.rhtml
-  - test/abstract_client.rb
-  - test/abstract_dispatcher.rb
-  - test/abstract_unit.rb
-  - test/api_test.rb
-  - test/apis
-  - test/base_test.rb
-  - test/casting_test.rb
-  - test/client_soap_test.rb
-  - test/client_xmlrpc_test.rb
-  - test/container_test.rb
-  - test/dispatcher_action_controller_soap_test.rb
-  - test/dispatcher_action_controller_xmlrpc_test.rb
-  - test/gencov
-  - test/invocation_test.rb
-  - test/run
-  - test/scaffolded_controller_test.rb
-  - test/struct_test.rb
-  - test/test_invoke_test.rb
-  - test/apis/auto_load_api.rb
-  - test/apis/broken_auto_load_api.rb
+- Rakefile
+- setup.rb
+- README
+- TODO
+- CHANGELOG
+- MIT-LICENSE
+- examples/googlesearch
+- examples/metaWeblog
+- examples/googlesearch/autoloading
+- examples/googlesearch/delegated
+- examples/googlesearch/direct
+- examples/googlesearch/README
+- examples/googlesearch/autoloading/google_search_api.rb
+- examples/googlesearch/autoloading/google_search_controller.rb
+- examples/googlesearch/delegated/google_search_service.rb
+- examples/googlesearch/delegated/search_controller.rb
+- examples/googlesearch/direct/google_search_api.rb
+- examples/googlesearch/direct/search_controller.rb
+- examples/metaWeblog/apis
+- examples/metaWeblog/controllers
+- examples/metaWeblog/README
+- examples/metaWeblog/apis/blogger_api.rb
+- examples/metaWeblog/apis/blogger_service.rb
+- examples/metaWeblog/apis/meta_weblog_api.rb
+- examples/metaWeblog/apis/meta_weblog_service.rb
+- examples/metaWeblog/controllers/xmlrpc_controller.rb
+- lib/action_web_service
+- lib/action_web_service.rb
+- lib/action_web_service/api.rb
+- lib/action_web_service/base.rb
+- lib/action_web_service/casting.rb
+- lib/action_web_service/client
+- lib/action_web_service/client.rb
+- lib/action_web_service/container
+- lib/action_web_service/container.rb
+- lib/action_web_service/dispatcher
+- lib/action_web_service/dispatcher.rb
+- lib/action_web_service/invocation.rb
+- lib/action_web_service/protocol
+- lib/action_web_service/protocol.rb
+- lib/action_web_service/scaffolding.rb
+- lib/action_web_service/struct.rb
+- lib/action_web_service/support
+- lib/action_web_service/templates
+- lib/action_web_service/test_invoke.rb
+- lib/action_web_service/version.rb
+- lib/action_web_service/client/base.rb
+- lib/action_web_service/client/soap_client.rb
+- lib/action_web_service/client/xmlrpc_client.rb
+- lib/action_web_service/container/action_controller_container.rb
+- lib/action_web_service/container/delegated_container.rb
+- lib/action_web_service/container/direct_container.rb
+- lib/action_web_service/dispatcher/abstract.rb
+- lib/action_web_service/dispatcher/action_controller_dispatcher.rb
+- lib/action_web_service/protocol/abstract.rb
+- lib/action_web_service/protocol/discovery.rb
+- lib/action_web_service/protocol/soap_protocol
+- lib/action_web_service/protocol/soap_protocol.rb
+- lib/action_web_service/protocol/xmlrpc_protocol.rb
+- lib/action_web_service/protocol/soap_protocol/marshaler.rb
+- lib/action_web_service/support/class_inheritable_options.rb
+- lib/action_web_service/support/signature_types.rb
+- lib/action_web_service/templates/scaffolds
+- lib/action_web_service/templates/scaffolds/layout.rhtml
+- lib/action_web_service/templates/scaffolds/methods.rhtml
+- lib/action_web_service/templates/scaffolds/parameters.rhtml
+- lib/action_web_service/templates/scaffolds/result.rhtml
+- test/abstract_client.rb
+- test/abstract_dispatcher.rb
+- test/abstract_unit.rb
+- test/api_test.rb
+- test/apis
+- test/base_test.rb
+- test/casting_test.rb
+- test/client_soap_test.rb
+- test/client_xmlrpc_test.rb
+- test/container_test.rb
+- test/dispatcher_action_controller_soap_test.rb
+- test/dispatcher_action_controller_xmlrpc_test.rb
+- test/fixtures
+- test/gencov
+- test/invocation_test.rb
+- test/run
+- test/scaffolded_controller_test.rb
+- test/struct_test.rb
+- test/test_invoke_test.rb
+- test/apis/auto_load_api.rb
+- test/apis/broken_auto_load_api.rb
+- test/fixtures/db_definitions
+- test/fixtures/users.yml
+- test/fixtures/db_definitions/mysql.sql
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: 
-  - none
+- none
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: actionpack
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - "="
-          - !ruby/object:Gem::Version 
-            version: 1.11.2
-      version: 
-  - !ruby/object:Gem::Dependency 
-    name: activerecord
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - "="
-          - !ruby/object:Gem::Version 
-            version: 1.13.2
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.12.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.14.0
+    version: