Merge branch 'master' into issue_451_parsing_filters_with_curlies

.github/workflows/ci.yml

@@ -28,10 +28,11 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - "2.6"
           - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
+          - "3.3"
         gemfile:
           - Gemfile
           - gemfiles/rails_5_2.gemfile
@@ -40,12 +41,13 @@ jobs:
           - gemfiles/rails_5_2_graphiti_rails.gemfile
           - gemfiles/rails_6_graphiti_rails.gemfile
           - gemfiles/rails_7_graphiti_rails.gemfile
+          - gemfiles/rails_7_1_graphiti_rails.gemfile
         appraisal:
           - true
           - false
         include:
           - ruby: ruby-head
-            gemfile: Gemfile
+            gemfile: gemfiles/rails_7_1.gemfile
             appraisal: true
           - ruby: ruby-head
             gemfile: Gemfile
@@ -66,7 +68,9 @@ jobs:
             appraisal: false
           - gemfile: gemfiles/rails_7_graphiti_rails.gemfile
             appraisal: false
-          # Rails 5 can't run on Ruby 3
+          - gemfile: gemfiles/rails_7_1_graphiti_rails.gemfile
+            appraisal: false
+            # Rails 5 can't run on Ruby 3
           - gemfile: gemfiles/rails_5_2.gemfile
             ruby: 3.0
           - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
@@ -75,11 +79,14 @@ jobs:
             ruby: 3.1
           - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
             ruby: 3.1
-          # Raise 7 can't run on 2.6
-          - gemfile: gemfiles/rails_7.gemfile
-            ruby: 2.6
-          - gemfile: gemfiles/rails_7_graphiti_rails.gemfile
-            ruby: 2.6
+          - gemfile: gemfiles/rails_5_2.gemfile
+            ruby: 3.2
+          - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
+            ruby: 3.2
+          - gemfile: gemfiles/rails_5_2.gemfile
+            ruby: 3.3
+          - gemfile: gemfiles/rails_5_2_graphiti_rails.gemfile
+            ruby: 3.3
     continue-on-error: ${{ matrix.ruby == 'ruby-head' }}
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}

Appraisals

@@ -42,3 +42,18 @@ appraise "rails-7-graphiti-rails" do
   gem "database_cleaner"
   gem "graphiti-rails", "~> 0.4.0"
 end
+
+appraise "rails-7-1" do
+  gem "rails", "~> 7.1"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.4.0"
+  gem "database_cleaner"
+end
+
+appraise "rails-7-1-graphiti-rails" do
+  gem "rails", "~> 7.1"
+  gem "rspec-rails"
+  gem "sqlite3", "~> 1.4.0"
+  gem "database_cleaner"
+  gem "graphiti-rails", "~> 0.4.0"
+end

Gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
+  gem "database_cleaner"
   gem "pry"
   gem "pry-byebug", platform: [:mri]
   gem "appraisal"

gemfiles/rails_7_1.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.1"
+gem "rspec-rails"
+gem "sqlite3", "~> 1.4.0"
+gem "database_cleaner"
+
+group :test do
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"

gemfiles/rails_7_1_graphiti_rails.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.1"
+gem "rspec-rails"
+gem "sqlite3", "~> 1.4.0"
+gem "database_cleaner"
+gem "graphiti-rails", "~> 0.4.0"
+
+group :test do
+  gem "pry"
+  gem "pry-byebug", platform: [:mri]
+  gem "appraisal"
+  gem "guard"
+  gem "guard-rspec"
+end
+
+gemspec path: "../"

lib/graphiti.rb

@@ -1,5 +1,6 @@
 require "json"
 require "forwardable"
+require "uri"
 require "active_support/core_ext/string"
 require "active_support/core_ext/enumerable"
 require "active_support/core_ext/class/attribute"
@@ -83,7 +84,12 @@ def self.logger=(val)
   end
 
   def self.log(msg, color = :white, bold = false)
-    colored = ActiveSupport::LogSubscriber.new.send(:color, msg, color, bold)
+    colored = if ::ActiveSupport.version >= Gem::Version.new("7.1")
+      ActiveSupport::LogSubscriber.new.send(:color, msg, color, bold: bold)
+    else
+      ActiveSupport::LogSubscriber.new.send(:color, msg, color, bold)
+    end
+
     logger.debug(colored)
   end
 

lib/graphiti/debugger.rb

@@ -140,7 +140,6 @@ def scrub_params(params)
         params ||= {}
         params = params.to_unsafe_h if params.respond_to?(:to_unsafe_h)
         params.reject! { |k, v| [:controller, :action, :format, :debug].include?(k.to_sym) }
-        params.reject! { |k, v| k.to_sym == :include }
         params.deep_symbolize_keys
       end
 

lib/graphiti/resource_proxy.rb

@@ -158,7 +158,7 @@ def update
       save(action: :update)
     end
 
-    alias update_attributes update
+    alias update_attributes update # standard:disable Style/Alias
 
     def include_hash
       @include_hash ||= begin

lib/graphiti/util/serializer_relationships.rb

@@ -118,7 +118,7 @@ def validate_link_for_sideload!(sideload)
         cache_key = :"#{@sideload.object_id}-#{action}"
         return if self.class.validated_link_cache.include?(cache_key)
         prc = Graphiti.config.context_for_endpoint
-        unless prc.call(sideload.resource.endpoint[:full_path], action)
+        unless prc.call(sideload.resource.endpoint[:full_path].to_s, action)
           raise Errors::InvalidLink.new(@resource_class, sideload, action)
         end
         self.class.validated_link_cache << cache_key