Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade savon httpi to fix integration dependency errors #18

Merged
merged 92 commits into from
Jun 26, 2024
Merged
Show file tree
Hide file tree
Changes from 89 commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
9b92e6e
allow specification of a different WSDL
May 30, 2012
8ae72a9
Support using sandbox endpoint via configuration
Jun 7, 2012
bd97d1e
Run integration tests against sandbox accounts
Jun 7, 2012
a9a6e32
support multiple product rate plans in subscribe requests
jmoline Jun 18, 2012
f2392a7
adding method for backward compatibility of single product_rate_plan …
jmoline Jun 18, 2012
d20546a
payment_method should allow for credit cards expiring this year
jmoline Jun 20, 2012
8c14557
adding specs to verify validation
jmoline Jun 25, 2012
c47d919
adding attribute assignment method to base, with specs
jmoline Jun 25, 2012
fc6328a
Merge branch 'payment_method_year' of https://github.com/jmoline/zuor…
oesmith Jun 27, 2012
c47babe
Prefer '>= year' over '> last year'.
oesmith Jun 27, 2012
4e66f55
product_rate_plan= method shouldn't be protected
jmoline Jul 2, 2012
b8b2d1f
DRYing object xml generation methods
jmoline Jul 2, 2012
b08ebaf
specs to cover modifications to validation methods and turning produc…
jmoline Jul 2, 2012
6b06963
Use our @google emails
kalbasit Nov 21, 2012
40ca7e2
Update dependencies - inspired by and heavily lifted from @mdemin914
Nov 26, 2013
1122cc4
As it turns out, some months have 31 days.
nirvdrum Oct 31, 2012
df90fd2
Set the account_id value after successfull subscribing.
nirvdrum Sep 14, 2012
d02820d
account_id isn't always required. It may be blank for :subscribe calls.
nirvdrum Sep 4, 2012
eb66903
Allow passing just the product_rate_plan_id rather than a fully mater…
nirvdrum Sep 4, 2012
fd51194
Updated @nirvdrum spec to support new return values
Nov 26, 2013
d4e9af6
Revert "Updated @nirvdrum spec to support new return values"
Nov 26, 2013
63f9ef8
Revert "Allow passing just the product_rate_plan_id rather than a ful…
Nov 26, 2013
0f59b53
Merge remote-tracking branch 'jmoline/multiple_rate_plans' into 1.0
Nov 26, 2013
8142d68
Update license and added CONTRIBUTING
Bram-- Nov 28, 2013
27e26c1
Re-add F
Bram-- Dec 5, 2013
a46b0dc
support multiple product rate plans in subscribe requests
jmoline Jun 18, 2012
6ef6b00
adding method for backward compatibility of single product_rate_plan …
jmoline Jun 18, 2012
6f37596
product_rate_plan= method shouldn't be protected
jmoline Jul 2, 2012
b7faf09
DRYing object xml generation methods
jmoline Jul 2, 2012
5ec27e5
specs to cover modifications to validation methods and turning produc…
jmoline Jul 2, 2012
c3eca59
Update dependencies - inspired by and heavily lifted from @mdemin914
Nov 26, 2013
b353b0f
As it turns out, some months have 31 days.
nirvdrum Oct 31, 2012
ee7b42a
Set the account_id value after successfull subscribing.
nirvdrum Sep 14, 2012
2d0bdee
account_id isn't always required. It may be blank for :subscribe calls.
nirvdrum Sep 4, 2012
fb51b3b
Allow passing just the product_rate_plan_id rather than a fully mater…
nirvdrum Sep 4, 2012
8fc1d4c
Updated @nirvdrum spec to support new return values
Nov 26, 2013
8b97f32
Revert "Updated @nirvdrum spec to support new return values"
Nov 26, 2013
8d3eb3e
Revert "Allow passing just the product_rate_plan_id rather than a ful…
Nov 26, 2013
b969579
Merge commit '0f59b53' into v1.0
Bram-- Dec 10, 2013
5886a88
Implemented the :amend call.
nirvdrum Sep 9, 2012
6ed98a5
Add jmonline to contributor list and fix a typo
Nov 26, 2013
789ccd2
Fix up integration specs
Bram-- Nov 28, 2013
8666679
Merge pull request #15 from wildfireapp/v1.0
Bram-- Dec 10, 2013
f5156e0
It's `log: true` not `logger: true`
chadoh Aug 21, 2014
33a3a71
fixing make_client to use savon 2.0 config
mdemin914 Oct 16, 2014
5ba1025
Update README.md
mdemin914 Nov 11, 2014
4141323
Update README.md
mdemin914 Feb 25, 2015
37291ca
Update README.md
mdemin914 Feb 25, 2015
1202129
fixed base.query function
mdemin914 Apr 1, 2015
45ed72a
Merge branch 'master' of https://github.com/zuorasc/zuora
mdemin914 Apr 1, 2015
08296bb
fixing subscribe request
mdemin914 Apr 2, 2015
89a87b1
enable services url
mdemin914 Apr 27, 2015
bad21dd
Update zuora.gemspec
mdemin914 Jun 1, 2015
9799fb4
Update payment.rb
dmhalejr Jun 2, 2015
bf09f13
Adds testing for ruby 2.x
Dec 1, 2015
a7051d8
Merge pull request #21 from dmhalejr/patch-1
mdemin914 Apr 18, 2016
74236d0
Merge pull request #29 from jwg2s/feature/travis-ruby2
mdemin914 Apr 18, 2016
fb31629
Merge pull request #18 from chadoh/patch-1
mdemin914 Apr 18, 2016
c2fe7ae
works with ruby 2.3.1, update to wsdl 78, update spec, remove date/da…
mdemin914 Aug 16, 2016
f46dfc8
don't query activeCurrencies for product rate plans with other fields
mdemin914 Sep 27, 2016
4574572
Merge remote-tracking branch 'upstream/master' into upgrade-savon-httpi
banjoko01 Jun 14, 2024
ee1e873
- Fix failing specs
banjoko01 Jun 14, 2024
ae4a946
- Update httpi to `~> 3` and related dependencies
banjoko01 Jun 14, 2024
462f494
- Update httpi to `< 4.0` to resolve `uninitialized constant Rack::Ut…
banjoko01 Jun 14, 2024
904f3fe
Downgrade httpi to 3.0
tapan-sh Jun 17, 2024
f756577
Downgrade savon to 2.14
tapan-sh Jun 17, 2024
382f6ec
Loosen httpi and savon gem
tapan-sh Jun 17, 2024
17e4cca
Bump Ruby version to 3.2
tapan-sh Jun 17, 2024
7beffa6
Bump Ruby version
tapan-sh Jun 17, 2024
28c8f19
Resolve gem dependency errors
tapan-sh Jun 18, 2024
067d069
Use Ruby 3.2.0
tapan-sh Jun 18, 2024
34721e2
Resolve undefined method `exists?' for File:Class
tapan-sh Jun 18, 2024
4dd4867
Use Ruby 3.2.0
tapan-sh Jun 18, 2024
f96fb18
Add i18n dependency
tapan-sh Jun 18, 2024
fe953de
- Add Ruby matrix to CI
banjoko01 Jun 19, 2024
9bf0617
- Loosen up httpi gem
banjoko01 Jun 19, 2024
a43ab7e
- Loosen up sqlite3 gem
banjoko01 Jun 19, 2024
81f6423
Add appraisals gem - Support Rails 4 - 7
tapan-sh Jun 19, 2024
df11da1
Merge pull request #19 from Sage/add-appraisal
tapan-sh Jun 21, 2024
841f53b
- Revert commented out validations
banjoko01 Jun 21, 2024
4890217
- Revert `WSDL` definition to the current pattern
banjoko01 Jun 21, 2024
6f059cf
- Revert `WSDL` definition to the latest pattern
banjoko01 Jun 21, 2024
46b7ecf
- Insert commented lines on how `wsdl` was previously defined till we…
banjoko01 Jun 21, 2024
2016532
- Remove `CONTRIBUTING.md` file
banjoko01 Jun 25, 2024
48578b7
- Revert use of `config.wsdl_path` pattern
banjoko01 Jun 25, 2024
04f281f
- Revert overriden validations from upstream
banjoko01 Jun 25, 2024
22c3381
- Add instructions on how to run specs with appraisal to `README`
banjoko01 Jun 26, 2024
40ff652
- Restore `WSDL` constant definition and test coverage
banjoko01 Jun 26, 2024
0d39260
- Comment out `refund_Date` validation to align with upstream changes
banjoko01 Jun 26, 2024
1afc8b1
- Address changes to `README` file
banjoko01 Jun 26, 2024
cd9b4ee
- Prefix gem name with `sage-`
banjoko01 Jun 26, 2024
5a06bc4
- Remove redundants debugging gems
banjoko01 Jun 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,36 @@ on: [push]
jobs:
test:
runs-on: ubuntu-latest
env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
strategy:
matrix:
gemfile:
- rails_4
- rails_5
- rails_6
- rails_7
rubygems:
- default
ruby:
- '2.7'
- '3.2'
exclude:
- gemfile: rails_4
ruby: '3.2'
- gemfile: rails_6
ruby: '2.7'
- gemfile: rails_7
ruby: '2.7'
name: ${{ matrix.gemfile }}, Ruby ${{ matrix.ruby }}

steps:
- uses: actions/checkout@v4
- name: Set up Ruby
- name: Set up Ruby and Bundle
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
ruby-version: ${{ matrix.ruby }}
rubygems: ${{ matrix.rubygems }}
bundler-cache: true

- name: Export ENV
Expand All @@ -33,7 +56,7 @@ jobs:
- uses: actions/checkout@v3
- uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Clear any existing packages
run: rm -f $GEMS_PATH
Expand All @@ -45,4 +68,4 @@ jobs:
- name: Build gem
run: bundle exec rake build zuora.gemspec
- name: Publish
run: gem push $GEMS_PATH
run: gem push $GEMS_PATH
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ doc
.yardoc
.rvmrc
.rbenv-version
.ruby-version
.ruby-gemset
gemfiles/*.gemfile.lock
zuora.log
Gemfile.lock
Expand Down
29 changes: 20 additions & 9 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
appraise "rails30" do
gem 'activesupport', '~> 3.0.0'
gem 'activemodel', '~> 3.0.0'
appraise "rails-4" do
gem 'activemodel', '~> 4.2'
gem 'bigdecimal', '~> 1.4'
gem 'sqlite3', '~> 1.3'
gem 'rack', '~> 2.0'
end

appraise "rails31" do
gem 'activesupport', '~> 3.1.0'
gem 'activemodel', '~> 3.1.0'
appraise "rails-5" do
gem 'activemodel', '~> 5.2'
gem 'sqlite3', '~> 1.4.0'
gem 'i18n', '~> 1.5.1'
gem 'rack', '~> 2.0'
end

appraise "rails32" do
gem 'activesupport', '~> 3.2.0'
gem 'activemodel', '~> 3.2.0'
appraise "rails-6" do
gem 'activemodel', '~> 6.0'
gem 'sqlite3'
gem 'httpi', '~> 4.0'
end

appraise "rails-7" do
gem 'activemodel', '~> 7.0'
gem 'sqlite3'
gem 'httpi', '~> 4.0'
end
8 changes: 6 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
ARG RUBY_VERSION=${RUBY_VERSION:-2.7}
ARG RUBY_VERSION=${RUBY_VERSION:-3.2}
FROM ruby:${RUBY_VERSION}-alpine

RUN apk --update add --no-cache build-base bash && \
apk add git && \
apk add --no-cache libxml2 && \
apk add --no-cache libxml2-dev && \
apk add --no-cache sqlite-dev
apk add --no-cache sqlite-dev && \
apk add --no-cache musl-dev && \
apk add --no-cache libc6-compat

RUN gem install nokogiri -v '1.15.6' -- --use-system-libraries

RUN gem update --system 3.3.22 --no-document && \
gem install bundler --no-document
Expand Down
4 changes: 0 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,3 @@
source 'https://rubygems.org'

gemspec

gem 'akami', '~> 1.3.2'
gem 'nokogiri', '~> 1.15.6'
gem 'wasabi', '2.3.0'
222 changes: 202 additions & 20 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,20 +1,202 @@
Copyright (c) 2012 Wildfire Interactive, Inc.

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Loading