wasabi 3.3.0 → 3.3.1

data/spec/wasabi/parser/marketo_spec.rb

@@ -11,7 +11,7 @@ describe Wasabi::Parser do
     let(:xml) { fixture(:marketo).read }
 
     it 'parses the operations' do
-      subject.operations[:get_lead][:input].should == 'paramsGetLead'
+      expect(subject.operations[:get_lead][:input]).to eq('getLead')
     end
   end
 end

data/spec/wasabi/parser/message_element_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Wasabi::Parser do
+  context 'with: savon562.wsdl' do
+    subject do
+      parser = Wasabi::Parser.new Nokogiri::XML(xml)
+      parser.parse
+      parser
+    end
+
+    let(:xml) { fixture(:savon562).read }
+
+    it 'parses the operations' do
+      subject.operations[:write_case_eform_data][:input].should == 'writeCaseEformData'
+    end
+  end
+end

data/spec/wasabi/parser/multiple_namespaces_spec.rb

@@ -12,28 +12,28 @@ describe Wasabi::Parser do
     let(:xml) { fixture(:multiple_namespaces).read }
 
     it "lists the types" do
-      subject.types.keys.sort.should == ["Article", "Save"]
+      expect(subject.types.keys.sort).to eq(["Article", "Save"])
     end
 
     it "records the namespace for each type" do
-      subject.types["Save"][:namespace].should == "http://example.com/actions"
+      expect(subject.types["Save"][:namespace]).to eq("http://example.com/actions")
     end
 
     it "records the fields under a type" do
-      subject.types["Save"].keys.should =~ ["article", :namespace, :order!]
+      expect(subject.types["Save"].keys).to match_array(["article", :namespace, :order!])
     end
 
     it "records multiple fields when there are more than one" do
-      subject.types["Article"].keys.should =~ ["Title", "Author", :namespace, :order!]
+      expect(subject.types["Article"].keys).to match_array(["Title", "Author", :namespace, :order!])
     end
 
     it "records the type of a field" do
-      subject.types["Save"]["article"][:type].should == "article:Article"
-      subject.namespaces["article"].should == "http://example.com/article"
+      expect(subject.types["Save"]["article"][:type]).to eq("article:Article")
+      expect(subject.namespaces["article"]).to eq("http://example.com/article")
     end
 
     it "lists the order of the type elements" do
-      subject.types["Article"][:order!].should == ["Author", "Title"]
+      expect(subject.types["Article"][:order!]).to eq(["Author", "Title"])
     end
 
   end

data/spec/wasabi/parser/multiple_parts_in_message_spec.rb

@@ -13,19 +13,23 @@ describe Wasabi::Parser do
 
     context "with a parts attribute in soap:body element" do
       it 'uses the part specified in parts attribute' do
+        pending("need to determine if these tests are actually valid. QName resolution of operations is complex")
+
         request = subject.operations[:some_operation][:input]
 
-        request.should == "SomeRequestBody"
+        expect(request).to eq("SomeRequestBody")
       end
     end
-    
+
     context "with no parts attribute in soap:body element" do
       it 'uses the first part element in message' do
+        pending("need to determine if these tests are actually valid. QName resolution of operations is complex")
+
         request = subject.operations[:other_operation][:input]
 
-        request.should == "SomeRequest"
+        expect(request).to eq("SomeRequest")
       end
     end
-    
+
   end
 end

data/spec/wasabi/parser/no_message_parts_spec.rb

@@ -13,20 +13,20 @@ describe Wasabi::Parser do
 
     it 'falls back to using the message type in the port element' do
       # Operation's input has no part element in the message, so using the message type.
-      subject.operations[:save][:input].should == 'Save'
+      expect(subject.operations[:save][:input]).to eq('Save')
 
       # Operation's output has part element in the message, so using part element's type.
-      subject.operations[:save][:output].should == 'SaveResponse'
+      expect(subject.operations[:save][:output]).to eq('SaveResponse')
     end
 
     it 'falls back to using the namespace ID in the port element' do
-      subject.operations[:save][:namespace_identifier].should == 'actions'
+      expect(subject.operations[:save][:namespace_identifier]).to eq('actions')
     end
 
     it 'gracefully handles port messages without a colon' do
-      subject.operations[:delete][:input].should == 'Delete'
-      subject.operations[:delete][:output].should == 'DeleteResponse'
-      subject.operations[:delete][:namespace_identifier].should be_nil
+      expect(subject.operations[:delete][:input]).to eq('Delete')
+      expect(subject.operations[:delete][:output]).to eq('DeleteResponse')
+      expect(subject.operations[:delete][:namespace_identifier]).to be_nil
     end
   end
 end

data/spec/wasabi/parser/no_namespace_spec.rb

@@ -12,15 +12,15 @@ describe Wasabi::Parser do
     let(:xml) { fixture(:no_namespace).read }
 
     it "lists the types" do
-      subject.types.keys.sort.should == ["McContact", "McContactArray", "MpUser", "MpUserArray"]
+      expect(subject.types.keys.sort).to eq(["McContact", "McContactArray", "MpUser", "MpUserArray"])
     end
 
     it "ignores xsd:all" do
       keys =  subject.types["MpUser"].keys
-      keys.size.should == 2
+      expect(keys.size).to eq(2)
 
-      keys.should include(:namespace)
-      keys.should include(:order!)
+      expect(keys).to include(:namespace)
+      expect(keys).to include(:order!)
     end
   end
 end

data/spec/wasabi/parser/no_target_namespace_spec.rb

@@ -29,7 +29,7 @@ describe Wasabi::Parser do
     # but I suppose we should do something reasonable if they do.
 
     it "defaults to the target namespace from xs:definitions" do
-      subject.types["Save"][:namespace].should == "http://def.example.com"
+      expect(subject.types["Save"][:namespace]).to eq("http://def.example.com")
     end
 
   end

data/spec/wasabi/parser/symbolic_endpoint_spec.rb

@@ -12,12 +12,12 @@ describe Wasabi::Parser do
     let(:xml) { fixture(:symbolic_endpoint).read }
 
     it "allows symbolic endpoints" do
-      subject.endpoint.should be_nil
+      expect(subject.endpoint).to 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"]
+      expect(type[:order!]).to eq(["messages", "returncode", "listenteil"])
     end
 
   end

data/spec/wasabi/parser/tradetracker_spec.rb

@@ -11,7 +11,7 @@ describe Wasabi::Parser do
     let(:xml) { fixture(:tradetracker).read }
 
     it 'parses the operations' do
-      subject.operations[:get_feeds][:input].should == 'getFeeds'
+      expect(subject.operations[:get_feeds][:input]).to eq('getFeeds')
     end
   end
 end

data/spec/wasabi/resolver_spec.rb

@@ -4,16 +4,16 @@ describe Wasabi::Resolver do
 
   describe "#resolve" do
     it "resolves remote documents" do
-      HTTPI.should_receive(:get) { HTTPI::Response.new(200, {}, "wsdl") }
+      expect(HTTPI).to receive(:get) { HTTPI::Response.new(200, {}, "wsdl") }
       xml = Wasabi::Resolver.new("http://example.com?wsdl").resolve
-      xml.should == "wsdl"
+      expect(xml).to eq("wsdl")
     end
 
     it "resolves remote documents with custom adapter" do
       prev_logging = HTTPI.instance_variable_get(:@log)
       HTTPI.log = false # Don't pollute rspec output by request logging
       xml = Wasabi::Resolver.new("http://example.com?wsdl", nil, :fake_adapter_for_test).resolve
-      xml.should == "wsdl_by_adapter"
+      expect(xml).to eq("wsdl_by_adapter")
       expect(FakeAdapterForTest.class_variable_get(:@@requests).size).to eq(1)
       expect(FakeAdapterForTest.class_variable_get(:@@requests).first.url).to eq(URI.parse("http://example.com?wsdl"))
       expect(FakeAdapterForTest.class_variable_get(:@@methods)).to eq([:get])
@@ -22,12 +22,12 @@ describe Wasabi::Resolver do
 
     it "resolves local documents" do
       xml = Wasabi::Resolver.new(fixture(:authentication).path).resolve
-      xml.should == fixture(:authentication).read
+      expect(xml).to eq(fixture(:authentication).read)
     end
 
     it "simply returns raw XML" do
       xml = Wasabi::Resolver.new("<xml/>").resolve
-      xml.should == "<xml/>"
+      expect(xml).to eq("<xml/>")
     end
 
     it "raises HTTPError when #load_from_remote gets a response error" do
@@ -38,12 +38,12 @@ describe Wasabi::Resolver do
       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
+      expect 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.to raise_error { |ex|
+        expect(ex).to be_a(Wasabi::Resolver::HTTPError)
+        expect(ex.message).to eq("Error: #{code}")
+        expect(ex.response).to eq(failed_response)
       }
     end
   end

data/spec/wasabi/wasabi_spec.rb

@@ -5,7 +5,7 @@ describe Wasabi do
   describe ".document" do
     it "should return a new Wasabi::Document" do
       document = Wasabi.document fixture(:authentication).read
-      document.should be_a(Wasabi::Document)
+      expect(document).to be_a(Wasabi::Document)
     end
   end
 

data/wasabi.gemspec

@@ -16,10 +16,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency "httpi",    "~> 2.0"
   s.add_dependency "nokogiri", ">= 1.4.0"
-  s.add_dependency "mime-types", "< 2.0.0"
 
   s.add_development_dependency "rake",  "~> 0.9"
-  s.add_development_dependency "rspec", "~> 2.10"
+  s.add_development_dependency "rspec", "~> 2.14"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,85 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: wasabi
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: '2.14'
 description: A simple WSDL parser
 email:
 - me@rubiii.com
@@ -87,9 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -117,6 +103,7 @@ files:
 - spec/fixtures/no_message_parts.wsdl
 - spec/fixtures/no_namespace.wsdl
 - spec/fixtures/savon295.wsdl
+- spec/fixtures/savon562.wsdl
 - spec/fixtures/soap12.wsdl
 - spec/fixtures/symbolic_endpoint.wsdl
 - spec/fixtures/tradetracker.wsdl
@@ -142,6 +129,7 @@ files:
 - spec/wasabi/parser/import_port_types_spec.rb
 - spec/wasabi/parser/juniper_spec.rb
 - spec/wasabi/parser/marketo_spec.rb
+- spec/wasabi/parser/message_element_spec.rb
 - spec/wasabi/parser/multiple_namespaces_spec.rb
 - spec/wasabi/parser/multiple_parts_in_message_spec.rb
 - spec/wasabi/parser/no_message_parts_spec.rb
@@ -162,17 +150,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: wasabi
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple WSDL parser
@@ -193,6 +181,7 @@ test_files:
 - spec/fixtures/no_message_parts.wsdl
 - spec/fixtures/no_namespace.wsdl
 - spec/fixtures/savon295.wsdl
+- spec/fixtures/savon562.wsdl
 - spec/fixtures/soap12.wsdl
 - spec/fixtures/symbolic_endpoint.wsdl
 - spec/fixtures/tradetracker.wsdl
@@ -218,6 +207,7 @@ test_files:
 - spec/wasabi/parser/import_port_types_spec.rb
 - spec/wasabi/parser/juniper_spec.rb
 - spec/wasabi/parser/marketo_spec.rb
+- spec/wasabi/parser/message_element_spec.rb
 - spec/wasabi/parser/multiple_namespaces_spec.rb
 - spec/wasabi/parser/multiple_parts_in_message_spec.rb
 - spec/wasabi/parser/no_message_parts_spec.rb