wasabi 3.0.0 → 3.1.0

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 3.1.0 (2013-04-21)
+
+* Feature: [#22](https://github.com/savonrb/wasabi/issues/22) added `Wasabi::Document#service_name`
+  to return the name of the SOAP service. Original issue: [savonrb/savon#408](https://github.com/savonrb/savon/pull/408).
+
+* Fix: [#21](https://github.com/savonrb/wasabi/issues/21) when the Resolver gets an
+  erroneous response (such as a 404), we now raise a more useful HTTPError.
+
+* Fix: [#23](https://github.com/savonrb/wasabi/issues/23) ignore extension base elements
+  defined in imports.
+
 ## 3.0.0 (2012-12-17)
 
 * Updated to HTTPI 2.0 to play nicely with Savon 2.0.
@@ -8,7 +19,7 @@
   finding the correct SOAP input tag and namespace identifier fails when portTypes
   are imported, since imports are currently not supported.
 
-  The bug was introduced in v2.2.0 by [583cf6](https://github.com/rubiii/wasabi/commit/583cf658f1953411a7a7a4c22923fa0a046c8d6d).
+  The bug was introduced in v2.2.0 by [583cf6](https://github.com/rubiii/wasabi/commit/583cf658f1953411a7a7a4c22923fa0a046c8d6d)
 
 * Refactoring: Removed `Object#blank?` core extension.
 

data/lib/wasabi/document.rb

@@ -76,6 +76,13 @@ module Wasabi
       @operations ||= parser.operations
     end
 
+    # Returns the service name.
+    def service_name
+      @service_name ||= parser.service_name
+    end
+
+    attr_writer :service_name
+
     def type_namespaces
       @type_namespaces ||= begin
         namespaces = []

data/lib/wasabi/parser.rb

@@ -14,6 +14,7 @@ module Wasabi
       self.document = document
       self.operations = {}
       self.namespaces = {}
+      self.service_name = ''
       self.types = {}
       self.deferred_types = []
       self.element_form_default = :unqualified
@@ -40,12 +41,16 @@ module Wasabi
     # Returns the SOAP endpoint.
     attr_accessor :endpoint
 
+    # Returns the SOAP Service Name
+    attr_accessor :service_name
+
     # Returns the elementFormDefault value.
     attr_accessor :element_form_default
 
     def parse
       parse_namespaces
       parse_endpoint
+      parse_service_name
       parse_operations
       parse_types
       parse_deferred_types
@@ -75,6 +80,11 @@ module Wasabi
       end
     end
 
+    def parse_service_name
+      service_name = at_xpath("wsdl:definitions/@name")
+      @service_name = service_name.to_s if service_name
+    end
+
     def parse_operations
       operations = xpath("wsdl:definitions/wsdl:binding/wsdl:operation")
       operations.each do |operation|
@@ -128,7 +138,9 @@ module Wasabi
         if @types[base]
           @types[name].merge! @types[base]
         else
-          deferred_types << Proc.new { @types[name].merge! @types[base] }
+          deferred_types << Proc.new {
+            @types[name].merge! @types[base] if @types[base]
+          }
         end
       end
     end

data/lib/wasabi/resolver.rb

@@ -7,7 +7,13 @@ module Wasabi
   # Resolves local and remote WSDL documents.
   class Resolver
 
-    class HTTPError < StandardError; end
+    class HTTPError < StandardError
+      def initialize(message, response=nil)
+        super(message)
+        @response = response
+      end
+      attr_reader :response
+    end
 
     URL = /^http[s]?:/
     XML = /^</
@@ -35,7 +41,8 @@ module Wasabi
       request.url = document
       response = HTTPI.get(request)
 
-      raise HTTPError, response if response.error?
+      raise HTTPError.new("Error: #{response.code}", response) if response.error?
+
       response.body
     end
 

data/lib/wasabi/version.rb

@@ -1,5 +1,5 @@
 module Wasabi
 
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 
 end

data/spec/fixtures/juniper.wsdl

@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="SystemService" targetNamespace="http://juniper.net/webproxy/systemservice" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://schemas.xmlsoap.org/soap/encoding/" xmlns:impl="http://juniper.net/webproxy/systemservice" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:core="http://juniper.net/core" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+  <types>
+    <xs:schema elementFormDefault="qualified" targetNamespace="http://juniper.net/webproxy/systemservice" version="1.0" xmlns="http://juniper.net/webproxy/systemservice" xmlns:core="http://juniper.net/core" xmlns:impl="http://juniper.net/webproxy/systemservice">
+  		<xs:import namespace="http://juniper.net/core" schemaLocation="SystemService?xsd=xsd0.xsd"/>
+			<xs:simpleType name="LoginStatusCodeType">
+				<xs:restriction base="xs:token">
+					<xs:enumeration value="Success"/>
+					<xs:enumeration value="Failure"/>
+					<xs:enumeration value="Challenge"/>
+				</xs:restriction>
+			</xs:simpleType>
+			<xs:complexType name="LoginStatus">
+				<xs:sequence>
+					<xs:element name="status" type="impl:LoginStatusCodeType"/>
+					<xs:element minOccurs="0" name="challenge" type="xs:string"/>
+				</xs:sequence>
+			</xs:complexType>
+			<xs:element name="LoginRequest">
+				<xs:annotation>
+					<xs:documentation>Login into the system
+					
+domainName: the domain to login
+userName: the user name
+password: the password
+                        </xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:complexContent>
+						<xs:extension base="core:SimpleRequestType">
+							<xs:sequence>
+								<xs:element name="domainName" type="xs:string"/>
+								<xs:element name="userName" type="xs:string"/>
+								<xs:element name="password" type="xs:string"/>
+							</xs:sequence>
+						</xs:extension>
+					</xs:complexContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:complexType name="LoginResponseType">
+				<xs:annotation>
+					<xs:documentation>The response of the login request
+					
+loginStatus: if the status is Success, a valid token is returned for requests followed, if the status is Challenge, the response to the challenge shall be sent
+authToken: the token used by the further requests
+                        </xs:documentation>
+				</xs:annotation>
+				<xs:complexContent>
+					<xs:extension base="core:SimpleResponseType">
+						<xs:sequence>
+							<xs:element name="loginStatus" type="impl:LoginStatus"/>
+							<xs:element minOccurs="0" name="authToken" type="core:AuthTokenType"/>
+						</xs:sequence>
+					</xs:extension>
+				</xs:complexContent>
+			</xs:complexType>
+			<xs:element name="LoginResponse" type="impl:LoginResponseType"/>
+			<xs:element name="RespondToChallengeRequest">
+				<xs:annotation>
+					<xs:documentation>Send the response to the challenge
+                        </xs:documentation>
+				</xs:annotation>
+				<xs:complexType>
+					<xs:complexContent>
+						<xs:extension base="core:SimpleRequestType">
+							<xs:sequence>
+								<xs:element name="challengeResponse" type="xs:string"/>
+							</xs:sequence>
+						</xs:extension>
+					</xs:complexContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="RespondToChallengeResponse" type="impl:LoginResponseType"/>
+			<xs:element name="LogoutRequest">
+				<xs:complexType>
+					<xs:complexContent>
+						<xs:extension base="core:SimpleRequestType"/>
+					</xs:complexContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:complexType name="ServiceDescType">
+				<xs:sequence>
+					<xs:element name="name" type="xs:string"/>
+					<xs:element name="version" type="xs:string"/>
+					<xs:element name="definition" type="xs:string"/>
+				</xs:sequence>
+			</xs:complexType>
+			<xs:element name="GetSystemInfoRequest">
+				<xs:complexType>
+					<xs:annotation>
+						<xs:documentation>Get the system informations: the service description and all the accessible domain ids and names. If no service name is specified, return the service description of all services
+                        </xs:documentation>
+					</xs:annotation>
+					<xs:complexContent>
+						<xs:extension base="core:SimpleRequestType">
+							<xs:sequence>
+								<xs:element maxOccurs="unbounded" minOccurs="0" name="serviceName" type="xs:string"/>
+							</xs:sequence>
+						</xs:extension>
+					</xs:complexContent>
+				</xs:complexType>
+			</xs:element>
+			<xs:element name="GetSystemInfoResponse">
+				<xs:complexType>
+					<xs:annotation>
+						<xs:documentation>Return the service list and all the accessible domain ids and names
+                    </xs:documentation>
+					</xs:annotation>
+					<xs:complexContent>
+						<xs:extension base="core:SimpleResponseType">
+							<xs:sequence>
+								<xs:element maxOccurs="unbounded" minOccurs="0" name="serviceDesc" type="impl:ServiceDescType"/>
+								<xs:element maxOccurs="unbounded" name="domainName" type="xs:string"/>
+								<xs:element maxOccurs="unbounded" name="domainId" type="xs:unsignedInt"/>
+							</xs:sequence>
+						</xs:extension>
+					</xs:complexContent>
+				</xs:complexType>
+			</xs:element>
+		</xs:schema>
+  </types>
+  <message name="LoginRequest">
+    <part name="LoginRequest" element="impl:LoginRequest">
+    </part>
+  </message>
+  <message name="RespondToChallengeRequest">
+    <part name="RespondToChallengeRequest" element="impl:RespondToChallengeRequest">
+    </part>
+  </message>
+  <message name="LoginResponse">
+    <part name="LoginRequest" element="impl:LoginResponse">
+    </part>
+  </message>
+  <message name="LogoutRequest">
+    <part name="LogoutRequest" element="impl:LogoutRequest">
+    </part>
+  </message>
+  <message name="RespondToChallengeResponse">
+    <part name="RespondToChallengeResponse" element="impl:RespondToChallengeResponse">
+    </part>
+  </message>
+  <message name="GetSystemInfoResponse">
+    <part name="GetSystemInfoResponse" element="impl:GetSystemInfoResponse">
+    </part>
+  </message>
+  <message name="GetSystemInfoRequest">
+    <part name="GetSystemInfoRequest" element="impl:GetSystemInfoRequest">
+    </part>
+  </message>
+  <portType name="SystemPortType">
+    <operation name="LoginRequest">
+      <input message="impl:LoginRequest">
+    </input>
+      <output message="impl:LoginResponse">
+    </output>
+    </operation>
+    <operation name="RespondToChallengeRequest">
+      <input message="impl:RespondToChallengeRequest">
+    </input>
+      <output message="impl:RespondToChallengeResponse">
+    </output>
+    </operation>
+    <operation name="LogoutRequest">
+      <input message="impl:LogoutRequest">
+    </input>
+    </operation>
+    <operation name="GetSystemInfoRequest">
+      <input message="impl:GetSystemInfoRequest">
+    </input>
+      <output message="impl:GetSystemInfoResponse">
+    </output>
+    </operation>
+  </portType>
+  <binding name="SystemSoapBinding" type="impl:SystemPortType">
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <operation name="LoginRequest">
+      <soap:operation soapAction="urn:#LoginRequest"/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="RespondToChallengeRequest">
+      <soap:operation soapAction="urn:#RespondToChallengeRequest"/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+    <operation name="LogoutRequest">
+      <soap:operation soapAction="urn:#LogoutRequest"/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+    </operation>
+    <operation name="GetSystemInfoRequest">
+      <soap:operation soapAction="urn:#GetSystemInfoRequest"/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+    </operation>
+  </binding>
+  <service name="SystemService">
+    <port name="System" binding="impl:SystemSoapBinding">
+      <soap:address location="https://10.1.1.1:8443/axis2/services/SystemService"/>
+    </port>
+  </service>
+</definitions>

data/spec/wasabi/parser/get_servicename_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe Wasabi::Parser do
+  context "with: geotrust.wsdl" do
+
+    subject do
+      parser = Wasabi::Parser.new Nokogiri::XML(xml)
+      parser.parse
+      parser
+    end
+
+    let(:xml) { fixture(:geotrust).read }
+
+    it "returns the #service_name attribute" do
+      subject.service_name.should == "queryDefinitions"
+    end
+
+  end
+end

data/spec/wasabi/parser/juniper_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe Wasabi::Parser do
+  context 'with: juniper.wsdl' do
+
+    subject do
+      parser = Wasabi::Parser.new Nokogiri::XML(xml)
+      parser.parse
+      parser
+    end
+
+    let(:xml) { fixture(:juniper).read }
+
+    it 'does not blow up when an extension base element is defined in an import' do
+      request = subject.operations[:get_system_info_request]
+
+      request[:input].should == 'GetSystemInfoRequest'
+      request[:action].should == 'urn:#GetSystemInfoRequest'
+      request[:namespace_identifier].should == 'impl'
+    end
+
+  end
+end

data/spec/wasabi/resolver_spec.rb

@@ -18,6 +18,23 @@ describe Wasabi::Resolver do
       xml = Wasabi::Resolver.new("<xml/>").resolve
       xml.should == "<xml/>"
     end
+
+    it "raises HTTPError when #load_from_remote gets a response error" do
+      code = 404
+      headers = {
+        "content-type" => "text/html"
+      }
+      body = "<html><head><title>404 Not Found</title></head><body>Oops!</body></html>"
+      failed_response = HTTPI::Response.new(code, headers, body)
+      HTTPI.stub(:get => failed_response)
+      lambda do
+        Wasabi::Resolver.new("http://example.com?wsdl").resolve
+      end.should raise_error { |ex|
+        ex.should be_a(Wasabi::Resolver::HTTPError)
+        ex.message.should == "Error: #{code}"
+        ex.response.should == failed_response
+      }
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wasabi
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpi
@@ -101,6 +101,7 @@ files:
 - spec/fixtures/geotrust.wsdl
 - spec/fixtures/import_port_types.wsdl
 - spec/fixtures/inherited.wsdl
+- spec/fixtures/juniper.wsdl
 - spec/fixtures/lower_camel.wsdl
 - spec/fixtures/multiple_namespaces.wsdl
 - spec/fixtures/multiple_types.wsdl
@@ -124,7 +125,9 @@ files:
 - spec/wasabi/document/soap12_spec.rb
 - spec/wasabi/document/two_bindings_spec.rb
 - spec/wasabi/document_spec.rb
+- spec/wasabi/parser/get_servicename_spec.rb
 - spec/wasabi/parser/import_port_types_spec.rb
+- spec/wasabi/parser/juniper_spec.rb
 - spec/wasabi/parser/multiple_namespaces_spec.rb
 - spec/wasabi/parser/no_message_parts_spec.rb
 - spec/wasabi/parser/no_namespace_spec.rb
@@ -147,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2903585129880410612
+      hash: 1638093846469018042
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -156,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2903585129880410612
+      hash: 1638093846469018042
 requirements: []
 rubyforge_project: wasabi
 rubygems_version: 1.8.24
@@ -168,6 +171,7 @@ test_files:
 - spec/fixtures/geotrust.wsdl
 - spec/fixtures/import_port_types.wsdl
 - spec/fixtures/inherited.wsdl
+- spec/fixtures/juniper.wsdl
 - spec/fixtures/lower_camel.wsdl
 - spec/fixtures/multiple_namespaces.wsdl
 - spec/fixtures/multiple_types.wsdl
@@ -191,7 +195,9 @@ test_files:
 - spec/wasabi/document/soap12_spec.rb
 - spec/wasabi/document/two_bindings_spec.rb
 - spec/wasabi/document_spec.rb
+- spec/wasabi/parser/get_servicename_spec.rb
 - spec/wasabi/parser/import_port_types_spec.rb
+- spec/wasabi/parser/juniper_spec.rb
 - spec/wasabi/parser/multiple_namespaces_spec.rb
 - spec/wasabi/parser/no_message_parts_spec.rb
 - spec/wasabi/parser/no_namespace_spec.rb