savon 0.5.3 → 0.6.0

data/spec/savon/wsse_spec.rb

@@ -2,24 +2,9 @@ require "spec_helper"
 
 describe Savon::WSSE do
   before do
-    @wsse = new_wsse_instance
-    @wsse_username = "gorilla"
-    @wsse_password = "secret"
-  end
-
-  def new_wsse_instance(credentials = {})
-    wsse = Class.new
-    class << wsse
-      include Savon::WSSE
-      attr_accessor :options
-    end
-    wsse.options = { :wsse => {} }
-    wsse
-  end
-
-  def wsse_options(digest = false)
-    { :wsse => { :username => @wsse_username,
-      :password => @wsse_password, :digest => digest } }
+    @wsse = Savon::WSSE.new
+    @username = "gorilla"
+    @password = "secret"
   end
 
   describe "WSENamespace" do
@@ -37,26 +22,28 @@ describe Savon::WSSE do
   end
 
   describe "@username" do
-    it "defaults to nil" do
-      Savon::WSSE.username.should be_nil
+    it "defaults to an empty String" do
+      Savon::WSSE.username.should be_a String
+      Savon::WSSE.username.should be_empty
     end
 
     it "has accessor methods" do
       Savon::WSSE.username = "gorilla"
       Savon::WSSE.username.should == "gorilla"
-      Savon::WSSE.username = nil
+      Savon::WSSE.username = ""
     end
   end
 
   describe "@password" do
-    it "defaults to nil" do
-      Savon::WSSE.password.should be_nil
+    it "defaults to an empty String" do
+      Savon::WSSE.password.should be_a String
+      Savon::WSSE.password.should be_empty
     end
 
     it "has accessor methods" do
       Savon::WSSE.password = "secret"
       Savon::WSSE.password.should == "secret"
-      Savon::WSSE.password = nil
+      Savon::WSSE.password = ""
     end
   end
 
@@ -72,84 +59,91 @@ describe Savon::WSSE do
     end
   end
 
-  describe "wsse?" do
-    describe "returns true in case WSSE credentials are available" do
-      it "via options" do
-        @wsse.options = wsse_options
-        @wsse.wsse?.should be_true
-      end
-
-      it "via defaults" do
-        Savon::WSSE.username = "gorilla"
-        Savon::WSSE.password = "secret"
+  describe "username" do
+    it "defaults to an empty String" do
+      @wsse.username.should be_a String
+      @wsse.username.should be_empty
+    end
 
-        @wsse.wsse?.should be_true
-      end
+    it "has accessor methods" do
+      @wsse.username = "gorilla"
+      @wsse.username.should == "gorilla"
+      @wsse.username = nil
     end
+  end
 
-    describe "returns false in case WSSE credentials are missing or incomplete" do
-      it "via options" do
-        @wsse.wsse?.should be_false
+  describe "password" do
+    it "defaults to an empty String" do
+      @wsse.password.should be_a String
+      @wsse.password.should be_empty
+    end
 
-        new_wsse_instance(:wsse => { :username => @wsse_username }).wsse?.
-          should be_false
+    it "has accessor methods" do
+      @wsse.password = "secret"
+      @wsse.password.should == "secret"
+      @wsse.password = nil
+    end
+  end
 
-        new_wsse_instance(:wsse => { :password => @wsse_password }).wsse?.
-            should be_false
-      end
+  describe "digest" do
+    it "defaults to false" do
+      @wsse.digest?.should be_false
+    end
 
-      it "via defaults" do
-        Savon::WSSE.username = @wsse_username
-        @wsse.wsse?.should be_false
-        
-        Savon::WSSE.username = nil
-        Savon::WSSE.password = @wsse_password
-        @wsse.wsse?.should be_false
-      end
+    it "has accessor methods" do
+      @wsse.digest = true
+      @wsse.digest?.should == true
+      @wsse.digest = false
     end
   end
 
-  describe "wsse_header" do
+  describe "header" do
     describe "returns the XML for a WSSE authentication header" do
-      it "with WSSE credentials specified via options" do
-        @wsse.options = wsse_options
-        wsse_header = @wsse.wsse_header Builder::XmlMarkup.new
-
-        wsse_header.should include_security_namespaces
-        wsse_header.should include @wsse_username
-        wsse_header.should include @wsse_password
+      it "with WSSE credentials specified" do
+        @wsse.username = @username
+        @wsse.password = @password
+        header = @wsse.header
+
+        header.should include_security_namespaces
+        header.should include @username
+        header.should include @password
       end
 
       it "with WSSE credentials specified via defaults" do
-        Savon::WSSE.username = @wsse_username
-        Savon::WSSE.password = @wsse_password
-        wsse_header = @wsse.wsse_header Builder::XmlMarkup.new
+        Savon::WSSE.username = @username
+        Savon::WSSE.password = @password
+        header = @wsse.header
+
+        header.should include_security_namespaces
+        header.should include @username
+        header.should include @password
 
-        wsse_header.should include_security_namespaces
-        wsse_header.should include @wsse_username
-        wsse_header.should include @wsse_password
+        Savon::WSSE.username = ""
+        Savon::WSSE.password = ""
       end
     end
 
     describe "returns the XML for a WSSE digest header if specified" do
-      before {}
-      it "via options" do
-        @wsse.options = wsse_options :for_digest
-        wsse_header = @wsse.wsse_header Builder::XmlMarkup.new
+      it "via accessors" do
+        @wsse.username = @username
+        @wsse.password = @password
+        @wsse.digest = true
+        header = @wsse.header
   
-        wsse_header.should include_security_namespaces
-        wsse_header.should include @wsse_username
-        wsse_header.should_not include @wsse_password
+        header.should include_security_namespaces
+        header.should include @username
+        header.should_not include @password
       end
 
       it "via defaults" do
+        @wsse.username = @username
+        @wsse.password = @password
         Savon::WSSE.digest = true
-        @wsse.options = wsse_options
-        wsse_header = @wsse.wsse_header Builder::XmlMarkup.new
+        header = @wsse.header
   
-        wsse_header.should include_security_namespaces
-        wsse_header.should include @wsse_username
-        wsse_header.should_not include @wsse_password
+        header.should include_security_namespaces
+        header.should include @username
+        header.should_not include @password
       end
     end
 
@@ -161,9 +155,4 @@ describe Savon::WSSE do
     end
   end
 
-  after do
-    Savon::WSSE.username = nil
-    Savon::WSSE.password = nil
-    Savon::WSSE.digest = false
-  end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 +01:00
+date: 2009-12-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,8 +84,8 @@ files:
 - lib/savon/core_ext/symbol.rb
 - lib/savon/core_ext/uri.rb
 - lib/savon/request.rb
+- lib/savon/response.rb
 - lib/savon/soap.rb
-- lib/savon/validation.rb
 - lib/savon/wsdl.rb
 - lib/savon/wsse.rb
 - spec/fixtures/multiple_user_response.xml
@@ -102,9 +102,9 @@ files:
 - 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/savon_spec.rb
 - spec/savon/soap_spec.rb
-- spec/savon/validation_spec.rb
 - spec/savon/wsdl_spec.rb
 - spec/savon/wsse_spec.rb
 - spec/spec_helper.rb
@@ -152,9 +152,9 @@ test_files:
 - 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/savon_spec.rb
 - spec/savon/soap_spec.rb
-- spec/savon/validation_spec.rb
 - spec/savon/wsdl_spec.rb
 - spec/savon/wsse_spec.rb
 - spec/spec_helper.rb

data/lib/savon/validation.rb

@@ -1,57 +0,0 @@
-module Savon
-  module Validation
-
-    # Validates a given +value+ of a given +type+. Raises an ArgumentError
-    # in case the value is not valid. 
-    def validate!(type, value)
-      case type
-        when :endpoint then validate_endpoint value
-        when :soap_version then validate_soap_version value
-        when :soap_body then validate_soap_body value
-        when :response_process then validate_response_process value
-        when :wsse_credentials then validate_wsse_credentials value
-      end
-      true
-    end
-
-    # Raises an ArgumentError for a given +argument+. Also accepts the invalid
-    # +value+ and adds it to the error message.
-    def invalid!(argument, value = nil)
-      message = "Invalid argument '#{argument}'"
-      message << ": #{value}" if value
-      raise ArgumentError, message
-    end
-
-  private
-
-    # Validates a given +endpoint+.
-    def validate_endpoint(endpoint)
-      invalid! :endpoint, endpoint unless /^(http|https):\/\// === endpoint
-    end
-
-    # Validates a given +soap_version+.
-    def validate_soap_version(soap_version)
-      invalid! :soap_version, soap_version unless SOAPVersions.include? soap_version
-    end
-
-    # Validates a given +soap_body+.
-    def validate_soap_body(soap_body)
-      invalid! :soap_body, soap_body unless
-        soap_body.kind_of?(Hash) || soap_body.respond_to?(:to_s)
-    end
-
-    # Validates a given +response_process+.
-    def validate_response_process(response_process)
-      invalid! :response_process, response_process unless
-        response_process.respond_to? :call
-    end
-
-    # Validates a given Hash of +wsse_credentials+.
-    def validate_wsse_credentials(wsse)
-      invalid! :wsse_credentials unless wsse[:username] && wsse[:password]
-      invalid! :wsse_username, wsse[:username] unless wsse[:username].respond_to? :to_s
-      invalid! :wsse_password, wsse[:password] unless wsse[:password].respond_to? :to_s
-    end
-
-  end
-end

data/spec/savon/validation_spec.rb

@@ -1,88 +0,0 @@
-require "spec_helper"
-
-describe Savon::Validation do
-  before do
-    @validation = Class.new
-    class << @validation
-      include Savon::Validation
-    end
-  end
-
-  describe "validate!" do
-    describe ":endpoint" do
-      it "returns true for valid endpoints" do
-        @validation.validate!(:endpoint, "http://example.com").should be_true
-      end
-
-      it "raises an ArgumentError in case of invalid endpoints" do
-        lambda { @validation.validate! :endpoint, "invalid" }.
-          should raise_error ArgumentError
-      end
-    end
-
-    describe ":soap_version" do
-      it "returns true for valid SOAP versions" do
-        Savon::SOAPVersions.each do |soap_version|
-          @validation.validate!(:soap_version, soap_version).should be_true
-        end
-      end
-
-      it "raises an ArgumentError in case of invalid SOAP versions" do
-        [5, 9, nil, false, "upcoming"].each do |soap_version|
-          lambda { @validation.validate! :soap_version, soap_version }.
-            should raise_error ArgumentError
-        end
-      end
-    end
-
-    describe ":soap_body" do
-      it "returns true for Hashes" do
-        @validation.validate!(:soap_body, {}).should be_true
-      end
-
-      it "returns true for Objects responding to to_s" do
-        [123, "body", Time.now].each do |soap_body|
-          lambda { @validation.validate!(:soap_body, soap_body) }.should be_true
-        end
-      end
-
-      it "raises an ArgumentError in case of an invalid SOAP body" do
-        singleton = "pretending like there is no such thing as to_s"
-        def singleton.respond_to?(method)
-          false
-        end
-
-        lambda { @validation.validate! :endpoint, singleton }.
-          should raise_error ArgumentError
-      end
-    end
-
-    describe ":response_process" do
-      it "returns true for Objects responding to call" do
-        @validation.validate!(:response_process, Proc.new {}).should be_true
-      end
-
-      it "raises an ArgumentError for an invalid response process" do
-        [123, "block", [], {}].each do |response_process|
-          lambda { @validation.validate! :response_process, response_process }.
-            should raise_error ArgumentError
-        end
-      end
-    end
-
-    describe ":wsse_credentials" do
-      it "returns true for valid WSSE credentials" do
-        wsse_credentials = { :username => "user", :password => "secret" }
-        @validation.validate!(:wsse_credentials, wsse_credentials).should be_true
-      end
-
-      it "returns false for invalid WSSE credentials" do
-        [{ :username => "user" }, { :password => "secret" }].each do |wsse_credentials|
-          lambda { @validation.validate! :wsse_credentials, wsse_credentials }.
-            should raise_error ArgumentError
-        end
-      end
-    end
-
-  end
-end