actionwebservice 0.6.0 → 0.6.1

data/CHANGELOG

@@ -1,3 +1,16 @@
+*0.6.1* (22th March, 2005)
+
+* Fix that method response QNames mismatched with that declared in the WSDL, makes SOAP::WSDLDriverFactory work against AWS again
+
+* Fix that @request.env was being modified, instead, dup the value gotten from env
+
+* Fix XML-RPC example to use :layered mode, so it works again
+
+* Support casting '0' or 0 into false, and '1' or 1 into true, when expecting a boolean value
+
+* Fix that SOAP fault response fault code values were not QName's #804
+
+
 *0.6.0* (7th March, 2005)
 
 * Add action_controller/test_invoke, used for integrating AWS with the Rails testing infrastructure
@@ -18,6 +31,7 @@
 
 * Replace '::' with '..' in fully qualified type names for marshaling and WSDL. This improves interoperability with .NET, and closes #676.
 
+
 *0.5.0* (24th February, 2005)
 
 	* lib/action_service/dispatcher*: replace "router" fragments with

data/Rakefile

@@ -9,7 +9,7 @@ require 'fileutils'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionwebservice'
-PKG_VERSION   = '0.6.0' + PKG_BUILD
+PKG_VERSION   = '0.6.1' + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
@@ -56,9 +56,9 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "aws"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '>= 1.5.1' + PKG_BUILD)
-  s.add_dependency('activerecord', '>= 1.8.0' + PKG_BUILD)
-  s.add_dependency('activesupport', '>= 1.0.1' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 1.6.0' + PKG_BUILD)
+  s.add_dependency('activerecord', '= 1.9.0' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.0.2' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'

data/TODO

@@ -1,7 +1,6 @@
 = 0.7.0
-  - WS Test Integration
-  - WS Scaffolding
-  - WS Generators
+  - WS Dynamic Scaffolding
+  - WS Scaffolding Generators
 
 = 0.8.0
   - Consumption of WSDL services

data/examples/metaWeblog/README

@@ -1,16 +1,17 @@
 = metaWeblog example
 
-
 This example shows how one might begin to go about adding metaWeblog
 (http://www.xmlrpc.com/metaWeblogApi) API support to a Rails-based
 blogging application.
 
+The example APIs are more verbose than you may want to make them, for documentation
+reasons.
 
 = Running
 
-  1. Copy blog_controller.rb to "app/controllers" in a Rails project.
+  1. Copy the "apis" directory and its files into "app" in a Rails project.
 
+  2. Copy the "controllers" directory and its files into "app" in a Rails project
 
-  2. Fire up a desktop blogging application (such as BloGTK on Linux),
-     point it at http://localhost:3000/blog/api, and try creating or
-     editing blog posts.
+  3. Fire up a desktop blogging application (such as w.bloggar, MarsEdit, or BloGTK),
+     point it at http://localhost:3000/xmlrpc/api, and try creating or editing blog posts.

data/examples/metaWeblog/apis/blogger_api.rb

@@ -0,0 +1,60 @@
+#
+# see the blogger API spec at http://www.blogger.com/developers/api/1_docs/
+# note that the method signatures are subtly different to metaWeblog, they
+# are not identical. take care to ensure you handle the different semantics
+# properly if you want to support blogger API too, to get maximum compatibility.
+#
+
+module Blog
+  class Blog < ActionWebService::Struct
+    member :url,      :string
+    member :blogid,   :string
+    member :blogName, :string
+  end
+
+  class User < ActionWebService::Struct
+    member :nickname,  :string
+    member :userid,    :string
+    member :url,       :string
+    member :email,     :string
+    member :lastname,  :string
+    member :firstname, :string
+  end
+end
+
+#
+# blogger
+#
+class BloggerAPI < ActionWebService::API::Base
+  inflect_names false
+
+  api_method :newPost, :returns => [:string], :expects => [
+    {:appkey=>:string},
+    {:blogid=>:string},
+    {:username=>:string},
+    {:password=>:string},
+    {:content=>:string},
+    {:publish=>:bool}
+  ]
+
+  api_method :editPost, :returns => [:bool], :expects => [
+    {:appkey=>:string},
+    {:postid=>:string},
+    {:username=>:string},
+    {:password=>:string},
+    {:content=>:string},
+    {:publish=>:bool}
+  ]
+
+  api_method :getUsersBlogs, :returns => [[Blog::Blog]], :expects => [
+    {:appkey=>:string},
+    {:username=>:string},
+    {:password=>:string}
+  ]
+
+  api_method :getUserInfo, :returns => [Blog::User], :expects => [
+    {:appkey=>:string},
+    {:username=>:string},
+    {:password=>:string}
+  ]
+end

data/examples/metaWeblog/apis/blogger_service.rb

@@ -0,0 +1,34 @@
+require 'blogger_api'
+
+class BloggerService < ActionWebService::Base
+  web_service_api BloggerAPI
+
+  def initialize
+    @postid = 0
+  end
+
+  def newPost(key, id, user, pw, content, publish)
+    $stderr.puts "id=#{id} user=#{user} pw=#{pw}, content=#{content.inspect} [#{publish}]"
+    (@postid += 1).to_s
+  end
+
+  def editPost(key, post_id, user, pw, content, publish)
+    $stderr.puts "id=#{post_id} user=#{user} pw=#{pw} content=#{content.inspect} [#{publish}]"
+    true
+  end
+
+  def getUsersBlogs(key, user, pw)
+    $stderr.puts "getting blogs for #{user}"
+    blog = Blog::Blog.new(
+      :url =>'http://blog',
+      :blogid => 'myblog',
+      :blogName => 'My Blog'
+    )
+    [blog]
+  end
+
+  def getUserInfo(key, user, pw)
+    $stderr.puts "getting user info for #{user}"
+    Blog::User.new(:nickname => 'user', :email => 'user@test.com')
+  end
+end

data/examples/metaWeblog/apis/meta_weblog_api.rb

@@ -0,0 +1,67 @@
+# 
+# here lie structures, cousins of those on http://www.xmlrpc.com/metaWeblog
+# but they don't necessarily the real world reflect
+# so if you do, find that your client complains:
+# please tell, of problems you suffered through
+#
+
+module Blog
+  class Post < ActionWebService::Struct
+    member :title,       :string
+    member :link,        :string
+    member :description, :string
+    member :author,      :string
+    member :category,    :string
+    member :comments,    :string
+    member :guid,        :string
+    member :pubDate,     :string
+  end
+
+  class Category < ActionWebService::Struct
+    member :description, :string
+    member :htmlUrl,     :string
+    member :rssUrl,      :string
+  end
+end
+
+#
+# metaWeblog
+#
+class MetaWeblogAPI < ActionWebService::API::Base
+  inflect_names false
+
+  api_method :newPost, :returns => [:string], :expects => [
+    {:blogid=>:string},
+    {:username=>:string},
+    {:password=>:string},
+    {:struct=>Blog::Post},
+    {:publish=>:bool}
+  ]
+
+  api_method :editPost, :returns => [:bool], :expects => [
+    {:postid=>:string},
+    {:username=>:string},
+    {:password=>:string},
+    {:struct=>Blog::Post},
+    {:publish=>:bool},
+  ]
+
+  api_method :getPost, :returns => [Blog::Post], :expects => [
+    {:postid=>:string},
+    {:username=>:string},
+    {:password=>:string},
+  ]
+
+  api_method :getCategories, :returns => [[Blog::Category]], :expects => [
+    {:blogid=>:string},
+    {:username=>:string},
+    {:password=>:string},
+  ]
+
+  api_method :getRecentPosts, :returns => [[Blog::Post]], :expects => [
+    {:blogid=>:string},
+    {:username=>:string},
+    {:password=>:string},
+    {:numberOfPosts=>:int},
+  ]
+end

data/examples/metaWeblog/apis/meta_weblog_service.rb

@@ -0,0 +1,48 @@
+require 'meta_weblog_api'
+
+class MetaWeblogService < ActionWebService::Base
+  web_service_api MetaWeblogAPI
+
+  def initialize
+    @postid = 0
+  end
+
+  def newPost(id, user, pw, struct, publish)
+    $stderr.puts "id=#{id} user=#{user} pw=#{pw}, struct=#{struct.inspect} [#{publish}]"
+    (@postid += 1).to_s
+  end
+
+  def editPost(post_id, user, pw, struct, publish)
+    $stderr.puts "id=#{post_id} user=#{user} pw=#{pw} struct=#{struct.inspect} [#{publish}]"
+    true
+  end
+
+  def getPost(post_id, user, pw)
+    $stderr.puts "get post #{post_id}"
+    Blog::Post.new(:title => 'hello world', :description => 'first post!')
+  end
+
+  def getCategories(id, user, pw)
+    $stderr.puts "categories for #{user}"
+    cat = Blog::Category.new(
+      :description => 'Tech',
+      :htmlUrl     => 'http://blog/tech',
+      :rssUrl      => 'http://blog/tech.rss')
+    [cat]
+  end
+
+  def getRecentPosts(id, user, pw, num)
+    $stderr.puts "recent #{num} posts for #{user} on blog #{id}"
+    post1 = Blog::Post.new(
+      :title => 'first post!',
+      :link => 'http://blog.xeraph.org/testOne.html',
+      :description => 'this is the first post'
+    )
+    post2 = Blog::Post.new(
+      :title => 'second post!',
+      :link => 'http://blog.xeraph.org/testTwo.html',
+      :description => 'this is the second post'
+    )
+    [post1, post2]
+  end
+end

data/examples/metaWeblog/controllers/xmlrpc_controller.rb

@@ -0,0 +1,16 @@
+#
+# example controller implementing both blogger and metaWeblog APIs
+# in a way that should be compatible with clients supporting both/either.
+#
+# test by pointing your client at http://URL/xmlrpc/api
+# 
+
+require 'meta_weblog_service'
+require 'blogger_service'
+
+class XmlrpcController < ApplicationController
+  web_service_dispatching_mode :layered
+
+  web_service :metaWeblog, MetaWeblogService.new
+  web_service :blogger, BloggerService.new
+end

data/lib/action_web_service/protocol/soap_protocol.rb

@@ -28,7 +28,7 @@ module ActionWebService # :nodoc:
           else
             return_value = nil
           end
-          body = @encoder.encode_rpc_response(method_name, return_value)
+          body = @encoder.encode_rpc_response(method_name + 'Response', return_value)
           Response.new(body, 'text/xml')
         end
 
@@ -46,6 +46,7 @@ module ActionWebService # :nodoc:
             return nil unless request.method == :post
             soap_action = request.env['HTTP_SOAPACTION']
             return nil unless soap_action
+            soap_action = soap_action.dup
             soap_action.gsub!(/^"/, '')
             soap_action.gsub!(/"$/, '')
             soap_action.strip!

data/lib/action_web_service/test_invoke.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
 
-module Test
-  module Unit
+module Test # :nodoc:
+  module Unit # :nodoc:
     class TestCase # :nodoc:
       private
         # invoke the specified API method

data/lib/action_web_service/vendor/ws/marshaling/soap_marshaling.rb

@@ -23,7 +23,7 @@ module WS
         if param.value.is_a?(Exception)
           detail = SOAP::Mapping::SOAPException.new(param.value)
           soap_obj = SOAP::SOAPFault.new(
-            SOAP::SOAPString.new('Server'),
+            SOAP::SOAPQName.new('%s:%s' % [SOAP::SOAPNamespaceTag, 'Server']),
             SOAP::SOAPString.new(param.value.to_s),
             SOAP::SOAPString.new(self.class.name),
             SOAP::Mapping.obj2soap(detail))

data/lib/action_web_service/vendor/ws/types.rb

@@ -146,6 +146,9 @@ module WS
           value.to_s
         when :bool
           return false if value.nil?
+          int_value = Integer(value) rescue nil
+          return true if int_value == 1
+          return false if int_value == 0
           value = value.to_s
           return true if value == 'true'
           return false if value == 'false'

data/test/ws/types_test.rb

@@ -27,6 +27,8 @@ class TypesTest < Test::Unit::TestCase
     assert_equal('50.0', @caster.cast(50.0, String))
     assert_equal(true, @caster.cast('true', FalseClass))
     assert_equal(false, @caster.cast('false', TrueClass))
+    assert_equal(true, @caster.cast(1, FalseClass))
+    assert_equal(false, @caster.cast(0, TrueClass))
     assert_raises(TypeError) do
       @caster.cast('yes', FalseClass)
     end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.6
+rubygems_version: 0.8.8
 specification_version: 1
 name: actionwebservice
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2005-03-07
+  version: 0.6.1
+date: 2005-03-22
 summary: Web service support for Action Pack.
 require_paths: 
   - lib
@@ -45,8 +45,14 @@ files:
   - examples/googlesearch/delegated/search_controller.rb
   - examples/googlesearch/direct/google_search_api.rb
   - examples/googlesearch/direct/search_controller.rb
-  - examples/metaWeblog/blog_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
@@ -134,9 +140,9 @@ dependencies:
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
-          - ">="
+          - "="
           - !ruby/object:Gem::Version 
-            version: 1.5.1
+            version: 1.6.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: activerecord
@@ -144,9 +150,9 @@ dependencies:
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
-          - ">="
+          - "="
           - !ruby/object:Gem::Version 
-            version: 1.8.0
+            version: 1.9.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: activesupport
@@ -154,7 +160,7 @@ dependencies:
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
-          - ">="
+          - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.1
+            version: 1.0.2
       version: 

data/examples/metaWeblog/blog_controller.rb

@@ -1,127 +0,0 @@
-# point your client at http://project_url/blog/api to test
-# this
-
-# structures as defined by the metaWeblog/blogger
-# specifications.
-module Blog
-  class Enclosure < ActionWebService::Struct
-    member :url,    :string
-    member :length, :int
-    member :type,   :string
-  end
-
-  class Source < ActionWebService::Struct
-    member :url,  :string
-    member :name, :string
-  end
-
-  class Post < ActionWebService::Struct
-    member :title,       :string
-    member :link,        :string
-    member :description, :string
-    member :author,      :string
-    member :category,    :string
-    member :comments,    :string
-    member :enclosure,   Enclosure
-    member :guid,        :string
-    member :pubDate,     :string
-    member :source,      Source
-  end
-
-  class Blog < ActionWebService::Struct
-    member :url,      :string
-    member :blogid,   :string
-    member :blogName, :string
-  end
-end
-
-# skeleton metaWeblog API
-class MetaWeblogAPI < ActionWebService::API::Base
-  inflect_names false
-
-  api_method :newPost, :returns => [:string], :expects => [
-    {:blogid=>:string},
-    {:username=>:string},
-    {:password=>:string},
-    {:struct=>Blog::Post},
-    {:publish=>:bool},
-  ]
-
-  api_method :editPost, :returns => [:bool], :expects => [
-    {:postid=>:string},
-    {:username=>:string},
-    {:password=>:string},
-    {:struct=>Blog::Post},
-    {:publish=>:bool},
-  ]
-
-  api_method :getPost, :returns => [Blog::Post], :expects => [
-    {:postid=>:string},
-    {:username=>:string},
-    {:password=>:string},
-  ]
-
-  api_method :getUsersBlogs, :returns => [[Blog::Blog]], :expects => [
-    {:appkey=>:string},
-    {:username=>:string},
-    {:password=>:string},
-  ]
-
-  api_method :getRecentPosts, :returns => [[Blog::Post]], :expects => [
-    {:blogid=>:string},
-    {:username=>:string},
-    {:password=>:string},
-    {:numberOfPosts=>:int},
-  ]
-end
-
-class BlogController < ApplicationController
-  web_service_api MetaWeblogAPI
-
-  def initialize
-    @postid = 0
-  end
-
-  def newPost
-    $stderr.puts 'Creating post: username=%s password=%s struct=%s' % [
-      @params['username'],
-      @params['password'],
-      @params['struct'].inspect
-    ]
-    (@postid += 1).to_s
-  end
-
-  def editPost
-    $stderr.puts 'Editing post: username=%s password=%s struct=%s' % [
-      @params['username'],
-      @params['password'],
-      @params['struct'].inspect
-    ]
-    true
-  end
-
-  def getUsersBlogs
-    $stderr.puts "Returning user %s's blogs" % @params['username']
-    blog = Blog::Blog.new(
-      :url =>'http://blog.xeraph.org',
-      :blogid => 'sttm',
-      :blogName => 'slave to the machine'
-    )
-    [blog]
-  end
-
-  def getRecentPosts
-    $stderr.puts "Returning recent posts (%d requested)" % @params['numberOfPosts']
-    post1 = Blog::Post.new(
-      :title => 'first post!',
-      :link => 'http://blog.xeraph.org/testOne.html',
-      :description => 'this is the first post'
-    )
-    post2 = Blog::Post.new(
-      :title => 'second post!',
-      :link => 'http://blog.xeraph.org/testTwo.html',
-      :description => 'this is the second post'
-    )
-    [post1, post2]
-  end
-end