savon-xaop 0.7.2.2 → 0.7.2.3

data/lib/savon/request.rb

@@ -85,7 +85,14 @@ module Savon
       log "Retrieving WSDL from: #{@endpoint}"
       http.endpoint @endpoint.host, @endpoint.port
       http.use_ssl = @endpoint.ssl?
-      http.start { |h| h.request request(:wsdl) }
+      # This is not yet ideal, but better at least.
+      # Actually it should be possible to select the authentication
+      # mechanism based on the returned header.
+      result = http.start { |h| h.request request(:wsdl, false) }
+      if Net::HTTPUnauthorized === result
+        result = http.start { |h| h.request request(:wsdl, true) }
+      end
+      result
     end
 
     # Executes a SOAP request using a given Savon::SOAP instance and
@@ -125,17 +132,19 @@ module Savon
 
     # Returns a Net::HTTP request for a given +type+. Yields the request
     # to an optional block.
-    def request(type)
+    def request(type, authenticate = true)
       request = case type
         when :wsdl then Net::HTTP::Get.new @endpoint.to_s, headers
         when :soap then Net::HTTP::Post.new @soap.endpoint.to_s, headers.merge(soap_headers)
       end
-      if @basic_auth
-        request.basic_auth *@basic_auth
-      elsif @ntlm_auth
-        log "Using NTLM authentication"
-        require 'net/ntlm_http'
-        request.ntlm_auth *@ntlm_auth
+      if authenticate
+        if @basic_auth
+          request.basic_auth *@basic_auth
+        elsif @ntlm_auth
+          log "Using NTLM authentication"
+          require 'net/ntlm_http'
+          request.ntlm_auth *@ntlm_auth
+        end
       end
       yield request if block_given?
       request

metadata

@@ -1,7 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: savon-xaop
 version: !ruby/object:Gem::Version 
-  version: 0.7.2.2
+  hash: 121
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 2
+  - 3
+  version: 0.7.2.3
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -14,64 +21,100 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 1
+        - 2
         version: 2.1.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: crack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 1
+        - 4
         version: 0.1.4
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ntlm-http
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
         version: 0.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 2
+        - 8
         version: 1.2.8
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 53
+        segments: 
+        - 0
+        - 9
+        - 7
         version: 0.9.7
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: fakeweb
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 2
+        - 7
         version: 1.2.7
-    version: 
+  type: :development
+  version_requirements: *id006
 description: 
 email: me@rubiii.com
 executables: []
@@ -142,21 +185,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Heavy metal Ruby SOAP client library