grape-jwt-authentication 2.5.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b3f2f11cb52a514981b47da3c788d812739f4b63a3d244e64ecb8f25feb318c
-  data.tar.gz: 5223a66f76740f0adb9e0fa184059d6f16badc8c1a9fdc753c1a0765d7d6ff1c
+  metadata.gz: 18bf4cf6b306fb0c9bc7e4661d06ec1ad1c06ca5b98f8dd4c903abbbbece763e
+  data.tar.gz: 63ec416166cb35583f664d2b30c0c8a96fcb708ad83ca6a1f62599d475a278f5
 SHA512:
-  metadata.gz: 6327e8b47d2fcb934c2fd1d2149a123d8e566a08270d060ea8064f3f26324bf9295bcae05fe50155af2be66d6aae8526c91daa121d942ec01dd72150a79768f1
-  data.tar.gz: c2d3338513c43ac57415880d1b9954728de41bf7725f48e41a1c3cea70047bf20eadef31afaf2aa34a8af4f1e3141dba272af03d1fe65676f305f0c3f82a10e1
+  metadata.gz: eedd2923aa5da56a699323be30d240c045c53dfefa80f7fb69d7c629a0ec7cbddc66028db7de74f275accd91e1be885577c1f74023ee1f61b39684219c04ac98
+  data.tar.gz: 13724dfa53421372f14387778b7a59cd5772e30632e5404a5f585189692683fead0e413641b5937f9f88e73276a4066dbe54d95a3cd04c176db7331b03b4be72

data/.github/workflows/test.yml

@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.7']
-        rails: ['5.2', '6.1', '7.1']
+        ruby: ['2.7', '3.0']
+        rails: ['6.1', '7.1']
     env:
       BUNDLE_GEMFILE: 'gemfiles/rails_${{ matrix.rails }}.gemfile'
     steps:

data/.rubocop.yml

@@ -13,7 +13,7 @@ AllCops:
   SuggestExtensions: false
   DisplayCopNames: true
   TargetRubyVersion: 2.7
-  TargetRailsVersion: 5.2
+  TargetRailsVersion: 6.1
   Exclude:
     - bin/**/*
     - vendor/**/*

data/Appraisals

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'rails-5.2' do
-  gem 'activejob', '~> 5.2.0'
-  gem 'activerecord', '~> 5.2.0'
-  gem 'activesupport', '~> 5.2.0'
-end
-
 appraise 'rails-6.1' do
   gem 'activejob', '~> 6.1.0'
   gem 'activerecord', '~> 6.1.0'

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 * TODO: Replace this bullet point with an actual description of a change.
 
+### 2.7.0 (11 January 2025)
+
+* Switched to Zeitwerk as autoloader (#17)
+
+### 2.6.0 (3 January 2025)
+
+* Raised minimum supported Ruby/Rails version to 2.7/6.1 (#16)
+
 ### 2.5.0 (4 October 2024)
 
 * Upgraded the `recursive-open-struct` gem to `~> 2.0` (#15)

data/Gemfile

@@ -14,7 +14,7 @@ gem 'countless', '~> 1.1'
 gem 'guard-rspec', '~> 4.7'
 gem 'rack', '~> 2.2'
 gem 'rack-test', '~> 2.0'
-gem 'railties', '>= 5.2'
+gem 'railties', '>= 6.1'
 gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.12'
 gem 'rubocop', '~> 1.28'

data/gemfiles/rails_6.1.gemfile

@@ -8,7 +8,7 @@ gem "countless", "~> 1.1"
 gem "guard-rspec", "~> 4.7"
 gem "rack", "~> 2.2"
 gem "rack-test", "~> 2.0"
-gem "railties", ">= 5.2"
+gem "railties", ">= 6.1"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.12"
 gem "rubocop", "~> 1.28"

data/gemfiles/rails_7.1.gemfile

@@ -8,7 +8,7 @@ gem "countless", "~> 1.1"
 gem "guard-rspec", "~> 4.7"
 gem "rack", "~> 2.2"
 gem "rack-test", "~> 2.0"
-gem "railties", ">= 5.2"
+gem "railties", ">= 6.1"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.12"
 gem "rubocop", "~> 1.28"

data/grape-jwt-authentication.gemspec

@@ -33,10 +33,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.7'
 
-  spec.add_runtime_dependency 'activesupport', '>= 5.2'
-  spec.add_runtime_dependency 'grape', '>= 1.0', '< 3.0'
-  spec.add_runtime_dependency 'httparty', '>= 0.21'
-  spec.add_runtime_dependency 'jwt', '~> 2.6'
-  spec.add_runtime_dependency 'keyless', '~> 1.4'
-  spec.add_runtime_dependency 'recursive-open-struct', '~> 2.0'
+  spec.add_dependency 'activesupport', '>= 6.1'
+  spec.add_dependency 'grape', '>= 1.0', '< 3.0'
+  spec.add_dependency 'httparty', '>= 0.21'
+  spec.add_dependency 'jwt', '~> 2.6'
+  spec.add_dependency 'keyless', '~> 1.6'
+  spec.add_dependency 'recursive-open-struct', '~> 2.0'
+  spec.add_dependency 'zeitwerk', '~> 2.6'
 end

data/lib/grape/jwt/authentication/extensions/dependencies.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Grape
+  module Jwt
+    module Authentication
+      module Extensions
+        # Root-level handling of dependencies.
+        module Dependencies
+          # Specifies which configuration keys are shared between keyless
+          # and grape-jwt-authentication, so that we can easily pass through
+          # our configuration to keyless.
+          KEYLESS_CONFIGURATION = %i[
+            authenticator rsa_public_key_url rsa_public_key_caching
+            rsa_public_key_expiration jwt_issuer jwt_beholder jwt_options
+            jwt_verification_key
+          ].freeze
+
+          # (Re)configure our gem dependencies. We take care of setting up
+          # +Keyless+, which has been extracted from this gem.
+          def configure_dependencies
+            configure_keyless
+          end
+
+          # Configure the +Keyless+ gem with our configuration.
+          def configure_keyless
+            configuration = Grape::Jwt::Authentication.configuration
+
+            Keyless.configure do |keyless|
+              KEYLESS_CONFIGURATION.each do |option|
+                keyless.send("#{option}=", configuration.send(option))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/grape/jwt/authentication/version.rb

@@ -5,7 +5,7 @@ module Grape
     # The gem version details.
     module Authentication
       # The version of the +grape-jwt-authentication+ gem
-      VERSION = '2.5.0'
+      VERSION = '2.7.0'
 
       class << self
         # Returns the version of gem as a string.

data/lib/grape/jwt/authentication.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'zeitwerk'
 require 'active_support'
 require 'active_support/concern'
 require 'active_support/configurable'
@@ -10,10 +11,6 @@ require 'active_support/time_with_zone'
 require 'jwt'
 require 'keyless'
 require 'grape'
-require 'grape/jwt/authentication/version'
-require 'grape/jwt/authentication/configuration'
-require 'grape/jwt/authentication/dependencies'
-require 'grape/jwt/authentication/jwt_handler'
 
 module Grape
   module Jwt
@@ -22,32 +19,44 @@ module Grape
       extend ActiveSupport::Concern
       include Grape::DSL::API
 
+      # Setup a Zeitwerk autoloader instance and configure it
+      loader = Zeitwerk::Loader.for_gem_extension(Grape::Jwt)
+
+      # Finish the auto loader configuration
+      loader.setup
+
+      # Make sure to eager load all SDK constants
+      loader.eager_load
+
       class << self
         attr_writer :configuration
-      end
 
-      # Retrieve the current configuration object.
-      #
-      # @return [Configuration]
-      def self.configuration
-        @configuration ||= Configuration.new
-      end
+        # Include top-level features
+        include Extensions::Dependencies
 
-      # Configure the concern by providing a block which takes
-      # care of this task. Example:
-      #
-      #   Grape::Jwt::Authentication.configure do |conf|
-      #     # conf.xyz = [..]
-      #   end
-      def self.configure
-        yield(configuration)
-        configure_dependencies
-      end
+        # Retrieve the current configuration object.
+        #
+        # @return [Configuration]
+        def configuration
+          @configuration ||= Configuration.new
+        end
 
-      # Reset the current configuration with the default one.
-      def self.reset_configuration!
-        self.configuration = Configuration.new
-        configure_dependencies
+        # Configure the concern by providing a block which takes
+        # care of this task. Example:
+        #
+        #   Grape::Jwt::Authentication.configure do |conf|
+        #     # conf.xyz = [..]
+        #   end
+        def configure
+          yield(configuration)
+          configure_dependencies
+        end
+
+        # Reset the current configuration with the default one.
+        def reset_configuration!
+          self.configuration = Configuration.new
+          configure_dependencies
+        end
       end
 
       included do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-jwt-authentication
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Hermann Mayer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-04 00:00:00.000000000 Z
+date: 2025-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 description: A reusable Grape JWT authentication concern
 email:
 - hermann.mayer92@gmail.com
@@ -133,13 +147,12 @@ files:
 - config/docker/.inputrc
 - doc/assets/project.svg
 - docker-compose.yml
-- gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.1.gemfile
 - grape-jwt-authentication.gemspec
 - lib/grape/jwt/authentication.rb
 - lib/grape/jwt/authentication/configuration.rb
-- lib/grape/jwt/authentication/dependencies.rb
+- lib/grape/jwt/authentication/extensions/dependencies.rb
 - lib/grape/jwt/authentication/jwt_handler.rb
 - lib/grape/jwt/authentication/version.rb
 homepage: 

data/gemfiles/rails_5.2.gemfile

@@ -1,27 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "appraisal", "~> 2.4"
-gem "bundler", "~> 2.3"
-gem "countless", "~> 1.1"
-gem "guard-rspec", "~> 4.7"
-gem "rack", "~> 2.2"
-gem "rack-test", "~> 2.0"
-gem "railties", ">= 5.2"
-gem "rake", "~> 13.0"
-gem "rspec", "~> 3.12"
-gem "rubocop", "~> 1.28"
-gem "rubocop-rails", "~> 2.14"
-gem "rubocop-rspec", "~> 2.10"
-gem "simplecov", ">= 0.22"
-gem "timecop", ">= 0.9.6"
-gem "vcr", "~> 6.0"
-gem "webmock", "~> 3.18"
-gem "yard", ">= 0.9.28"
-gem "yard-activesupport-concern", ">= 0.0.1"
-gem "activejob", "~> 5.2.0"
-gem "activerecord", "~> 5.2.0"
-gem "activesupport", "~> 5.2.0"
-
-gemspec path: "../"

data/lib/grape/jwt/authentication/dependencies.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Grape
-  module Jwt
-    # The Grape JWT authentication concern.
-    module Authentication
-      # Specifies which configuration keys are shared between keyless
-      # and grape-jwt-authentication, so that we can easily pass through
-      # our configuration to keyless.
-      KEYLESS_CONFIGURATION = %i[
-        authenticator rsa_public_key_url rsa_public_key_caching
-        rsa_public_key_expiration jwt_issuer jwt_beholder jwt_options
-        jwt_verification_key
-      ].freeze
-
-      # (Re)configure our gem dependencies. We take care of setting up
-      # +Keyless+, which has been extracted from this gem.
-      def self.configure_dependencies
-        configure_keyless
-      end
-
-      # Configure the +Keyless+ gem with our configuration.
-      def self.configure_keyless
-        configuration = Grape::Jwt::Authentication.configuration
-
-        Keyless.configure do |keyless|
-          KEYLESS_CONFIGURATION.each do |option|
-            keyless.send("#{option}=", configuration.send(option))
-          end
-        end
-      end
-    end
-  end
-end