dougbarth-actionwebservice 2.1.1 → 2.3.3

data/Rakefile

@@ -38,25 +38,6 @@ task :build_database do
   %x( mysql -uroot actionwebservice_unittest < #{File.join(SCHEMA_PATH, 'mysql.sql')} )
 end
 
-desc 'Print file list for gemspec file.'
-task :list_files do
-  s_files = [ "Rakefile", "setup.rb", "README", "TODO", "CHANGELOG", "MIT-LICENSE" ]
-  s_files = s_files + Dir.glob( "examples/**/*" ).delete_if { |item| item.match( /\.(svn|git)/ ) }
-  s_files = s_files + Dir.glob( "lib/**/*" ).delete_if { |item| item.match( /\.(svn|git)/ ) }
-  s_files = s_files + Dir.glob( "test/**/*" ).delete_if { |item| item.match( /\.(svn|git)/ ) }
-  s_files = s_files + Dir.glob( "generators/**/*" ).delete_if { |item| item.match( /\.(svn|git)/ ) }
-  puts "#{s_files.inspect}"
-end
-
-desc 'Checks gemspec for methods disallowed by GitHub\'s $SAFE=3 build environment.'
-task :check_for_github do
-  require 'rubygems/specification'
-  data = File.read('actionwebservice.gemspec')
-  spec = nil
-  Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join
-  puts "Success! Gem should build at GitHub." if spec.class == Gem::Specification
-end
-
 
 # Generate the RDoc documentation
 Rake::RDocTask.new { |rdoc|
@@ -91,8 +72,8 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "aws"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 2.1.1' + PKG_BUILD)
-  s.add_dependency('activerecord', '= 2.1.1' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 2.3.3' + PKG_BUILD)
+  s.add_dependency('activerecord', '= 2.3.3' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'
@@ -189,4 +170,4 @@ task :release => [ :package ] do
   rubyforge = RubyForge.new
   rubyforge.login
   rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
-end
+end

data/lib/action_web_service.rb

@@ -27,9 +27,9 @@ begin
   require 'active_record'
 rescue LoadError
   require 'rubygems'
-  gem 'activesupport', '>= 2.1.0'
-  gem 'actionpack', '>= 2.1.0'
-  gem 'activerecord', '>= 2.1.0'
+  gem 'activesupport', '>= 2.3.0'
+  gem 'actionpack', '>= 2.3.0'
+  gem 'activerecord', '>= 2.3.0'
 end
 
 $:.unshift(File.dirname(__FILE__) + "/action_web_service/vendor/")

data/lib/action_web_service/casting.rb

@@ -117,8 +117,13 @@ module ActionWebService # :nodoc:
 
         def cast_to_structured_type(value, signature_type) # :nodoc:
           obj = nil
-          obj = value if canonical_type(value.class) == canonical_type(signature_type.type)
-          obj ||= signature_type.type_class.new
+          # if the canonical classes are the same or if the given value is of 
+          # a type that is derived from the signature_type do not attempt to 
+          # "cast" the value into the signature_type as it's already good to go
+          obj = (
+            canonical_type(value.class) == canonical_type(signature_type.type) or 
+            derived_from?(signature_type.type, value.class)
+          ) ? value : signature_type.type_class.new
           if value.respond_to?(:each_pair)
             klass = signature_type.type_class
             value.each_pair do |name, val|

data/lib/action_web_service/dispatcher/action_controller_dispatcher.rb

@@ -165,7 +165,7 @@ module ActionWebService # :nodoc:
         private
           def base_uri
             host = request.host_with_port
-            relative_url_root = request.relative_url_root
+            relative_url_root = ::ActionController::Base.relative_url_root
             scheme = request.ssl? ? 'https' : 'http'
             '%s://%s%s/%s/' % [scheme, host, relative_url_root, self.class.controller_path]
           end

data/lib/action_web_service/protocol/abstract.rb

@@ -12,7 +12,7 @@ module ActionWebService # :nodoc:
 
       def encode_action_pack_request(service_name, public_method_name, raw_body, options={})
         klass = options[:request_class] || SimpleActionPackRequest
-        request = klass.new
+        request = klass.new({})
         request.request_parameters['action'] = service_name.to_s
         request.env['RAW_POST_DATA'] = raw_body
         request.env['REQUEST_METHOD'] = 'POST'
@@ -71,9 +71,9 @@ module ActionWebService # :nodoc:
       end
     end
 
-    class SimpleActionPackRequest < ActionController::AbstractRequest # :nodoc:
-      def initialize
-        @env = {}
+    class SimpleActionPackRequest < ActionController::Request # :nodoc:
+      def initialize(env = {})
+        @env = env
         @qparams = {}
         @rparams = {}
         @cookies = {}

data/lib/action_web_service/scaffolding.rb

@@ -69,7 +69,7 @@ module ActionWebService
                 post_params = params['method_params'] ? params['method_params'].dup : nil
                 params = []
                 @scaffold_method.expects.each_with_index do |spec, i|
-                  params << post_params[i.to_s]                                            
+                  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)
@@ -87,7 +87,6 @@ module ActionWebService
                 @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 @@ module ActionWebService
                 @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)
-              else
-                content = @template.render_file(default_template, false)
+              begin
+                content = @template.render(:file => customized_template)
+              rescue ActionView::MissingTemplate
+                content = @template.render(:file => default_template)
               end
               @template.instance_variable_set("@content_for_layout", content)
               if self.active_layout.nil?
@@ -127,7 +125,7 @@ module ActionWebService
 
             def reset_invocation_response
               erase_render_results
-              response.headers = ::ActionController::AbstractResponse::DEFAULT_HEADERS.merge("cookie" => [])
+              response.instance_variable_set :@header, Rack::Utils::HeaderHash.new(::ActionController::Response::DEFAULT_HEADERS.merge("cookie" => []))
             end
 
             def public_method_name(service_name, method_name)

data/lib/action_web_service/version.rb

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

data/test/abstract_dispatcher.rb

@@ -358,7 +358,7 @@ module DispatcherCommonTests
         response = ActionController::TestResponse.new
         controller.process(request, response)
         # puts response.body
-        assert(response.headers['Status'] =~ /^500/)
+        assert(response.status =~ /^500/)
       end
       send_garbage_request.call
       controller.class.web_service_exception_reporting = false
@@ -538,7 +538,8 @@ module DispatcherCommonTests
     
     def http_method_allowed?(method)
       method = method.to_s.upcase
-      test_request = ActionController::TestRequest.new({ 'action' => 'api' })
+      test_request = ActionController::TestRequest.new
+      test_request.action = 'api'
       test_response = ActionController::TestResponse.new
       test_request.env['REQUEST_METHOD'] = method
       result = @direct_controller.process(test_request, test_response)

data/test/abstract_unit.rb

@@ -4,7 +4,9 @@ require 'rubygems'
 require 'test/unit'
 require 'action_web_service'
 require 'action_controller'
-require 'action_controller/test_process'
+require 'action_controller/test_case'
+require 'action_view'
+require 'action_view/test_case'
 
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
@@ -14,6 +16,7 @@ ActiveRecord::Base.logger = ActionController::Base.logger = Logger.new("debug.lo
 
 begin
   require 'activerecord'
+  require "active_record/test_case"
   require "active_record/fixtures" unless Object.const_defined?(:Fixtures)
 rescue LoadError => e
   fail "\nFailed to load activerecord: #{e}"
@@ -30,4 +33,7 @@ ActiveRecord::Base.configurations = {
 
 ActiveRecord::Base.establish_connection 'mysql'
 
-Test::Unit::TestCase.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
+class ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+  self.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
+end

data/test/api_test.rb

@@ -12,7 +12,7 @@ module APITest
   end
 end
 
-class TC_API < Test::Unit::TestCase
+class TC_API < ActiveSupport::TestCase
   API = APITest::API
 
   def test_api_method_declaration

data/test/base_test.rb

@@ -34,7 +34,7 @@ module BaseTest
   end
 end
 
-class TC_Base < Test::Unit::TestCase
+class TC_Base < ActiveSupport::TestCase
   def test_options
     assert(BaseTest::PristineService.web_service_api.inflect_names == false)
     assert(BaseTest::Service.web_service_api.inflect_names == true)

data/test/casting_test.rb

@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/abstract_unit'
 
 module CastingTest
+  class A < ActionWebService::Struct; end
+  class B < A; end
   class API < ActionWebService::API::Base
     api_method :int,       :expects => [:int]
     api_method :str,       :expects => [:string]
@@ -14,6 +16,8 @@ module CastingTest
     api_method :int_array,   :expects => [[:int]]
     api_method :str_array,   :expects => [[:string]]
     api_method :bool_array,  :expects => [[:bool]]
+    
+    api_method :a, :expects => [A]
   end
 end
 
@@ -78,6 +82,10 @@ class TC_Casting < Test::Unit::TestCase
       cast_expects(:int_array, ['1', '2.021', '4'])
     end
   end
+  
+  def test_structured_type_casting_with_polymorphism
+    assert cast_expects(:a, B.new)[0].is_a?(B)
+  end
 
   private
     def cast_expects(method_name, *args)

data/test/client_soap_test.rb

@@ -19,6 +19,8 @@ module ClientSoapTest
     rescue Exception => e
       $stderr.puts e.message
       $stderr.puts e.backtrace.join("\n")
+    ensure
+      ActiveRecord::Base.clear_active_connections!
     end
   end
 
@@ -46,7 +48,7 @@ module ClientSoapTest
   end
 end
 
-class TC_ClientSoap < Test::Unit::TestCase
+class TC_ClientSoap < ActiveSupport::TestCase
   include ClientTest
   include ClientSoapTest
   

data/test/client_xmlrpc_test.rb

@@ -18,6 +18,8 @@ module ClientXmlRpcTest
     rescue Exception => e
       $stderr.puts e.message
       $stderr.puts e.backtrace.join("\n")
+    ensure
+      ActiveRecord::Base.clear_active_connections!
     end
   end
 
@@ -40,7 +42,7 @@ module ClientXmlRpcTest
   end
 end
 
-class TC_ClientXmlRpc < Test::Unit::TestCase
+class TC_ClientXmlRpc < ActiveSupport::TestCase
   include ClientTest
   include ClientXmlRpcTest
   

data/test/dispatcher_action_controller_soap_test.rb

@@ -129,7 +129,8 @@ class TC_DispatcherActionControllerSoap < Test::Unit::TestCase
     end
 
     def ensure_valid_wsdl_action(controller)
-      test_request = ActionController::TestRequest.new({ 'action' => 'wsdl' })
+      test_request = ActionController::TestRequest.new
+      test_request.action = 'wsdl'
       test_response = ActionController::TestResponse.new
       wsdl = controller.process(test_request, test_response).body
       ensure_valid_wsdl(controller, wsdl, DispatcherTest::WsdlNamespace)

data/test/scaffolded_controller_test.rb

@@ -64,12 +64,12 @@ class ScaffoldedController < ActionController::Base
   end
 end
 
-class ScaffoldedControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = ScaffoldedController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
+class ScaffoldedControllerTest < ActionController::TestCase
+  # def setup
+  #   @controller = ScaffoldedController.new
+  #   @request    = ActionController::TestRequest.new
+  #   @response   = ActionController::TestResponse.new
+  # end
 
   def test_scaffold_invoke
     get :scaffold_invoke

data/test/test_invoke_test.rb

@@ -49,7 +49,7 @@ class TestInvokeLayeredController < TestController
   web_service(:two) { @service_two ||= TestInvokeService.new }
 end
 
-class TestInvokeTest < Test::Unit::TestCase
+class TestInvokeTest < ActiveSupport::TestCase
   def setup
     @request  = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new

metadata

@@ -1,34 +1,36 @@
 --- !ruby/object:Gem::Specification 
 name: dougbarth-actionwebservice
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  version: 2.3.3
 platform: ruby
 authors: 
 - Leon Breedt, Kent Sibilev
-autorequire: actionwebservice
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 -07:00
+date: 2009-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.3.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.3.3
     version: 
 description: Adds WSDL/SOAP and XML-RPC web service support to Action Pack
 email: bitserf@gmail.com, ksibilev@yahoo.com
@@ -140,6 +142,7 @@ files:
 - generators/web_service/web_service_generator.rb
 has_rdoc: true
 homepage: http://www.rubyonrails.org
+licenses: 
 post_install_message: 
 rdoc_options: []
 
@@ -160,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: aws
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Web service support for Action Pack.