mauth-client 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ac6251a66453ac4fe6f1f449d407173851a6c34e3dd17bf3b80d816e619e045
-  data.tar.gz: bf6f603408e51a6af3965e458f736ee3ed07763a7f0a662f1af0bd67a1cbeab3
+  metadata.gz: efbde48109b1d067f8901ca07cd13181a3564ef6ed0bce1b3741c8c956765341
+  data.tar.gz: a28441224938890a0e4538063273705cdda2b7b9efec79149db3929cceb2f6df
 SHA512:
-  metadata.gz: e4faea9d5bcf10c64b3c3bc10dded82d14b68bce39312b87140e38ba5410ba9d67b993f94e2e96036d7d88550837a6088d43deb75d7e4fed8164b51ed81b296c
-  data.tar.gz: a7a71824118eb6b4ca88a7f8a7afdb85719613997754392147dfa348eae7c04faf4ba7458eb28375d8b596c6b609ecbe6e8c42d5caed4931b9427c843bbf9448
+  metadata.gz: e4afa642e9235c58371b7d42c2ec7c22f8357ce9379a2cb7045d7f9bda5bfd94c83caf8ba4eaa172926429d383d7956a35cd41bc0a79324eccf1123ed25d5642
+  data.tar.gz: d238221c9a124d45a33136c930346d6999bf2e0d8492f16ab4bf94090b67b6e149a4dde8388af1f479f3a21f5b723374b6b95b571add51f179b93cc6a8590b91

data/.gitignore

@@ -6,5 +6,9 @@
 /yardoc
 /log
 
+# Appraisal related files
+/gemfiles/.bundle/
+/gemfiles/*.gemfile.lock
+
 /Gemfile.lock
 .byebug_history

data/.travis.yml

@@ -2,24 +2,33 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
+
+gemfile:
+  - gemfiles/faraday_0.x.gemfile
+  - gemfiles/faraday_1.x.gemfile
 
 before_install:
-  - gem update --system -N > /dev/null && echo "Rubygems version $(gem --version)"
-  - gem install bundler --force -N -v=2.0.1 && bundle --version
+  - gem update --system --force -N > /dev/null && echo "Rubygems version $(gem --version)"
+  - gem install bundler --force -N -v=2.1.4 && bundle --version
 
 install:
   - bundle install --jobs=3 --retry=3
-  - |-
-    curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/mdsol/fossa_ci_scripts/master/travis_ci/fossa_install.sh | bash -s -- -b $TRAVIS_BUILD_DIR
+  - >-
+    curl -H 'Cache-Control: no-cache'
+    https://raw.githubusercontent.com/mdsol/fossa_ci_scripts/master/travis_ci/fossa_install.sh |
+    bash -s -- -b $TRAVIS_BUILD_DIR
 
 script:
   - bundle exec rspec
-  - |-
-    curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/mdsol/fossa_ci_scripts/master/travis_ci/fossa_run.sh | bash -s -- -b $TRAVIS_BUILD_DIR
+  - >-
+    curl -H 'Cache-Control: no-cache'
+    https://raw.githubusercontent.com/mdsol/fossa_ci_scripts/master/travis_ci/fossa_run.sh |
+    bash -s -- -b $TRAVIS_BUILD_DIR
 
 deploy:
   provider: rubygems
@@ -29,4 +38,4 @@ deploy:
   on:
     tags: true
     repo: mdsol/mauth-client-ruby
-    condition: "$TRAVIS_RUBY_VERSION == 2.6.3"
+    condition: $TRAVIS_RUBY_VERSION == 2.7 && $BUNDLE_GEMFILE == $TRAVIS_BUILD_DIR/gemfiles/faraday_1.x.gemfile

data/Appraisals

@@ -0,0 +1,7 @@
+appraise 'faraday_0.x' do
+  gem 'faraday', '0.9.0'
+end
+
+appraise 'faraday_1.x' do
+  gem 'faraday', '~> 1.0'
+end

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-## v.6.0.0
+## v6.1.0
+* Allow Faraday 1.x.
+
+## v6.0.0
 - Added parsing code to test with mauth-protocol-test-suite.
 - Added unescape step in query_string encoding in order to remove 'double encoding'.
 - Added normalization of paths.

data/examples/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '~> 0.15'
+gem 'faraday', '~> 1.0'
 gem 'mauth-client', path: '..'

data/examples/Gemfile.lock

@@ -1,41 +1,47 @@
 PATH
   remote: ..
   specs:
-    mauth-client (4.1.0)
+    mauth-client (6.1.0)
+      addressable (~> 2.0)
       coderay (~> 1.0)
       dice_bag (>= 0.9, < 2.0)
-      faraday (~> 0.7)
-      faraday_middleware (~> 0.9)
+      faraday (>= 0.9, < 2.0)
+      faraday_middleware (>= 0.9, < 2.0)
       rack
       term-ansicolor (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.2)
-    dice_bag (1.3.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    coderay (1.1.3)
+    dice_bag (1.4.1)
       diff-lcs (~> 1.0)
       rake
-      thor (~> 0.0)
-    diff-lcs (1.3)
-    faraday (0.15.3)
+      thor (< 2.0)
+    diff-lcs (1.4.4)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.12.2)
-      faraday (>= 0.7.4, < 1.0)
-    multipart-post (2.0.0)
-    rack (2.0.6)
-    rake (12.3.1)
-    term-ansicolor (1.7.0)
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
+    multipart-post (2.1.1)
+    public_suffix (4.0.6)
+    rack (2.2.3)
+    rake (13.0.1)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.20.3)
-    tins (1.20.2)
+    thor (1.0.1)
+    tins (1.25.0)
+      sync
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  faraday (~> 0.15)
+  faraday (~> 1.0)
   mauth-client!
 
 BUNDLED WITH
-   1.17.1
+   2.1.4

data/examples/config.yml

@@ -6,3 +6,7 @@ mauth:
   mauth_api_version: v1
   app_uuid: <APP UUID>
   private_key_file: ./mauth_key
+  v2_only_authenticate: false
+  v2_only_sign_requests: false
+  disable_fallback_to_v1_on_v2_failure: true
+  v1_only_sign_requests: false

data/gemfiles/faraday_0.x.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "faraday", "0.9.0"
+
+gemspec path: "../"

data/gemfiles/faraday_1.x.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "faraday", "~> 1.0"
+
+gemspec path: "../"

data/lib/mauth/client/remote_authenticator.rb

@@ -42,7 +42,7 @@ module MAuth
       def make_mauth_request(authentication_ticket)
         begin
           response = mauth_connection.post("/mauth/#{mauth_api_version}/authentication_tickets.json", 'authentication_ticket' => authentication_ticket)
-        rescue ::Faraday::Error::ConnectionFailed, ::Faraday::Error::TimeoutError => e
+        rescue ::Faraday::ConnectionFailed, ::Faraday::TimeoutError => e
           msg = "mAuth service did not respond; received #{e.class}: #{e.message}"
           logger.error("Unable to authenticate with MAuth. Exception #{msg}")
           raise UnableToAuthenticateError, msg

data/lib/mauth/client/security_token_cacher.rb

@@ -27,7 +27,7 @@ module MAuth
             url_encoded_app_uuid = URI.escape(app_uuid, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
             begin
               response = signed_mauth_connection.get("/mauth/#{@mauth_client.mauth_api_version}/security_tokens/#{url_encoded_app_uuid}.json")
-            rescue ::Faraday::Error::ConnectionFailed, ::Faraday::Error::TimeoutError => e
+            rescue ::Faraday::ConnectionFailed, ::Faraday::TimeoutError => e
               msg = "mAuth service did not respond; received #{e.class}: #{e.message}"
               @mauth_client.logger.error("Unable to authenticate with MAuth. Exception #{msg}")
               raise UnableToAuthenticateError, msg

data/lib/mauth/request_and_response.rb

@@ -26,7 +26,7 @@ module MAuth
     # for responses:
     #   string_to_sign =
     #     status_code_string + <LF> +
-    #     response_body_digest + <LF> +
+    #     response_body + <LF> +
     #     app_uuid + <LF> +
     #     current_seconds_since_epoch
     def string_to_sign_v1(more_attributes)

data/lib/mauth/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MAuth
-  VERSION = '6.0.0'.freeze
+  VERSION = '6.1.0'
 end

data/mauth-client.gemspec

@@ -18,14 +18,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'faraday', '~> 0.7'
-  spec.add_dependency 'faraday_middleware', '~> 0.9'
+  spec.add_dependency 'faraday', '>= 0.9', '< 2.0'
+  spec.add_dependency 'faraday_middleware', '>= 0.9', '< 2.0'
   spec.add_dependency 'term-ansicolor', '~> 1.0'
   spec.add_dependency 'coderay', '~> 1.0'
   spec.add_dependency 'rack'
   spec.add_dependency 'dice_bag', '>= 0.9', '< 2.0'
   spec.add_dependency 'addressable', '~> 2.0'
 
+  spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'bundler', '>= 1.17'
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'rack-test', '~> 1.1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mauth-client
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Matthew Szenher
@@ -11,36 +11,48 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +129,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -245,6 +271,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - ".yardopts"
+- Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -263,6 +290,8 @@ files:
 - examples/mauth_key
 - exe/mauth-client
 - exe/mauth-proxy
+- gemfiles/faraday_0.x.gemfile
+- gemfiles/faraday_1.x.gemfile
 - lib/mauth-client.rb
 - lib/mauth/autoload.rb
 - lib/mauth/client.rb
@@ -305,8 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Sign and authenticate requests and responses with mAuth authentication.