savon 0.7.9 → 0.8.0.beta.1

data/spec/savon/{wsdl_spec.rb → wsdl/document_spec.rb}

@@ -1,24 +1,65 @@
 require "spec_helper"
 
-describe Savon::WSDL do
-  describe "a common WSDL document" do
-    before { @wsdl = new_wsdl }
+describe Savon::WSDL::Document do
 
-    it "is initialized with a Savon::Request object" do
-      Savon::WSDL.new Savon::Request.new(EndpointHelper.wsdl_endpoint)
+  context "with a remote document" do
+    let(:wsdl) { Savon::WSDL::Document.new HTTPI::Request.new, Endpoint.wsdl }
+    before { HTTPI.stubs(:get).returns(new_response) }
+
+    it "should be present" do
+      wsdl.should be_present
+    end
+
+    describe "#namespace" do
+      it "should return the namespace URI" do
+        wsdl.namespace.should == WSDLFixture.authentication(:namespace)
+      end
+    end
+
+    describe "#soap_actions" do
+      it "should return an Array of available SOAP actions" do
+        wsdl.soap_actions.should include(*WSDLFixture.authentication(:operations).keys)
+      end
+    end
+  end
+
+  context "with a local document" do
+    let(:wsdl) do
+      wsdl = "spec/fixtures/wsdl/xml/authentication.xml"
+      Savon::WSDL::Document.new HTTPI::Request.new, wsdl
+    end
+
+    before { HTTPI.expects(:get).never }
+
+    it "should be present" do
+      wsdl.should be_present
     end
 
-    it "it accepts a custom SOAP endpoint" do
-      wsdl = Savon::WSDL.new Savon::Request.new(EndpointHelper.wsdl_endpoint), "http://localhost"
-      wsdl.soap_endpoint.should == "http://localhost"
+    describe "#namespace" do
+      it "should return the namespace URI" do
+        wsdl.namespace.should == WSDLFixture.authentication(:namespace)
+      end
     end
 
-    it "is enabled by default" do
-      @wsdl.enabled?.should be_true
+    describe "#soap_actions" do
+      it "should return an Array of available SOAP actions" do
+        wsdl.soap_actions.should include(*WSDLFixture.authentication(:operations).keys)
+      end
     end
+  end
+
+  def new_response(options = {})
+    defaults = { :code => 200, :headers => {}, :body => WSDLFixture.load }
+    response = defaults.merge options
+    
+    HTTPI::Response.new(response[:code], response[:headers], response[:body])
+  end
+
+end
+__END__
 
     it "has a getter for the namespace URI" do
-      @wsdl.namespace_uri.should == WSDLFixture.authentication(:namespace_uri)
+      @wsdl.namespace.should == WSDLFixture.authentication(:namespace_uri)
     end
 
     it "has a getter for returning an Array of available SOAP actions" do
@@ -40,8 +81,8 @@ describe Savon::WSDL do
       @wsdl.respond_to?(:some_undefined_method).should be_false
     end
 
-    it "returns the raw WSDL document for to_s" do
-      @wsdl.to_s.should == WSDLFixture.authentication
+    it "returns the raw WSDL document for to_xml" do
+      @wsdl.to_xml.should == WSDLFixture.authentication
     end
   end
 
@@ -99,9 +140,5 @@ describe Savon::WSDL do
     end
   end
 
-  def new_wsdl(fixture = nil)
-    endpoint = fixture ? EndpointHelper.wsdl_endpoint(fixture) : EndpointHelper.wsdl_endpoint
-    Savon::WSDL.new Savon::Request.new(endpoint)
-  end
 
 end

data/spec/savon/wsdl/request_spec.rb

@@ -0,0 +1,15 @@
+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 "#response" do
+    it "execute an HTTP GET request and return the HTTPI::Response" do
+      response = HTTPI::Response.new 200, {}, ResponseFixture.authentication
+      HTTPI.expects(:get).with(http_request).returns(response)
+      request.response.should == response
+    end
+  end
+
+end

data/spec/savon/wsse_spec.rb

@@ -1,130 +1,161 @@
 require "spec_helper"
 
 describe Savon::WSSE do
-  before do
-    Savon::WSSE.username, Savon::WSSE.password, Savon::WSSE.digest = nil, nil, false
-    @wsse, @username, @password = Savon::WSSE.new, "gorilla", "secret"
-  end
-
-  it "contains the namespace for WS Security Secext" do
-    Savon::WSSE::WSENamespace.should be_a(String)
-    Savon::WSSE::WSENamespace.should_not be_empty
-  end
+  let(:wsse) { Savon::WSSE.new }
 
-  it "contains the namespace for WS Security Utility" do
-    Savon::WSSE::WSUNamespace.should be_a(String)
-    Savon::WSSE::WSUNamespace.should_not be_empty
+  it "should contain the namespace for WS Security Secext" do
+    Savon::WSSE::WSENamespace.should ==
+      "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
   end
 
-  it "defaults to nil for the WSSE username (global setting)" do
-    Savon::WSSE.username.should be_nil
+  it "should contain the namespace for WS Security Utility" do
+    Savon::WSSE::WSUNamespace.should ==
+      "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
   end
 
-  it "has both getter and setter for the WSSE username (global setting)" do
-    Savon::WSSE.username = "gorilla"
-    Savon::WSSE.username.should == "gorilla"
+  it "should contain the namespace for the PasswordText type" do
+    Savon::WSSE::PasswordTextURI.should ==
+      "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText"
   end
 
-  it "defaults to nil for the WSSE password (global setting)" do
-    Savon::WSSE.password.should be_nil
+  it "should contain the namespace for the PasswordDigest type" do
+    Savon::WSSE::PasswordDigestURI.should ==
+      "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest"
   end
 
-  it "has both getter and setter for the WSSE password (global setting)" do
-    Savon::WSSE.password = "secret"
-    Savon::WSSE.password.should == "secret"
-  end
+  describe "#credentials" do
+    it "should set the username" do
+      wsse.credentials "username", "password"
+      wsse.username.should == "username"
+    end
 
-  it "defaults to nil for whether to use WSSE digest (global setting)" do
-    Savon::WSSE.digest?.should be_false
-  end
+    it "should set the password" do
+      wsse.credentials "username", "password"
+      wsse.password.should == "password"
+    end
 
-  it "has both getter and setter for whether to use WSSE digest (global setting)" do
-    Savon::WSSE.digest = true
-    Savon::WSSE.digest?.should == true
-  end
+    it "should default to set digest to false" do
+      wsse.credentials "username", "password"
+      wsse.should_not be_digest
+    end
 
-  it "defaults to nil for the WSSE username" do
-    @wsse.username.should be_nil
+    it "should set digest to true if specified" do
+      wsse.credentials "username", "password", :digest
+      wsse.should be_digest
+    end
   end
 
-  it "has both getter and setter for the WSSE username" do
-    @wsse.username = "gorilla"
-    @wsse.username.should == "gorilla"
+  describe "#username" do
+    it "should set the username" do
+      wsse.username = "username"
+      wsse.username.should == "username"
+    end
   end
 
-  it "defaults to nil for the WSSE password" do
-    @wsse.password.should be_nil
+  describe "#password" do
+    it "should set the password" do
+      wsse.password = "password"
+      wsse.password.should == "password"
+    end
   end
 
-  it "has both getter and setter for the WSSE password" do
-    @wsse.password = "secret"
-    @wsse.password.should == "secret"
-  end
+  describe "#digest" do
+    it "should default to false" do
+      wsse.should_not be_digest
+    end
 
-  it "defaults to nil for whether to use WSSE digest" do
-    @wsse.digest?.should be_false
+    it "should specify whether to use digest auth" do
+      wsse.digest = true
+      wsse.should be_digest
+    end
   end
 
-  it "has both getter and setter for whether to use WSSE digest" do
-    @wsse.digest = true
-    @wsse.digest?.should == true
-  end
+  describe "#to_xml" do
+    context "with no credentials" do
+      it "should return an empty String" do
+        wsse.to_xml.should == ""
+      end
+    end
 
-  describe "header" do
-    describe "returns the XML for a WSSE authentication header" do
-      it "with WSSE credentials specified" do
-        @wsse.username = @username
-        @wsse.password = @password
-        header = @wsse.header
+    context "with only a username" do
+      before { wsse.username = "username" }
 
-        header.should include_security_namespaces
-        header.should include(@username)
-        header.should include(@password)
-        header.should include(Savon::WSSE::PasswordTextURI)
+      it "should return an empty String" do
+        wsse.to_xml.should == ""
       end
+    end
 
-      it "with WSSE credentials specified via defaults" do
-        Savon::WSSE.username = @username
-        Savon::WSSE.password = @password
-        header = @wsse.header
+    context "with only a password" do
+      before { wsse.password = "password" }
 
-        header.should include_security_namespaces
-        header.should include(@username)
-        header.should include(@password)
-        header.should include(Savon::WSSE::PasswordTextURI)
+      it "should return an empty String" do
+        wsse.to_xml.should == ""
       end
     end
 
-    describe "returns the XML for a WSSE digest header if specified" do
-      it "via accessors" do
-        @wsse.username = @username
-        @wsse.password = @password
-        @wsse.digest = true
-        header = @wsse.header
-  
-        header.should include_security_namespaces
-        header.should include(@username)
-        header.should_not include(@password)
-        header.should include(Savon::WSSE::PasswordDigestURI)
-      end
-
-      it "via defaults" do
-        @wsse.username = @username
-        @wsse.password = @password
-        Savon::WSSE.digest = true
-        header = @wsse.header
-  
-        header.should include_security_namespaces
-        header.should include(@username)
-        header.should_not include(@password)
-        header.should include(Savon::WSSE::PasswordDigestURI)
+    context "with credentials" do
+      before { wsse.credentials "username", "password" }
+
+      it "should contain a wsse:Security tag" do
+        namespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
+        wsse.to_xml.should include("<wsse:Security xmlns:wsse=\"#{namespace}\">")
+      end
+
+      it "should contain a wsu:Id attribute" do
+        wsse.to_xml.should include('<wsse:UsernameToken wsu:Id="UsernameToken-1"')
+      end
+
+      it "should increment the wsu:Id attribute count" do
+        wsse.to_xml.should include('<wsse:UsernameToken wsu:Id="UsernameToken-1"')
+        wsse.to_xml.should include('<wsse:UsernameToken wsu:Id="UsernameToken-2"')
+      end
+
+      it "should contain the WSE and WSU namespaces" do
+        wsse.to_xml.should include(Savon::WSSE::WSENamespace, Savon::WSSE::WSUNamespace)
+      end
+
+      it "should contain the username and password" do
+        wsse.to_xml.should include("username", "password")
+      end
+
+      it "should contain a wsse:Nonce tag" do
+        wsse.to_xml.should match(/<wsse:Nonce>\w+<\/wsse:Nonce>/)
+      end
+
+      it "should contain a wsu:Created tag" do
+        wsse.to_xml.should match(/<wsu:Created>#{Savon::SOAP::DateTimeRegexp}.+<\/wsu:Created>/)
+      end
+
+      it "should contain the PasswordText type attribute" do
+        wsse.to_xml.should include(Savon::WSSE::PasswordTextURI)
       end
     end
 
-    def include_security_namespaces
-      simple_matcher("include security namespaces") do |given|
-        given.should include(Savon::WSSE::WSENamespace)
-        given.should include(Savon::WSSE::WSUNamespace)
+    context "with credentials and digest auth" do
+      before { wsse.credentials "username", "password", :digest }
+
+      it "should contain the WSE and WSU namespaces" do
+        wsse.to_xml.should include(Savon::WSSE::WSENamespace, Savon::WSSE::WSUNamespace)
+      end
+
+      it "should contain the username" do
+        wsse.to_xml.should include("username")
+      end
+
+      it "should not contain the (original) password" do
+        wsse.to_xml.should_not include("password")
+      end
+
+      it "should contain a wsse:Nonce tag" do
+        wsse.to_xml.should match(/<wsse:Nonce>\w+<\/wsse:Nonce>/)
+      end
+
+      it "should contain a wsu:Created tag" do
+        wsse.to_xml.should match(/<wsu:Created>#{Savon::SOAP::DateTimeRegexp}.+<\/wsu:Created>/)
+      end
+
+      it "should contain the PasswordDigest type attribute" do
+        wsse.to_xml.should include(Savon::WSSE::PasswordDigestURI)
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,5 +1,20 @@
-require "basic_spec_helper"
+require "rspec"
+require "mocha"
 
-FileList["spec/fixtures/**/*.rb"].each { |fixture| require fixture }
-require "endpoint_helper"
-require "http_stubs"
+spec = File.expand_path("..", __FILE__)
+$:.unshift spec unless $:.include? spec
+
+RSpec.configure do |config|
+  config.mock_with :mocha
+end
+
+require "savon"
+
+# Disable logging for specs.
+Savon.log = false
+
+# Requires fixtures.
+Dir[File.expand_path("../fixtures/**/*.rb", __FILE__)].each { |file| require file }
+
+# Requires supporting files.
+require "support/endpoint"

data/spec/support/endpoint.rb

@@ -0,0 +1,25 @@
+class Endpoint
+  class << self
+
+    # Returns the WSDL endpoint for a given +type+ of request.
+    def wsdl(type = nil)
+      case type
+        when :no_namespace       then "http://nons.example.com/Service?wsdl"
+        when :namespaced_actions then "http://nsactions.example.com/Service?wsdl"
+        when :geotrust           then "https://test-api.geotrust.com/webtrust/query.jws?WSDL"
+        else                          soap(type)
+      end
+    end
+
+    # Returns the SOAP endpoint for a given +type+ of request.
+    def soap(type = nil)
+      case type
+        when :soap_fault then "http://soapfault.example.com/Service?wsdl"
+        when :http_error then "http://httperror.example.com/Service?wsdl"
+        when :invalid    then "http://invalid.example.com/Service?wsdl"
+        else                  "http://example.com/validation/1.0/AuthenticationService"
+      end
+    end
+
+  end
+end

metadata

@@ -1,12 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 62196257
+  prerelease: true
   segments: 
   - 0
-  - 7
-  - 9
-  version: 0.7.9
+  - 8
+  - 0
+  - beta
+  - 1
+  version: 0.8.0.beta.1
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -14,16 +17,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 +02:00
+date: 2010-10-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 1
@@ -35,179 +40,174 @@ dependencies:
   name: crack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 1
-        - 4
-        version: 0.1.4
+        - 8
+        version: 0.1.8
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: httpi
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
-        - 1
-        - 2
-        - 8
-        version: 1.2.8
-  type: :development
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
+        - 2
         - 0
-        - 9
-        - 7
-        version: 0.9.7
+        - 0
+        version: 2.0.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: mocha
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 53
         segments: 
-        - 1
-        - 2
+        - 0
+        - 9
         - 7
-        version: 1.2.7
+        version: 0.9.7
   type: :development
   version_requirements: *id005
-description: 
+description: Savon is the heavy metal Ruby SOAP client.
 email: me@rubiii.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- CHANGELOG
+- .gitignore
+- .rspec
+- .yardopts
+- CHANGELOG.md
+- Gemfile
+- LICENSE
+- README.md
 - Rakefile
-- README.rdoc
+- autotest/discover.rb
+- lib/savon.rb
 - lib/savon/client.rb
 - lib/savon/core_ext/array.rb
 - lib/savon/core_ext/datetime.rb
 - lib/savon/core_ext/hash.rb
-- lib/savon/core_ext/net_http.rb
 - lib/savon/core_ext/object.rb
 - lib/savon/core_ext/string.rb
 - lib/savon/core_ext/symbol.rb
-- lib/savon/core_ext/uri.rb
-- lib/savon/core_ext.rb
-- lib/savon/logger.rb
-- lib/savon/request.rb
-- lib/savon/response.rb
+- lib/savon/error.rb
+- lib/savon/global.rb
+- lib/savon/http/error.rb
 - lib/savon/soap.rb
+- lib/savon/soap/fault.rb
+- lib/savon/soap/request.rb
+- lib/savon/soap/response.rb
+- lib/savon/soap/xml.rb
 - lib/savon/version.rb
-- lib/savon/wsdl.rb
-- lib/savon/wsdl_stream.rb
+- lib/savon/wsdl/document.rb
+- lib/savon/wsdl/parser.rb
+- lib/savon/wsdl/request.rb
 - lib/savon/wsse.rb
-- lib/savon.rb
-- spec/basic_spec_helper.rb
-- spec/endpoint_helper.rb
+- savon.gemspec
 - spec/fixtures/gzip/gzip_response_fixture.rb
+- spec/fixtures/gzip/message.gz
 - spec/fixtures/response/response_fixture.rb
+- spec/fixtures/response/xml/authentication.xml
+- spec/fixtures/response/xml/list.xml
+- spec/fixtures/response/xml/multi_ref.xml
+- spec/fixtures/response/xml/soap_fault.xml
+- spec/fixtures/response/xml/soap_fault12.xml
 - spec/fixtures/wsdl/wsdl_fixture.rb
-- spec/http_stubs.rb
-- spec/integration/http_basic_auth_spec.rb
-- spec/integration/server.rb
+- spec/fixtures/wsdl/wsdl_fixture.yml
+- spec/fixtures/wsdl/xml/authentication.xml
+- spec/fixtures/wsdl/xml/geotrust.xml
+- spec/fixtures/wsdl/xml/namespaced_actions.xml
+- spec/fixtures/wsdl/xml/no_namespace.xml
 - spec/savon/client_spec.rb
 - spec/savon/core_ext/array_spec.rb
 - spec/savon/core_ext/datetime_spec.rb
 - spec/savon/core_ext/hash_spec.rb
-- spec/savon/core_ext/net_http_spec.rb
 - spec/savon/core_ext/object_spec.rb
 - spec/savon/core_ext/string_spec.rb
 - spec/savon/core_ext/symbol_spec.rb
-- spec/savon/core_ext/uri_spec.rb
-- spec/savon/request_spec.rb
-- spec/savon/response_spec.rb
+- spec/savon/http/error_spec.rb
+- spec/savon/savon_spec.rb
+- spec/savon/soap/fault_spec.rb
+- spec/savon/soap/request_spec.rb
+- spec/savon/soap/response_spec.rb
+- spec/savon/soap/xml_spec.rb
 - spec/savon/soap_spec.rb
-- spec/savon/wsdl_spec.rb
+- spec/savon/wsdl/document_spec.rb
+- spec/savon/wsdl/request_spec.rb
 - spec/savon/wsse_spec.rb
 - spec/spec_helper.rb
-- spec/fixtures/response/xml/authentication.xml
-- spec/fixtures/response/xml/multi_ref.xml
-- spec/fixtures/response/xml/soap_fault.xml
-- spec/fixtures/response/xml/soap_fault12.xml
-- spec/fixtures/wsdl/xml/authentication.xml
-- spec/fixtures/wsdl/xml/geotrust.xml
-- spec/fixtures/wsdl/xml/namespaced_actions.xml
-- spec/fixtures/wsdl/xml/no_namespace.xml
-- spec/fixtures/wsdl/wsdl_fixture.yml
-- spec/fixtures/gzip/message.gz
-- .autotest
-- spec/spec.opts
+- spec/support/endpoint.rb
 has_rdoc: true
 homepage: http://github.com/rubiii/savon
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-- --line-numbers
-- --inline-source
-- --title
-- Savon - Heavy metal Ruby SOAP client library
+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"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: savon
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Heavy metal Ruby SOAP client library
-test_files: 
-- spec/basic_spec_helper.rb
-- spec/endpoint_helper.rb
-- spec/fixtures/gzip/gzip_response_fixture.rb
-- spec/fixtures/response/response_fixture.rb
-- spec/fixtures/wsdl/wsdl_fixture.rb
-- spec/http_stubs.rb
-- spec/integration/http_basic_auth_spec.rb
-- spec/integration/server.rb
-- spec/savon/client_spec.rb
-- spec/savon/core_ext/array_spec.rb
-- spec/savon/core_ext/datetime_spec.rb
-- spec/savon/core_ext/hash_spec.rb
-- spec/savon/core_ext/net_http_spec.rb
-- spec/savon/core_ext/object_spec.rb
-- spec/savon/core_ext/string_spec.rb
-- spec/savon/core_ext/symbol_spec.rb
-- spec/savon/core_ext/uri_spec.rb
-- spec/savon/request_spec.rb
-- spec/savon/response_spec.rb
-- spec/savon/soap_spec.rb
-- spec/savon/wsdl_spec.rb
-- spec/savon/wsse_spec.rb
-- spec/spec_helper.rb
+summary: Heavy metal Ruby SOAP client
+test_files: []
+