savon-multipart 2.1.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1453752c3356664f6f81bceaf030316157f4d7d4
-  data.tar.gz: 9511e7c2d636c54af0eb11dcf1e6c6264422d2ed
+SHA256:
+  metadata.gz: 4473b669ad70af6dfa4371b373da602fe0a9e982b70e2813473506bdf5d28146
+  data.tar.gz: 3270f043522e840c94fc3b0ac7b419ccc35e98aa9071c4f63b04844425724fa6
 SHA512:
-  metadata.gz: f3b2cbf00edc90989ced02fa321cb5e370e7f3938ea092a91036d4fdddadf6acad9cbc7905445c12dd43a108f0cfe09913d0ac8909c71a2c3adf7f2b9a15b6bc
-  data.tar.gz: 43975f967153b5107f1fa1050fa6c131991148c5ab81acb3434abfa98a12a2599b4cbbe231df02de9235af538ce3a921f814193fea3da3a797ae3849bce45924
+  metadata.gz: df2da88ea80eb1d39cbb091d2139f47552e7353938daf76a33534553676140608cf84b5e65fb41b6870c6dc4192e5104875f8c8c0a58947d0963f48979d01169
+  data.tar.gz: 336c526a3f42e0d03560aa29d4046ea62b0efa6eba3a0058abf74e90ae80a8ec6165411926ab68595615fd9348acb928ba0e30c02805c5db6a663e41f4123fbb

data/.github/ISSUE_TEMPLATE/Bug_report.md

@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a bug report
+
+---
+
+<!-- Please don't delete this template or we'll close your issue -->
+<!-- Before creating an issue, please ensure you are using the latest version of savon-multipart. -->
+
+# Bug report
+
+
+**Current behavior:**
+
+
+**Expected behavior:**
+
+
+**Steps to reproduce current behavior:**
+
+<!-- The more of the following you can give us, the faster we can reproduce and fix it. -->
+
+* Client setup and the operation call (the Ruby code you ran):
+
+* The request XML built by the client (or just the part that's wrong):
+
+* The response you got back (body, and for a transport issue the status and headers):
+
+* The WSDL of the service, or a snippet of the operation involved:
+
+
+**System information:**
+
+* ruby version: 
+* savon-multipart version: 

data/.github/ISSUE_TEMPLATE/Feature_request.md

@@ -0,0 +1,27 @@
+---
+name: Feature request
+about: Suggest a new feature for savon-multipart
+
+---
+
+<!-- Please don't delete this template or we'll close your issue -->
+
+## Feature request
+
+<!-- Issues which contain questions or support requests will be closed. -->
+
+**Motivation for this feature:**
+
+<!-- Please describe the use case or problem this would solve. -->
+
+**Proposed implementation:**
+
+<!-- Please describe at least one proposed implementation design. -->
+
+**Would this introduce a breaking change?**
+
+<!-- If yes, please describe the impact and a migration path for existing applications. -->
+
+**Are you willing to work on this yourself?**
+yes
+

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+**What kind of change is this?**
+
+<!-- E.g. a bugfix, feature, refactoring, build change, etc… -->
+
+**Did you add tests for your changes?**
+
+<!-- Note that we won't merge your changes if you don't add tests -->
+
+**Summary of changes**
+
+<!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->
+<!-- Try to link to an open issue for more information. -->
+
+**Other information**
+
+

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    cooldown:
+      default-days: 7

data/.github/workflows/ci.yml

@@ -0,0 +1,81 @@
+name: Ruby
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+permissions:
+  contents: read # checkout only, nothing else
+
+jobs:
+  audit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+      - uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        with:
+          ruby-version: "3.4"
+          bundler-cache: true
+      - name: Audit dependencies
+        run: bundle exec bundle-audit check --update
+      - name: Audit Ruby runtime
+        # CVE-2026-41316 is an ERB flaw fixed in Ruby 4.0.3 and not yet backported.
+        # Ignored on affected rubies only. See:
+        # https://www.ruby-lang.org/en/news/2026/04/21/erb-cve-2026-41316/
+        # https://github.com/advisories/GHSA-q339-8rmv-2mhv
+        run: |
+          ignore=""
+          if ruby -e 'exit 1 unless Gem::Version.new(RUBY_VERSION) < Gem::Version.new("4.0.3")'; then
+            ignore="--ignore CVE-2026-41316"
+          fi
+          bundle exec ruby-audit check $ignore
+
+  zizmor:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+      - name: Audit workflows
+        uses: zizmorcore/zizmor-action@70fb788f84895a7701f5643d103d587e460b5c99 # v0.6.3
+        with:
+          advanced-security: false # fail the build on findings instead of uploading SARIF
+
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+      - uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        with:
+          ruby-version: "3.4"
+          bundler-cache: true
+      - name: RuboCop
+        run: bundle exec rubocop --format github
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['3.0', 3.1, 3.2, 3.3, 3.4, '4.0', truffleruby, head, truffleruby-head]
+    # Head builds exist to surface upstream regressions early.
+    # They should not block the build.
+    continue-on-error: ${{ matrix.ruby == 'head' || matrix.ruby == 'truffleruby-head' }}
+    env:
+      RAILS_ENV: test
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # bundle installs and caches dependencies
+      - name: Run tests
+        run: bundle exec rake --trace

data/.github/workflows/gem_push.yml

@@ -0,0 +1,22 @@
+name: Push gem
+on:
+  release:
+    types: [published]
+jobs:
+  push:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: write
+    environment: release
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+      - uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
+        with:
+          ruby-version: "3"
+          bundler-cache: false
+      - name: Install dependencies
+        run: bundle install
+      - uses: rubygems/release-gem@7f9650160c1a4e7989fdc9855807bdbd421d8b6b # v1.4.1

data/.rubocop.yml

@@ -0,0 +1,37 @@
+inherit_from: .rubocop_todo.yml
+
+plugins:
+  - rubocop-rake
+  - rubocop-rspec
+
+AllCops:
+  TargetRubyVersion: 3.0
+  SuggestExtensions: true
+
+Gemspec/RequireMFA:
+  Enabled: true
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+  # Gemspec floors are intentionally low; raising them is a separate breaking-change decision.
+
+Naming/FileName:
+  Exclude:
+    - "lib/savon-multipart.rb"
+    # Entry-point file matches the gem name; renaming it would break `require "savon-multipart"`.
+
+Layout/FirstHashElementIndentation:
+  EnforcedStyle: consistent
+
+Layout/HashAlignment:
+  EnforcedHashRocketStyle: table
+
+RSpec/ContextWording:
+  Enabled: false
+
+Style/BlockDelimiters:
+  EnforcedStyle: semantic
+
+Style/HashSyntax:
+  EnforcedStyle: ruby19
+  EnforcedShorthandSyntax: never

data/.rubocop_todo.yml

@@ -0,0 +1,7 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# using RuboCop version 1.86.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.

data/CHANGELOG.md

@@ -1,6 +1,15 @@
-## 2.1.1 (current)
+## 2.1.3 (2026-09-16)
 
-* Improve detection of multipart content-type header.s
+* Fix `xop:Include` parts with percent-encoded Content-IDs not being replaced in the response. ([#21](https://github.com/savonrb/savon-multipart/pull/21))
+
+## 2.1.2 (2022-01-20)
+
+* Loosen dependency on `mail` gem. ([#23](https://github.com/savonrb/savon-multipart/pull/23))
+* Add ability to flatten MTOM XOP parts back into the main XML document ([#17](https://github.com/savonrb/savon-multipart/pull/17))
+
+## 2.1.1
+
+* Improve detection of multipart content-type header.
 
 ## 2.1.0
 

data/Gemfile

@@ -1,9 +1,19 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec
 
-platform :rbx do
-  gem 'json'
-  gem 'racc'
-  gem 'rubysl'
-  gem 'rubinius-coverage'
+if RUBY_VERSION > '3.1'
+  # net-smtp, net-pop and net-imap were removed from ruby 3.1 standard gems. See: https://github.com/rails/rails/pull/42366
+  # Can drop when https://github.com/mikel/mail/pull/1439 is resolved
+  gem 'net-imap', require: false
+  gem 'net-pop', require: false
+  gem 'net-smtp', require: false
 end
+
+gem 'rubocop', '~> 1.86', '>= 1.86.2'
+gem 'rubocop-rake', '~> 0.7.1'
+gem 'rubocop-rspec', '~> 3.9'
+
+gem 'bundler-audit', '~> 0.9.3', require: false
+gem 'ruby_audit', '~> 3.1', require: false if RUBY_VERSION >= '3.1.0'

data/README.md

@@ -1,23 +1,34 @@
-Savon Multipart [![Build Status](https://secure.travis-ci.org/savonrb/savon-multipart.png)](http://travis-ci.org/savonrb/savon-multipart)
-===============
+# Savon Multipart
 
-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.
+[![CI](https://github.com/savonrb/savon-multipart/actions/workflows/ci.yml/badge.svg)](https://github.com/savonrb/savon-multipart/actions/workflows/ci.yml)
+[![Gem Version](https://img.shields.io/gem/v/savon-multipart.svg)](https://rubygems.org/gems/savon-multipart)
+
+Adds multipart support (SOAP with Attachments) to [Savon](https://github.com/savonrb/savon).
 
 Installation
 ------------
 
-Savon Multipart is available through [Rubygems](http://rubygems.org/gems/savon-multipart) and can be installed via:
+Savon Multipart is available through [Rubygems](https://rubygems.org/gems/savon-multipart) and can be installed via:
 
 ```
 $ gem install savon-multipart
 ```
 
+Or in your `Gemfile`:
+
+```ruby
+gem 'savon-multipart', '~> 2.1'
+```
+
 Usage
 ------------
 
-Just require the gem 'savon-multipart', which automatically requires 'savon' as well:
+Just require the gem 'savon-multipart', '~> 2.1', which automatically requires 'savon' as well:
 
 ```
 require 'savon-multipart'
 ```
+
+## Ruby support
+
+Savon Multipart requires Ruby >= 1.9.2.

data/RELEASING.md

@@ -0,0 +1,19 @@
+_You'll need write access to the repository to create a release. Publishing is handled automatically via [trusted publishing](https://guides.rubygems.org/trusted-publishing/)._
+
+## Cutting a release
+
+1. On your release branch (e.g. `main`, `v2.x`), edit [CHANGELOG.md](https://github.com/savonrb/savon-multipart/blob/main/CHANGELOG.md) to finalize the new version number and list of all changes.
+2. Bump [version.rb](https://github.com/savonrb/savon-multipart/blob/main/lib/savon/multipart/version.rb) to the version you picked in previous step.
+3. **Final check**: make sure all tests are green, and that `rake build` succeeds. If not, merge any fixes back to the release branch and go to step 1.
+4. [Draft a new release](https://github.com/savonrb/savon-multipart/releases/new) on Github.
+   - In the "Choose a tag" field, type the version tag - e.g. `v2.12.1` - and select "Create new tag on publish".
+   - Use `v[version]` for the release title, and copy the changelog into the release notes.
+   - Click "Publish release". Github creates and pushes the tag, which triggers the release workflow.
+5. Publishing to RubyGems.org is fully automated. The [Push gem workflow](https://github.com/savonrb/savon-multipart/actions/workflows/gem_push.yml) triggers on the published release and requires approval from a release manager via the `release` environment before credentials are issued. **Before approving**: confirm that CI is green on the release commit. Approve the deployment in the Actions UI and the gem will be built and pushed automatically.
+
+## Updating minimum ruby version
+
+- Update `required_ruby_version` in [savon-multipart.gemspec](https://github.com/savonrb/savon-multipart/blob/main/savon-multipart.gemspec)
+- Update the test matrix in [ci.yml](https://github.com/savonrb/savon-multipart/blob/main/.github/workflows/ci.yml)
+- Update [README](https://github.com/savonrb/savon-multipart/blob/main/README.md) with the correct support matrix
+- Note the updated requirement in [CHANGELOG.md](https://github.com/savonrb/savon-multipart/blob/main/CHANGELOG.md)

data/Rakefile

@@ -1,11 +1,16 @@
-require "bundler"
+# frozen_string_literal: true
+
+require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require "rspec/core/rake_task"
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = %w(-c)
+  t.rspec_opts = %w[-c]
 end
 
-task :default => :spec
-task :test => :spec
+desc 'Run the spec suite'
+task default: :spec
+
+desc 'Run the spec suite'
+task test: :spec

data/lib/savon/multipart/response.rb

@@ -1,7 +1,12 @@
+# frozen_string_literal: true
+
 require 'mail'
+require 'cgi'
 
 module Savon
   module Multipart
+    # Savon::Response subclass that understands multipart/related SOAP
+    # responses, exposing MIME parts, attachments and XOP content.
     class Response < Savon::Response
       attr_reader :parts
 
@@ -20,31 +25,75 @@ module Savon
       end
 
       def xml
-        if multipart?
-          parse_body unless @has_parsed_body
-          @parts.first.body.to_s
+        return super unless multipart?
+
+        parse_body unless @has_parsed_body
+        multipart_xml
+      end
+
+      private
+
+      def multipart_xml
+        if xop?
+          parse_xop unless @has_parsed_xop
+          @xop_body
         else
-          super
+          @parts.first.body.to_s
         end
       end
 
-      private
       def multipart?
         !(http.headers['content-type'] =~ /^multipart/im).nil?
       end
 
+      def xop?
+        if multipart?
+          parse_body unless @has_parsed_body
+          !(@parts.first.header['content-type'].to_s =~ %r{^application/xop\+xml}i).nil?
+        else
+          false
+        end
+      end
+
       def boundary
         return unless multipart?
+
         @boundary ||= Mail::Field.new('content-type', http.headers['content-type']).parameters['boundary']
       end
 
       def parse_body
         @parts = Mail::Part.new(
-          :headers => http.headers,
-          :body => http.body
+          headers: http.headers,
+          body: http.body
         ).body.split!(boundary).parts
         @has_parsed_body = true
       end
+
+      def parse_xop
+        parsed = Nokogiri.XML(@parts.first.body.to_s)
+        xop_elements = parsed.xpath('//xop:Include', xop: 'http://www.w3.org/2004/08/xop/include')
+
+        if xop_elements.empty?
+          @xop_body = @parts.first.body.to_s
+        else
+          replace_xop_includes(xop_elements)
+          @xop_body = parsed.to_s
+        end
+        @has_parsed_xop = true
+      end
+
+      def replace_xop_includes(xop_elements)
+        xop_elements.each do |xop_element|
+          href = xop_element.attributes['href'].to_s
+          cid = CGI.unescape(href[4..])
+          data = find_part_by_cid(cid).body.to_s
+          xop_element.parent.content = Base64.encode64(data).chomp
+        end
+      end
+
+      def find_part_by_cid(cid)
+        @parts.find { |part| part.header['content-id'].to_s == "<#{cid}>" }
+      end
     end
   end
 end

data/lib/savon/multipart/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Savon
   module Multipart
-    VERSION = "2.1.1"
+    VERSION = '2.1.3'
   end
 end

data/lib/savon-multipart.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'savon'
 require 'savon/multipart/version'
 require 'savon/multipart/response'

data/savon-multipart.gemspec

@@ -1,29 +1,31 @@
-lib = File.expand_path("../lib", __FILE__)
-$:.unshift lib unless $:.include? lib
+# frozen_string_literal: true
 
-require "savon/multipart/version"
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
+
+require 'savon/multipart/version'
 
 Gem::Specification.new do |s|
-  s.name        = "savon-multipart"
+  s.name        = 'savon-multipart'
   s.version     = Savon::Multipart::VERSION
-  s.authors     = ["Martin Westin", "Daniel Harrington"]
-  s.email       = ["martin@eimermusic.com", "me@rubiii.com"]
-  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.authors     = ['Martin Westin', 'Daniel Harrington']
+  s.email       = ['martin@eimermusic.com', 'me@rubiii.com']
+  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'
+  # NOTE: this floor is intentionally conservative — CI starts at Ruby 3.0, but the gem likely
+  # still works on older Rubies. Don't raise it just to satisfy lint or match CI without evidence of breakage.
   s.required_ruby_version = '>= 1.9.2'
 
-  s.rubyforge_project = s.name
-
-  s.add_dependency "savon", "~> 2"
-  s.add_dependency "mail", "~> 2.5.4"
+  s.add_dependency 'mail', '~> 2'
+  s.add_dependency 'savon', '~> 2'
 
-  s.add_development_dependency "rake"
-  s.add_development_dependency "pry"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "autotest"
-  s.add_development_dependency "transpec"
+  s.add_development_dependency 'autotest'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
 
   s.files = `git ls-files`.split("\n")
-  s.require_path = "lib"
+  s.require_path = 'lib'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

data/spec/fixtures/response/multipart_expected.xml

@@ -0,0 +1 @@
+<?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>

data/spec/fixtures/response/not_multipart_expected.xml

@@ -0,0 +1 @@
+<?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>

data/spec/fixtures/response/simple_xop.txt

@@ -0,0 +1,13 @@
+----==_mimepart_4d416ae62fd32_201a8043814c4724
+Content-ID: <http://tempuri.org/0>
+Content-Transfer-Encoding: 8bit
+Content-Type: application/xop+xml;charset=utf-8;type="text/xml"
+
+<?xml version="1.0" encoding="UTF-8"?><envelope ><header></header><body><BinaryData><xop:Include href="cid:http://tempuri.org/1/123456789" xmlns:xop="http://www.w3.org/2004/08/xop/include"/></BinaryData></body></envelope>
+----==_mimepart_4d416ae62fd32_201a8043814c4724
+Content-ID: <http://tempuri.org/1/123456789>
+Content-Transfer-Encoding: binary
+Content-Type: application/octet-stream
+
+BinaryDataGoesHere
+----==_mimepart_4d416ae62fd32_201a8043814c4724--

data/spec/savon/multipart/response_spec.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require 'savon-multipart'
+
+RSpec.describe Savon::Multipart::Response do
+  let(:multipart_content_type) do
+    'multipart/related; boundary="--==_mimepart_4d416ae62fd32_201a8043814c4724"; ' \
+      'charset=UTF-8; type="text/xml"'
+  end
+  let(:header) { { 'Content-Type' => multipart_content_type } }
+  let(:body) { File.read(path) }
+  let(:response) { soap_response(headers: header, body: body) }
+
+  def soap_response(options = {})
+    defaults = { code: 200, headers: {}, body: '' }
+    response = defaults.merge options
+    globals = {
+      multipart: true,
+      raise_errors: true,
+      convert_response_tags_to: ->(tag) { Savon::StringUtils.snakecase(tag).to_sym }
+    }
+    http = HTTPI::Response.new(response[:code], response[:headers], response[:body])
+
+    Savon::Multipart::Response.new(http, globals, {})
+  end
+
+  context 'multipart' do
+    let(:path) { File.expand_path('../../fixtures/response/multipart.txt', __dir__) }
+
+    it 'parses the SOAP envelope from the first MIME part' do
+      expected = File.expand_path('../../fixtures/response/multipart_expected.xml', __dir__)
+      expect(response.xml.strip).to eq(File.read(expected))
+    end
+
+    it 'exposes the top-level MIME parts' do
+      expect(response.parts.length).to eq(2)
+    end
+
+    it 'exposes nested MIME parts' do
+      expect(response.parts[1].parts.length).to eq(3)
+    end
+
+    it 'decodes attachment bodies' do
+      expect(response.parts[1].parts[2].body.decoded.strip).to eq('This is a test message from Github')
+    end
+
+    it 'returns the attachments' do
+      expect(response.attachments.size).to eq(1)
+    end
+
+    it 'only parses the SOAP body once' do
+      # Referencing `response` here builds it (parsing the body a first time)
+      # before the spy is installed, so no further parses may happen below.
+      allow(response).to receive(:parse_body).and_call_original
+
+      5.times do
+        response.attachments
+      end
+
+      expect(response).not_to have_received(:parse_body)
+    end
+  end
+
+  context 'simple multipart' do
+    let(:path) { File.expand_path('../../fixtures/response/simple_multipart.txt', __dir__) }
+
+    it 'returns a String from the #xml method' do
+      expect(response.xml.class).to eq(String)
+    end
+
+    it 'returns a Hash from the #body method' do
+      expect(response.body).to eq({ submit_req: true })
+    end
+  end
+
+  context 'simple xop' do
+    let(:path) { File.expand_path('../../fixtures/response/simple_xop.txt', __dir__) }
+
+    it 'returns a String from the #xml method' do
+      expect(response.xml.class).to eq(String)
+    end
+
+    it 'returns a Hash from the #body method, include xop data' do
+      expect(response.body).to eq({ binary_data: Base64.encode64('BinaryDataGoesHere').chomp })
+    end
+  end
+
+  describe 'a multipart response with case sensitive headers' do
+    let(:multipart_content_type) do
+      'MuLtIpArT/rElAtEd; boundary="--==_mimepart_4d416ae62fd32_201a8043814c4724"; ' \
+        'charset=UTF-8; type="text/xml"'
+    end
+    let(:path) { File.expand_path('../../fixtures/response/simple_multipart.txt', __dir__) }
+
+    it 'does not care about upper or lowercase values for ContentType' do
+      expect(response.body).to eq({ submit_req: true })
+    end
+  end
+
+  context 'not multipart' do
+    let(:path) { File.expand_path('../../fixtures/response/not_multipart.txt', __dir__) }
+    let(:header) { { 'Content-Type' => 'text/html; charset=utf-8' } }
+
+    it 'parses soap messages without attachments too' do
+      expected = File.expand_path('../../fixtures/response/not_multipart_expected.xml', __dir__)
+      expect(response.xml.chomp).to eq(File.read(expected))
+    end
+
+    it 'has no parts' do
+      expect(response.parts.size).to eq(0)
+    end
+
+    it 'has no attachments' do
+      expect(response.attachments.size).to eq(0)
+    end
+  end
+
+  context 'soap errors' do
+    let(:path) { File.expand_path('../../fixtures/response/soap_fault.txt', __dir__) }
+
+    it 'handles them correctly' do
+      expect { response }.to raise_error(Savon::SOAPFault, /The service cannot be found/)
+    end
+  end
+end

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: savon-multipart
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Martin Westin
 - Daniel Harrington
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: savon
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -26,21 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: autotest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,21 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: autotest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: transpec
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -117,27 +102,38 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/Bug_report.md"
+- ".github/ISSUE_TEMPLATE/Feature_request.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
+- ".github/workflows/gem_push.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
+- RELEASING.md
 - Rakefile
 - lib/savon-multipart.rb
 - lib/savon/multipart/response.rb
 - lib/savon/multipart/version.rb
 - savon-multipart.gemspec
 - spec/fixtures/response/multipart.txt
+- spec/fixtures/response/multipart_expected.xml
 - spec/fixtures/response/not_multipart.txt
+- spec/fixtures/response/not_multipart_expected.xml
 - spec/fixtures/response/simple_multipart.txt
+- spec/fixtures/response/simple_xop.txt
 - spec/fixtures/response/soap_fault.txt
-- spec/savon/soap/response_spec.rb
+- spec/savon/multipart/response_spec.rb
 homepage: http://savonrb.com
 licenses: []
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -152,9 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: savon-multipart
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Heavy metal Ruby SOAP client with multipart support
 test_files: []

data/.travis.yml

@@ -1,10 +0,0 @@
-# https://github.com/travis-ci/travis-ci/wiki/.travis.yml-options
-language: "ruby"
-script: "bundle exec rake"
-rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
-  - jruby-19mode
-  - rbx-2

data/spec/savon/soap/response_spec.rb

@@ -1,83 +0,0 @@
-require 'savon-multipart'
-
-describe Savon::Multipart::Response do
-
-  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) }
-
-  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])
-
-    Savon::Multipart::Response.new(http, globals, {})
-  end
-
-  context "multipart" do
-    let(:path) { File.expand_path("../../../fixtures/response/multipart.txt", __FILE__) }
-
-    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 "returns the attachments" do
-      expect(response.attachments.size).to eq(1)
-    end
-
-    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
-
-  context "simple multipart" do
-    let(:path) { File.expand_path('../../../fixtures/response/simple_multipart.txt', __FILE__) }
-
-    it "returns a String from the #xml method" do
-      expect(response.xml.class).to eq(String)
-    end
-
-    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
-
-  describe "a multipart response with case sensitive headers" do
-    let(:header) {{ "Content-Type" => 'MuLtIpArT/rElAtEd; boundary="--==_mimepart_4d416ae62fd32_201a8043814c4724"; charset=UTF-8; type="text/xml"' }}
-    let(:path) { File.expand_path('../../../fixtures/response/simple_multipart.txt', __FILE__) }
-
-    it "does not care about upper or lowercase values for ContentType" do
-      expect(response.body).to eq({:submit_req => true})
-    end
-  end
-
-  context "not multipart" do
-    let(:path) { File.expand_path('../../../fixtures/response/not_multipart.txt', __FILE__) }
-    let(:header) { { 'Content-Type' => 'text/html; charset=utf-8'} }
-
-    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