phprpc 3.0.1 → 3.0.2

data/lib/phprpc/client.rb

@@ -25,7 +25,7 @@
 #
 # Copyright (C) 2005-2008 Ma Bingyao <andot@ujn.edu.cn>
 # Version: 3.0
-# LastModified: Sep 15, 2008
+# LastModified: Oct 6, 2008
 # This library is free.  You can redistribute it and/or modify it.
 
 require "net/http"
@@ -50,6 +50,7 @@ module PHPRPC
       Net::HTTP.version_1_2
       @httpclient = nil
       @http = Net::HTTP
+      @uri = nil
       if url then
         @uri = URI.parse(url)
       end
@@ -62,35 +63,32 @@ module PHPRPC
       @cookie = ''
       @cookies = {}
       @charset = 'utf-8'
-      @username = nil
-      @password = nil
       @server_version = nil
     end
 
-    def use_service(url, username = nil, password = nil)
-      close
-      @httpclient = nil
-      @uri = URI.parse(url)
-      @key = nil
-      @keylength = 128
-      @encryptmode = 0
-      @cookie = ''
-      @cookies = {}
-      @charset = 'utf-8'
-      @username = username
-      @password = password
+    def use_service(url = nil, username = nil, password = nil)
+      if url then
+        close
+        @uri = URI.parse(url)
+        @key = nil
+        @keylength = 128
+        @encryptmode = 0
+        @cookie = ''
+        @cookies = {}
+        @charset = 'utf-8'
+        @uri.user = username unless username.nil?
+        @uri.password = password unless password.nil?
+      end
       Proxy.new(self)
     end
 
     def set_proxy(p_addr, p_port = nil, p_user = nil, p_pass = nil)
       close
-      @httpclient = nil
       @http = Net::HTTP::Proxy(p_addr, p_port, p_user, p_pass)
     end
 
     def proxy=(proxy)
       close
-      @httpclient = nil
       @http = case proxy
       when Net::HTTP then
         proxy
@@ -124,7 +122,7 @@ module PHPRPC
         request = "phprpc_func=#{methodname}"
         request << '&phprpc_args=' << [_encrypt(PHP::Formator.serialize(args), 1)].pack('m').delete!("\n").gsub('+', '%2B') if args.size > 0
         request << "&phprpc_encrypt=#{@encryptmode}"
-        request << '&phprpc_ref=false' if not byref
+        request << '&phprpc_ref=false' unless byref
         result = _post(request)
         if result.key?('phprpc_errstr') and result.key?('phprpc_errno') then
           @warning = PHPRPC::Error.new(result['phprpc_errstr'].unpack('m')[0])
@@ -161,6 +159,7 @@ module PHPRPC
     
     def close
       @httpclient.finish if (not @httpclient.nil?) and @httpclient.started?
+      @httpclient = nil
     end
 
     private
@@ -178,14 +177,14 @@ module PHPRPC
         @httpclient.start
       end
       headers = {
-        'Cookie' => @cookie,
         'User-Agent' => "PHPRPC 3.0 Client for Ruby (#{RUBY_VERSION})",
         'Cache-Control' => 'no-cache',
         'Content-Type' => "application/x-www-form-urlencoded; charset=#{@charset}",
         'Content-Length' => req.size.to_s,
         'Connection' => 'keep-alive',
       }
-      headers.delete('Cookie') if @cookie.nil? or @cookie.empty?
+      headers['Cookie'] = @cookie unless @cookie.empty?
+      headers['Authorization'] = 'Basic ' << ["#{@uri.user}:#{@uri.password}"].pack('m').delete!("\n") unless @uri.user.nil? or @uri.password.nil?
       resp, data = @httpclient.request_post(@uri.path, req, headers)
       if resp.code == '200' then
         if resp.key?('x-powered-by') then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: phprpc
 version: !ruby/object:Gem::Version 
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors: 
 - MA Bingyao ( andot )
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-30 00:00:00 +08:00
+date: 2008-10-06 00:00:00 +08:00
 default_executable: 
 dependencies: []