quickpay-ruby-client 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a7b8b3bec59cf6276448d2e8eb29149288518b12d0df8e377fc10783bb6090
-  data.tar.gz: d80a3b9b3deda68bea662dd67a5937ea724a7aa58d44ec7fde61c74c588b9e43
+  metadata.gz: c8f90300ec364b0706c081ca97c62b667c09b72a619966bbb01bf7cdeb304226
+  data.tar.gz: ef577ec024e538394edeb1bf963eb621c8202fdd148b4b96aa327983b888cf3a
 SHA512:
-  metadata.gz: cadad5ea2172320dd9133e6e8534d08cc1475d1b3d8d66839686eebaeba74000e0b162f8332b118cc21794299970a3c938b199f85ceff6a5b44c37405164ffaa
-  data.tar.gz: c46b7f639b9f9359c53206a02583c5c593535601541cd8a75861666b943db5a629edfb7df58d6b25615450758b8ffa461bcb668a002b7022e511f7f2acd85ede
+  metadata.gz: d1c2135febd4554583e9a75f07f3dcb6e16c2b206b643c42d91c9bedb3d7d0807c4790fb2b0dcca6c08fb7f9b62112cd8c4eff48cc662b3a0d82d4d141ea9169
+  data.tar.gz: 21512e8cb653a7681bec3a31ff76001836298aa079338565fb65c1dc3e6e915d82be7028a969a03d4e8ca9fedb3ee103c18264be1a44adfc2437ef59824aed5f

data/.github/workflows/test_and_lint.yml

@@ -0,0 +1,63 @@
+name: Test and Lint on Push and PR
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: "ubuntu-20.04"
+    strategy:
+      matrix:
+        ruby:
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: QuickPay/quickpay-base-action@v2.2
+        with:
+          rubocop: true
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake
+  publish:
+    runs-on: "ubuntu-20.04"
+    needs: 
+      test
+    if: ${{ github.ref == 'refs/heads/master' }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1
+          bundler-cache: true
+      - name: Setup gem credentials
+        run: |
+          mkdir ~/.gem && echo ":rubygems_api_key: ${{secrets.BUNDLE_RUBYGEMS__ORG}}" > ~/.gem/credentials && chmod 0600 ~/.gem/credentials
+      - name: Retrieve versions
+        run: |
+          echo "##[set-output name=versions;]$(gem search '^quickpay-ruby-client$' --all --prerelease | grep -o '\((.*)\)$' | tr -d '() ' | tr ',' "|" | sort)"
+        id: extract_versions
+      - name: Retrieve Current Versions
+        run: |
+          ruby -e "
+            require './lib/quickpay/api/version.rb'
+            versions = '${{ steps.extract_versions.outputs.versions }}'.strip.split('|').map {|x| Gem::Version.new x }
+            unless versions.include? Gem::Version.new(QuickPay::API::VERSION)
+              puts('##[set-output name=version;]' + QuickPay::API::VERSION)
+            end
+          "
+        id: extract_version
+      - name: Push gem
+        if: ${{ steps.extract_version.outputs.version != '' }}
+        run: gem build && gem push *.gem
+      - name: Create Release
+        if: ${{ steps.extract_version.outputs.version != '' }}
+        uses: zendesk/action-create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ steps.extract_version.outputs.version }}
+          release_name: Release ${{ steps.extract_version.outputs.version }}

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.0.1
+
+* Fixed bug where variations of Content-Type application/json got scrubbed, fx application/json;charset=UTF-8 (https://github.com/QuickPay/quickpay-ruby-client/pull/41)
+
 ## 3.0.0
 
 ### Breaking changes

data/README.md

@@ -20,7 +20,7 @@ or install from Rubygems:
 $ gem install quickpay-ruby-client
 ```
 
-It is currently tested with Ruby ( >= 2.5.x)
+It is currently tested with Ruby ( >= 2.6.x)
 
 * MRI
 * Rubinius (2.0)

data/lib/quickpay/api/client.rb

@@ -11,6 +11,8 @@ module QuickPay
         "Accept-Version" => "v10"
       }.freeze
 
+      CONTENT_TYPE_JSON_REGEX = %r{application/.*json}.freeze
+
       Request = Struct.new(:method, :path, :body, :headers, :query) # rubocop:disable Lint/StructNewOverride
 
       def initialize(username: nil, password: nil, base_uri: "https://api.quickpay.net", options: {})
@@ -32,7 +34,7 @@ module QuickPay
           headers = DEFAULT_HEADERS.merge(options.fetch(:headers, {}))
           body    = begin
             data = options.fetch(:body, "")
-            if headers["Content-Type"] == "application/json" && data.instance_of?(Hash)
+            if CONTENT_TYPE_JSON_REGEX.match(headers["Content-Type"]) && data.instance_of?(Hash)
               data.to_json
             else
               data
@@ -50,7 +52,7 @@ module QuickPay
           res = @connection.request(**req.to_h)
           error = QuickPay::API::Error.by_status_code(res.status, res.body, res.headers, req)
 
-          if !options.fetch(:raw, false) && res.headers["Content-Type"] =~ %r{application/json}
+          if !options.fetch(:raw, false) && res.headers["Content-Type"] =~ CONTENT_TYPE_JSON_REGEX
             res.body = JSON.parse(res.body, options[:json_opts] || @connection.data[:json_opts])
           end
 
@@ -72,7 +74,7 @@ module QuickPay
       def scrub_body(body, content_type)
         return "" if body.to_s.empty?
 
-        if ["application/json", "application/x-www-form-urlencoded"].include?(content_type)
+        if [CONTENT_TYPE_JSON_REGEX, %r{application/x-www-form-urlencoded}].any? { |regex| regex.match(content_type) }
           body
         else
           "<scrubbed for Content-Type #{content_type}>"

data/lib/quickpay/api/error.rb

@@ -54,7 +54,7 @@ module QuickPay
 
       def to_s
         "#<#{self.class}: status=#{status}, body=#{body.inspect}, " \
-        "headers=#{headers.inspect} request=#{request.inspect}>"
+          "headers=#{headers.inspect} request=#{request.inspect}>"
       end
       alias_method :inspect, :to_s
 

data/lib/quickpay/api/version.rb

@@ -1,5 +1,5 @@
 module QuickPay
   module API
-    VERSION = "3.0.0".freeze
+    VERSION = "3.0.2".freeze
   end
 end

data/quickpay-ruby-client.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-console"
 
-  spec.add_dependency "excon", "~> 0.79.0"
-  spec.add_dependency "json", "~> 2.5.0"
+  spec.add_dependency "excon", ">= 0.79"
+  spec.add_dependency "json", "~> 2", ">= 2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickpay-ruby-client
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - QuickPay Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2022-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,30 +112,36 @@ dependencies:
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: '0.79'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: '0.79'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.5'
 description: Embed QuickPay's secure payments directly into your Ruby applications.
   Learn more at https://tech.quickpay.net
 email:
@@ -144,8 +150,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test_and_lint.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -175,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Ruby client for QuickPay API

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0
-cache: bundler
-before_script: wget -O ~/.rubocop.yml https://quickpay.github.io/development/.rubocop.yml
-script: bundle exec rake
-notifications:
-  slack:
-    secure: SixeTgiVsOaeWyKwICxLJ0GLN/C9j6qW1ZdaEytIDuZaBAn9oArrRGkJiehFdlzcPUHwzMWC0vl9GQzyBhZ7dbq+B53QY1mH9LTb9A53Y2d1OO1kBjJAkC5Yprvpjm52+x889Dwlz0bfLETvLsC2ej0NZDvSSLKFjpZZIZMOWkg=