actionwebservice 0.6.2 → 0.7.0

data/test/abstract_unit.rb

@@ -1,5 +1,5 @@
+ENV["RAILS_ENV"] = "test"
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-$:.unshift(File.dirname(__FILE__) + '/../lib/action_web_service/vendor')
 
 require 'test/unit'
 require 'action_web_service'

data/test/api_test.rb

@@ -35,13 +35,20 @@ class TC_API < Test::Unit::TestCase
   end
 
   def test_signature_canonicalization
-    assert_equal({:expects=>nil, :returns=>nil}, API.api_methods[:void])
-    assert_equal({:expects=>[String], :returns=>[String]}, API.api_methods[:expects_and_returns])
-    assert_equal({:expects=>[Integer, TrueClass], :returns=>nil}, API.api_methods[:expects])
-    assert_equal({:expects=>nil, :returns=>[Integer, [String]]}, API.api_methods[:returns])
-    assert_equal({:expects=>[{:appkey=>Integer}, {:publish=>TrueClass}], :returns=>nil}, API.api_methods[:named_signature])
-    assert_equal({:expects=>[Integer, String, TrueClass], :returns=>nil}, API.api_methods[:string_types])
-    assert_equal({:expects=>[TrueClass, Integer, String], :returns=>nil}, API.api_methods[:class_types])
+    assert_equal(nil, API.api_methods[:void].expects)
+    assert_equal(nil, API.api_methods[:void].returns)
+    assert_equal([String], API.api_methods[:expects_and_returns].expects.map{|x| x.type_class})
+    assert_equal([String], API.api_methods[:expects_and_returns].returns.map{|x| x.type_class})
+    assert_equal([Integer, TrueClass], API.api_methods[:expects].expects.map{|x| x.type_class})
+    assert_equal(nil, API.api_methods[:expects].returns)
+    assert_equal(nil, API.api_methods[:returns].expects)
+    assert_equal([Integer, [String]], API.api_methods[:returns].returns.map{|x| x.array?? [x.element_type.type_class] : x.type_class})
+    assert_equal([[:appkey, Integer], [:publish, TrueClass]], API.api_methods[:named_signature].expects.map{|x| [x.name, x.type_class]})
+    assert_equal(nil, API.api_methods[:named_signature].returns)
+    assert_equal([Integer, String, TrueClass], API.api_methods[:string_types].expects.map{|x| x.type_class})
+    assert_equal(nil, API.api_methods[:string_types].returns)
+    assert_equal([TrueClass, Integer, String], API.api_methods[:class_types].expects.map{|x| x.type_class})
+    assert_equal(nil, API.api_methods[:class_types].returns)
   end
 
   def test_not_instantiable
@@ -66,4 +73,30 @@ class TC_API < Test::Unit::TestCase
       end
     end
   end
+
+  def test_parameter_names
+    method = API.api_methods[:named_signature]
+    assert_equal 0, method.expects_index_of(:appkey)
+    assert_equal 1, method.expects_index_of(:publish)
+    assert_equal 1, method.expects_index_of('publish')
+    assert_equal 0, method.expects_index_of('appkey')
+    assert_equal -1, method.expects_index_of('blah')
+    assert_equal -1, method.expects_index_of(:missing)
+    assert_equal -1, API.api_methods[:void].expects_index_of('test')
+  end
+
+  def test_parameter_hash
+    method = API.api_methods[:named_signature]
+    hash = method.expects_to_hash([5, false])
+    assert_equal({:appkey => 5, :publish => false}, hash)
+  end
+
+  def test_api_methods_compat
+    sig = API.api_methods[:named_signature][:expects]
+    assert_equal [{:appkey=>Integer}, {:publish=>TrueClass}], sig
+  end
+
+  def test_to_s
+    assert_equal 'void Expects(int param0, bool param1)', APITest::API.api_methods[:expects].to_s
+  end
 end

data/test/casting_test.rb

@@ -0,0 +1,82 @@
+require File.dirname(__FILE__) + '/abstract_unit'
+
+module CastingTest
+  class API < ActionWebService::API::Base
+    api_method :int,       :expects => [:int]
+    api_method :str,       :expects => [:string]
+    api_method :bool,      :expects => [:bool]
+    api_method :float,     :expects => [:float]
+    api_method :time,      :expects => [:time]
+    api_method :datetime,  :expects => [:datetime]
+    api_method :date,      :expects => [:date]
+
+    api_method :int_array,   :expects => [[:int]]
+    api_method :str_array,   :expects => [[:string]]
+    api_method :bool_array,  :expects => [[:bool]]
+  end
+end
+
+class TC_Casting < Test::Unit::TestCase
+  include CastingTest
+
+  def test_base_type_casting_valid
+    assert_equal 10000,   cast_expects(:int, '10000')[0]
+    assert_equal '10000', cast_expects(:str, 10000)[0]
+    [1, '1', 'true', 'y', 'yes'].each do |val|
+      assert_equal true, cast_expects(:bool, val)[0]
+    end
+    [0, '0', 'false', 'n', 'no'].each do |val|
+      assert_equal false, cast_expects(:bool, val)[0]
+    end
+    assert_equal 3.14159, cast_expects(:float, '3.14159')[0]
+    now = Time.at(Time.now.tv_sec)
+    casted = cast_expects(:time, now.to_s)[0]
+    assert_equal now, casted
+    now = DateTime.now
+    assert_equal now.to_s, cast_expects(:datetime, now.to_s)[0].to_s
+    today = Date.today
+    assert_equal today, cast_expects(:date, today.to_s)[0]
+  end
+
+  def test_base_type_casting_invalid
+    assert_raises ArgumentError do
+      cast_expects(:int, 'this is not a number')
+    end
+    assert_raises ActionWebService::Casting::CastingError do
+      # neither true or false ;)
+      cast_expects(:bool, 'i always lie')
+    end
+    assert_raises ArgumentError do
+      cast_expects(:float, 'not a float')
+    end
+    assert_raises ArgumentError do
+      cast_expects(:time, '111111111111111111111111111111111')
+    end
+    assert_raises ArgumentError do
+      cast_expects(:datetime, '-1')
+    end
+    assert_raises ArgumentError do
+      cast_expects(:date, '')
+    end
+  end
+
+  def test_array_type_casting
+    assert_equal [1, 2, 3213992, 4], cast_expects(:int_array, ['1', '2', '3213992', '4'])[0]
+    assert_equal ['one', 'two', '5.0', '200', '', 'true'], cast_expects(:str_array, [:one, 'two', 5.0, 200, nil, true])[0]
+    assert_equal [true, false, true, true, false], cast_expects(:bool_array, ['1', nil, 'y', true, 'false'])[0]
+  end
+
+  def test_array_type_casting_failure
+    assert_raises ActionWebService::Casting::CastingError do
+      cast_expects(:bool_array, ['false', 'blahblah'])
+    end
+    assert_raises ArgumentError do
+      cast_expects(:int_array, ['1', '2.021', '4'])
+    end
+  end
+
+  private
+    def cast_expects(method_name, *args)
+      API.api_method_instance(method_name.to_sym).cast_expects([*args])
+    end
+end

data/test/client_soap_test.rb

@@ -66,6 +66,9 @@ class TC_ClientSoap < Test::Unit::TestCase
     assert(@container.value_normal.nil?)
     assert_equal(5, @client.normal(5, 6))
     assert_equal([5, 6], @container.value_normal)
+    assert_equal(5, @client.normal("7", "8"))
+    assert_equal([7, 8], @container.value_normal)
+    assert_equal(5, @client.normal(true, false))
   end
 
   def test_array_return

data/test/client_xmlrpc_test.rb

@@ -15,6 +15,7 @@ module ClientXmlRpcTest
       @controller.process(test_request, response)
       res.header['content-type'] = 'text/xml'
       res.body = response.body
+      # puts res.body
     rescue Exception => e
       $stderr.puts e.message
       $stderr.puts e.backtrace.join("\n")
@@ -60,6 +61,9 @@ class TC_ClientXmlRpc < Test::Unit::TestCase
     assert(@container.value_normal.nil?)
     assert_equal(5, @client.normal(5, 6))
     assert_equal([5, 6], @container.value_normal)
+    assert_equal(5, @client.normal("7", "8"))
+    assert_equal([7, 8], @container.value_normal)
+    assert_equal(5, @client.normal(true, false))
   end
 
   def test_array_return
@@ -97,7 +101,7 @@ class TC_ClientXmlRpc < Test::Unit::TestCase
   end
 
   def test_invalid_signature
-    assert_raises(ActionWebService::Client::ClientError) do
+    assert_raises(ArgumentError) do
       @client.normal
     end
   end

data/test/dispatcher_action_controller_soap_test.rb

@@ -23,11 +23,11 @@ class TC_DispatcherActionControllerSoap < Test::Unit::TestCase
   include DispatcherCommonTests
 
   def setup
-    @encoder = WS::Encoding::SoapRpcEncoding.new 'urn:ActionWebService'
-    @marshaler = WS::Marshaling::SoapMarshaler.new 'urn:ActionWebService'
     @direct_controller = DirectController.new
     @delegated_controller = DelegatedController.new
     @virtual_controller = VirtualController.new
+    @layered_controller = LayeredController.new
+    @protocol = ActionWebService::Protocol::Soap::SoapProtocol.new
   end
 
   def test_wsdl_generation
@@ -60,6 +60,13 @@ class TC_DispatcherActionControllerSoap < Test::Unit::TestCase
     assert(BrokenAutoLoadController.web_service_api.nil?)
   end
 
+  def test_layered_dispatching
+    mt_cats = do_method_call(@layered_controller, 'mt.getCategories')
+    assert_equal(["mtCat1", "mtCat2"], mt_cats)
+    blogger_cats = do_method_call(@layered_controller, 'blogger.getCategories')
+    assert_equal(["bloggerCat1", "bloggerCat2"], blogger_cats)
+  end
+
   protected
     def exception_message(soap_fault_exception)
       soap_fault_exception.detail.cause.message
@@ -70,16 +77,6 @@ class TC_DispatcherActionControllerSoap < Test::Unit::TestCase
       obj.detail.cause.is_a?(Exception)
     end
 
-    def create_ap_request(container, body, public_method_name, *args)
-      test_request = ActionController::TestRequest.new
-      test_request.request_parameters['action'] = service_name(container)
-      test_request.env['REQUEST_METHOD'] = "POST"
-      test_request.env['HTTP_CONTENT_TYPE'] = 'text/xml'
-      test_request.env['HTTP_SOAPACTION'] = "/soap/#{service_name(container)}/#{public_method_name}"
-      test_request.env['RAW_POST_DATA'] = body
-      test_request
-    end
-
     def service_name(container)
       container.is_a?(DelegatedController) ? 'test_service' : 'api'
     end

data/test/dispatcher_action_controller_xmlrpc_test.rb

@@ -5,8 +5,7 @@ class TC_DispatcherActionControllerXmlRpc < Test::Unit::TestCase
   include DispatcherCommonTests
 
   def setup
-    @encoder = WS::Encoding::XmlRpcEncoding.new
-    @marshaler = WS::Marshaling::XmlRpcMarshaler.new
+    @protocol = ActionWebService::Protocol::XmlRpc::XmlRpcProtocol.new
     @direct_controller = DirectController.new
     @delegated_controller = DelegatedController.new
     @layered_controller = LayeredController.new
@@ -29,15 +28,6 @@ class TC_DispatcherActionControllerXmlRpc < Test::Unit::TestCase
       obj.is_a?(XMLRPC::FaultException)
     end
 
-    def create_ap_request(container, body, public_method_name, *args)
-      test_request = ActionController::TestRequest.new
-      test_request.request_parameters['action'] = service_name(container)
-      test_request.env['REQUEST_METHOD'] = "POST"
-      test_request.env['HTTP_CONTENT_TYPE'] = 'text/xml'
-      test_request.env['RAW_POST_DATA'] = body
-      test_request
-    end
-
     def service_name(container)
       container.is_a?(DelegatedController) ? 'test_service' : 'api'
     end

data/test/run

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'test/unit'
+$:.unshift(File.dirname(__FILE__) + '/../lib')
 args = Dir[File.join(File.dirname(__FILE__), '*_test.rb')] + Dir[File.join(File.dirname(__FILE__), 'ws/*_test.rb')]
 (r = Test::Unit::AutoRunner.new(true)).process_args(args)
 exit r.run

data/test/scaffolded_controller_test.rb

@@ -0,0 +1,67 @@
+require File.dirname(__FILE__) + '/abstract_unit'
+
+ActionController::Routing::Routes.draw do |map|
+  map.connect '', :controller => 'scaffolded'
+end
+
+class ScaffoldPerson < ActionWebService::Struct
+  member :id,   :int
+  member :name, :string
+
+  def ==(other)
+    self.id == other.id && self.name == other.name
+  end
+end
+
+class ScaffoldedControllerTestAPI < ActionWebService::API::Base
+  api_method :hello, :expects => [{:integer=>:int}, :string], :returns => [:bool]
+  api_method :bye,   :returns => [[ScaffoldPerson]]
+end
+
+class ScaffoldedController < ActionController::Base
+  web_service_api ScaffoldedControllerTestAPI
+  web_service_scaffold :scaffold_invoke
+
+  def hello(int, string)
+    0
+  end
+
+  def bye
+    [ScaffoldPerson.new(:id => 1, :name => "leon"), ScaffoldPerson.new(:id => 2, :name => "paul")]
+  end
+
+  def rescue_action(e)
+    raise e
+  end
+end
+
+class ScaffoldedControllerTest < Test::Unit::TestCase
+  def setup
+    @controller = ScaffoldedController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  def test_scaffold_invoke
+    get :scaffold_invoke
+    assert_rendered_file 'methods.rhtml'
+  end
+
+  def test_scaffold_invoke_method_params
+    get :scaffold_invoke_method_params, :service => 'scaffolded', :method => 'Hello'
+    assert_rendered_file 'parameters.rhtml'
+  end
+
+  def test_scaffold_invoke_submit_hello
+    post :scaffold_invoke_submit, :service => 'scaffolded', :method => 'Hello', :method_params => ['5', 'hello world']
+    assert_rendered_file 'result.rhtml'
+    assert_equal false, @controller.instance_eval{ @method_return_value }
+  end
+
+  def test_scaffold_invoke_submit_bye
+    post :scaffold_invoke_submit, :service => 'scaffolded', :method => 'Bye'
+    assert_rendered_file 'result.rhtml'
+    persons = [ScaffoldPerson.new(:id => 1, :name => "leon"), ScaffoldPerson.new(:id => 2, :name => "paul")]
+    assert_equal persons, @controller.instance_eval{ @method_return_value }
+  end
+end

data/test/struct_test.rb

@@ -11,30 +11,42 @@ module StructTest
 end
 
 class TC_Struct < Test::Unit::TestCase
+  include StructTest
+
+  def setup
+    @struct = Struct.new(:id      => 5,
+                         :name    => 'hello',
+                         :items   => ['one', 'two'],
+                         :deleted => true,
+                         :emails  => ['test@test.com'])
+  end
+
   def test_members
-    assert_equal(5, StructTest::Struct.members.size)
-    assert_equal(Integer, StructTest::Struct.members[:id])
-    assert_equal(String, StructTest::Struct.members[:name])
-    assert_equal([String], StructTest::Struct.members[:items])
-    assert_equal(TrueClass, StructTest::Struct.members[:deleted])
-    assert_equal([String], StructTest::Struct.members[:emails])
+    assert_equal(5, Struct.members.size)
+    assert_equal(Integer, Struct.members[:id].type_class)
+    assert_equal(String, Struct.members[:name].type_class)
+    assert_equal(String, Struct.members[:items].element_type.type_class)
+    assert_equal(TrueClass, Struct.members[:deleted].type_class)
+    assert_equal(String, Struct.members[:emails].element_type.type_class)
   end
 
   def test_initializer_and_lookup
-    s = StructTest::Struct.new(:id      => 5,
-                               :name    => 'hello',
-                               :items   => ['one', 'two'],
-                               :deleted => true,
-                               :emails  => ['test@test.com'])
-    assert_equal(5, s.id)
-    assert_equal('hello', s.name)
-    assert_equal(['one', 'two'], s.items)
-    assert_equal(true, s.deleted)
-    assert_equal(['test@test.com'], s.emails)
-    assert_equal(5, s['id'])
-    assert_equal('hello', s['name'])
-    assert_equal(['one', 'two'], s['items'])
-    assert_equal(true, s['deleted'])
-    assert_equal(['test@test.com'], s['emails'])
+    assert_equal(5, @struct.id)
+    assert_equal('hello', @struct.name)
+    assert_equal(['one', 'two'], @struct.items)
+    assert_equal(true, @struct.deleted)
+    assert_equal(['test@test.com'], @struct.emails)
+    assert_equal(5, @struct['id'])
+    assert_equal('hello', @struct['name'])
+    assert_equal(['one', 'two'], @struct['items'])
+    assert_equal(true, @struct['deleted'])
+    assert_equal(['test@test.com'], @struct['emails'])
+  end
+
+  def test_each_pair
+    @struct.each_pair do |name, value|
+      assert_equal @struct.__send__(name), value
+      assert_equal @struct[name], value
+    end
   end
 end

data/test/test_invoke_test.rb

@@ -65,7 +65,7 @@ class TestInvokeTest < Test::Unit::TestCase
   end
 
   def test_layered_add
-    @protocol = :xmlrpc
+    @protocol = ActionWebService::Protocol::XmlRpc::XmlRpcProtocol.new
     @controller = TestInvokeLayeredController.new
     [:one, :two].each do |service|
       assert_equal nil, @controller.web_service_object(service).invoked

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: actionwebservice
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
-date: 2005-03-27
+  version: 0.7.0
+date: 2005-04-19
 summary: Web service support for Action Pack.
 require_paths: 
   - lib
@@ -55,9 +55,9 @@ files:
   - examples/metaWeblog/controllers/xmlrpc_controller.rb
   - lib/action_web_service
   - lib/action_web_service.rb
-  - lib/action_web_service/api
   - 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
@@ -67,11 +67,11 @@ files:
   - 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/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
@@ -82,29 +82,24 @@ files:
   - 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/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
+  - 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
@@ -113,19 +108,11 @@ files:
   - test/gencov
   - test/invocation_test.rb
   - test/run
+  - test/scaffolded_controller_test.rb
   - 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: []
@@ -142,7 +129,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.7.0
+            version: 1.8.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: activerecord
@@ -152,7 +139,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.9.1
+            version: 1.10.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: activesupport
@@ -162,5 +149,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.3
+            version: 1.0.4
       version: