handsoap 1.1.4 → 1.1.5

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 1
-:patch: 4
+:patch: 5
 :build: 

data/lib/handsoap/http/drivers/curb_driver.rb

@@ -19,12 +19,18 @@ module Handsoap
           if @curl
             @curl.url = url
           else
-            @curl = ::Curl::Easy.new(url)
-            @curl.timeout = Handsoap.timeout
-            @curl.enable_cookies = @enable_cookies
+            @curl                 = ::Curl::Easy.new(url)
+            @curl.timeout         = Handsoap.timeout
+            @curl.enable_cookies  = @enable_cookies
+            
+            if Handsoap.follow_redirects?
+              @curl.follow_location = true
+              @curl.max_redirects   = Handsoap.max_redirects
+            end
           end
           @curl
         end
+        
         private :get_curl
 
         def send_http_request(request)

data/lib/handsoap/http/drivers/http_client_driver.rb

@@ -16,6 +16,8 @@ module Handsoap
             domain = request.url.match(/^(http(s?):\/\/[^\/]+\/)/)[1]
             http_client.set_auth(domain, request.username, request.password)
           end
+          http_client.ssl_config.set_trust_ca(request.trust_ca_file) if request.trust_ca_file
+          http_client.ssl_config.set_client_cert_file(request.client_cert_file,request.client_cert_key_file) if request.client_cert_file and request.client_cert_key_file
           # pack headers
           headers = request.headers.inject([]) do |arr, (k,v)|
             arr + v.map {|x| [k,x] }

data/lib/handsoap/http/request.rb

@@ -5,7 +5,7 @@ module Handsoap
 
     # Represents a HTTP Request.
     class Request
-      attr_reader :url, :http_method, :headers, :body, :username, :password
+      attr_reader :url, :http_method, :headers, :body, :username, :password, :trust_ca_file, :client_cert_file, :client_cert_key_file
       attr_writer :body, :http_method
       def initialize(url, http_method = :get)
         @url = url
@@ -14,6 +14,16 @@ module Handsoap
         @body = nil
         @username = nil
         @password = nil
+        @trust_ca_file = nil
+        @client_cert_file = nil
+        @client_cert_key_file = nil
+      end
+      def set_trust_ca_file(ca_file)
+        @trust_ca_file = ca_file
+      end
+      def set_client_cert_files(client_cert_file,client_cert_key_file)
+        @client_cert_file = client_cert_file
+        @client_cert_key_file = client_cert_key_file
       end
       def set_auth(username, password)
         @username = username

data/lib/handsoap/service.rb

@@ -35,6 +35,27 @@ module Handsoap
   def self.timeout
     @timeout || (self.timeout = 60)
   end
+  
+  # Tell Handsoap to follow redirects
+  def self.follow_redirects!
+    @follow_redirects = true
+  end
+  
+  # Check whether Handsoap should follow redirects
+  def self.follow_redirects?
+    @follow_redirects || false
+  end
+  
+  # Sets the max number of redirects
+  def self.max_redirects=(max_redirects)
+    @max_redirects = max_redirects
+  end
+
+  # Fetches the max number of redirects
+  # The default is 1
+  def self.max_redirects
+    @max_redirects || (self.max_redirects = 1)
+  end
 
   # Wraps SOAP errors in a standard class.
   class Fault < StandardError
@@ -203,7 +224,11 @@ module Handsoap
         elsif options[:soap_action] == :none
           options[:soap_action] = nil
         end
-        doc = make_envelope do |body|
+        doc = make_envelope do |body,header|
+          options[:soap_header].each_pair do |k,v|
+            header.add k,v
+          end
+          
           body.add action
         end
         if block_given?
@@ -215,7 +240,7 @@ module Handsoap
         }
         headers["SOAPAction"] = options[:soap_action] unless options[:soap_action].nil?
         on_before_dispatch
-        request = make_http_request(self.uri, doc.to_s, headers)
+        request = make_http_request(self.uri, doc.to_s, headers,options[:http_options])
         response = http_driver_instance.send_http_request(request)
         parse_http_response(response)
       end
@@ -347,8 +372,13 @@ module Handsoap
       end
     end
 
-    def make_http_request(uri, post_body, headers)
+    def make_http_request(uri, post_body, headers,http_options=nil)
       request = Handsoap::Http::Request.new(uri, :post)
+
+      # SSL CA AND CLIENT CERTIFICATES
+      request.set_trust_ca_file(http_options[:trust_ca_file])
+      request.set_client_cert_files(http_options[:client_cert_file],http_options[:client_cert_key_file])
+      
       headers.each do |key, value|
         request.add_header(key, value)
       end
@@ -399,7 +429,7 @@ module Handsoap
       self.class.fire_on_create_document doc # deprecated .. use instance method
       on_create_document(doc)
       if block_given?
-        yield doc.find("Body")
+        yield doc.find("Body"),doc.find("Header")
       end
       return doc
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: handsoap
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - Troels Knak-Nielsen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +01:00
+date: 2010-01-12 00:00:00 +01:00
 default_executable: 
 dependencies: []