Ruby 3 upgrade [WIP]

.github/workflows/tests.yml

@@ -9,31 +9,66 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: test
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
     strategy:
       fail-fast: false
       matrix:
         ruby:
-          - 2.6.6
-          - 2.7.2
+          - 2.6
+          - 2.7
+          - '3.0'
+          - 3.1
+          - 3.2
         rails:
-          - 6.1.1
-          - 6.0.3.4
-          - 5.2.4.4
+          - 7.0.4
+          - 6.1.7
+          - 6.0.6
+          - 5.2.8.1
           - 5.1.7
-          - 5.0.7.2
-          - 4.2.11
+        database_url:
+          - postgresql://postgres:password@localhost:5432/test
+          - sqlite3:test_db
         exclude:
-          - ruby: 2.7.2
-            rails: 5.0.7.2
-          - ruby: 2.7.2
-            rails: 4.2.11
-          - ruby: 2.6.6
-            rails: 4.2.11
+          - ruby: 3.2
+            rails: 6.0.6
+          - ruby: 3.2
+            rails: 5.2.8.1
+          - ruby: 3.2
+            rails: 5.1.7
+          - ruby: 3.1
+            rails: 6.0.6
+          - ruby: 3.1
+            rails: 5.2.8.1
+          - ruby: 3.1
+            rails: 5.1.7
+          - ruby: '3.0'
+            rails: 6.0.6
+          - ruby: '3.0'
+            rails: 5.2.8.1
+          - ruby: '3.0'
+            rails: 5.1.7
+          - ruby: 2.6
+            rails: 7.0.4
+          - database_url: postgresql://postgres:password@localhost:5432/test
+            rails: 5.1.7
     env:
       RAILS_VERSION: ${{ matrix.rails }}
-    name: Ruby ${{ matrix.ruby }} Rails ${{ matrix.rails }}
+      DATABASE_URL: ${{ matrix.database_url }}
+    name: Ruby ${{ matrix.ruby }} Rails ${{ matrix.rails }} DB ${{ matrix.database_url }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

lib/jsonapi/cached_resource_fragment.rb

@@ -65,7 +65,7 @@ def to_cache_value
     end
 
     def to_real_resource
-      rs = Resource.resource_for(self.type).find_by_keys([self.id], {context: self.context})
+      rs = Resource.resource_for(self.type).find_by_keys([self.id], context: self.context)
       return rs.try(:first)
     end
 

lib/jsonapi/error.rb

@@ -2,7 +2,7 @@ module JSONAPI
   class Error
     attr_accessor :title, :detail, :id, :href, :code, :source, :links, :status, :meta
 
-    def initialize(options = {})
+    def initialize(**options)
       @title          = options[:title]
       @detail         = options[:detail]
       @id             = options[:id]
@@ -28,7 +28,7 @@ def to_hash
 
   class Warning
     attr_accessor :title, :detail, :code
-    def initialize(options = {})
+    def initialize(**options)
       @title          = options[:title]
       @detail         = options[:detail]
       @code           = if JSONAPI.configuration.use_text_errors

lib/jsonapi/exceptions.rb

@@ -3,12 +3,12 @@ module Exceptions
     class Error < RuntimeError
       attr :error_object_overrides
 
-      def initialize(error_object_overrides = {})
+      def initialize(**error_object_overrides)
         @error_object_overrides = error_object_overrides
       end
 
-      def create_error_object(error_defaults)
-        JSONAPI::Error.new(error_defaults.merge(error_object_overrides))
+      def create_error_object(**error_defaults)
+        JSONAPI::Error.new(**error_defaults.merge(error_object_overrides))
       end
 
       def errors
@@ -21,9 +21,9 @@ def errors
     class InternalServerError < Error
       attr_accessor :exception
 
-      def initialize(exception, error_object_overrides = {})
+      def initialize(exception, **error_object_overrides)
         @exception = exception
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -46,9 +46,9 @@ def errors
     class InvalidResource < Error
       attr_accessor :resource
 
-      def initialize(resource, error_object_overrides = {})
+      def initialize(resource, **error_object_overrides)
         @resource = resource
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -64,9 +64,9 @@ def errors
     class RecordNotFound < Error
       attr_accessor :id
 
-      def initialize(id, error_object_overrides = {})
+      def initialize(id, **error_object_overrides)
         @id = id
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -82,9 +82,9 @@ def errors
     class UnsupportedMediaTypeError < Error
       attr_accessor :media_type
 
-      def initialize(media_type, error_object_overrides = {})
+      def initialize(media_type, **error_object_overrides)
         @media_type = media_type
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -102,9 +102,9 @@ def errors
     class NotAcceptableError < Error
       attr_accessor :media_type
 
-      def initialize(media_type, error_object_overrides = {})
+      def initialize(media_type, **error_object_overrides)
         @media_type = media_type
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -123,9 +123,9 @@ def errors
     class HasManyRelationExists < Error
       attr_accessor :id
 
-      def initialize(id, error_object_overrides = {})
+      def initialize(id, **error_object_overrides)
         @id = id
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -179,9 +179,9 @@ def errors
     class InvalidFiltersSyntax < Error
       attr_accessor :filters
 
-      def initialize(filters, error_object_overrides = {})
+      def initialize(filters, **error_object_overrides)
         @filters = filters
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -198,9 +198,9 @@ def errors
     class FilterNotAllowed < Error
       attr_accessor :filter
 
-      def initialize(filter, error_object_overrides = {})
+      def initialize(filter, **error_object_overrides)
         @filter = filter
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -216,10 +216,10 @@ def errors
     class InvalidFilterValue < Error
       attr_accessor :filter, :value
 
-      def initialize(filter, value, error_object_overrides = {})
+      def initialize(filter, value, **error_object_overrides)
         @filter = filter
         @value = value
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -236,10 +236,10 @@ def errors
     class InvalidFieldValue < Error
       attr_accessor :field, :value
 
-      def initialize(field, value, error_object_overrides = {})
+      def initialize(field, value, **error_object_overrides)
         @field = field
         @value = value
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -289,9 +289,9 @@ def errors
     class TypeMismatch < Error
       attr_accessor :type
 
-      def initialize(type, error_object_overrides = {})
+      def initialize(type, **error_object_overrides)
         @type = type
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -307,10 +307,10 @@ def errors
     class InvalidField < Error
       attr_accessor :field, :type
 
-      def initialize(type, field, error_object_overrides = {})
+      def initialize(type, field, **error_object_overrides)
         @field = field
         @type = type
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -327,10 +327,10 @@ def errors
     class InvalidInclude < Error
       attr_accessor :relationship, :resource
 
-      def initialize(resource, relationship, error_object_overrides = {})
+      def initialize(resource, relationship, **error_object_overrides)
         @resource = resource
         @relationship = relationship
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -347,10 +347,10 @@ def errors
     class InvalidSortCriteria < Error
       attr_accessor :sort_criteria, :resource
 
-      def initialize(resource, sort_criteria, error_object_overrides = {})
+      def initialize(resource, sort_criteria, **error_object_overrides)
         @resource = resource
         @sort_criteria = sort_criteria
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -367,9 +367,9 @@ def errors
     class ParameterNotAllowed < Error
       attr_accessor :param
 
-      def initialize(param, error_object_overrides = {})
+      def initialize(param, **error_object_overrides)
         @param = param
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -385,9 +385,9 @@ def errors
     class ParameterMissing < Error
       attr_accessor :param
 
-      def initialize(param, error_object_overrides = {})
+      def initialize(param, **error_object_overrides)
         @param = param
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -403,9 +403,9 @@ def errors
     class KeyNotIncludedInURL < Error
       attr_accessor :key
 
-      def initialize(key, error_object_overrides = {})
+      def initialize(key, **error_object_overrides)
         @key = key
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -433,9 +433,9 @@ def errors
     class RecordLocked < Error
       attr_accessor :message
 
-      def initialize(message, error_object_overrides = {})
+      def initialize(message, **error_object_overrides)
         @message = message
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -450,13 +450,13 @@ def errors
     class ValidationErrors < Error
       attr_reader :error_messages, :error_metadata, :resource_relationships, :resource_class
 
-      def initialize(resource, error_object_overrides = {})
+      def initialize(resource, **error_object_overrides)
         @error_messages = resource.model_error_messages
         @error_metadata = resource.validation_error_metadata
         @resource_class = resource.class
         @resource_relationships = resource.class._relationships.keys
         @key_formatter = JSONAPI.configuration.key_formatter
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def format_key(key)
@@ -529,9 +529,9 @@ def errors
     class PageParametersNotAllowed < Error
       attr_accessor :params
 
-      def initialize(params, error_object_overrides = {})
+      def initialize(params, **error_object_overrides)
         @params = params
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors
@@ -550,10 +550,10 @@ def errors
     class InvalidPageValue < Error
       attr_accessor :page, :value
 
-      def initialize(page, value, error_object_overrides = {})
+      def initialize(page, value, **error_object_overrides)
         @page = page
         @value = value
-        super(error_object_overrides)
+        super(**error_object_overrides)
       end
 
       def errors