actionwebservice 0.6.1 → 0.6.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+*0.6.2* (27th March, 2005)
+
+* Allow method declarations for direct dispatching to declare parameters as well. We treat an arity of < 0 or > 0 as an indication that we should send through parameters. Closes #939.
+
+
 *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

data/Rakefile

@@ -9,10 +9,15 @@ require 'fileutils'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionwebservice'
-PKG_VERSION   = '0.6.1' + PKG_BUILD
+PKG_VERSION   = '0.6.2' + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
+RELEASE_NAME  = "REL #{PKG_VERSION}"
+
+RUBY_FORGE_PROJECT = "aws"
+RUBY_FORGE_USER    = "webster132"
+
 desc "Default Task"
 task :default => [ :test ]
 
@@ -30,6 +35,7 @@ Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Action Web Service -- Web services for Action Pack"
   rdoc.options << '--line-numbers --inline-source --main README --accessor class_inheritable_option=RW'
+  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('CHANGELOG')
   rdoc.rdoc_files.include('lib/action_web_service.rb')
@@ -56,9 +62,9 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "aws"
   s.homepage = "http://www.rubyonrails.org"
 
-  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.add_dependency('actionpack', '= 1.7.0' + PKG_BUILD)
+  s.add_dependency('activerecord', '= 1.9.1' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.0.3' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'
@@ -144,3 +150,118 @@ task :lines do
   puts "Total:"
   puts "  Lines #{total_lines}, LOC #{total_loc}"
 end
+
+desc "Publish the release files to RubyForge."
+task :release => [:package] do
+  files = ["gem", "tgz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
+
+  if RUBY_FORGE_PROJECT then
+    require 'net/http'
+    require 'open-uri'
+
+    project_uri = "http://rubyforge.org/projects/#{RUBY_FORGE_PROJECT}/"
+    project_data = open(project_uri) { |data| data.read }
+    group_id = project_data[/[?&]group_id=(\d+)/, 1]
+    raise "Couldn't get group id" unless group_id
+
+    # This echos password to shell which is a bit sucky
+    if ENV["RUBY_FORGE_PASSWORD"]
+      password = ENV["RUBY_FORGE_PASSWORD"]
+    else
+      print "#{RUBY_FORGE_USER}@rubyforge.org's password: "
+      password = STDIN.gets.chomp
+    end
+
+    login_response = Net::HTTP.start("rubyforge.org", 80) do |http|
+      data = [
+        "login=1",
+        "form_loginname=#{RUBY_FORGE_USER}",
+        "form_pw=#{password}"
+      ].join("&")
+      http.post("/account/login.php", data)
+    end
+
+    cookie = login_response["set-cookie"]
+    raise "Login failed" unless cookie
+    headers = { "Cookie" => cookie }
+
+    release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
+    release_data = open(release_uri, headers) { |data| data.read }
+    package_id = release_data[/[?&]package_id=(\d+)/, 1]
+    raise "Couldn't get package id" unless package_id
+
+    first_file = true
+    release_id = ""
+
+    files.each do |filename|
+      basename  = File.basename(filename)
+      file_ext  = File.extname(filename)
+      file_data = File.open(filename, "rb") { |file| file.read }
+
+      puts "Releasing #{basename}..."
+
+      release_response = Net::HTTP.start("rubyforge.org", 80) do |http|
+        release_date = Time.now.strftime("%Y-%m-%d %H:%M")
+        type_map = {
+          ".zip"    => "3000",
+          ".tgz"    => "3110",
+          ".gz"     => "3110",
+          ".gem"    => "1400"
+        }; type_map.default = "9999"
+        type = type_map[file_ext]
+        boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
+
+        query_hash = if first_file then
+          {
+            "group_id" => group_id,
+            "package_id" => package_id,
+            "release_name" => RELEASE_NAME,
+            "release_date" => release_date,
+            "type_id" => type,
+            "processor_id" => "8000", # Any
+            "release_notes" => "",
+            "release_changes" => "",
+            "preformatted" => "1",
+            "submit" => "1"
+          }
+        else
+          {
+            "group_id" => group_id,
+            "release_id" => release_id,
+            "package_id" => package_id,
+            "step2" => "1",
+            "type_id" => type,
+            "processor_id" => "8000", # Any
+            "submit" => "Add This File"
+          }
+        end
+
+        query = "?" + query_hash.map do |(name, value)|
+          [name, URI.encode(value)].join("=")
+        end.join("&")
+
+        data = [
+          "--" + boundary,
+          "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
+          "Content-Type: application/octet-stream",
+          "Content-Transfer-Encoding: binary",
+          "", file_data, ""
+          ].join("\x0D\x0A")
+
+        release_headers = headers.merge(
+          "Content-Type" => "multipart/form-data; boundary=#{boundary}"
+        )
+
+        target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
+        http.post(target + query, data, release_headers)
+      end
+
+      if first_file then
+        release_id = release_response.body[/release_id=(\d+)/, 1]
+        raise("Couldn't get release id") unless release_id
+      end
+
+      first_file = false
+    end
+  end
+end

data/lib/action_web_service.rb

@@ -27,9 +27,9 @@ begin
   require 'active_record'
 rescue LoadError
   require 'rubygems'
-  require_gem 'activesupport', '>= 0.9.0'
-  require_gem 'actionpack', '>= 1.4.0'
-  require_gem 'activerecord', '>= 1.6.0'
+  require_gem 'activesupport', '>= 1.0.2'
+  require_gem 'actionpack', '>= 1.6.0'
+  require_gem 'activerecord', '>= 1.9.0'
 end
 
 $:.unshift(File.dirname(__FILE__) + "/action_web_service/vendor/")

data/lib/action_web_service/container/action_controller_container.rb

@@ -64,7 +64,8 @@ module ActionWebService # :nodoc:
               require_dependency(file_name)
             rescue LoadError => load_error
               requiree = / -- (.*?)(\.rb)?$/.match(load_error).to_a[1]
-              raise LoadError, requiree == file_name ? "Missing API definition file in apis/#{file_name}.rb" : "Can't load file: #{requiree}"
+              msg = requiree == file_name ? "Missing API definition file in apis/#{file_name}.rb" : "Can't load file: #{requiree}"
+              raise LoadError.new(msg).copy_blame!(load_error)
             end
             klass = nil
             class_names.each do |name|
@@ -83,8 +84,10 @@ module ActionWebService # :nodoc:
         private
           def inherited(child)
             inherited_without_api(child)
-            child.web_service_api(child.controller_path)
-          rescue Exception => e
+            begin child.web_service_api(child.controller_path)
+            rescue MissingSourceFile => e
+              raise unless e.is_missing?("apis/#{child.controller_path}_api")
+            end
           end
       end
     end

data/lib/action_web_service/dispatcher/abstract.rb

@@ -34,7 +34,12 @@ module ActionWebService # :nodoc:
       
         def web_service_direct_invoke(invocation)
           @method_params = invocation.method_ordered_params
-          return_value = self.__send__(invocation.api_method_name)
+          arity = method(invocation.api_method_name).arity rescue 0
+          if arity < 0 || arity > 0
+            return_value = self.__send__(invocation.api_method_name, *@method_params)
+          else
+            return_value = self.__send__(invocation.api_method_name)
+          end
           if invocation.api.has_api_method?(invocation.api_method_name)
             returns = invocation.returns ? invocation.returns[0] : nil
           else

data/test/abstract_dispatcher.rb

@@ -40,6 +40,7 @@ module DispatcherTest
 
   class DirectAPI < ActionWebService::API::Base
     api_method :add, :expects => [{:a=>:int}, {:b=>:int}], :returns => [:int]
+    api_method :add2, :expects => [{:a=>:int}, {:b=>:int}], :returns => [:int]
     api_method :before_filtered
     api_method :after_filtered, :returns => [[:int]]
     api_method :struct_return, :returns => [[Node]]
@@ -141,6 +142,7 @@ module DispatcherTest
     after_filter :alwaysok, :only => [:after_filtered]
 
     attr :added
+    attr :added2
     attr :before_filter_called
     attr :before_filter_target_called
     attr :after_filter_called
@@ -159,6 +161,10 @@ module DispatcherTest
       @added = @params['a'] + @params['b']
     end
 
+    def add2(a, b)
+      @added2 = a + b
+    end
+
     def before_filtered
       @before_filter_target_called = true
     end
@@ -212,6 +218,8 @@ module DispatcherCommonTests
   def test_direct_dispatching
     assert_equal(70, do_method_call(@direct_controller, 'Add', 20, 50))
     assert_equal(70, @direct_controller.added)
+    assert_equal(50, do_method_call(@direct_controller, 'Add2', 25, 25))
+    assert_equal(50, @direct_controller.added2)
     assert(@direct_controller.void_called == false)
     case @encoder
     when WS::Encoding::SoapRpcEncoding

data/test/dispatcher_action_controller_soap_test.rb

@@ -2,6 +2,18 @@ $:.unshift(File.dirname(__FILE__) + '/apis')
 require File.dirname(__FILE__) + '/abstract_dispatcher'
 require 'wsdl/parser'
 
+class ActionController::Base
+  class << self
+    alias :inherited_without_name_error :inherited
+    def inherited(child)
+      begin
+        inherited_without_name_error(child)
+      rescue NameError => e
+      end
+    end
+  end
+end
+
 class AutoLoadController < ActionController::Base; end
 class FailingAutoLoadController < ActionController::Base; end
 class BrokenAutoLoadController < ActionController::Base; end
@@ -39,7 +51,7 @@ class TC_DispatcherActionControllerSoap < Test::Unit::TestCase
     assert(!AutoLoadController.web_service_api.nil?)
     assert(AutoLoadController.web_service_api.has_public_api_method?('Void'))
     assert(FailingAutoLoadController.web_service_api.nil?)
-    assert_raises(LoadError, NameError) do
+    assert_raises(MissingSourceFile) do
       FailingAutoLoadController.require_web_service_api :blah
     end
     assert_raises(ArgumentError) do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.8
 specification_version: 1
 name: actionwebservice
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
-date: 2005-03-22
+  version: 0.6.2
+date: 2005-03-27
 summary: Web service support for Action Pack.
 require_paths: 
   - lib
@@ -142,7 +142,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.6.0
+            version: 1.7.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: activerecord
@@ -152,7 +152,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.9.0
+            version: 1.9.1
       version: 
   - !ruby/object:Gem::Dependency 
     name: activesupport
@@ -162,5 +162,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.2
+            version: 1.0.3
       version: