graphiti 1.6.4 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60dd55a9db78fcc197c66de85b88bd69e840462d77a679dbb76fcd41b040dbe1
-  data.tar.gz: e6a2cdefe4435864ea9101c94ac122d3c11ba0e85b7284f19a08f5ec4a3cee0d
+  metadata.gz: fb08a2d097076d868284efb475a82bfb9f44b697bc322dda5a654a6d259384cf
+  data.tar.gz: ef60e4a509d87c76973a15a59105a50d9de7635d3084afe2621f23008ff46580
 SHA512:
-  metadata.gz: 2264e0a1313762c00ffb96fbb80c60bbc7d6406e37fedc8eef0a9b813b6bc5d5ff9443ca165d2afcf7499c61f9746a0d851b699b9ec5f90ba5ca74c16932c428
-  data.tar.gz: 74d51069de9047b07d213c628889766d54d8e8c43812d75a433247e70bc2b027dc7735e310bd0460a36e37083c7a9306dddbeb5d15b0160987cb8f5a65daaa93
+  metadata.gz: bd5489249c9c768f83e05bfcd6be59bacfef2a50826c9eb547ae6a9b12cdfc25fbd54e36d54e0a37264e77458cfdc4415e707aacdeb6377179cf44a7480850a3
+  data.tar.gz: 7be1d2008f1f74b3a5203053eb4dc91efe013a33e5c2cada66f409f9de1a515f720e357ef619b8459f1451d90f9fb39c3a130502304f7ce2eb408a421d29f511

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 graphiti changelog
 
+## [1.7.1](https://github.com/graphiti-api/graphiti/compare/v1.7.0...v1.7.1) (2024-04-18)
+
+
+### Bug Fixes
+
+* properly display .find vs .all in debugger statements ([d2a7a03](https://github.com/graphiti-api/graphiti/commit/d2a7a038a649818979d52ccd898e68dba78b051f))
+* rescue error from sideloads updated_at calculation, defaulting to the current time ([661e3b5](https://github.com/graphiti-api/graphiti/commit/661e3b5212e2649870a200067d0d5d52fa962637))
+
+# [1.7.0](https://github.com/graphiti-api/graphiti/compare/v1.6.4...v1.7.0) (2024-03-27)
+
+
+### Features
+
+* Add support for caching renders in Graphiti, and better support using etags and stale? in the controller ([#424](https://github.com/graphiti-api/graphiti/issues/424)) ([8bae50a](https://github.com/graphiti-api/graphiti/commit/8bae50ab82559e2644d506e16a4f715effd89317))
+
 ## [1.6.4](https://github.com/graphiti-api/graphiti/compare/v1.6.3...v1.6.4) (2024-03-27)
 
 ## [1.6.3](https://github.com/graphiti-api/graphiti/compare/v1.6.2...v1.6.3) (2024-03-26)

data/README.md

@@ -1,6 +1,7 @@
-![Build Status](https://travis-ci.org/graphiti-api/graphiti.svg?branch=master)
+[![CI](https://github.com/graphiti-api/graphiti/actions/workflows/ci.yml/badge.svg)](https://github.com/graphiti-api/graphiti/actions/workflows/ci.yml)
 [![Gem Version](https://badge.fury.io/rb/graphiti.svg)](https://badge.fury.io/rb/graphiti)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
+[![semantic-release: angular](https://img.shields.io/badge/semantic--release-angular-e10079?logo=semantic-release)](https://github.com/semantic-release/semantic-release)
 
 <p align="center">
   <a href="https://www.graphiti.dev/guides">

data/lib/graphiti/configuration.rb

@@ -20,6 +20,7 @@ module Graphiti
     attr_reader :debug, :debug_models
 
     attr_writer :schema_path
+    attr_writer :cache_rendering
 
     # Set defaults
     # @api private
@@ -32,6 +33,7 @@ module Graphiti
       @pagination_links = false
       @typecast_reads = true
       @raise_on_missing_sidepost = true
+      @cache_rendering = false
       self.debug = ENV.fetch("GRAPHITI_DEBUG", true)
       self.debug_models = ENV.fetch("GRAPHITI_DEBUG_MODELS", false)
 
@@ -52,6 +54,16 @@ module Graphiti
       end
     end
 
+    def cache_rendering?
+      use_caching = @cache_rendering && Graphiti.cache.respond_to?(:fetch)
+
+      use_caching.tap do |use|
+        if @cache_rendering && !Graphiti.cache&.respond_to?(:fetch)
+          raise "You must configure a cache store in order to use cache_rendering. Set Graphiti.cache = Rails.cache, for example."
+        end
+      end
+    end
+
     def schema_path
       @schema_path ||= raise("No schema_path defined! Set Graphiti.config.schema_path to save your schema.")
     end

data/lib/graphiti/debugger.rb

@@ -36,7 +36,7 @@ module Graphiti
               json[:sideload] = sideload.name
             end
             if params
-              query = "#{payload[:resource].class.name}.all(#{JSON.pretty_generate(params)}).data"
+              query = "#{payload[:resource].class.name}.#{payload[:action]}(#{JSON.pretty_generate(params)}).data"
               logs << [query, :cyan, true]
               logs << ["The error occurred when running the above query. Copy/paste it into a rake task or Rails console session to reproduce. Keep in mind you may have to set context.", :yellow, true]
             else
@@ -64,7 +64,7 @@ module Graphiti
           query = if sideload.class.scope_proc
             "#{payload[:resource].class.name}: Manual sideload via .scope"
           else
-            "#{payload[:resource].class.name}.all(#{params.inspect})"
+            "#{payload[:resource].class.name}.#{payload[:action]}(#{params.inspect})"
           end
           logs << ["    #{query}", :cyan, true]
           json[:query] = query
@@ -82,7 +82,7 @@ module Graphiti
           title = "Top Level Data Retrieval (+ sideloads):"
           logs << [title, :green, true]
           json[:title] = title
-          query = "#{payload[:resource].class.name}.all(#{params.inspect})"
+          query = "#{payload[:resource].class.name}.#{payload[:action]}(#{params.inspect})"
           logs << [query, :cyan, true]
           json[:query] = query
           logs << ["Returned Models: #{results}"] if debug_models
@@ -98,7 +98,30 @@ module Graphiti
           took = ((stop - start) * 1000.0).round(2)
           logs << [""]
           logs << ["=== Graphiti Debug", :green, true]
-          logs << ["Rendering:", :green, true]
+          if payload[:proxy]&.cached? && Graphiti.config.cache_rendering?
+            logs << ["Rendering (cached):", :green, true]
+
+            Graphiti::Util::CacheDebug.new(payload[:proxy]).analyze do |cache_debug|
+              logs << ["Cache key for #{cache_debug.name}", :blue, true]
+              logs << if cache_debug.volatile?
+                [" \\_ volatile | Request count: #{cache_debug.request_count} | Hit count: #{cache_debug.hit_count}", :red, true]
+              else
+                [" \\_   stable | Request count: #{cache_debug.request_count} | Hit count: #{cache_debug.hit_count}", :blue, true]
+              end
+
+              if cache_debug.changed_key?
+                logs << [" [x] cache key changed #{cache_debug.last_version[:etag]} -> #{cache_debug.current_version[:etag]}", :red]
+                logs << ["      removed: #{cache_debug.removed_segments}", :red]
+                logs << ["        added: #{cache_debug.added_segments}", :red]
+              elsif cache_debug.new_key?
+                logs << [" [+] cache key added #{cache_debug.current_version[:etag]}", :red, true]
+              else
+                logs << [" [✓] #{cache_debug.current_version[:etag]}", :green, true]
+              end
+            end
+          else
+            logs << ["Rendering:", :green, true]
+          end
           logs << ["Took: #{took}ms", :magenta, true]
         end
       end

data/lib/graphiti/query.rb

@@ -1,3 +1,5 @@
+require "digest"
+
 module Graphiti
   class Query
     attr_reader :resource, :association_name, :params, :action
@@ -232,8 +234,22 @@ module Graphiti
       ![false, "false"].include?(@params[:paginate])
     end
 
+    def cache_key
+      "args-#{query_cache_key}"
+    end
+
     private
 
+    def query_cache_key
+      attrs = {extra_fields: extra_fields,
+               fields: fields,
+               links: links?,
+               pagination_links: pagination_links?,
+               format: params[:format]}
+
+      Digest::SHA1.hexdigest(attrs.to_s)
+    end
+
     def cast_page_param(name, value)
       if [:before, :after].include?(name)
         decode_cursor(value)

data/lib/graphiti/renderer.rb

@@ -68,7 +68,14 @@ module Graphiti
         options[:meta][:debug] = Debugger.to_a if debug_json?
         options[:proxy] = proxy
 
-        renderer.render(records, options)
+        if proxy.cache? && Graphiti.config.cache_rendering?
+          Graphiti.cache.fetch("graphiti:render/#{proxy.cache_key}", version: proxy.updated_at, expires_in: proxy.cache_expires_in) do
+            options.delete(:cache) # ensure that we don't use JSONAPI-Resources's built-in caching logic
+            renderer.render(records, options)
+          end
+        else
+          renderer.render(records, options)
+        end
       end
     end
 

data/lib/graphiti/resource/interface.rb

@@ -4,6 +4,11 @@ module Graphiti
       extend ActiveSupport::Concern
 
       class_methods do
+        def cache_resource(expires_in: false)
+          @cache_resource = true
+          @cache_expires_in = expires_in
+        end
+
         def all(params = {}, base_scope = nil)
           validate_request!(params)
           _all(params, {}, base_scope)
@@ -13,7 +18,7 @@ module Graphiti
         def _all(params, opts, base_scope)
           runner = Runner.new(self, params, opts.delete(:query), :all)
           opts[:params] = params
-          runner.proxy(base_scope, opts)
+          runner.proxy(base_scope, opts.merge(caching_options))
         end
 
         def find(params = {}, base_scope = nil)
@@ -31,10 +36,14 @@ module Graphiti
           params[:filter][:id] = id if id
 
           runner = Runner.new(self, params, nil, :find)
-          runner.proxy base_scope,
+
+          find_options = {
             single: true,
             raise_on_missing: true,
             bypass_required_filters: true
+          }.merge(caching_options)
+
+          runner.proxy base_scope, find_options
         end
 
         def build(params, base_scope = nil)
@@ -45,6 +54,10 @@ module Graphiti
 
         private
 
+        def caching_options
+          {cache: @cache_resource, cache_expires_in: @cache_expires_in}
+        end
+
         def validate_request!(params)
           return if Graphiti.context[:graphql] || !validate_endpoints?
 

data/lib/graphiti/resource_proxy.rb

@@ -2,20 +2,31 @@ module Graphiti
   class ResourceProxy
     include Enumerable
 
-    attr_reader :resource, :query, :scope, :payload
+    attr_reader :resource, :query, :scope, :payload, :cache_expires_in, :cache
 
     def initialize(resource, scope, query,
       payload: nil,
       single: false,
-      raise_on_missing: false)
+      raise_on_missing: false,
+      cache: nil,
+      cache_expires_in: nil)
+
       @resource = resource
       @scope = scope
       @query = query
       @payload = payload
       @single = single
       @raise_on_missing = raise_on_missing
+      @cache = cache
+      @cache_expires_in = cache_expires_in
+    end
+
+    def cache?
+      !!@cache
     end
 
+    alias_method :cached?, :cache?
+
     def single?
       !!@single
     end
@@ -180,6 +191,22 @@ module Graphiti
       query.debug_requested?
     end
 
+    def updated_at
+      @scope.updated_at
+    end
+
+    def etag
+      "W/#{ActiveSupport::Digest.hexdigest(cache_key_with_version.to_s)}"
+    end
+
+    def cache_key
+      ActiveSupport::Cache.expand_cache_key([@scope.cache_key, @query.cache_key])
+    end
+
+    def cache_key_with_version
+      ActiveSupport::Cache.expand_cache_key([@scope.cache_key_with_version, @query.cache_key])
+    end
+
     private
 
     def persist

data/lib/graphiti/runner.rb

@@ -71,7 +71,9 @@ module Graphiti
         query,
         payload: deserialized_payload,
         single: opts[:single],
-        raise_on_missing: opts[:raise_on_missing]
+        raise_on_missing: opts[:raise_on_missing],
+        cache: opts[:cache],
+        cache_expires_in: opts[:cache_expires_in]
     end
   end
 end

data/lib/graphiti/scope.rb

@@ -67,14 +67,72 @@ module Graphiti
       end
     end
 
+    def parent_resource
+      @resource
+    end
+
+    def cache_key
+      # This is the combined cache key for the base query and the query for all sideloads
+      # Changing the query will yield a different cache key
+
+      cache_keys = sideload_resource_proxies.map { |proxy| proxy.try(:cache_key) }
+
+      cache_keys << @object.try(:cache_key) # this is what calls into the ORM (ActiveRecord, most likely)
+      ActiveSupport::Cache.expand_cache_key(cache_keys.flatten.compact)
+    end
+
+    def cache_key_with_version
+      # This is the combined and versioned cache key for the base query and the query for all sideloads
+      # If any returned model's updated_at changes, this key will change
+
+      cache_keys = sideload_resource_proxies.map { |proxy| proxy.try(:cache_key_with_version) }
+
+      cache_keys << @object.try(:cache_key_with_version) # this is what calls into ORM (ActiveRecord, most likely)
+      ActiveSupport::Cache.expand_cache_key(cache_keys.flatten.compact)
+    end
+
+    def updated_at
+      updated_time = nil
+      begin
+        updated_ats = sideload_resource_proxies.map(&:updated_at)
+        updated_ats << @object.maximum(:updated_at)
+        updated_time = updated_ats.compact.max
+      rescue => e
+        Graphiti.log(["error calculating last_modified_at for #{@resource.class}", :red])
+        Graphiti.log(e)
+      end
+
+      return updated_time || Time.now
+    end
+    alias_method :last_modified_at, :updated_at
+
     private
 
+    def sideload_resource_proxies
+      @sideload_resource_proxies ||= begin
+        @object = @resource.before_resolve(@object, @query)
+        results = @resource.resolve(@object)
+
+        [].tap do |proxies|
+          unless @query.sideloads.empty?
+            @query.sideloads.each_pair do |name, q|
+              sideload = @resource.class.sideload(name)
+              next if sideload.nil? || sideload.shared_remote?
+
+              proxies << sideload.build_resource_proxy(results, q, parent_resource)
+            end
+          end
+        end.flatten
+      end
+    end
+
     def broadcast_data
       opts = {
         resource: @resource,
-        params: @opts[:params],
+        params: @opts[:params] || @query.params,
         sideload: @opts[:sideload],
-        parent: @opts[:parent]
+        parent: @opts[:parent],
+        action: @query.action
         # Set once data is resolved within block
         #   results: ...
       }

data/lib/graphiti/serializer.rb

@@ -99,7 +99,7 @@ module Graphiti
 
     def strip_relationships?
       return false unless Graphiti.config.links_on_demand
-      params = Graphiti.context[:object].params || {}
+      params = Graphiti.context[:object]&.params || {}
       [false, nil, "false"].include?(params[:links])
     end
   end

data/lib/graphiti/sideload.rb

@@ -209,13 +209,16 @@ module Graphiti
       end
     end
 
-    def load(parents, query, graph_parent)
-      params, opts, proxy = nil, nil, nil
+    def build_resource_proxy(parents, query, graph_parent)
+      params = nil
+      opts = nil
+      proxy = nil
 
       with_error_handling Errors::SideloadParamsError do
         params = load_params(parents, query)
         params_proc&.call(params, parents, context)
         return [] if blank_query?(params)
+
         opts = load_options(parents, query)
         opts[:sideload] = self
         opts[:parent] = graph_parent
@@ -228,7 +231,11 @@ module Graphiti
         pre_load_proc&.call(proxy, parents)
       end
 
-      proxy.to_a
+      proxy
+    end
+
+    def load(parents, query, graph_parent)
+      build_resource_proxy(parents, query, graph_parent).to_a
     end
 
     # Override in subclass

data/lib/graphiti/util/cache_debug.rb

@@ -0,0 +1,88 @@
+module Graphiti
+  module Util
+    class CacheDebug
+      attr_reader :proxy
+
+      def initialize(proxy)
+        @proxy = proxy
+      end
+
+      def last_version
+        @last_version ||= Graphiti.cache.read(key) || {}
+      end
+
+      def name
+        "#{Graphiti.context[:object]&.request&.method} #{Graphiti.context[:object]&.request&.url}"
+      end
+
+      def key
+        "graphiti:debug/#{name}"
+      end
+
+      def current_version
+        @current_version ||= {
+          cache_key: proxy.cache_key_with_version,
+          version: proxy.updated_at,
+          expires_in: proxy.cache_expires_in,
+          etag: proxy.etag,
+          miss_count: last_version[:miss_count].to_i + (changed_key? ? 1 : 0),
+          hit_count: last_version[:hit_count].to_i + (!changed_key? && !new_key? ? 1 : 0),
+          request_count: last_version[:request_count].to_i + (last_version.present? ? 1 : 0)
+        }
+      end
+
+      def analyze
+        yield self
+        save
+      end
+
+      def request_count
+        current_version[:request_count]
+      end
+
+      def miss_count
+        current_version[:miss_count]
+      end
+
+      def hit_count
+        current_version[:hit_count]
+      end
+
+      def change_percentage
+        return 0 if request_count == 0
+        (miss_count.to_i / request_count.to_f * 100).round(1)
+      end
+
+      def volatile?
+        change_percentage > 50
+      end
+
+      def new_key?
+        last_version[:cache_key].blank? && proxy.cache_key_with_version
+      end
+
+      def changed_key?
+        last_version[:cache_key] != proxy.cache_key_with_version && !new_key?
+      end
+
+      def removed_segments
+        changes[1] - changes[0]
+      end
+
+      def added_segments
+        changes[0] - changes[1]
+      end
+
+      def changes
+        sub_keys_old = last_version[:cache_key]&.scan(/\w+\/query-[a-z0-9-]+\/args-[a-z0-9-]+/).to_a || []
+        sub_keys_new = current_version[:cache_key]&.scan(/\w+\/query-[a-z0-9-]+\/args-[a-z0-9-]+/).to_a || []
+
+        [sub_keys_old, sub_keys_new]
+      end
+
+      def save
+        Graphiti.cache.write(key, current_version)
+      end
+    end
+  end
+end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.6.4"
+  VERSION = "1.7.1"
 end

data/lib/graphiti.rb

@@ -106,6 +106,14 @@ module Graphiti
       r.apply_sideloads_to_serializer
     end
   end
+
+  def self.cache=(val)
+    @cache = val
+  end
+
+  def self.cache
+    @cache
+  end
 end
 
 require "graphiti/version"
@@ -177,6 +185,7 @@ require "graphiti/extensions/temp_id"
 require "graphiti/serializer"
 require "graphiti/query"
 require "graphiti/debugger"
+require "graphiti/util/cache_debug"
 
 if defined?(ActiveRecord)
   require "graphiti/adapters/active_record"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.7.1
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-27 00:00:00.000000000 Z
+date: 2024-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -324,6 +324,7 @@ files:
 - lib/graphiti/stats/payload.rb
 - lib/graphiti/types.rb
 - lib/graphiti/util/attribute_check.rb
+- lib/graphiti/util/cache_debug.rb
 - lib/graphiti/util/class.rb
 - lib/graphiti/util/field_params.rb
 - lib/graphiti/util/hash.rb