Merge pull request #149 from RIPAGlobal/feature/v2.10.0

Gather together recent PR merges and maintenance for v2.10.0

Author: pond

.ruby-version

@@ -1 +1 @@
-3.3.0
+3.3.5

CHANGELOG.md

@@ -1,3 +1,23 @@
+# 2.10.0 (2024-10-22)
+
+Features:
+
+* Custom controller mixins can now override more of the Scimitar base controller since the inclusion has been moved to the end of the file. This is particularly useful for overriding `rescue_from` declarations. See [#148](https://github.com/RIPAGlobal/scimitar/pull/148) for more - thanks to `@hrtshu`
+
+Fixes:
+
+* The `ResourceTypes` endpoint returned an invalid payload; this is now fixed per RFC 7644 via [#147](https://github.com/RIPAGlobal/scimitar/pull/147) - thanks to `@pbouda`
+
+Other notes:
+
+* `README.md` typo fix via [#145](https://github.com/RIPAGlobal/scimitar/pull/145) - thanks to `@pavelloz`
+
+Gem developer notes:
+
+* Local developer Ruby version (for `rbenv` users, at least) bumped to v3.3.5
+* Gemspec development dependency versions bumped to latest, where relevant
+* Dockerfile bumps PostgreSQL to v17
+
 # 2.9.0 (2024-06-27)
 
 Features:

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 RIPA Global
+Copyright (c) 2024 RIPA Global
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   postgresql:
-    image: postgres:15
+    image: postgres:17
     ports:
       - '5432'
     environment:

lib/scimitar/version.rb

@@ -3,11 +3,11 @@ module Scimitar
   # Gem version. If this changes, be sure to re-run "bundle install" or
   # "bundle update".
   #
-  VERSION = '2.9.0'
+  VERSION = '2.10.0'
 
   # Date for VERSION. If this changes, be sure to re-run "bundle install"
   # or "bundle update".
   #
-  DATE = '2024-06-27'
+  DATE = '2024-10-22'
 
 end

scimitar.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pg',             '~>  1.5'
   s.add_development_dependency 'simplecov-rcov', '~>  0.3'
   s.add_development_dependency 'rdoc',           '~>  6.7'
-  s.add_development_dependency 'rspec-rails',    '~>  6.1'
+  s.add_development_dependency 'rspec-rails',    '~>  7.0'
   s.add_development_dependency 'doggo',          '~>  1.3'
 end