handsoap 1.1.7 → 1.1.8

data/DEPLOY.markdown

@@ -7,4 +7,4 @@ To make a release, do:
     rake build
     gem push pkg/handsoap-*.gem
 
-You need `jeweleer` and `gemcutter`, as well as login credentials for gemcutter.
+You need `jeweler` and `gemcutter`, as well as login credentials for gemcutter.

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 7
 :major: 1
 :minor: 1
 :build: 
+:patch: 8

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

@@ -39,6 +39,10 @@ module Handsoap
           if request.username && request.password
             http_client.userpwd = [request.username, ":", request.password].join
           end
+          http_client.cacert = request.trust_ca_file if request.trust_ca_file
+          http_client.cert = request.client_cert_file if request.client_cert_file
+          # I have submitted a patch for this to curb, but it's not yet supported. If you get errors, try upgrading curb.
+          http_client.cert_key = request.client_cert_key_file if 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/drivers/net_http_driver.rb

@@ -32,6 +32,7 @@ module Handsoap
           http_client = Net::HTTP.new(url.host, url.port)
           
           #http_client.read_timeout = 120
+          http_client.open_timeout = Handsoap.timeout
           http_client.read_timeout = Handsoap.timeout
           
           http_client.use_ssl = true if url.scheme == 'https'

data/lib/handsoap/service.rb

@@ -214,7 +214,7 @@ module Handsoap
     # +String+ sends a SOAPAction http header.
     #
     # +nil+ sends no SOAPAction http header.
-    def invoke(action, options = { :soap_action => :auto }, &block) # :yields: Handsoap::XmlMason::Element
+    def invoke(action, options = { :soap_action => :auto, :http_options => nil }, &block) # :yields: Handsoap::XmlMason::Element
       if action
         if options.kind_of? String
           options = { :soap_action => options }
@@ -241,11 +241,11 @@ module Handsoap
         end
         # ready to dispatch
         headers = {
-          "Content-Type" => "#{self.request_content_type};charset=UTF-8"
+          "Content-Type" => "#{self.request_content_type}; charset=UTF-8"
         }
         headers["SOAPAction"] = options[:soap_action] unless options[:soap_action].nil?
         on_before_dispatch
-        request = make_http_request(self.uri, doc.to_s, headers,options[:http_options])
+        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
@@ -287,7 +287,7 @@ module Handsoap
         dispatcher.request_block.call doc.find(action)
         # ready to dispatch
         headers = {
-          "Content-Type" => "#{self.request_content_type};charset=UTF-8"
+          "Content-Type" => "#{self.request_content_type}; charset=UTF-8"
         }
         headers["SOAPAction"] = options[:soap_action] unless options[:soap_action].nil?
         on_before_dispatch
@@ -399,13 +399,13 @@ module Handsoap
       end
     end
 
-    def make_http_request(uri, post_body, headers,http_options=nil)
+    def make_http_request(uri, post_body, headers, http_options=nil)
       request = Handsoap::Http::Request.new(uri, :post)
 
       # SSL CA AND CLIENT CERTIFICATES
       if http_options
         request.set_trust_ca_file(http_options[:trust_ca_file]) if http_options[:trust_ca_file]
-        request.set_client_cert_files(http_options[:client_cert_file],http_options[:client_cert_key_file]) if http_options[:client_cert_file] && http_options[:client_cert_key_file]
+        request.set_client_cert_files(http_options[:client_cert_file], http_options[:client_cert_key_file]) if http_options[:client_cert_file] && http_options[:client_cert_key_file]
       end
       
       headers.each do |key, value|

data/lib/handsoap/xml_query_front.rb

@@ -92,6 +92,9 @@ module Handsoap
       def node_name
         self.first.node_name if self.any?
       end
+      def node_namespace
+        self.first.node_namespace if self.any?
+      end
       def xpath(expression, ns = nil)
         self.first.xpath(expression, ns)
       end
@@ -172,6 +175,11 @@ module Handsoap
       def node_name
         raise NotImplementedError.new
       end
+      # Returns the node namespace uri of the current element if any, +nil+ otherwise.
+      # Result returned for attribute nodes varies for different drivers, currently.
+      def node_namespace
+        raise NotImplementedError.new
+      end
       # Queries the document with XPath, relative to the current element.
       #
       # +ns+ Should be a Hash of prefix => namespace
@@ -216,6 +224,13 @@ module Handsoap
       def node_name
         @element.name
       end
+      def node_namespace
+        if @element.respond_to? :namespaces
+          if namespace = @element.namespaces.namespace
+            namespace.href
+          end
+        end
+      end
       def xpath(expression, ns = nil)
         ns = {} if ns.nil?
         ns = @namespaces.merge(ns)
@@ -256,6 +271,13 @@ module Handsoap
           @element.class.name.gsub(/.*::([^:]+)$/, "\\1").downcase
         end
       end
+      def node_namespace
+        if @element.respond_to? :namespace
+          namespace = @element.namespace
+          return if namespace == ''
+        end
+        namespace
+      end
       def xpath(expression, ns = nil)
         ns = {} if ns.nil?
         ns = @namespaces.merge(ns)
@@ -297,6 +319,9 @@ module Handsoap
       def node_name
         @element.name
       end
+      def node_namespace
+        @element.namespace.href if @element.namespace
+      end
       def xpath(expression, ns = nil)
         ns = {} if ns.nil?
         ns = @namespaces.merge(ns)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: handsoap
 version: !ruby/object:Gem::Version 
-  version: 1.1.7
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 8
+  version: 1.1.8
 platform: ruby
 authors: 
 - Troels Knak-Nielsen
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 +01:00
+date: 2011-01-07 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -62,14 +67,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - |-
   You need to install either "curb" or "httpclient", using one of:
@@ -77,7 +84,7 @@ requirements:
       gem install httpclient
 - It is recommended that you install either "nokogiri" or "libxml-ruby"
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Handsoap is a library for creating SOAP clients in Ruby