fixed scaffolding and test cases for Rails 2.2.2

actionwebservice.gemspec

@@ -3,20 +3,19 @@ Gem::Specification.new do |s|
   s.name = 'actionwebservice'
   s.summary = "Web service support for Action Pack."
   s.description = %q{Adds WSDL/SOAP and XML-RPC web service support to Action Pack}
-  s.version = '2.1.1'
+  s.version = '2.2.2'
 
   s.author = "Leon Breedt, Kent Sibilev"
   s.email = "bitserf@gmail.com, ksibilev@yahoo.com"
   s.rubyforge_project = "aws"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 2.1.1')
-  s.add_dependency('activerecord', '= 2.1.1')
+  s.add_dependency('actionpack', '= 2.2.2')
+  s.add_dependency('activerecord', '= 2.2.2')
 
   s.has_rdoc = true
   s.requirements << 'none'
   s.require_path = 'lib'
-  s.autorequire = 'actionwebservice'
 
   s.files = [ "Rakefile", "setup.rb", "README", "TODO", "CHANGELOG", "MIT-LICENSE" ]
   s.files = s.files + 

lib/action_web_service/scaffolding.rb

@@ -87,7 +87,6 @@ def #{action_name}_submit
                 @method_return_value = @scaffold_method.cast_returns(obj)
               end
               @method_elapsed = bm.real
-              add_instance_variables_to_assigns
               reset_invocation_response
               render_invocation_scaffold 'result'
             end
@@ -102,16 +101,15 @@ def setup_invocation_assigns
                 @scaffold_service = @scaffold_container.services.find{ |x| x.name == params['service'] }
                 @scaffold_method = @scaffold_service.api_methods[params['method']]
               end
-              add_instance_variables_to_assigns
             end
 
             def render_invocation_scaffold(action)
               customized_template = "\#{self.class.controller_path}/#{action_name}/\#{action}"
               default_template = scaffold_path(action)
               if template_exists?(customized_template)
-                content = @template.render_file(customized_template)
+                content = @template.render(:file => customized_template)
               else
-                content = @template.render_file(default_template, false)
+                content = @template.render(:file => default_template)
               end
               @template.instance_variable_set("@content_for_layout", content)
               if self.active_layout.nil?

test/client_soap_test.rb

@@ -19,6 +19,8 @@ def do_POST(req, res)
     rescue Exception => e
       $stderr.puts e.message
       $stderr.puts e.backtrace.join("\n")
+    ensure
+      ActiveRecord::Base.clear_active_connections!
     end
   end
 

test/client_xmlrpc_test.rb

@@ -18,6 +18,8 @@ def do_POST(req, res)
     rescue Exception => e
       $stderr.puts e.message
       $stderr.puts e.backtrace.join("\n")
+    ensure
+      ActiveRecord::Base.clear_active_connections!
     end
   end