actionwebservice 0.5.0 → 0.6.0

data/test/test_invoke_test.rb

@@ -0,0 +1,77 @@
+require File.dirname(__FILE__) + '/abstract_unit'
+require 'action_web_service/test_invoke'
+
+class TestInvokeAPI < ActionWebService::API::Base
+  api_method :add, :expects => [:int, :int], :returns => [:int]
+end
+
+class TestInvokeService < ActionWebService::Base
+  web_service_api TestInvokeAPI
+
+  attr :invoked
+
+  def add(a, b)
+    @invoked = true
+    a + b
+  end
+end
+
+class TestController < ActionController::Base
+  def rescue_action(e); raise e; end
+end
+
+class TestInvokeDirectController < TestController
+  web_service_api TestInvokeAPI
+
+  attr :invoked
+
+  def add
+    @invoked = true
+    @method_params[0] + @method_params[1]
+  end
+end
+
+class TestInvokeDelegatedController < TestController
+  web_service_dispatching_mode :delegated
+  web_service :service, TestInvokeService.new
+end
+
+class TestInvokeLayeredController < TestController
+  web_service_dispatching_mode :layered
+  web_service :one, TestInvokeService.new
+  web_service :two, TestInvokeService.new
+end
+
+class TestInvokeTest < Test::Unit::TestCase
+  def setup
+    @request  = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
+  end
+
+  def test_direct_add
+    @controller = TestInvokeDirectController.new
+    assert_equal nil, @controller.invoked
+    result = invoke :add, 25, 25
+    assert_equal 50, result
+    assert_equal true, @controller.invoked
+  end
+
+  def test_delegated_add
+    @controller = TestInvokeDelegatedController.new
+    assert_equal nil, @controller.web_service_object(:service).invoked
+    result = invoke_delegated :service, :add, 100, 50
+    assert_equal 150, result
+    assert_equal true, @controller.web_service_object(:service).invoked
+  end
+
+  def test_layered_add
+    @protocol = :xmlrpc
+    @controller = TestInvokeLayeredController.new
+    [:one, :two].each do |service|
+      assert_equal nil, @controller.web_service_object(service).invoked
+      result = invoke_layered service, :add, 200, -50
+      assert_equal 150, result
+      assert_equal true, @controller.web_service_object(service).invoked
+    end
+  end
+end

data/test/ws/abstract_encoding.rb

@@ -0,0 +1,68 @@
+require File.dirname(__FILE__) + '/abstract_unit'
+
+module Nested
+  class StructClass
+    attr_accessor :name
+    attr_accessor :version
+
+    def initialize
+      @name = 5
+      @version = "1.0"
+    end
+
+    def ==(other)
+      @name == other.name && @version == other.version
+    end
+  end
+end
+
+module EncodingTest
+  def setup
+    @call_signature = [:int, :bool, :string, :float, [:time], Nested::StructClass]
+    @call_params = [1, true, "string", 5.0, [Time.now], Nested::StructClass.new]
+    @response_signature = [:string]
+    @response_param = "hello world"
+    test_setup
+  end
+
+  def test_abstract
+    obj = WS::Encoding::AbstractEncoding.new
+    assert_raises(NotImplementedError) do
+      obj.encode_rpc_call(nil, nil)
+    end
+    assert_raises(NotImplementedError) do
+      obj.decode_rpc_call(nil)
+    end
+    assert_raises(NotImplementedError) do
+      obj.encode_rpc_response(nil, nil)
+    end
+    assert_raises(NotImplementedError) do
+      obj.decode_rpc_response(nil)
+    end
+  end
+
+  def encode_rpc_call(method_name, signature, params)
+    params = params.dup
+    (0..(signature.length-1)).each do |i|
+      type_binding = @marshaler.register_type(signature[i])
+      info = WS::ParamInfo.create(signature[i], type_binding, i)
+      params[i] = @marshaler.marshal(WS::Param.new(params[i], info))
+    end
+    @encoder.encode_rpc_call(method_name, params)
+  end
+
+  def decode_rpc_call(obj)
+    @encoder.decode_rpc_call(obj)
+  end
+
+  def encode_rpc_response(method_name, signature, param)
+    type_binding = @marshaler.register_type(signature[0])
+    info = WS::ParamInfo.create(signature[0], type_binding, 0)
+    param = @marshaler.marshal(WS::Param.new(param, info))
+    @encoder.encode_rpc_response(method_name, param)
+  end
+
+  def decode_rpc_response(obj)
+    @encoder.decode_rpc_response(obj)
+  end
+end

data/test/ws/abstract_unit.rb

@@ -0,0 +1,13 @@
+require 'pathname'
+$:.unshift(Pathname.new(File.dirname(__FILE__)).realpath.to_s + '/../../lib/action_web_service/vendor')
+require 'test/unit'
+require 'ws'
+begin
+  require 'active_record'
+rescue LoadError
+  begin
+    require 'rubygems'
+    require_gem 'activerecord', '>= 1.6.0'
+  rescue LoadError
+  end
+end

data/test/ws/gencov

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rcov -x '.*_test\.rb,rubygems,abstract_,/run' ./run

data/test/ws/run

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+Dir[File.join(File.dirname(__FILE__), '*_test.rb')].each do |f|
+  require f
+end

data/test/ws/soap_marshaling_test.rb

@@ -0,0 +1,91 @@
+require File.dirname(__FILE__) + '/abstract_unit'
+
+module Nested
+  class MyClass
+    attr_accessor :id
+    attr_accessor :name
+
+    def initialize(id, name)
+      @id = id
+      @name = name
+    end
+
+    def ==(other)
+      @id == other.id && @name == other.name
+    end
+  end
+end
+
+class SoapMarshalingTest < Test::Unit::TestCase
+  def setup
+    @marshaler = WS::Marshaling::SoapMarshaler.new
+  end
+
+  def test_abstract
+    marshaler = WS::Marshaling::AbstractMarshaler.new
+    assert_raises(NotImplementedError) do
+      marshaler.marshal(nil)
+    end
+    assert_raises(NotImplementedError) do
+      marshaler.unmarshal(nil)
+    end
+    assert_equal(nil, marshaler.register_type(nil))
+  end
+
+  def test_marshaling
+    info = WS::ParamInfo.create(Nested::MyClass, @marshaler.register_type(Nested::MyClass))
+    param = WS::Param.new(Nested::MyClass.new(2, "name"), info)
+    new_param = @marshaler.unmarshal(@marshaler.marshal(param))
+    assert(param == new_param)
+  end
+  
+  def test_exception_marshaling
+    info = WS::ParamInfo.create(RuntimeError, @marshaler.register_type(RuntimeError))
+    param = WS::Param.new(RuntimeError.new("hello, world"), info)
+    new_param = @marshaler.unmarshal(@marshaler.marshal(param))
+    assert_equal("hello, world", new_param.value.detail.cause.message)
+  end
+
+  def test_registration
+    type_binding1 = @marshaler.register_type(:int)
+    type_binding2 = @marshaler.register_type(:int)
+    assert(type_binding1.equal?(type_binding2))
+  end
+
+  def test_active_record
+    if Object.const_defined?('ActiveRecord')
+      node_class = Class.new(ActiveRecord::Base) do
+        def initialize(*args)
+          super(*args)
+          @new_record = false
+        end
+
+        class << self
+          def name
+            "Node"
+          end
+
+          def columns(*args)
+            [
+              ActiveRecord::ConnectionAdapters::Column.new('id', 0, 'int'),
+              ActiveRecord::ConnectionAdapters::Column.new('name', nil, 'string'),
+              ActiveRecord::ConnectionAdapters::Column.new('email', nil, 'string'),
+            ]
+          end
+
+          def connection
+            self
+          end
+        end
+      end
+      info = WS::ParamInfo.create(node_class, @marshaler.register_type(node_class), 0)
+      ar_obj = node_class.new('name' => 'hello', 'email' => 'test@test.com') 
+      param = WS::Param.new(ar_obj, info)
+      obj = @marshaler.marshal(param)
+      param = @marshaler.unmarshal(obj)
+      new_ar_obj = param.value
+      assert_equal(ar_obj, new_ar_obj)
+      assert(!ar_obj.equal?(new_ar_obj))
+    end
+  end
+end

data/test/ws/soap_rpc_encoding_test.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/abstract_encoding'
+require 'time'
+
+class SoapRpcEncodingTest < Test::Unit::TestCase
+  include EncodingTest
+
+  def test_setup
+    @encoder = WS::Encoding::SoapRpcEncoding.new
+    @marshaler = WS::Marshaling::SoapMarshaler.new
+  end
+
+  def test_call_encoding_and_decoding
+    obj = encode_rpc_call('DecodeMe', @call_signature, @call_params)
+    method_name, decoded_params = decode_rpc_call(obj)
+    params = decoded_params.map{|x| @marshaler.unmarshal(x).value}
+    assert_equal(method_name, 'DecodeMe')
+    assert_equal(@call_params[0..3], params[0..3])
+    # XXX: DateTime not marshaled correctly yet
+    assert_equal(@call_params[5..-1], params[5..-1])
+  end
+
+  def test_response_encoding_and_decoding_simple
+    obj = encode_rpc_response('DecodeMe', @response_signature, @response_param)
+    method_name, return_value = decode_rpc_response(obj)
+    return_value = @marshaler.unmarshal(return_value).value
+    assert_equal('DecodeMe', method_name)
+    assert_equal(@response_param, return_value)
+  end
+
+  def test_response_encoding_and_decoding_struct
+    struct = Nested::StructClass.new
+    obj = encode_rpc_response('DecodeMe', [Nested::StructClass], struct)
+    method_name, return_value = decode_rpc_response(obj)
+    return_value = @marshaler.unmarshal(return_value).value
+    assert_equal('DecodeMe', method_name)
+    assert_equal(struct, return_value)
+  end
+
+  def test_response_encoding_and_decoding_array
+    struct = Nested::StructClass.new
+    obj = encode_rpc_response('DecodeMe', [[Nested::StructClass]], [struct])
+    method_name, return_value = decode_rpc_response(obj)
+    return_value = @marshaler.unmarshal(return_value).value
+    assert_equal('DecodeMe', method_name)
+    assert_equal([struct], return_value)
+  end
+end

data/test/ws/types_test.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/abstract_unit'
+
+class TypesTest < Test::Unit::TestCase
+  include WS
+
+  def setup
+    @caster = BaseTypeCaster.new
+  end
+
+  def test_base_types
+    assert_equal(:int, BaseTypes.canonical_type_name(:integer))
+    assert_equal(:int, BaseTypes.canonical_type_name(:fixnum))
+    assert_equal(Integer, BaseTypes.type_name_to_class(:bignum))
+    assert_equal(Date, BaseTypes.type_name_to_class(:date))
+    assert_equal(Time, BaseTypes.type_name_to_class(:timestamp))
+    assert_equal(TrueClass, BaseTypes.type_name_to_class(:bool))
+    assert_equal(:int, BaseTypes.class_to_type_name(Bignum))
+    assert_equal(:bool, BaseTypes.class_to_type_name(FalseClass))
+    assert_equal(Integer, BaseTypes.canonical_type_class(Fixnum))
+    assert_raises(TypeError) do
+      BaseTypes.canonical_type_name(:fake)
+    end
+  end
+
+  def test_casting
+    assert_equal(5, @caster.cast("5", Fixnum))
+    assert_equal('50.0', @caster.cast(50.0, String))
+    assert_equal(true, @caster.cast('true', FalseClass))
+    assert_equal(false, @caster.cast('false', TrueClass))
+    assert_raises(TypeError) do
+      @caster.cast('yes', FalseClass)
+    end
+    assert_equal(3.14159, @caster.cast('3.14159', Float))
+    now1 = Time.new
+    now2 = @caster.cast("#{now1}", Time)
+    assert_equal(now1.tv_sec, now2.tv_sec)
+    date1 = Date.parse('2004-01-01')
+    date2 = @caster.cast("#{date1}", Date)
+    assert_equal(date1, date2)
+  end
+end

data/test/ws/xmlrpc_encoding_test.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/abstract_encoding'
+require 'time'
+
+class XmlRpcEncodingTest < Test::Unit::TestCase
+  include EncodingTest
+
+  def test_setup
+    @encoder = WS::Encoding::XmlRpcEncoding.new
+    @marshaler = WS::Marshaling::XmlRpcMarshaler.new
+  end
+
+  def test_typed_call_encoding_and_decoding
+    obj = encode_rpc_call('DecodeMe', @call_signature, @call_params)
+    method_name, params = decode_rpc_call(obj)
+    (0..(@call_signature.length-1)).each do |i|
+      params[i] = @marshaler.typed_unmarshal(params[i], @call_signature[i]).value
+    end
+    assert_equal(method_name, 'DecodeMe')
+    assert_equal(@call_params[0..3], params[0..3])
+    assert_equal(@call_params[5..-1], params[5..-1])
+  end
+
+  def test_untyped_call_encoding_and_decoding
+    obj = encode_rpc_call('DecodeMe', @call_signature, @call_params)
+    method_name, params = decode_rpc_call(obj)
+    (0..(@call_signature.length-1)).each do |i|
+      params[i] = @marshaler.unmarshal(params[i]).value
+    end
+    assert_equal(method_name, 'DecodeMe')
+    assert_equal(@call_params[0..3], params[0..3])
+    assert_equal(@call_params[5].name, params[5]['name'])
+    assert_equal(@call_params[5].version, params[5]['version'])
+  end
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.6
 specification_version: 1
 name: actionwebservice
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2005-02-24
+  version: 0.6.0
+date: 2005-03-07
 summary: Web service support for Action Pack.
 require_paths: 
   - lib
@@ -31,7 +31,7 @@ files:
   - setup.rb
   - README
   - TODO
-  - ChangeLog
+  - CHANGELOG
   - MIT-LICENSE
   - examples/googlesearch
   - examples/metaWeblog
@@ -54,6 +54,7 @@ files:
   - lib/action_web_service/base.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
@@ -62,35 +63,63 @@ files:
   - lib/action_web_service/protocol.rb
   - lib/action_web_service/struct.rb
   - lib/action_web_service/support
-  - lib/action_web_service/api/abstract.rb
-  - lib/action_web_service/api/action_controller.rb
+  - lib/action_web_service/test_invoke.rb
+  - lib/action_web_service/vendor
+  - lib/action_web_service/api/base.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/registry.rb
+  - lib/action_web_service/protocol/discovery.rb
   - lib/action_web_service/protocol/soap_protocol.rb
   - lib/action_web_service/protocol/xmlrpc_protocol.rb
   - lib/action_web_service/support/class_inheritable_options.rb
-  - lib/action_web_service/support/signature.rb
+  - lib/action_web_service/vendor/ws
+  - lib/action_web_service/vendor/ws.rb
+  - lib/action_web_service/vendor/ws/common.rb
+  - lib/action_web_service/vendor/ws/encoding
+  - lib/action_web_service/vendor/ws/encoding.rb
+  - lib/action_web_service/vendor/ws/marshaling
+  - lib/action_web_service/vendor/ws/marshaling.rb
+  - lib/action_web_service/vendor/ws/types.rb
+  - lib/action_web_service/vendor/ws/encoding/abstract.rb
+  - lib/action_web_service/vendor/ws/encoding/soap_rpc_encoding.rb
+  - lib/action_web_service/vendor/ws/encoding/xmlrpc_encoding.rb
+  - lib/action_web_service/vendor/ws/marshaling/abstract.rb
+  - lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb
+  - lib/action_web_service/vendor/ws/marshaling/xmlrpc_marshaling.rb
   - test/abstract_client.rb
-  - test/abstract_soap.rb
+  - test/abstract_dispatcher.rb
   - test/abstract_unit.rb
   - test/api_test.rb
+  - test/apis
   - test/base_test.rb
   - test/client_soap_test.rb
   - test/client_xmlrpc_test.rb
   - test/container_test.rb
-  - test/dispatcher_action_controller_test.rb
+  - test/dispatcher_action_controller_soap_test.rb
+  - test/dispatcher_action_controller_xmlrpc_test.rb
   - test/gencov
   - test/invocation_test.rb
-  - test/protocol_registry_test.rb
-  - test/protocol_soap_test.rb
-  - test/protocol_xmlrpc_test.rb
   - test/run
   - test/struct_test.rb
+  - test/test_invoke_test.rb
+  - test/ws
+  - test/apis/auto_load_api.rb
+  - test/apis/broken_auto_load_api.rb
+  - test/ws/abstract_encoding.rb
+  - test/ws/abstract_unit.rb
+  - test/ws/gencov
+  - test/ws/run
+  - test/ws/soap_marshaling_test.rb
+  - test/ws/soap_rpc_encoding_test.rb
+  - test/ws/types_test.rb
+  - test/ws/xmlrpc_encoding_test.rb
 test_files: []
 rdoc_options: []
 extra_rdoc_files: []
@@ -105,9 +134,9 @@ dependencies:
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
-          - "="
+          - ">="
           - !ruby/object:Gem::Version 
-            version: 1.5.0
+            version: 1.5.1
       version: 
   - !ruby/object:Gem::Dependency 
     name: activerecord
@@ -115,9 +144,9 @@ dependencies:
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
-          - "="
+          - ">="
           - !ruby/object:Gem::Version 
-            version: 1.7.0
+            version: 1.8.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: activesupport
@@ -125,7 +154,7 @@ dependencies:
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
-          - "="
+          - ">="
           - !ruby/object:Gem::Version 
-            version: 1.0.0
+            version: 1.0.1
       version: