savon-multipart 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a46264c37ca1a22ed9ef5e852dbbedeee173de2
-  data.tar.gz: de5f926dde79583c307d768ddad351fc4881c17a
+  metadata.gz: 5b2646fc41ff720bd7228d8c05f4300972e64686
+  data.tar.gz: 885ce75c4025dd8e64ee5fe7a430599caf534049
 SHA512:
-  metadata.gz: 908ce3d97c78d5eb4d64fe30f863dd6b4f4f17867375e2e5b918ab9193fab6c993f637dc83151329605a17557279c7b902e83f7115e4c221620a4f94e1e30887
-  data.tar.gz: 52126a00b9e7197b16bb862582e7a434d1502a6076475b06669e82be5fdb72b2f271d38dcb527eb666f1dcbbfda8167c1c0964a71a16cf312f1d38af39d07b39
+  metadata.gz: fb7660f083792e8452663715fdd6624bbf1d01cab3469e72b12ff6b9146de5660d0a976b6f9df9f2c4f4c5e69b508b5efcbf38aeb96be6ea37b88ba560c0de9b
+  data.tar.gz: b7496671d6a550a9d9ae0c079f5bce6ae45371dd1141a1925698749a3a3552fecf8dd5b23d58015e928069520eb3297d9756b53b392f578bd9f3a6c828c48649

data/.travis.yml

@@ -3,7 +3,8 @@ language: "ruby"
 script: "bundle exec rake"
 rvm:
   - 1.9.3
-  - 2.0.0
+  - 2.0
   - 2.1
+  - 2.2
   - jruby-19mode
   - rbx-2

data/CHANGELOG.md

@@ -1,12 +1,18 @@
-## 0.9.7
+## 2.1.0 (current)
 
-* Initial version. Adds multipart support (SOAP with Attachments) to Savon v0.9.7.
-  Please test and provide feedback so we can merge this into Savon proper.
+* Drops support for ruby 1.8.7
+
+## 2.0.2
+* Removes hardcoded version lock on Mail gem
 
 ## 2.0.0
 * Rewrite of savon-multipart to work with Savon 2.0+
   This includes all of the existing functionality in savon-multipart
   for savon1, but in a way that will be easier to maintain.
 
-# 2.0.2 (Current)
-* Removes hardcoded version lock on Mail gem
+## 0.9.7
+
+* Initial version. Adds multipart support (SOAP with Attachments) to Savon v0.9.7.
+  Please test and provide feedback so we can merge this into Savon proper.
+
+

data/README.md

@@ -4,25 +4,20 @@ Savon Multipart [![Build Status](https://secure.travis-ci.org/savonrb/savon-mult
 Adds multipart support (SOAP with Attachments) to [Savon](https://github.com/savonrb/savon).  
 Please test and provide feedback so we can support as many multipart-soap messages as possible.
 
+Installation
+------------
 
-Savon2
-------
-
-Recently Savon launched a rewrite that broke compatibility with savon-multipart. If you're using savon
-version 1, this should just work, but if you'd like to use Savon2, you will probably want to specify
-something like this in your Gemfile
-
+Savon Multipart is available through [Rubygems](http://rubygems.org/gems/savon-multipart) and can be installed via:
 
 ```
-gem 'savon-multipart',       :git => 'https://github.com/tjarratt/savon-multipart.git', :branch => 'savon2'
+$ gem install savon-multipart
 ```
 
-
-Installation
+Usage
 ------------
 
-Savon Multipart is available through [Rubygems](http://rubygems.org/gems/savon-multipart) and can be installed via:
+Just require the gem 'savon-multipart', which automatically requires 'savon' as well:
 
 ```
-$ gem install savon-multipart
+require 'savon-multipart'
 ```

data/lib/savon/multipart/version.rb

@@ -1,5 +1,5 @@
 module Savon
   module Multipart
-    VERSION = "2.0.2"
+    VERSION = "2.1.0"
   end
 end

data/savon-multipart.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://savonrb.com"
   s.summary     = "Heavy metal Ruby SOAP client with multipart support"
   s.description = "Adds multipart support (SOAP with Attachments) to Savon"
+  s.required_ruby_version = '>= 1.9.2'
 
   s.rubyforge_project = s.name
 

data/spec/fixtures/response/soap_fault.txt

@@ -0,0 +1,7 @@
+----==_mimepart_4d416ae62fd32_201a8043814c4724
+Content-Type: text/xml; charset=UTF-8
+Content-Transfer-Encoding: binary
+Content-ID: <0.1bccd0fe5cc64dd5b5910cd3cc23a762332ffb50bdd8fe1b@apache.org>
+
+<?xml version='1.0' encoding='UTF-8'?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"><soapenv:Body><soapenv:Fault xmlns:axis2ns1="http://schemas.xmlsoap.org/soap/envelope/"><faultcode>axis2ns1:Client</faultcode><faultstring>The service cannot be found for the endpoint reference (EPR) http://110.74.218.219:8080/EngineWS/services/SoapGWAppImp.SoapGWAppImpHttpSoap12Endpoint/</faultstring><detail /></soapenv:Fault></soapenv:Body></soapenv:Envelope>
+----==_mimepart_4d416ae62fd32_201a8043814c4724

data/spec/savon/soap/response_spec.rb

@@ -2,70 +2,73 @@ require 'savon-multipart'
 
 describe Savon::Multipart::Response do
 
-  before do
-    @header = { "Content-Type" => 'multipart/related; boundary="--==_mimepart_4d416ae62fd32_201a8043814c4724"; charset=UTF-8; type="text/xml"' }
-    path = File.expand_path("../../../fixtures/response/multipart.txt", __FILE__)
-    raise ArgumentError, "Unable to load: #{path}" unless File.exist? path
-    @body = File.read(path)
-  end
+  let(:header) {{ "Content-Type" => 'multipart/related; boundary="--==_mimepart_4d416ae62fd32_201a8043814c4724"; charset=UTF-8; type="text/xml"' }}
+  let(:body) { File.read(path) }
+  let(:response) { soap_response(:headers => header, :body => body) }
 
-  it "parses without Exception" do
-    response = soap_response :headers => @header, :body => @body
-    expect(response.xml.strip).to eq('<?xml version="1.0" encoding="UTF-8"?><soapenv:Envelope xmlns:wsdl="http://www.3gpp.org/ftp/Specs/archive/23_series/23.140/schema/REL-5-MM7-1-2" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"><soapenv:Header><ns1:TransactionID soapenv:actor="" soapenv:mustUnderstand="1" xsi:type="xsd:string" xmlns:ns1="http://www.3gpp.org/ftp/Specs/archive/23_series/23.140/schema/REL-5-MM7-1-2">2011012713535811111111111</ns1:TransactionID></soapenv:Header><soapenv:Body><SubmitReq xmlns="http://www.3gpp.org/ftp/Specs/archive/23_series/23.140/schema/REL-5-MM7-1-2"><MM7Version>5.3.0</MM7Version><SenderIdentification><VASPID>messaging</VASPID><VASID>ADM</VASID><SenderAddress><ShortCode>1111</ShortCode></SenderAddress></SenderIdentification><Recipients><To><Number>11111111111</Number></To></Recipients><ServiceCode>1</ServiceCode><MessageClass>Personal</MessageClass><ExpiryDate>2011-01-28T13:53:58Z</ExpiryDate><DeliveryReport>false</DeliveryReport><ReadReply>false</ReadReply><Priority>Normal</Priority><Subject>Test MMS via Savon</Subject><ChargedParty>Sender</ChargedParty><Content href="cid:attachment_1" allowAdaptations="true"/></SubmitReq></soapenv:Body></soapenv:Envelope>')
-    expect(response.parts.length).to eq(2)
-    expect(response.parts[1].parts.length).to eq(3)
-    expect(response.parts[1].parts[2].body.decoded.strip).to eq("This is a test message from Github")
-  end
+  def soap_response(options = {})
+    defaults = { :code => 200, :headers => {}, :body => "" }
+    response = defaults.merge options
+    globals = {
+      :multipart => true,
+      :raise_errors => true,
+      :convert_response_tags_to  => lambda { |tag| tag.snakecase.to_sym}
+    }
+    http = HTTPI::Response.new(response[:code], response[:headers], response[:body])
 
-  it "returns a String from the #xml method" do
-    body = File.read(File.expand_path('../../../fixtures/response/simple_multipart.txt', __FILE__))
-    response = soap_response :headers => @header, :body => body
-    expect(response.xml.class).to eq(String)
+    Savon::Multipart::Response.new(http, globals, {})
   end
 
-  it "returns a Hash from the #body method" do
-    body = File.read(File.expand_path('../../../fixtures/response/simple_multipart.txt', __FILE__))
-    response = soap_response :headers => @header, :body => body
-    expect(response.body.class).to eq(Hash)
-    expect(response.body).to eq({:submit_req => true})
-  end
+  context "multipart" do
+    let(:path) { File.expand_path("../../../fixtures/response/multipart.txt", __FILE__) }
 
-  it "returns the attachments" do
-    response = soap_response :headers => @header, :body => @body
-    expect(response.attachments.size).to eq(1)
-  end
+    it "parses without Exception" do
+      expect(response.xml.strip).to eq('<?xml version="1.0" encoding="UTF-8"?><soapenv:Envelope xmlns:wsdl="http://www.3gpp.org/ftp/Specs/archive/23_series/23.140/schema/REL-5-MM7-1-2" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"><soapenv:Header><ns1:TransactionID soapenv:actor="" soapenv:mustUnderstand="1" xsi:type="xsd:string" xmlns:ns1="http://www.3gpp.org/ftp/Specs/archive/23_series/23.140/schema/REL-5-MM7-1-2">2011012713535811111111111</ns1:TransactionID></soapenv:Header><soapenv:Body><SubmitReq xmlns="http://www.3gpp.org/ftp/Specs/archive/23_series/23.140/schema/REL-5-MM7-1-2"><MM7Version>5.3.0</MM7Version><SenderIdentification><VASPID>messaging</VASPID><VASID>ADM</VASID><SenderAddress><ShortCode>1111</ShortCode></SenderAddress></SenderIdentification><Recipients><To><Number>11111111111</Number></To></Recipients><ServiceCode>1</ServiceCode><MessageClass>Personal</MessageClass><ExpiryDate>2011-01-28T13:53:58Z</ExpiryDate><DeliveryReport>false</DeliveryReport><ReadReply>false</ReadReply><Priority>Normal</Priority><Subject>Test MMS via Savon</Subject><ChargedParty>Sender</ChargedParty><Content href="cid:attachment_1" allowAdaptations="true"/></SubmitReq></soapenv:Body></soapenv:Envelope>')
+      expect(response.parts.length).to eq(2)
+      expect(response.parts[1].parts.length).to eq(3)
+      expect(response.parts[1].parts[2].body.decoded.strip).to eq("This is a test message from Github")
+    end
 
-  it "parses soap messages without attachments too" do
-    header = { 'Content-Type' => 'text/html; charset=utf-8'}
-    body = File.read(File.expand_path('../../../fixtures/response/not_multipart.txt', __FILE__))
-    response = soap_response :headers => header, :body => body
+    it "returns the attachments" do
+      expect(response.attachments.size).to eq(1)
+    end
 
-    expect(response.xml.chomp).to eq('<?xml version="1.0" encoding="UTF-8"?><soapenv:Envelope xmlns:wsdl="http://www.3gpp.org/ftp/Specs/archive/23_series/23.140/schema/REL-5-MM7-1-2" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"><soapenv:Header><ns1:TransactionID soapenv:actor="" soapenv:mustUnderstand="1" xsi:type="xsd:string" xmlns:ns1="http://www.3gpp.org/ftp/Specs/archive/23_series/23.140/schema/REL-5-MM7-1-2">2011012713535811111111111</ns1:TransactionID></soapenv:Header><soapenv:Body><SubmitReq xmlns="http://www.3gpp.org/ftp/Specs/archive/23_series/23.140/schema/REL-5-MM7-1-2"><MM7Version>5.3.0</MM7Version><SenderIdentification><VASPID>messaging</VASPID><VASID>ADM</VASID><SenderAddress><ShortCode>1111</ShortCode></SenderAddress></SenderIdentification><Recipients><To><Number>11111111111</Number></To></Recipients><ServiceCode>1</ServiceCode><MessageClass>Personal</MessageClass><ExpiryDate>2011-01-28T13:53:58Z</ExpiryDate><DeliveryReport>false</DeliveryReport><ReadReply>false</ReadReply><Priority>Normal</Priority><Subject>Test MMS via Savon</Subject><ChargedParty>Sender</ChargedParty><Content href="cid:attachment_1" allowAdaptations="true"/></SubmitReq></soapenv:Body></soapenv:Envelope>')
-    expect(response.parts.size).to eq(0)
-    expect(response.attachments.size).to eq(0)
+    it "only parses the SOAP body once" do
+      Mail::Part.stub(:new).and_return(double(Mail::Part).as_null_object)
+      expect(Mail::Part).to receive(:new).exactly(1).times
+      5.times { response.attachments }
+    end
   end
 
-  it "only parses the SOAP body once" do
-    response = soap_response :headers => @header, :body => @body
-    response.xml
+  context "simple multipart" do
+    let(:path) { File.expand_path('../../../fixtures/response/simple_multipart.txt', __FILE__) }
 
-    counter = 0
-    subbed_parse_body = lambda { counter += 1 }
-    response.class.send(:define_method, :parse_body, subbed_parse_body)
-    5.times { response.attachments }
+    it "returns a String from the #xml method" do
+      expect(response.xml.class).to eq(String)
+    end
 
-    expect(counter).to eq(0)
+    it "returns a Hash from the #body method" do
+      expect(response.body.class).to eq(Hash)
+      expect(response.body).to eq({:submit_req => true})
+    end
   end
 
-  def soap_response(options = {})
-    defaults = { :code => 200, :headers => {}, :body => "" }
-    response = defaults.merge options
-    globals = {
-      :multipart => true,
-      :convert_response_tags_to  => lambda { |tag| tag.snakecase.to_sym}
-    }
-    http = HTTPI::Response.new(response[:code], response[:headers], response[:body])
+  context "not multipart" do
+    let(:path) { File.expand_path('../../../fixtures/response/not_multipart.txt', __FILE__) }
+    let(:header) { { 'Content-Type' => 'text/html; charset=utf-8'} }
 
-    Savon::Multipart::Response.new(http, globals, {})
+    it "parses soap messages without attachments too" do
+      expect(response.xml.chomp).to eq('<?xml version="1.0" encoding="UTF-8"?><soapenv:Envelope xmlns:wsdl="http://www.3gpp.org/ftp/Specs/archive/23_series/23.140/schema/REL-5-MM7-1-2" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"><soapenv:Header><ns1:TransactionID soapenv:actor="" soapenv:mustUnderstand="1" xsi:type="xsd:string" xmlns:ns1="http://www.3gpp.org/ftp/Specs/archive/23_series/23.140/schema/REL-5-MM7-1-2">2011012713535811111111111</ns1:TransactionID></soapenv:Header><soapenv:Body><SubmitReq xmlns="http://www.3gpp.org/ftp/Specs/archive/23_series/23.140/schema/REL-5-MM7-1-2"><MM7Version>5.3.0</MM7Version><SenderIdentification><VASPID>messaging</VASPID><VASID>ADM</VASID><SenderAddress><ShortCode>1111</ShortCode></SenderAddress></SenderIdentification><Recipients><To><Number>11111111111</Number></To></Recipients><ServiceCode>1</ServiceCode><MessageClass>Personal</MessageClass><ExpiryDate>2011-01-28T13:53:58Z</ExpiryDate><DeliveryReport>false</DeliveryReport><ReadReply>false</ReadReply><Priority>Normal</Priority><Subject>Test MMS via Savon</Subject><ChargedParty>Sender</ChargedParty><Content href="cid:attachment_1" allowAdaptations="true"/></SubmitReq></soapenv:Body></soapenv:Envelope>')
+      expect(response.parts.size).to eq(0)
+      expect(response.attachments.size).to eq(0)
+    end
+  end
+
+  context "soap errors" do
+    let(:path) { File.expand_path('../../../fixtures/response/soap_fault.txt', __FILE__) }
+
+    it "handles them correctly" do
+      expect { response }.to raise_error(Savon::SOAPFault, /The service cannot be found/)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: savon-multipart
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Martin Westin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -132,6 +132,7 @@ files:
 - spec/fixtures/response/multipart.txt
 - spec/fixtures/response/not_multipart.txt
 - spec/fixtures/response/simple_multipart.txt
+- spec/fixtures/response/soap_fault.txt
 - spec/savon/soap/response_spec.rb
 homepage: http://savonrb.com
 licenses: []
@@ -144,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="