wasabi 3.1.0 → 3.2.0

data/spec/fixtures/encoded_endpoint.wsdl

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions
+  xmlns="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
+  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:s="http://www.w3.org/2001/XMLSchema"
+  xmlns:actions="http://example.com/actions"
+  targetNamespace="http://example.com/topLevelNamespace">
+    <types>
+        <s:schema elementFormDefault="qualified" targetNamespace="http://example.com/actions">
+            <s:element name="SomeRequest">
+                <s:complexType>
+                    <s:sequence>
+                        <s:element name="status" type="s:string"/>
+                    </s:sequence>
+                </s:complexType>
+            </s:element>
+        </s:schema>
+    </types>
+    <message name="SomeInput">
+        <part name="parameters" element="actions:SomeRequest"/>
+    </message>
+    <message name="SomeOutput">
+        <part name="parameters" element="actions:SomeResponse"/>
+    </message>
+    <portType name="ExamplePortType">
+        <operation name="SomeOperation">
+            <input message="actions:SomeInput"/>
+            <output message="actions:SomeOutput"/>
+        </operation>
+    </portType>
+    <binding name="ExampleBinding" type="actions:ExamplePortType">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <operation name="SomeOperation">
+            <soap:operation soapAction="http://example.com/actions.SomeOperation" style="document"/>
+            <input>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+    </binding>
+    <service name="ExampleService">
+        <port name="ExamplePort" binding="actions:ExampleBinding">
+            <soap:address location="http://localhost/soapservice/execute?path=%2Fbase%2Fincludes%2FTest+Soap%2FReturn+Rows"/>
+        </port>
+    </service>
+</definitions>

data/spec/spec_helper.rb

@@ -1,9 +1,19 @@
 require "bundler"
 Bundler.require :default, :development
 
+unless RUBY_PLATFORM =~ /java/
+  require "simplecov"
+  require "coveralls"
+
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  SimpleCov.start do
+    add_filter "spec"
+  end
+end
+
 support_files = File.expand_path("spec/support/**/*.rb")
 Dir[support_files].each { |file| require file }
 
 RSpec.configure do |config|
-  config.include SpecSupport::Methods
+  config.include SpecSupport
 end

data/spec/support/fixture.rb

@@ -33,10 +33,8 @@ module SpecSupport
     end
   end
 
-  module Methods
-    def fixture(*args)
-      Fixture.new(*args)
-    end
+  def fixture(*args)
+    Fixture.new(*args)
   end
 
 end

data/spec/support/profiling.rb

@@ -0,0 +1,18 @@
+module SpecSupport
+
+  def benchmark(&block)
+    require 'benchmark'
+
+    puts "Benchmark:"
+    puts Benchmark.measure(&block)
+  end
+
+  def profile_methods
+    require 'method_profiler'
+
+    profiler = MethodProfiler.observe(Wasabi::Parser)
+    yield
+    puts profiler.report
+  end
+
+end

data/spec/wasabi/document/authentication_spec.rb

@@ -15,7 +15,7 @@ describe Wasabi::Document do
 
     its(:operations) do
       should == {
-        :authenticate => { :input => "authenticate", :action => "authenticate", :namespace_identifier => "tns" }
+        :authenticate => { :input => "authenticate", :output => "authenticateResponse", :action => "authenticate", :namespace_identifier => "tns" }
       }
     end
 

data/spec/wasabi/document/economic_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Wasabi::Document do
+  context 'with: economic.wsdl' do
+
+    subject { Wasabi::Document.new fixture(:economic).read }
+
+    it 'has an ok parse-time for huge wsdl files' do
+      expect(subject.operations.count).to eq(1511)
+    end
+
+  end
+end

data/spec/wasabi/document/encoded_endpoint_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe Wasabi::Document do
+  context "with: encoded_endpoint.wsdl" do
+
+    subject { Wasabi::Document.new fixture(:encoded_endpoint).read }
+
+    its(:endpoint) { should == URI("http://localhost/soapservice/execute?path=/base/includes/Test+Soap/Return+Rows") }
+
+  end
+end

data/spec/wasabi/document/geotrust_spec.rb

@@ -15,8 +15,8 @@ describe Wasabi::Document do
 
     its(:operations) do
       should include(
-        { :get_quick_approver_list => { :input => "GetQuickApproverList", :action => "GetQuickApproverList" } },
-        { :hello => { :input => "hello", :action => "hello" } }
+        { :get_quick_approver_list => { :input => "GetQuickApproverList", :action => "GetQuickApproverList", :parameters=>{:Request=>{:name=>"Request", :type=>"GetQuickApproverListInput"}}}},
+        { :hello => { :input => "hello", :action => "hello", :parameters=>{:Input=>{:name=>"Input", :type=>"string"}} } }
       )
     end
 

data/spec/wasabi/document/inherited_spec.rb

@@ -13,6 +13,26 @@ describe Wasabi::Document do
       should include([["Account", "fieldsToNull"], "string"])
     end
 
+    it "should position base class attributes before subclass attributes in :order! array" do
+      account = subject.parser.types["Account"]
+      account[:order!].should == ["fieldsToNull", "Id", "Description", "ProcessId", "CreatedDate"]
+    end
+
+    it "should have each type's hash remember it's base type in :base_type element" do
+      account = subject.parser.types["Account"]
+      account[:base_type].should == "baseObject"
+
+      base_object = subject.parser.types["baseObject"]
+      base_object.should_not have_key(:base_type)
+    end
+
+    it "should have element's hash contain all these attributes (:nillable, :minOccurs, :maxOccurs) in addition to :type" do
+      base_object = subject.parser.types["baseObject"]
+      fields_to_null = base_object["fieldsToNull"]
+      fields_to_null[:nillable].should == "true"
+      fields_to_null[:minOccurs].should == "0"
+      fields_to_null[:maxOccurs].should == "unbounded"
+    end
   end
 end
 

data/spec/wasabi/document/multiple_namespaces_spec.rb

@@ -14,7 +14,7 @@ describe Wasabi::Document do
     it { should have(1).operations }
 
     its(:operations) do
-      should == { :save => { :input => "Save", :action => "http://example.com/actions.Save", :namespace_identifier => "actions" } }
+      should == { :save => { :input => "Save", :output=>"SaveResponse", :action => "http://example.com/actions.Save", :namespace_identifier => "actions", :parameters => { :article => { :name => "article", :type => "Article" } } } }
     end
 
     its(:type_namespaces) do

data/spec/wasabi/document/namespaced_actions_spec.rb

@@ -15,9 +15,9 @@ describe Wasabi::Document do
 
     its(:operations) do
       should include(
-        { :delete_client => { :input => "Client.Delete", :action => "http://api.example.com/api/Client.Delete", :namespace_identifier => "tns" } },
-        { :get_clients   => { :input => "User.GetClients", :action => "http://api.example.com/api/User.GetClients", :namespace_identifier => "tns" } },
-        { :get_api_key   => { :input => "User.GetApiKey", :action => "http://api.example.com/api/User.GetApiKey", :namespace_identifier => "tns" } }
+        { :delete_client => { :input => "Client.Delete", :output => "Client.DeleteResponse", :action => "http://api.example.com/api/Client.Delete", :namespace_identifier => "tns" } },
+        { :get_clients   => { :input => "User.GetClients", :output => "User.GetClientsResponse", :action => "http://api.example.com/api/User.GetClients", :namespace_identifier => "tns" } },
+        { :get_api_key   => { :input => "User.GetApiKey", :output => "User.GetApiKeyResponse", :action => "http://api.example.com/api/User.GetApiKey", :namespace_identifier => "tns" } }
       )
     end
 

data/spec/wasabi/document/no_namespace_spec.rb

@@ -15,9 +15,9 @@ describe Wasabi::Document do
 
     its(:operations) do
       should include(
-        { :get_user_login_by_id => { :input => "GetUserLoginById", :action => "/api/api/GetUserLoginById", :namespace_identifier => "typens" } },
-        { :get_all_contacts => { :input => "GetAllContacts", :action => "/api/api/GetAllContacts", :namespace_identifier => "typens" } },
-        { :search_user => { :input => "SearchUser", :action => "/api/api/SearchUser", :namespace_identifier => "typens" } }
+        { :get_user_login_by_id => { :input => "GetUserLoginById", :output => "GetUserLoginByIdResponse", :action => "/api/api/GetUserLoginById", :namespace_identifier => "typens" } },
+        { :get_all_contacts => { :input => "GetAllContacts", :output =>"GetAllContactsResponse", :action => "/api/api/GetAllContacts", :namespace_identifier => "typens" } },
+        { :search_user => { :input => "SearchUser", :output =>"SearchUserResponse", :action => "/api/api/SearchUser", :namespace_identifier => "typens" } }
       )
     end
 

data/spec/wasabi/document/savon295_spec.rb

@@ -7,7 +7,7 @@ describe Wasabi::Document do
 
     its(:operations) do
       should include(
-        { :sendsms => { :input => "sendsms", :action => "sendsms", :namespace_identifier => "tns" } }
+        { :sendsms => { :input => "sendsmsRequest", :output => "sendsmsResponse", :action => "sendsms", :namespace_identifier => "tns" } }
       )
     end
 

data/spec/wasabi/parser/multiple_namespaces_spec.rb

@@ -20,11 +20,11 @@ describe Wasabi::Parser do
     end
 
     it "records the fields under a type" do
-      subject.types["Save"].keys.should =~ ["article", :namespace]
+      subject.types["Save"].keys.should =~ ["article", :namespace, :order!]
     end
 
     it "records multiple fields when there are more than one" do
-      subject.types["Article"].keys.should =~ ["Title", "Author", :namespace]
+      subject.types["Article"].keys.should =~ ["Title", "Author", :namespace, :order!]
     end
 
     it "records the type of a field" do
@@ -32,5 +32,9 @@ describe Wasabi::Parser do
       subject.namespaces["article"].should == "http://example.com/article"
     end
 
+    it "lists the order of the type elements" do
+      subject.types["Article"][:order!].should == ["Author", "Title"]
+    end
+
   end
 end

data/spec/wasabi/parser/no_message_parts_spec.rb

@@ -12,7 +12,11 @@ describe Wasabi::Parser do
     let(:xml) { fixture(:no_message_parts).read }
 
     it "falls back to using the message type in the port element" do
-      subject.operations[:save][:input].should == "Save"
+      # Operation's input has no part element in the message, so using the message type.
+      subject.operations[:save][:input].should == "SaveSoapIn"
+
+      # Operation's output has part element in the message, so using part element's type.
+      subject.operations[:save][:output].should == "SaveResponse"
     end
 
     it "falls back to using the namespace ID in the port element" do

data/spec/wasabi/parser/no_namespace_spec.rb

@@ -16,8 +16,11 @@ describe Wasabi::Parser do
     end
 
     it "ignores xsd:all" do
-      subject.types["MpUser"].keys.should == [:namespace]
-    end
+      keys =  subject.types["MpUser"].keys
+      keys.size.should == 2
 
+      keys.should include(:namespace)
+      keys.should include(:order!)
+    end
   end
 end

data/spec/wasabi/parser/symbolic_endpoint_spec.rb

@@ -15,5 +15,10 @@ describe Wasabi::Parser do
       subject.endpoint.should be_nil
     end
 
+    it "should position base class attributes before subclass attributes in :order! array" do
+      type = subject.types["ROPtsLiesListe"]
+      type[:order!].should == ["messages", "returncode", "listenteil"]
+    end
+
   end
 end

data/wasabi.gemspec

@@ -7,14 +7,15 @@ Gem::Specification.new do |s|
   s.version     = Wasabi::VERSION
   s.authors     = ["Daniel Harrington"]
   s.email       = ["me@rubiii.com"]
-  s.homepage    = "https://github.com/rubiii/#{s.name}"
+  s.homepage    = "https://github.com/savonrb/#{s.name}"
   s.summary     = "A simple WSDL parser"
   s.description = s.summary
 
   s.rubyforge_project = s.name
+  s.license = 'MIT'
 
   s.add_dependency "httpi",    "~> 2.0"
-  s.add_dependency "nokogiri", ">= 1.4.0"
+  s.add_dependency "nokogiri", ">= 1.4.0", "< 1.6"
 
   s.add_development_dependency "rake",  "~> 0.9"
   s.add_development_dependency "rspec", "~> 2.10"

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: wasabi
 version: !ruby/object:Gem::Version
-  version: 3.1.0
-  prerelease: 
+  version: 3.2.0
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-21 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +27,26 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +54,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +61,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +68,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -96,8 +93,9 @@ files:
 - lib/wasabi/parser.rb
 - lib/wasabi/resolver.rb
 - lib/wasabi/version.rb
-- lib/wasabi/xpath_helper.rb
 - spec/fixtures/authentication.wsdl
+- spec/fixtures/economic.wsdl
+- spec/fixtures/encoded_endpoint.wsdl
 - spec/fixtures/geotrust.wsdl
 - spec/fixtures/import_port_types.wsdl
 - spec/fixtures/inherited.wsdl
@@ -114,8 +112,11 @@ files:
 - spec/fixtures/two_bindings.wsdl
 - spec/spec_helper.rb
 - spec/support/fixture.rb
+- spec/support/profiling.rb
 - spec/wasabi/core_ext/string_spec.rb
 - spec/wasabi/document/authentication_spec.rb
+- spec/wasabi/document/economic_spec.rb
+- spec/wasabi/document/encoded_endpoint_spec.rb
 - spec/wasabi/document/geotrust_spec.rb
 - spec/wasabi/document/inherited_spec.rb
 - spec/wasabi/document/multiple_namespaces_spec.rb
@@ -136,38 +137,34 @@ files:
 - spec/wasabi/resolver_spec.rb
 - spec/wasabi/wasabi_spec.rb
 - wasabi.gemspec
-homepage: https://github.com/rubiii/wasabi
-licenses: []
+homepage: https://github.com/savonrb/wasabi
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1638093846469018042
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1638093846469018042
 requirements: []
 rubyforge_project: wasabi
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple WSDL parser
 test_files:
 - spec/fixtures/authentication.wsdl
+- spec/fixtures/economic.wsdl
+- spec/fixtures/encoded_endpoint.wsdl
 - spec/fixtures/geotrust.wsdl
 - spec/fixtures/import_port_types.wsdl
 - spec/fixtures/inherited.wsdl
@@ -184,8 +181,11 @@ test_files:
 - spec/fixtures/two_bindings.wsdl
 - spec/spec_helper.rb
 - spec/support/fixture.rb
+- spec/support/profiling.rb
 - spec/wasabi/core_ext/string_spec.rb
 - spec/wasabi/document/authentication_spec.rb
+- spec/wasabi/document/economic_spec.rb
+- spec/wasabi/document/encoded_endpoint_spec.rb
 - spec/wasabi/document/geotrust_spec.rb
 - spec/wasabi/document/inherited_spec.rb
 - spec/wasabi/document/multiple_namespaces_spec.rb