Extract user retrieval into its own method for easy overriding

.travis.yml

@@ -8,6 +8,8 @@ gemfile:
   - gemfiles/rails_5.gemfile
   - gemfiles/rails_6.gemfile
   - gemfiles/rails_6.1.gemfile
+  - gemfiles/rails_7.gemfile
+
 before_script:
   - bin/rails db:migrate RAILS_ENV=test
 before_install:

Appraisals

@@ -9,3 +9,7 @@ end
 appraise "rails-6.1" do
   gem "rails", "~> 6.1"
 end
+
+appraise "rails-7" do
+  gem "rails", "~> 7.0"
+end

app/controllers/scim_rails/scim_users_controller.rb

@@ -43,12 +43,12 @@ def create
     end
 
     def show
-      user = @company.public_send(ScimRails.config.scim_users_scope).find(params[:id])
+      user = find_user
       json_scim_response(object: user)
     end
 
     def put_update
-      user = @company.public_send(ScimRails.config.scim_users_scope).find(params[:id])
+      user = find_user
       update_status(user) unless put_active_param.nil?
       user.update!(permitted_user_params)
       json_scim_response(object: user)
@@ -57,13 +57,17 @@ def put_update
     # TODO: PATCH will only deprovision or reprovision users.
     # This will work just fine for Okta but is not SCIM compliant.
     def patch_update
-      user = @company.public_send(ScimRails.config.scim_users_scope).find(params[:id])
+      user = find_user
       update_status(user)
       json_scim_response(object: user)
     end
 
     private
 
+    def find_user
+      @company.public_send(ScimRails.config.scim_users_scope).find(params[:id])
+    end
+
     def permitted_user_params
       ScimRails.config.mutable_user_attributes.each.with_object({}) do |attribute, hash|
         hash[attribute] = find_value_for(attribute)

gemfiles/rails_7.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0"
+gem "pry", group: [:development, :test]
+
+gemspec path: "../"

lib/scim_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ScimRails
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

scim_rails.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
 
   s.required_ruby_version = "~> 2.4"
-  s.add_dependency "rails", ">= 5.0", "< 6.2"
+  s.add_dependency "rails", ">= 5.0", "< 7.1"
   s.add_runtime_dependency "jwt", ">= 1.5"
   s.test_files = Dir["spec/**/*"]
 

spec/dummy/config/initializers/assets.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
+#Rails.application.config.assets.version = '1.0'
 
 # Add additional assets to the asset load path
 # Rails.application.config.assets.paths << Emoji.images_path