graphiti 1.8.2 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 694b6036077d9ea14373be4b15e8e2d9cfab59253d79ce36d85303aa182a5482
-  data.tar.gz: 64afa2d52f244239c2b099f84500d18446ba04482e2b45447a8c8d9d93164be4
+  metadata.gz: ad1f5708fdf6d0ce3e322a050c23440765c7d965be7020e1c1fa1a4a8205ee85
+  data.tar.gz: b80f90e0cc2421b89ef4ccbb142bb8ee67ccb5490eb55ace716ca22e154cc578
 SHA512:
-  metadata.gz: 31f0a5953dbbb9526c33d9710528cd1410cf120ce8b036d9d9cbcb3983b62cab77d0adaaf641b9dd3e342e6096eb85a3427353ea58396bdad76593bbcf392161
-  data.tar.gz: 692cb0d0042334e2e92847dc5aee81e2ecb090329b6763adf4d757da205ab61df88e24b3c54230d28285c1cae9007a9ca1c554769ed2d02452fba8afd623d2eb
+  metadata.gz: 9f2a223141a825552d578c2b3720a2157337e48ff7a4c3bb55b09eb3dac0093f65903c20b048893b8ab61ea47cc21c61c41a25ae59aa2163efe08c721e5dd5b8
+  data.tar.gz: 4bb15d52b3749de416d8c90cf6e9964614412346ed25e9504135da48b187d5212aa6c79931e8c4ff1691cc83bea439f12d3d2813736c23bc80afbb9c8082ee6c

data/.github/workflows/ci.yml

@@ -45,6 +45,7 @@ jobs:
           - gemfiles/rails_7_1_graphiti_rails.gemfile
           - gemfiles/rails_7_2_graphiti_rails.gemfile
           - gemfiles/rails_8_0_graphiti_rails.gemfile
+          - gemfiles/rails_8_1_graphiti_rails.gemfile
         appraisal:
           - true
           - false
@@ -58,6 +59,9 @@ jobs:
           - ruby: ruby-head
             gemfile: gemfiles/rails_8_0_graphiti_rails.gemfile
             appraisal: true
+          - ruby: ruby-head
+            gemfile: gemfiles/rails_8_1_graphiti_rails.gemfile
+            appraisal: true
           - ruby: ruby-head
             gemfile: Gemfile
             appraisal: false
@@ -83,6 +87,16 @@ jobs:
             appraisal: false
           - gemfile: gemfiles/rails_8_0_graphiti_rails.gemfile
             appraisal: false
+          - gemfile: gemfiles/rails_8_1_graphiti_rails.gemfile
+            appraisal: false
+
+          # Rails 8.1 needs ruby 3.2 +
+          - gemfile: gemfiles/rails_8_1_graphiti_rails.gemfile
+            ruby: 2.7
+          - gemfile: gemfiles/rails_8_1_graphiti_rails.gemfile
+            ruby: 3.0
+          - gemfile: gemfiles/rails_8_1_graphiti_rails.gemfile
+            ruby: 3.1
 
           # Rails 8 needs ruby 3.2 +
           - gemfile: gemfiles/rails_8_0_graphiti_rails.gemfile

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 graphiti changelog
 
+# [1.10.0](https://github.com/graphiti-api/graphiti/compare/v1.9.0...v1.10.0) (2026-01-06)
+
+
+### Features
+
+* add cache tag support to allow context-aware caching ([#498](https://github.com/graphiti-api/graphiti/issues/498)) ([e8c2bad](https://github.com/graphiti-api/graphiti/commit/e8c2bad478cb3dd8dbd1a5e993b10f84046a0fa8))
+
+# [1.9.0](https://github.com/graphiti-api/graphiti/compare/v1.8.2...v1.9.0) (2026-01-03)
+
+
+### Features
+
+* Support rails 8.1 ([#500](https://github.com/graphiti-api/graphiti/issues/500)) ([34d0cf0](https://github.com/graphiti-api/graphiti/commit/34d0cf03b6b4d887d10d660f0ae08bfa6833345f))
+
 ## [1.8.2](https://github.com/graphiti-api/graphiti/compare/v1.8.1...v1.8.2) (2025-05-20)
 
 

data/gemfiles/rails_8_1_graphiti_rails.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 8.1"
+gem "rspec-rails"
+gem "sqlite3", "~> 2.1"
+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: "../"

data/lib/graphiti/configuration.rb

@@ -115,7 +115,7 @@ module Graphiti
     private
 
     def infer_uri_decoder
-      if defined?(::ActionDispatch::Journey::Router::Utils)
+      if defined?(::ActionDispatch::Journey::Router::Utils) && ::ActionDispatch::Journey::Router::Utils.respond_to?(:unescape_uri)
         # available in all supported versions of Rails.
         # This method should be preferred for comparing URI path segments
         # to params, as it is the exact decoder used in the Rails router.

data/lib/graphiti/resource/interface.rb

@@ -4,9 +4,10 @@ module Graphiti
       extend ActiveSupport::Concern
 
       class_methods do
-        def cache_resource(expires_in: false)
+        def cache_resource(expires_in: false, tag: nil)
           @cache_resource = true
           @cache_expires_in = expires_in
+          @cache_tag = tag
         end
 
         def all(params = {}, base_scope = nil)
@@ -55,7 +56,7 @@ module Graphiti
         private
 
         def caching_options
-          {cache: @cache_resource, cache_expires_in: @cache_expires_in}
+          {cache: @cache_resource, cache_expires_in: @cache_expires_in, cache_tag: @cache_tag}
         end
 
         def validate_request!(params)

data/lib/graphiti/resource_proxy.rb

@@ -2,14 +2,19 @@ module Graphiti
   class ResourceProxy
     include Enumerable
 
-    attr_reader :resource, :query, :scope, :payload, :cache_expires_in, :cache
+    attr_reader :resource, :query, :scope, :payload, :cache_expires_in, :cache, :cache_tag
 
-    def initialize(resource, scope, query,
+    def initialize(
+      resource,
+      scope,
+      query,
       payload: nil,
       single: false,
       raise_on_missing: false,
       cache: nil,
-      cache_expires_in: nil)
+      cache_expires_in: nil,
+      cache_tag: nil
+    )
 
       @resource = resource
       @scope = scope
@@ -19,6 +24,7 @@ module Graphiti
       @raise_on_missing = raise_on_missing
       @cache = cache
       @cache_expires_in = cache_expires_in
+      @cache_tag = cache_tag
     end
 
     def cache?
@@ -207,12 +213,30 @@ module Graphiti
       "W/#{ActiveSupport::Digest.hexdigest(cache_key_with_version.to_s)}"
     end
 
+    def resource_cache_tag
+      return unless @cache_tag.present? && @resource.respond_to?(@cache_tag)
+
+      @resource.try(@cache_tag)
+    end
+
     def cache_key
-      ActiveSupport::Cache.expand_cache_key([@scope.cache_key, @query.cache_key])
+      ActiveSupport::Cache.expand_cache_key(
+        [
+          @scope.cache_key,
+          @query.cache_key,
+          resource_cache_tag
+        ].compact_blank
+      )
     end
 
     def cache_key_with_version
-      ActiveSupport::Cache.expand_cache_key([@scope.cache_key_with_version, @query.cache_key])
+      ActiveSupport::Cache.expand_cache_key(
+        [
+          @scope.cache_key_with_version,
+          @query.cache_key,
+          resource_cache_tag
+        ].compact_blank
+      )
     end
 
     private

data/lib/graphiti/runner.rb

@@ -58,22 +58,29 @@ module Graphiti
 
     def proxy(base = nil, opts = {})
       base ||= jsonapi_resource.base_scope
-      scope_opts = opts.slice :sideload_parent_length,
+      scope_opts = opts.slice(
+        :sideload_parent_length,
         :default_paginate,
         :after_resolve,
         :sideload,
         :parent,
         :params,
         :bypass_required_filters
+      )
+
       scope = jsonapi_scope(base, scope_opts)
-      ResourceProxy.new jsonapi_resource,
+
+      ::Graphiti::ResourceProxy.new(
+        jsonapi_resource,
         scope,
         query,
         payload: deserialized_payload,
         single: opts[:single],
         raise_on_missing: opts[:raise_on_missing],
         cache: opts[:cache],
-        cache_expires_in: opts[:cache_expires_in]
+        cache_expires_in: opts[:cache_expires_in],
+        cache_tag: opts[:cache_tag]
+      )
     end
   end
 end

data/lib/graphiti/util/cache_debug.rb

@@ -12,7 +12,9 @@ module Graphiti
       end
 
       def name
-        "#{Graphiti.context[:object]&.request&.method} #{Graphiti.context[:object]&.request&.url}"
+        tag = proxy.resource_cache_tag
+
+        "#{::Graphiti.context[:object]&.request&.method} #{::Graphiti.context[:object]&.request&.url} #{tag}"
       end
 
       def key

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.8.2"
+  VERSION = "1.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.10.0
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-20 00:00:00.000000000 Z
+date: 2026-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -264,6 +264,7 @@ files:
 - gemfiles/rails_7_2_graphiti_rails.gemfile
 - gemfiles/rails_7_graphiti_rails.gemfile
 - gemfiles/rails_8_0_graphiti_rails.gemfile
+- gemfiles/rails_8_1_graphiti_rails.gemfile
 - graphiti.gemspec
 - lib/graphiti.rb
 - lib/graphiti/adapters/abstract.rb