savon 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/savon/client.rb

@@ -66,6 +66,7 @@ module Savon
     def method_missing(method, *args, &block) #:doc:
       soap_action = @wsdl.mapped_soap_actions[method]
       super unless soap_action
+      #soap_action = "User.GetApiKey"
 
       soap_body, options = args[0] || {}, args[1] || {}
       validate_arguments! soap_body, options, block

data/lib/savon/validation.rb

@@ -14,43 +14,43 @@ module Savon
       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
+      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
+      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
+      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
+      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
-
-    # 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
+      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

data/spec/http_stubs.rb

@@ -17,4 +17,9 @@ FakeWeb.register_uri :post, SpecHelper.soap_soapfault_endpoint, :body => UserFix
 # Register fake WSDL and SOAP request for a Savon::HTTPError.
 FakeWeb.register_uri :get, SpecHelper.httperror_endpoint, :body => UserFixture.user_wsdl
 FakeWeb.register_uri :post, SpecHelper.soap_httperror_endpoint, :body => "",
-  :status => ["404", "Not Found"]
+  :status => ["404", "Not Found"]
+
+# Register fake WSDL and SOAP request for an invalid endpoint.
+FakeWeb.register_uri :get, SpecHelper.invalid_endpoint, :body => ""
+FakeWeb.register_uri :post, SpecHelper.soap_invalid_endpoint, :body => "",
+  :status => ["404", "Not Found"]

data/spec/savon/wsdl_spec.rb

@@ -19,6 +19,11 @@ describe Savon::WSDL do
     it "returns an Array containing all available SOAP actions" do
       @wsdl.soap_actions.should == UserFixture.soap_actions.keys
     end
+
+    it "raises an ArgumentError in case the WSDL seems to be invalid" do
+      wsdl = Savon::WSDL.new Savon::Request.new SpecHelper.invalid_endpoint
+      lambda { wsdl.soap_actions }.should raise_error ArgumentError
+    end
   end
 
   describe "mapped_soap_actions" do
@@ -33,4 +38,4 @@ describe Savon::WSDL do
     end
   end
 
-end
+end

data/spec/spec_helper_methods.rb

@@ -12,6 +12,9 @@ class SpecHelper
 
   @soap_httperror_endpoint = "http://httperror.example.com/UserService"
   @httperror_endpoint = @soap_httperror_endpoint + "?wsdl"
+
+  @soap_invalid_endpoint = "http://invalid.example.com/UserService"
+  @invalid_endpoint = @soap_invalid_endpoint + "?wsdl"
   
   @wsse_security_nodes =  ["wsse:Security", "wsse:UsernameToken",
     "wsse:Username", "wsse:Password", "wsse:Nonce", "wsu:Created"]
@@ -22,6 +25,7 @@ class SpecHelper
       :soap_multiple_endpoint , :multiple_endpoint,
       :soap_soapfault_endpoint, :soapfault_endpoint,
       :soap_httperror_endpoint, :httperror_endpoint,
+      :soap_invalid_endpoint, :invalid_endpoint,
       :wsse_security_nodes
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Daniel Harrington