savon-xaop 0.7.2.6 → 0.7.2.7

data/lib/savon/request.rb

@@ -81,11 +81,24 @@ module Savon
     end
     
     # Retrieves WSDL document and returns the Net::HTTP response.
-    def wsdl
+    def wsdl(retries = 0)
       log "Retrieving WSDL from: #{@endpoint}"
       http.endpoint @endpoint.host, @endpoint.port
       http.use_ssl = @endpoint.ssl?
-      http.start { |h| h.request request(:wsdl) }
+      response = http.start { |h| h.request request(:wsdl) }
+      case response
+      when Net::HTTPFound, Net::HTTPMovedPermanently
+        puts "REDIRECT: #{@endpoint} -> #{response["location"]}"
+        @endpoint = URI response["location"]
+        if retries == 10
+          raise Savon::HTTPError.new("Redirect too long", {})
+        end
+        wsdl(retries + 1)
+      when Net::HTTPSuccess
+        response
+      else
+        raise Savon::HTTPError.new(response.body.to_s, response.to_hash)
+      end
     end
 
     # Executes a SOAP request using a given Savon::SOAP instance and
@@ -133,7 +146,7 @@ module Savon
       if @basic_auth
         request.basic_auth *@basic_auth
       elsif @ntlm_auth
-        log "Using NTLM authentication"
+        require 'kconv'
         require 'net/ntlm_http'
         request.ntlm_auth *@ntlm_auth
       end

data/lib/savon/wsdl.rb

@@ -59,7 +59,11 @@ module Savon
         @stream = WSDLStream.new
         REXML::Document.parse_stream to_s, @stream
       end
-      @stream
+      if @stream.sections.include? :service
+        @stream
+      else
+        raise Savon::HTTPError.new("Not a WSDL", {})
+      end
     end
 
   end
@@ -74,6 +78,7 @@ module Savon
 
     def initialize
       @depth, @operations = 0, {}
+      @sections = []
     end
 
     # Returns the namespace URI.
@@ -84,13 +89,19 @@ module Savon
 
     # Returns the SOAP endpoint.
     attr_reader :soap_endpoint
+    
+    # Visited sections (used to check validaty of the WSDL)
+    attr_reader :sections
 
     # Hook method called when the stream parser encounters a starting tag.
     def tag_start(tag, attrs)
       @depth += 1
       tag = tag.strip_namespace
-
-      @section = tag.to_sym if @depth <= 2 && Sections.include?(tag)
+      
+      if @depth <= 2 && Sections.include?(tag)
+        @section = tag.to_sym
+        @sections << @section
+      end
       @namespace_uri ||= attrs["targetNamespace"] if @section == :definitions
       @soap_endpoint ||= URI(URI.escape(attrs["location"])) if @section == :service && tag == "address"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: savon-xaop
 version: !ruby/object:Gem::Version 
-  hash: 115
+  hash: 113
   prerelease: false
   segments: 
   - 0
   - 7
   - 2
-  - 6
-  version: 0.7.2.6
+  - 7
+  version: 0.7.2.7
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -52,19 +52,20 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ntlm-http
+  name: xaop-ntlm-http
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 71
         segments: 
         - 0
         - 1
         - 1
-        version: 0.1.1
+        - 2
+        version: 0.1.1.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency