savon 2.2.0 → 2.3.0

data/lib/savon/qualified_message.rb

@@ -15,17 +15,21 @@ module Savon
       return hash.to_s unless hash.kind_of? Hash
 
       hash.inject({}) do |newhash, (key, value)|
-        translated_key = Gyoku.xml_tag(key, :key_converter => @key_converter).to_s
-        newpath = path + [translated_key]
-
-        if @used_namespaces[newpath]
-          newhash.merge(
-            "#{@used_namespaces[newpath]}:#{translated_key}" =>
-              to_hash(value, @types[newpath] ? [@types[newpath]] : newpath)
-          )
-        else
-          add_namespaces_to_values(value, path) if key == :order!
+        if key == :order!
+          add_namespaces_to_values(value, path)
           newhash.merge(key => value)
+        else
+          translated_key = Gyoku.xml_tag(key, :key_converter => @key_converter).to_s
+          newpath = path + [translated_key]
+
+          if @used_namespaces[newpath]
+            newhash.merge(
+              "#{@used_namespaces[newpath]}:#{translated_key}" =>
+                to_hash(value, @types[newpath] ? [@types[newpath]] : newpath)
+            )
+          else
+            newhash.merge(translated_key => value)
+          end
         end
       end
     end

data/lib/savon/request.rb

@@ -37,6 +37,7 @@ module Savon
     def configure_auth
       @http_request.auth.basic(*@globals[:basic_auth])   if @globals.include? :basic_auth
       @http_request.auth.digest(*@globals[:digest_auth]) if @globals.include? :digest_auth
+      @http_request.auth.ntlm(*@globals[:ntlm])          if @globals.include? :ntlm
     end
 
   end

data/lib/savon/request_logger.rb

@@ -0,0 +1,48 @@
+require "savon/log_message"
+
+module Savon
+  class RequestLogger
+
+    def initialize(globals)
+      @globals = globals
+    end
+
+    def log(request, &http_request)
+      log_request(request) if log?
+      response = http_request.call
+      log_response(response) if log?
+
+      response
+    end
+
+    def logger
+      @globals[:logger]
+    end
+
+    def log?
+      @globals[:log]
+    end
+
+    private
+
+    def log_request(request)
+      logger.info  "SOAP request: #{request.url}"
+      logger.info  headers_to_log(request.headers)
+      logger.debug body_to_log(request.body)
+    end
+
+    def log_response(response)
+      logger.info  "SOAP response (status #{response.code})"
+      logger.debug body_to_log(response.body)
+    end
+
+    def headers_to_log(headers)
+      headers.map { |key, value| "#{key}: #{value}" }.join(", ")
+    end
+
+    def body_to_log(body)
+      LogMessage.new(body, @globals[:filters], @globals[:pretty_print_xml]).to_s
+    end
+
+  end
+end

data/lib/savon/response.rb

@@ -10,15 +10,16 @@ module Savon
       @globals = globals
       @locals  = locals
 
+      build_soap_and_http_errors!
       raise_soap_and_http_errors! if @globals[:raise_errors]
     end
 
-    attr_reader :http, :globals, :locals
+    attr_reader :http, :globals, :locals, :soap_fault, :http_error
 
     def success?
       !soap_fault? && !http_error?
     end
-    alias successful? success?
+    alias_method :successful?, :success?
 
     def soap_fault?
       SOAPFault.present? @http
@@ -29,15 +30,14 @@ module Savon
     end
 
     def header
-      raise_invalid_response_error! unless hash.key? :envelope
-      hash[:envelope][:header]
+      find('Header')
     end
 
     def body
-      raise_invalid_response_error! unless hash.key? :envelope
-      hash[:envelope][:body]
+      find('Body')
     end
-    alias to_hash body
+
+    alias_method :to_hash, :body
 
     def to_array(*path)
       result = path.inject body do |memo, key|
@@ -49,30 +49,45 @@ module Savon
     end
 
     def hash
-      @hash ||= nori.parse(to_xml)
+      @hash ||= nori.parse(xml)
     end
 
-    def to_xml
+    def xml
       @http.body
     end
 
+    alias_method :to_xml, :xml
+    alias_method :to_s,   :xml
+
     def doc
-      @doc ||= Nokogiri.XML(to_xml)
+      @doc ||= Nokogiri.XML(xml)
     end
 
     def xpath(path, namespaces = nil)
       doc.xpath(path, namespaces || xml_namespaces)
     end
 
+    def find(*path)
+      envelope = nori.find(hash, 'Envelope')
+      raise_invalid_response_error! unless envelope
+
+      nori.find(envelope, *path)
+    end
+
     private
 
+    def build_soap_and_http_errors!
+      @soap_fault = SOAPFault.new(@http, nori) if soap_fault?
+      @http_error = HTTPError.new(@http) if http_error?
+    end
+
     def raise_soap_and_http_errors!
-      raise SOAPFault.new(@http, nori) if soap_fault?
-      raise HTTPError.new(@http) if http_error?
+      raise soap_fault if soap_fault?
+      raise http_error if http_error?
     end
 
     def raise_invalid_response_error!
-      raise InvalidResponseError, "Unable to parse response body:\n" + to_xml.inspect
+      raise InvalidResponseError, "Unable to parse response body:\n" + xml.inspect
     end
 
     def xml_namespaces

data/lib/savon/version.rb

@@ -1,5 +1,5 @@
 module Savon
 
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 
 end

data/savon.gemspec

@@ -14,22 +14,23 @@ Gem::Specification.new do |s|
   s.description = s.summary
 
   s.rubyforge_project = s.name
+  s.license = 'MIT'
 
-  s.add_dependency "nori",     "~> 2.1.0"
-  s.add_dependency "httpi",    "~> 2.0.2"
-  s.add_dependency "wasabi",   "~> 3.1.0"
+  s.add_dependency "nori",     "~> 2.3.0"
+  s.add_dependency "httpi",    "~> 2.1.0"
+  s.add_dependency "wasabi",   "~> 3.2.0"
   s.add_dependency "akami",    "~> 1.2.0"
-  s.add_dependency "gyoku",    "~> 1.0.0"
+  s.add_dependency "gyoku",    "~> 1.1.0"
 
   s.add_dependency "builder",  ">= 2.1.2"
-  s.add_dependency "nokogiri", ">= 1.4.0"
+  s.add_dependency "nokogiri", ">= 1.4.0", "< 1.6"
 
   s.add_development_dependency "rack"
   s.add_development_dependency "puma",  "2.0.0.b4"
 
-  s.add_development_dependency "rake",  "~> 0.9"
-  s.add_development_dependency "rspec", "~> 2.10"
-  s.add_development_dependency "mocha", "~> 0.11"
+  s.add_development_dependency "rake",  "~> 10.1"
+  s.add_development_dependency "rspec", "~> 2.14"
+  s.add_development_dependency "mocha", "~> 0.14"
   s.add_development_dependency "json",  "~> 1.7"
 
   ignores  = File.readlines(".gitignore").grep(/\S+/).map(&:chomp)

data/spec/fixtures/wsdl/vies.xml

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="urn:ec.europa.eu:taxud:vies:services:checkVat" xmlns:tns1="urn:ec.europa.eu:taxud:vies:services:checkVat:types" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:impl="urn:ec.europa.eu:taxud:vies:services:checkVat" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/">
+  <xsd:documentation>
+	 Specific disclaimer for this service ----------------------------------------- The
+	    objective of this Internet site is to allow persons involved in the intra-Community supply of
+	    goods or of services to obtain confirmation of the validity of the VAT identification number of
+	    any specified person, in accordance to article 27 of Council Regulation (EC) No. 1798/2003 of 7
+	    October 2003. Any other use and any extraction and use of the data which is not in conformity
+	    with the objective of this site is strictly forbidden. Any retransmission of the contents of
+	    this site, whether for a commercial purpose or otherwise, as well as any more general use other
+	    than as far as is necessary to support the activity of a legitimate user (for example: to draw
+	    up their own invoices) is expressly forbidden. In addition, any copying or reproduction of the
+	    contents of this site is strictly forbidden. The European Commission maintains this website to
+	    enhance the access by taxable persons making intra-Community supplies to verification of their
+	    customers VAT identification numbers. Our goal is to supply instantaneous and accurate
+	    information. However the Commission accepts no responsibility or liability whatsoever with
+	    regard to the information obtained using this site. This information: - is obtained from Member
+	    States databases over which the Commission services have no control and for which the Commission
+	    assumes no responsibility; it is the responsibility of the Member States to keep their databases
+	    complete, accurate and up to date; - is not professional or legal advice (if you need specific
+	    advice, you should always consult a suitably qualified professional); - does not in itself give
+	    a right to exempt intra-Community supplies from Value Added Tax; - does not change any
+	    obligations imposed on taxable persons in relation to intra-Community supplies. It is our goal
+	    to minimise disruption caused by technical errors. However some data or information on our site
+	    may have been created or structured in files or formats which are not error-free and we cannot
+	    guarantee that our service will not be interrupted or otherwise affected by such problems. The
+	    Commission accepts no responsibility with regard to such problems incurred as a result of using
+	    this site or any linked external sites. This disclaimer is not intended to limit the liability
+	    of the Commission in contravention of any requirements laid down in applicable national law nor
+	    to exclude its liability for matters which may not be excluded under that law. Usage: The
+	    countryCode input parameter must follow the pattern [A-Z]{2} The vatNumber input parameter must
+	    follow the [0-9A-Za-z\+\*\.]{2,12} In case of problem, the returned FaultString can take the
+	    following specific values: - INVALID_INPUT: The provided CountryCode is invalid or the VAT
+	    number is empty; - SERVICE_UNAVAILABLE: The SOAP service is unavailable, try again later; -
+	    MS_UNAVAILABLE: The Member State service is unavailable, try again later or with another Member
+	    State; - TIMEOUT: The Member State service could not be reach in time, try again later or with
+	    another Member State; - SERVER_BUSY: The service can't process your request. Try again latter. 
+	</xsd:documentation>
+  
+  <wsdl:types>
+    <xsd:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="urn:ec.europa.eu:taxud:vies:services:checkVat:types" xmlns="urn:ec.europa.eu:taxud:vies:services:checkVat:types">
+			<xsd:element name="checkVat">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="countryCode" type="xsd:string"/>
+						<xsd:element name="vatNumber" type="xsd:string"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="checkVatResponse">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="countryCode" type="xsd:string"/>
+						<xsd:element name="vatNumber" type="xsd:string"/>
+						<xsd:element name="requestDate" type="xsd:date"/>
+						<xsd:element name="valid" type="xsd:boolean"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="name" nillable="true" type="xsd:string"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="address" nillable="true" type="xsd:string"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="checkVatApprox">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="countryCode" type="xsd:string"/>
+						<xsd:element name="vatNumber" type="xsd:string"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderName" type="xsd:string"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderCompanyType" type="tns1:companyTypeCode"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderStreet" type="xsd:string"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderPostcode" type="xsd:string"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderCity" type="xsd:string"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="requesterCountryCode" type="xsd:string"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="requesterVatNumber" type="xsd:string"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="checkVatApproxResponse">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="countryCode" type="xsd:string"/>
+						<xsd:element name="vatNumber" type="xsd:string"/>
+						<xsd:element name="requestDate" type="xsd:date"/>
+						<xsd:element name="valid" type="xsd:boolean"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderName" nillable="true" type="xsd:string"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderCompanyType" nillable="true" type="tns1:companyTypeCode"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderAddress" type="xsd:string"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderStreet" type="xsd:string"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderPostcode" type="xsd:string"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderCity" type="xsd:string"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderNameMatch" type="tns1:matchCode"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderCompanyTypeMatch" type="tns1:matchCode"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderStreetMatch" type="tns1:matchCode"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderPostcodeMatch" type="tns1:matchCode"/>
+						<xsd:element maxOccurs="1" minOccurs="0" name="traderCityMatch" type="tns1:matchCode"/>
+						<xsd:element name="requestIdentifier" type="xsd:string"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:simpleType name="companyTypeCode">
+				<xsd:restriction base="xsd:string">
+					<xsd:pattern value="[A-Z]{2}\-[1-9][0-9]?"/>
+				</xsd:restriction>
+			</xsd:simpleType>
+			<xsd:simpleType name="matchCode">
+				<xsd:restriction base="xsd:string">
+					<xsd:enumeration value="1">
+						<xsd:annotation>
+							<xsd:documentation>VALID</xsd:documentation>
+						</xsd:annotation>
+					</xsd:enumeration>
+					<xsd:enumeration value="2">
+						<xsd:annotation>
+							<xsd:documentation>INVALID</xsd:documentation>
+						</xsd:annotation>
+					</xsd:enumeration>
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:schema>
+  </wsdl:types>
+  <wsdl:message name="checkVatRequest">
+    <wsdl:part name="parameters" element="tns1:checkVat">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="checkVatApproxResponse">
+    <wsdl:part name="parameters" element="tns1:checkVatApproxResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="checkVatApproxRequest">
+    <wsdl:part name="parameters" element="tns1:checkVatApprox">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:message name="checkVatResponse">
+    <wsdl:part name="parameters" element="tns1:checkVatResponse">
+    </wsdl:part>
+  </wsdl:message>
+  <wsdl:portType name="checkVatPortType">
+    <wsdl:operation name="checkVat">
+      <wsdl:input name="checkVatRequest" message="impl:checkVatRequest">
+    </wsdl:input>
+      <wsdl:output name="checkVatResponse" message="impl:checkVatResponse">
+    </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="checkVatApprox">
+      <wsdl:input name="checkVatApproxRequest" message="impl:checkVatApproxRequest">
+    </wsdl:input>
+      <wsdl:output name="checkVatApproxResponse" message="impl:checkVatApproxResponse">
+    </wsdl:output>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="checkVatBinding" type="impl:checkVatPortType">
+    <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="checkVat">
+      <wsdlsoap:operation soapAction=""/>
+      <wsdl:input name="checkVatRequest">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="checkVatResponse">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="checkVatApprox">
+      <wsdlsoap:operation soapAction=""/>
+      <wsdl:input name="checkVatApproxRequest">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="checkVatApproxResponse">
+        <wsdlsoap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="checkVatService">
+    <wsdl:port name="checkVatPort" binding="impl:checkVatBinding">
+      <wsdlsoap:address location="http://ec.europa.eu/taxation_customs/vies/services/checkVatService"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>

data/spec/savon/builder_spec.rb

@@ -81,7 +81,6 @@ describe Savon::Builder do
 
       expect(builder.to_s).to include("<tns:username>luke</tns:username>")
     end
-
   end
 
 end

data/spec/savon/features/message_tag_spec.rb

@@ -27,6 +27,11 @@ describe Savon do
     expect(message_tag).to eq(['http://www.betfair.com/publicapi/v5/BFExchangeService/', 'getBet'])
   end
 
+  it 'knows the message tag for :vies' do
+    message_tag = message_tag_for(:vies, :check_vat)
+    expect(message_tag).to eq(['urn:ec.europa.eu:taxud:vies:services:checkVat:types', 'checkVat'])
+  end
+
   it 'knows the message tag for :wasmuth' do
     message_tag = message_tag_for(:wasmuth, :get_st_tables)
     expect(message_tag).to eq(['http://ws.online.msw/', 'getStTables'])

data/spec/savon/message_spec.rb

@@ -0,0 +1,40 @@
+require "spec_helper"
+require "integration/support/server"
+
+describe Savon::Message do
+
+  before do
+    @server = IntegrationServer.run
+  end
+
+  after do
+    @server.stop
+  end
+
+  context "with a qualified message" do
+    it "converts request Hash keys for which there is not namespace" do
+      client = Savon.client(
+        :endpoint => @server.url(:repeat),
+        :namespace => 'http://example.com',
+        :log => false,
+
+        :element_form_default => :qualified,
+        :convert_request_keys_to => :camelcase,
+
+        :convert_response_tags_to => nil
+      )
+
+      message = {
+       :email_count => 3,
+       :user_name   => 'josh',
+       :order!      => [:user_name, :email_count]
+      }
+
+      response = client.call(:something, :message => message)
+      body = response.hash['Envelope']['Body']
+
+      expect(response.xml).to include('<wsdl:UserName>josh</wsdl:UserName><wsdl:EmailCount>3</wsdl:EmailCount>')
+    end
+  end
+
+end