Merge pull request #4 from CodingAnarchy/rails-6

Rails 6 support

.travis.yml

@@ -3,13 +3,19 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.1
-before_install: gem install bundler -v 2.0.1
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
+before_install: gem install bundler
 gemfile:
   - Gemfile
-  - gemfiles/rails42.gemfile
   - gemfiles/rails51.gemfile
   - gemfiles/rails52.gemfile
+  - gemfiles/rails6.gemfile
+
+jobs:
+  exclude:
+    - rvm: 2.4.9
+      gemfile: Gemfile
+    - rvm: 2.4.9
+      gemfile: gemfiles/rails6.gemfile

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG.md
 
+## 0.3.0 (2019-11-14)
+
+  - Add Rails 6 support
+  - Update minimum json-jwt and loofah libraries for CVEs
+
 ## 0.2.0 (2019-02-21)
 
   - Improvements to handling errors fetching JWKs and decoding Cognito JWTs

Gemfile.lock

@@ -1,42 +1,44 @@
 PATH
   remote: .
   specs:
-    cognito_token_verifier (0.2.0)
-      activesupport (>= 4.2, < 6.0)
-      json-jwt (~> 1.1)
+    cognito_token_verifier (0.3.0)
+      activesupport (>= 4.2, < 6.1)
+      json-jwt (~> 1.11)
       rest-client (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
+    actionpack (6.0.1)
+      actionview (= 6.0.1)
+      activesupport (= 6.0.1)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.1)
+      activesupport (= 6.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.2)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     aes_key_wrap (1.0.1)
     bindata (2.4.4)
     builder (3.2.3)
-    byebug (11.0.0)
+    byebug (11.0.1)
     concurrent-ruby (1.1.5)
     crass (1.0.5)
     diff-lcs (1.3)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    erubi (1.8.0)
+    erubi (1.9.0)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     i18n (1.7.0)
@@ -49,68 +51,70 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (0.9.2)
-    mime-types (3.2.2)
+    mime-types (3.3)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.1009)
     mini_portile2 (2.4.0)
     minitest (5.13.0)
     netrc (0.11.0)
     nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
-    rack (2.0.6)
+    rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.1)
+      actionpack (= 6.0.1)
+      activesupport (= 6.0.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (12.3.2)
-    rest-client (2.0.2)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.1)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
     thor (0.20.3)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
+    zeitwerk (2.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (>= 4.2, < 6.0)
+  actionpack (>= 4.2, < 6.1)
   bundler (~> 2.0)
   byebug (~> 11.0)
   cognito_token_verifier!
-  rake (>= 10.0, < 13.0)
+  rake (>= 10.0, < 14.0)
   rspec-rails (~> 3.0)
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

README.md

@@ -1,6 +1,6 @@
 # CognitoTokenVerifier [![Build Status](https://travis-ci.org/CodingAnarchy/cognito_token_verifier.svg?branch=master)](https://travis-ci.org/CodingAnarchy/cognito_token_verifier)
 
-Verify and decode AWS Cognito tokens for use in your Ruby application.
+Verify and decode AWS Cognito tokens for use in your Rails 5.2+ application. Rails 4.2 may work on 0.3+, but as it is no longer supported for security fixes by the Rails team, I make no guarantees of this and changes may result that break compatibility.
 
 ## Installation
 

cognito_token_verifier.gemspec

@@ -31,13 +31,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activesupport", [">= 4.2", "< 6.0"]
-  spec.add_runtime_dependency "json-jwt", "~> 1.1"
+  spec.add_runtime_dependency "activesupport", [">= 4.2", "< 6.1"]
+  spec.add_runtime_dependency "json-jwt", "~> 1.11"
   spec.add_runtime_dependency "rest-client", "~> 2.0"
 
   spec.add_development_dependency "byebug", "~> 11.0"
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", [">= 10.0", "< 13.0"]
+  spec.add_development_dependency "rake", [">= 10.0", "< 14.0"]
   spec.add_development_dependency "rspec-rails", "~> 3.0"
-  spec.add_development_dependency "actionpack", [">= 4.2", "< 6.0"]
+  spec.add_development_dependency "actionpack", [">= 4.2", "< 6.1"]
 end

gemfiles/rails51.gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "activesupport", "~> 5.1.0"
-gem "json-jwt", "~> 1.1"
+gem "json-jwt", "~> 1.11"
 gem "rest-client", "~> 2.0"
 
 gem "byebug"

gemfiles/rails52.gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 gem "activesupport", "~> 5.2.0"
-gem "json-jwt", "~> 1.1"
+gem "json-jwt", "~> 1.11"
 gem "rest-client", "~> 2.0"
 
 gem "byebug"

gemfiles/rails42.gemfile → gemfiles/rails6.gemfile

@@ -1,11 +1,11 @@
 source "https://rubygems.org"
 
-gem "activesupport", "~> 4.2.0"
-gem "json-jwt", "~> 1.1"
+gem "activesupport", "~> 6.0.0"
+gem "json-jwt", "~> 1.11"
 gem "rest-client", "~> 2.0"
 
 gem "byebug"
 gem "bundler", "~> 2.0"
-gem "rake", "~> 10.0"
+gem "rake", "~> 12.0"
 gem "rspec-rails", "~> 3.0"
-gem "actionpack", "~> 4.2.0"
+gem "actionpack", "~> 6.0.0"

lib/cognito_token_verifier/version.rb

@@ -1,3 +1,3 @@
 module CognitoTokenVerifier
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end