savon 0.9.3 → 0.9.4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.9.4 (2011-07-03)
+
+* Refactoring: Extracted the WSDL parser out into the [wasabi](http://rubygems.org/gems/wasabi) gem.
+  This should isolate upcoming improvements to the parser.
+
 ## 0.9.3 (2011-06-30)
 
 * Fix: [issue 138](https://github.com/rubiii/savon/issues/138) -

data/lib/savon/client.rb

@@ -1,16 +1,15 @@
 require "httpi/request"
+require "savon/wasabi/document"
 require "savon/soap/xml"
 require "savon/soap/request"
 require "savon/soap/response"
-require "savon/wsdl/document"
 require "savon/wsse"
 
 module Savon
 
   # = Savon::Client
   #
-  # Savon::Client is the main object for connecting to a SOAP service. It includes methods to access
-  # both the Savon::WSDL::Document and HTTPI::Request object.
+  # Savon::Client is the main object for connecting to a SOAP service.
   class Client
 
     # Initializes the Savon::Client for a SOAP service. Accepts a +block+ which is evaluated in the
@@ -19,13 +18,10 @@ module Savon
     # == Examples
     #
     #   # Using a remote WSDL
-    #   client = Savon::Client.new { wsdl.document = "http://example.com/UserService?wsdl" }
+    #   client = Savon::Client.new("http://example.com/UserService?wsdl")
     #
     #   # Using a local WSDL
-    #   client = Savon::Client.new { wsdl.document = "../wsdl/user_service.xml" }
-    #
-    #   # Shortcut for setting the WSDL
-    #   client = Savon::Client.new "http://example.com/UserService?wsdl"
+    #   client = Savon::Client.new File.expand_path("../wsdl/service.xml", __FILE__)
     #
     #   # Directly accessing a SOAP endpoint
     #   client = Savon::Client.new do
@@ -38,9 +34,9 @@ module Savon
       wsdl.request = http
     end
 
-    # Returns the <tt>Savon::WSDL::Document</tt>.
+    # Returns the <tt>Savon::Wasabi::Document</tt>.
     def wsdl
-      @wsdl ||= WSDL::Document.new
+      @wsdl ||= Wasabi::Document.new
     end
 
     # Returns the <tt>HTTPI::Request</tt>.
@@ -112,7 +108,7 @@ module Savon
       soap.endpoint = wsdl.endpoint
       soap.namespace_identifier = options[0]
       soap.namespace = wsdl.namespace
-      soap.element_form_default = wsdl.element_form_default if wsdl.present?
+      soap.element_form_default = wsdl.element_form_default if wsdl.document?
       soap.body = options[2].delete(:body)
 
       set_soap_action options[1]
@@ -121,16 +117,16 @@ module Savon
 
     # Expects an +input+ and sets the +SOAPAction+ HTTP headers.
     def set_soap_action(input)
-      soap_action = wsdl.soap_action input.to_sym
+      soap_action = wsdl.soap_action(input.to_sym) if wsdl.document?
       soap_action ||= Gyoku::XMLKey.create(input).to_sym
       http.headers["SOAPAction"] = %{"#{soap_action}"}
     end
 
     # Expects a +namespace+, +input+ and +attributes+ and sets the SOAP input.
     def set_soap_input(namespace, input, attributes)
-      new_input = wsdl.soap_input input.to_sym
-      new_input ||= Gyoku::XMLKey.create(input).to_sym
-      soap.input = [namespace, new_input, attributes].compact
+      new_input = wsdl.soap_input(input.to_sym) if wsdl.document?
+      new_input ||= Gyoku::XMLKey.create(input)
+      soap.input = [namespace, new_input.to_sym, attributes].compact
     end
 
     # Processes a given +block+. Yields objects if the block expects any arguments.

data/lib/savon/version.rb

@@ -1,5 +1,5 @@
 module Savon
 
-  Version = "0.9.3"
+  Version = "0.9.4"
 
 end

data/lib/savon/wasabi/document.rb

@@ -0,0 +1,41 @@
+require "wasabi"
+require "httpi/request"
+
+module Savon
+  module Wasabi
+
+    # = Savon::Wasabi::Document
+    #
+    # Extends the <tt>Wasabi::Document</tt> to extend its document handling by
+    # adding support for remote and local WSDL documents.
+    class Document < ::Wasabi::Document
+
+      # Hooks into Wasabi and extends its document handling.
+      def xml
+        @xml ||= document.kind_of?(String) ? resolve_document : document
+      end
+
+      # Sets up and returns the <tt>HTTPI::Request</tt>.
+      def request
+        @request ||= HTTPI::Request.new
+        @request.url = document
+        @request
+      end
+
+      # Sets the <tt>HTTPI::Request</tt> for remote WSDL documents.
+      attr_writer :request
+
+    private
+
+      # Resolves and returns the raw WSDL document.
+      def resolve_document
+        case document
+          when /^http[s]?:/ then HTTPI.get(request).body
+          when /^</         then document
+          else                   File.read(document)
+        end
+      end
+
+    end
+  end
+end

data/savon.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "builder",  ">= 2.1.2"
   s.add_dependency "nori",     "~> 1.0"
   s.add_dependency "httpi",    "~> 0.9"
+  s.add_dependency "wasabi",   "~> 1.0"
   s.add_dependency "gyoku",    ">= 0.4.0"
   s.add_dependency "nokogiri", ">= 1.4.0"
 

data/spec/savon/client_spec.rb

@@ -7,21 +7,21 @@ describe Savon::Client do
     context "with a String" do
       it "should set the WSDL document" do
         wsdl = "http://example.com/UserService?wsdl"
-        client = Savon::Client.new wsdl
+        client = Savon::Client.new(wsdl)
         client.wsdl.instance_variable_get("@document").should == wsdl
       end
     end
 
     context "with a block expecting one argument" do
       it "should yield the WSDL object" do
-        Savon::Client.new { |wsdl| wsdl.should be_a(Savon::WSDL::Document) }
+        Savon::Client.new { |wsdl| wsdl.should be_a(Savon::Wasabi::Document) }
       end
     end
 
     context "with a block expecting two arguments" do
       it "should yield the WSDL and HTTP objects" do
         Savon::Client.new do |wsdl, http|
-          wsdl.should be_an(Savon::WSDL::Document)
+          wsdl.should be_an(Savon::Wasabi::Document)
           http.should be_an(HTTPI::Request)
         end
       end
@@ -30,7 +30,7 @@ describe Savon::Client do
     context "with a block expecting three arguments" do
       it "should yield the WSDL, HTTP and WSSE objects" do
         Savon::Client.new do |wsdl, http, wsse|
-          wsdl.should be_an(Savon::WSDL::Document)
+          wsdl.should be_an(Savon::Wasabi::Document)
           http.should be_an(HTTPI::Request)
           wsse.should be_an(Savon::WSSE)
         end
@@ -39,7 +39,7 @@ describe Savon::Client do
 
     context "with a block expecting no arguments" do
       it "should let you access the WSDL object" do
-        Savon::Client.new { wsdl.should be_a(Savon::WSDL::Document) }
+        Savon::Client.new { wsdl.should be_a(Savon::Wasabi::Document) }
       end
 
       it "should let you access the HTTP object" do
@@ -53,8 +53,8 @@ describe Savon::Client do
   end
 
   describe "#wsdl" do
-    it "should return the Savon::WSDL::Document" do
-      client.wsdl.should be_a(Savon::WSDL::Document)
+    it "should return the Savon::Wasabi::Document" do
+      client.wsdl.should be_a(Savon::Wasabi::Document)
     end
   end
 
@@ -150,7 +150,7 @@ describe Savon::Client do
       it "should yield the SOAP and WSDL objects" do
         client.request(:authenticate) do |soap, wsdl|
           soap.should be_a(Savon::SOAP::XML)
-          wsdl.should be_an(Savon::WSDL::Document)
+          wsdl.should be_an(Savon::Wasabi::Document)
         end
       end
     end
@@ -159,7 +159,7 @@ describe Savon::Client do
       it "should yield the SOAP, WSDL and HTTP objects" do
         client.request(:authenticate) do |soap, wsdl, http|
           soap.should be_a(Savon::SOAP::XML)
-          wsdl.should be_an(Savon::WSDL::Document)
+          wsdl.should be_an(Savon::Wasabi::Document)
           http.should be_an(HTTPI::Request)
         end
       end
@@ -169,7 +169,7 @@ describe Savon::Client do
       it "should yield the SOAP, WSDL, HTTP and WSSE objects" do
         client.request(:authenticate) do |soap, wsdl, http, wsse|
           soap.should be_a(Savon::SOAP::XML)
-          wsdl.should be_a(Savon::WSDL::Document)
+          wsdl.should be_a(Savon::Wasabi::Document)
           http.should be_an(HTTPI::Request)
           wsse.should be_a(Savon::WSSE)
         end
@@ -190,7 +190,7 @@ describe Savon::Client do
       end
 
       it "should let you access the WSDL object" do
-        client.request(:authenticate) { wsdl.should be_a(Savon::WSDL::Document) }
+        client.request(:authenticate) { wsdl.should be_a(Savon::Wasabi::Document) }
       end
     end
 
@@ -262,7 +262,7 @@ describe Savon::Client do
 
     it "should get #element_form_default from the WSDL" do
       HTTPI.stubs(:post).returns(new_response)
-      Savon::WSDL::Document.any_instance.expects(:element_form_default).returns(:qualified)
+      Savon::Wasabi::Document.any_instance.expects(:element_form_default).returns(:qualified)
 
       client.request :authenticate
     end
@@ -287,7 +287,7 @@ describe Savon::Client do
     before { HTTPI.expects(:get).never }
 
     it "raise an ArgumentError when trying to access the WSDL" do
-      lambda { client.wsdl.soap_actions }.should raise_error(ArgumentError)
+      lambda { client.wsdl.soap_actions }.should raise_error(ArgumentError, /Wasabi/)
     end
 
     it "adds a SOAPAction header containing the SOAP action name" do
@@ -300,7 +300,7 @@ describe Savon::Client do
 
     it "should not get #element_form_default from the WSDL" do
       HTTPI.stubs(:post).returns(new_response)
-      Savon::WSDL::Document.any_instance.expects(:element_form_default).never
+      Savon::Wasabi::Document.any_instance.expects(:element_form_default).never
 
       client.request :authenticate
     end

data/spec/savon/wasabi/document_spec.rb

@@ -0,0 +1,45 @@
+require "spec_helper"
+
+describe Savon::Wasabi::Document do
+
+  context "with a remote document" do
+    before do
+      response = HTTPI::Response.new 200, {}, Fixture.wsdl(:authentication)
+      HTTPI.stubs(:get).returns(response)
+    end
+
+    it "should resolve via HTTP" do
+      wsdl = Savon::Wasabi::Document.new("http://example.com?wsdl")
+      wsdl.xml.should == Fixture.wsdl(:authentication)
+    end
+
+    it "should resolve via HTTPS" do
+      wsdl = Savon::Wasabi::Document.new("https://example.com?wsdl")
+      wsdl.xml.should == Fixture.wsdl(:authentication)
+    end
+  end
+
+  context "with a local document" do
+    before do
+      HTTPI.expects(:get).never
+    end
+
+    it "should read the file" do
+      wsdl = Savon::Wasabi::Document.new("spec/fixtures/wsdl/authentication.xml")
+      wsdl.xml.should == Fixture.wsdl(:authentication)
+    end
+  end
+
+  context "with raw XML" do
+    before do
+      HTTPI.expects(:get).never
+      File.expects(:read).never
+    end
+
+    it "should use the raw XML" do
+      wsdl = Savon::Wasabi::Document.new Fixture.wsdl(:authentication)
+      wsdl.xml.should == Fixture.wsdl(:authentication)
+    end
+  end
+
+end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
+  hash: 51
   prerelease: 
-  version: 0.9.3
+  segments: 
+  - 0
+  - 9
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 Z
+date: 2011-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -20,6 +25,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 1
+        - 2
         version: 2.1.2
   type: :runtime
   version_requirements: *id001
@@ -31,6 +41,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
   type: :runtime
   version_requirements: *id002
@@ -42,86 +56,138 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
         version: "0.9"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: gyoku
+  name: wasabi
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: gyoku
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
         version: 1.4.0
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: timecop
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 3
+        - 5
         version: 0.3.5
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: autotest
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 description: Ruby's heavy metal SOAP client
 email: me@rubiii.com
 executables: []
@@ -154,9 +220,7 @@ files:
 - lib/savon/soap/response.rb
 - lib/savon/soap/xml.rb
 - lib/savon/version.rb
-- lib/savon/wsdl/document.rb
-- lib/savon/wsdl/parser.rb
-- lib/savon/wsdl/request.rb
+- lib/savon/wasabi/document.rb
 - lib/savon/wsse.rb
 - savon.gemspec
 - spec/fixtures/gzip/message.gz
@@ -184,9 +248,7 @@ files:
 - spec/savon/soap/response_spec.rb
 - spec/savon/soap/xml_spec.rb
 - spec/savon/soap_spec.rb
-- spec/savon/wsdl/document_spec.rb
-- spec/savon/wsdl/parser_spec.rb
-- spec/savon/wsdl/request_spec.rb
+- spec/savon/wasabi/document_spec.rb
 - spec/savon/wsse_spec.rb
 - spec/spec_helper.rb
 - spec/support/endpoint.rb
@@ -204,17 +266,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: savon
-rubygems_version: 1.8.4
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Heavy metal Ruby SOAP client

data/lib/savon/wsdl/document.rb

@@ -1,112 +0,0 @@
-require "nokogiri"
-
-require "savon/wsdl/request"
-require "savon/wsdl/parser"
-
-module Savon
-  module WSDL
-
-    # = Savon::WSDL::Document
-    #
-    # Represents the WSDL of your service, including information like the namespace URI,
-    # the SOAP endpoint and available SOAP actions.
-    class Document
-
-      # Accepts an <tt>HTTPI::Request</tt> and a +document+.
-      def initialize(request = nil, document = nil)
-        self.request = request
-        self.document = document
-      end
-
-      # Accessor for the <tt>HTTPI::Request</tt> to use.
-      attr_accessor :request
-
-      def present?
-        !!@document
-      end
-
-      # Returns the namespace URI of the WSDL.
-      def namespace
-        @namespace ||= parser.namespace
-      end
-
-      # Sets the SOAP namespace.
-      attr_writer :namespace
-
-      # Returns the SOAP endpoint.
-      def endpoint
-        @endpoint ||= parser.endpoint
-      end
-
-      # Sets the SOAP endpoint.
-      attr_writer :endpoint
-
-      # Returns an Array of available SOAP actions.
-      def soap_actions
-        @soap_actions ||= parser.operations.keys
-      end
-
-      # Returns the SOAP action for a given +key+.
-      def soap_action(key)
-        operations[key][:action] if present? && operations[key]
-      end
-
-      # Returns the SOAP input for a given +key+.
-      def soap_input(key)
-        operations[key][:input].to_sym if present? && operations[key]
-      end
-
-      # Returns a Hash of SOAP operations.
-      def operations
-        @operations ||= parser.operations
-      end
-
-      # Returns the elementFormDefault value.
-      def element_form_default
-        @element_form_default ||= parser.element_form_default
-      end
-
-      # Sets the location of the WSDL document to use. This can either be a URL
-      # or a path to a local file.
-      attr_writer :document
-
-      # Returns the raw WSDL document.
-      def document
-        @wsdl_document ||= begin
-          raise ArgumentError, "No WSDL document given" if @document.blank?
-          remote? ? http_request : read_file
-        end
-      end
-
-      alias :to_xml :document
-
-    private
-
-      # Returns whether the WSDL document is located on the Web.
-      def remote?
-        @document =~ /^http/
-      end
-
-      # Executes an HTTP GET request to retrieve a remote WSDL document.
-      def http_request
-        request.url = @document
-        Request.execute(request).body
-      end
-
-      # Reads the WSDL document from a local file.
-      def read_file
-        File.read @document
-      end
-
-      # Parses the WSDL document and returns the <tt>Savon::WSDL::Parser</tt>.
-      def parser
-        @parser ||= begin
-          parser = Parser.new(Nokogiri::XML(document))
-          parser.parse
-          parser
-        end
-      end
-
-    end
-  end
-end

data/lib/savon/wsdl/parser.rb

@@ -1,96 +0,0 @@
-require "savon/core_ext/object"
-require "savon/core_ext/string"
-
-module Savon
-  module WSDL
-
-    # = Savon::WSDL::Parser
-    #
-    # Parses WSDL documents and remembers the parts of them we care about.
-    class Parser
-
-      # The main sections of a WSDL document.
-      Sections = %w(definitions types message portType binding service)
-
-      def initialize(nokogiri_document)
-        @document = nokogiri_document
-        @path = []
-        @operations = {}
-        @namespaces = {}
-        @element_form_default = :unqualified
-      end
-
-      # Returns the namespace URI.
-      attr_reader :namespace
-
-      # Returns the SOAP operations.
-      attr_reader :operations
-
-      # Returns the SOAP endpoint.
-      attr_reader :endpoint
-
-      # Returns the elementFormDefault value.
-      attr_reader :element_form_default
-
-      def parse
-        parse_namespaces
-        parse_endpoint
-        parse_operations
-      end
-
-      def parse_namespaces
-        element_form_default = @document.at_xpath(
-          "s0:definitions/s0:types/xs:schema/@elementFormDefault",
-          "s0" => "http://schemas.xmlsoap.org/wsdl/",
-          "xs" => "http://www.w3.org/2001/XMLSchema")
-        @element_form_default = element_form_default.to_s.to_sym if element_form_default
-
-        namespace = @document.at_xpath(
-          "s0:definitions/@targetNamespace",
-          "s0" => "http://schemas.xmlsoap.org/wsdl/")
-        @namespace = namespace.to_s if namespace
-      end
-
-      def parse_endpoint
-        endpoint = @document.at_xpath(
-          "s0:definitions/s0:service//soap11:address/@location",
-          "s0" => "http://schemas.xmlsoap.org/wsdl/",
-          "soap11" => "http://schemas.xmlsoap.org/wsdl/soap/")
-        endpoint ||= @document.at_xpath(
-          "s0:definitions/s0:service//soap12:address/@location",
-          "s0" => "http://schemas.xmlsoap.org/wsdl/",
-          "soap12" => "http://schemas.xmlsoap.org/wsdl/soap12/")
-        @endpoint = URI(URI.escape(endpoint.to_s)) if endpoint
-      end
-
-      def parse_operations
-        operations = @document.xpath(
-          "s0:definitions/s0:binding/s0:operation",
-          "s0" => "http://schemas.xmlsoap.org/wsdl/")
-        operations.each do |operation|
-          name = operation.attribute("name").to_s
-
-          soap_action = operation.at_xpath(".//soap11:operation/@soapAction",
-            "soap11" => "http://schemas.xmlsoap.org/wsdl/soap/"
-          )
-          soap_action ||= operation.at_xpath(".//soap12:operation/@soapAction",
-            "soap12" => "http://schemas.xmlsoap.org/wsdl/soap12/"
-          )
-          if soap_action
-            soap_action = soap_action.to_s
-
-            action = !soap_action.blank? ? soap_action : name
-            input = (!name || name.empty?) ? action.split("/").last : name
-
-            @operations[input.snakecase.to_sym] =
-              { :action => action, :input => input }
-          elsif !@operations[name.snakecase.to_sym]
-            @operations[name.snakecase.to_sym] =
-              { :action => name, :input => name }
-          end
-        end
-      end
-
-    end
-  end
-end

data/lib/savon/wsdl/request.rb

@@ -1,41 +0,0 @@
-require "httpi"
-
-module Savon
-  module WSDL
-
-    # = Savon::WSDL::Request
-    #
-    # Executes WSDL requests.
-    class Request
-
-      # Expects an <tt>HTTPI::Request</tt> to execute a WSDL request
-      # and returns the response.
-      def self.execute(request)
-        new(request).response
-      end
-
-      # Expects an <tt>HTTPI::Request</tt>.
-      def initialize(request)
-        self.request = request
-      end
-
-      # Accessor for the <tt>HTTPI::Request</tt>.
-      attr_accessor :request
-
-      # Executes the request and returns the response.
-      def response
-        @response ||= with_logging { HTTPI.get request }
-      end
-
-    private
-
-      # Logs the HTTP request and yields to a given +block+.
-      def with_logging
-        Savon.log "Retrieving WSDL from: #{request.url}"
-        Savon.log "Using :#{request.auth.type} authentication" if request.auth?
-        yield
-      end
-
-    end
-  end
-end

data/spec/savon/wsdl/document_spec.rb

@@ -1,132 +0,0 @@
-require "spec_helper"
-
-describe Savon::WSDL::Document do
-
-  shared_examples_for "a WSDL document" do
-    it "should be present" do
-      wsdl.should be_present
-    end
-
-    describe "#namespace" do
-      it "should return the namespace URI" do
-        wsdl.namespace.should == "http://v1_0.ws.auth.order.example.com/"
-      end
-    end
-
-    describe "#soap_actions" do
-      it "should return an Array of available SOAP actions" do
-        wsdl.soap_actions.should == [:authenticate]
-      end
-    end
-
-    describe "#soap_action" do
-      it "should return the SOAP action for a given key" do
-        wsdl.soap_action(:authenticate).should == "authenticate"
-      end
-
-      it "should return nil if no SOAP action could be found" do
-        wsdl.soap_action(:unknown).should be_nil
-      end
-    end
-
-    describe "#soap_input" do
-      it "should return the SOAP input tag for a given key" do
-        wsdl.soap_input(:authenticate).should == :authenticate
-      end
-
-      it "should return nil if no SOAP input tag could be found" do
-        wsdl.soap_input(:unknown).should be_nil
-      end
-    end
-
-    describe "#operations" do
-      it "should return a Hash of SOAP operations" do
-        wsdl.operations.should == {
-          :authenticate => {
-            :input => "authenticate", :action => "authenticate"
-          }
-        }
-      end
-    end
-
-    describe "#document" do
-      it "should return the raw WSDL document" do
-        wsdl.document.should == Fixture.wsdl(:authentication)
-      end
-
-      it "should be memoized" do
-        wsdl.document.should equal(wsdl.document)
-      end
-    end
-  end
-
-  context "with a remote document" do
-    let(:wsdl) { Savon::WSDL::Document.new HTTPI::Request.new, Endpoint.wsdl }
-
-    before do
-      response = HTTPI::Response.new 200, {}, Fixture.wsdl(:authentication)
-      HTTPI.stubs(:get).returns(response)
-    end
-
-    it_should_behave_like "a WSDL document"
-
-    describe "#element_form_default" do
-      it "should return :unqualified" do
-        wsdl.element_form_default.should == :unqualified
-      end
-    end
-  end
-
-  context "with a local document" do
-    let(:wsdl) do
-      wsdl = "spec/fixtures/wsdl/authentication.xml"
-      Savon::WSDL::Document.new HTTPI::Request.new, wsdl
-    end
-
-    before { HTTPI.expects(:get).never }
-
-    it_should_behave_like "a WSDL document"
-  end
-
-  context "without a WSDL document" do
-    let(:wsdl) { Savon::WSDL::Document.new HTTPI::Request.new }
-
-    it "should not be present" do
-      wsdl.should_not be_present
-    end
-
-    describe "#soap_action" do
-      it "should return nil" do
-        wsdl.soap_action(:authenticate).should be_nil
-      end
-    end
-
-    describe "#soap_input" do
-      it "should return nil" do
-        wsdl.soap_input(:authenticate).should be_nil
-      end
-    end
-
-    describe "#document" do
-      it "should raise an ArgumentError" do
-        lambda { wsdl.document }.should raise_error(ArgumentError)
-      end
-    end
-  end
-
-  context "with a WSDL document containing elementFormDefault='qualified'" do
-    let(:wsdl) { Savon::WSDL::Document.new HTTPI::Request.new, Endpoint.wsdl }
-
-    before do
-      response = HTTPI::Response.new 200, {}, Fixture.wsdl(:geotrust)
-      HTTPI.stubs(:get).returns(response)
-    end
-
-    describe "#element_form_default" do
-      it "should return :qualified" do
-        wsdl.element_form_default.should == :qualified
-      end
-    end
-  end
-
-end

data/spec/savon/wsdl/parser_spec.rb

@@ -1,107 +0,0 @@
-require "spec_helper"
-
-describe Savon::WSDL::Parser do
-
-  context "with namespaced_actions.xml" do
-    let(:parser) { new_parser :namespaced_actions }
-
-    it "should return the target namespace" do
-      parser.namespace.should == "http://api.example.com/api/"
-    end
-
-    it "should return the SOAP endpoint" do
-      parser.endpoint.should == URI("https://api.example.com/api/api.asmx")
-    end
-
-    it "should return the available SOAP operations" do
-      parser.operations.should match_operations(
-        :get_api_key => { :input => "GetApiKey", :action => "http://api.example.com/api/User.GetApiKey" },
-        :delete_client => { :input => "DeleteClient", :action => "http://api.example.com/api/Client.Delete" },
-        :get_clients => { :input => "GetClients", :action => "http://api.example.com/api/User.GetClients" }
-      )
-    end
-
-    it "should return that :element_form_default is set to :qualified" do
-      parser.element_form_default.should == :qualified
-    end
-  end
-
-  context "with no_namespace.xml" do
-    let(:parser) { new_parser :no_namespace }
-
-    it "should return the target namespace" do
-      parser.namespace.should == "urn:ActionWebService"
-    end
-
-    it "should return the SOAP endpoint" do
-      parser.endpoint.should == URI("http://example.com/api/api")
-    end
-
-    it "should return the available SOAP operations" do
-      parser.operations.should match_operations(
-        :search_user => { :input => "SearchUser", :action => "/api/api/SearchUser" },
-        :get_user_login_by_id => { :input => "GetUserLoginById", :action => "/api/api/GetUserLoginById" },
-        :get_all_contacts => { :input => "GetAllContacts", :action => "/api/api/GetAllContacts" }
-      )
-    end
-
-    it "should return that :element_form_default is set to :unqualified" do
-      parser.element_form_default.should == :unqualified
-    end
-  end
-
-  context "with geotrust.xml" do
-    let(:parser) { new_parser :geotrust }
-
-    it "should return the target namespace" do
-      parser.namespace.should == "http://api.geotrust.com/webtrust/query"
-    end
-
-    it "should return the SOAP endpoint" do
-      parser.endpoint.should == URI("https://test-api.geotrust.com/webtrust/query.jws")
-    end
-
-    it "should return the available SOAP operations" do
-      parser.operations.should match_operations(
-        :get_quick_approver_list => { :input => "GetQuickApproverList", :action => "GetQuickApproverList" },
-        :hello => { :input => "hello", :action => "hello" }
-      )
-    end
-
-    it "should return that :element_form_default is set to :qualified" do
-      parser.element_form_default.should == :qualified
-    end
-  end
-
-  context "with two_bindings.xml" do
-    let(:parser) { new_parser :two_bindings }
-
-    it "should merge operations from all binding sections (until we have an example where it makes sense to do otherwise)" do
-      parser.operations.keys.map(&:to_s).sort.should ==
-        %w{post post11only post12only}
-    end
-  end
-
-  context "with soap12.xml" do
-    let(:parser) { new_parser :soap12 }
-
-    it "should return the endpoint" do
-      parser.endpoint.should == URI("http://blogsite.example.com/endpoint12")
-    end
-  end
-
-  RSpec::Matchers.define :match_operations do |expected|
-    match do |actual|
-      actual.should have(expected.keys.size).items
-      actual.keys.should include(*expected.keys)
-      actual.each { |key, value| value.should == expected[key] }
-    end
-  end
-
-  def new_parser(fixture)
-    parser = Savon::WSDL::Parser.new(Nokogiri::XML(Fixture[:wsdl, fixture]))
-    parser.parse
-    parser
-  end
-
-end

data/spec/savon/wsdl/request_spec.rb

@@ -1,23 +0,0 @@
-require "spec_helper"
-
-describe Savon::WSDL::Request do
-  let(:http_request) { HTTPI::Request.new :url => Endpoint.wsdl }
-  let(:request) { Savon::WSDL::Request.new http_request }
-
-  describe ".execute" do
-    it "executes a WSDL request and returns the response" do
-      response = HTTPI::Response.new 200, {}, Fixture.response(:authentication)
-      HTTPI.expects(:get).with(http_request).returns(response)
-      Savon::WSDL::Request.execute(http_request).should == response
-    end
-  end
-
-  describe "#response" do
-    it "executes an HTTP GET request and returns the HTTPI::Response" do
-      response = HTTPI::Response.new 200, {}, Fixture.response(:authentication)
-      HTTPI.expects(:get).with(http_request).returns(response)
-      request.response.should == response
-    end
-  end
-
-end