graphql-fragment_cache 1.3.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8454e3e398cc31081e2b17fb4a9b9e971cfbd1da05bce06149e419bb0e6b6b36
-  data.tar.gz: f654d30606764307daad38b45921533edba92fa2cd95a75556488985bd78a590
+  metadata.gz: a5c6796b976bd78fc44c483dd9b39684081ee07bfb8b791d3a9bf00a31893ae7
+  data.tar.gz: fc772a7e8c4319bd5b5bff5978ad20293334ac872be2fed170bc9084326874a0
 SHA512:
-  metadata.gz: 3a573a48cfe5b5d1beebd665c09b8adc4fe7d7a4bb08b29cc923c2434d921c0e9eb2c46b317d4d44367e46d0afafd2a686a0186cfb68f50459eaad2707f3da72
-  data.tar.gz: 2db445bfbf4ef1cd56d715e586a6c0b748695e022ac55d94bc8bd52171221902fa562426c8a53cadb2e7d0ee7667dd866f27106fb3901247932e1b1a2e3320b6
+  metadata.gz: 597046420b6342ca1c7e1429c1e44d36fa3a0eca9592d194318213614f3dc95c10eadf5ea616a13e8582f354caed9bf425b639149b15a7d9c3647e970fd3a780
+  data.tar.gz: 1aa900bb9840ccb836498b79ef0031859304a328bebbce86fc32399e468d43ae1279daedc1bb6444e4366450ab5b11974dec679d4e11d8688fbea9f6bdf1c4a0

data/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 ## master
 
+## 1.6.0 (2021-03-13)
+
+- [PR#54](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/54) Include arguments in selections_cache_key ([@bbugh][])
+
+## 1.5.1 (2021-03-10)
+
+- [PR#53](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/53) Use thread-safe query result for final_value ([@bbugh][])
+- [PR#51](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/51) Do not cache fragments without final value ([@DmitryTsepelev][])
+
+## 1.5.0 (2021-02-20)
+
+- [PR#50](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/50) Add object_cache_key to CacheKeyBuilder ([@bbugh][])
+
+## 1.4.1 (2021-01-21)
+
+- [PR#48](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/48) Support graphql-ruby 1.12 ([@DmitryTsepelev][])
+
+## 1.4.0 (2020-12-03)
+
+- [PR#41](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/41) Add `keep_in_context` option ([@DmitryTsepelev][])
+
 ## 1.3.0 (2020-11-25)
 
 - [PR#39](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/39) Implement `path_cache_key` option ([@DmitryTsepelev][])

data/README.md

@@ -112,10 +112,10 @@ selections_cache_key = "[#{%w[id name].join(".")}]"
 
 query_cache_key = Digest::SHA1.hexdigest("#{path_cache_key}#{selections_cache_key}")
 
-cache_key = "#{schema_cache_key}/#{query_cache_key}"
+cache_key = "#{schema_cache_key}/#{query_cache_key}/#{object_cache_key}"
 ```
 
-You can override `schema_cache_key`, `query_cache_key` or `path_cache_key` by passing parameters to the `cache_fragment` calls:
+You can override `schema_cache_key`, `query_cache_key`, `path_cache_key` or `object_cache_key` by passing parameters to the `cache_fragment` calls:
 
 ```ruby
 class QueryType < BaseObject
@@ -140,6 +140,21 @@ class PostType < BaseObject
 end
 ```
 
+Overriding `object_cache_key` is helpful in the case where the value that is cached is different than the one used as a key, like a database query that is pre-processed before caching.
+
+```ruby
+class QueryType < BaseObject
+  field :post, PostType, null: true do
+    argument :id, ID, required: true
+  end
+
+  def post(id:)
+    query = Post.where("updated_at < ?", Time.now - 1.day)
+    cache_fragment(object_cache_key: query.cache_key) { query.some_process }
+  end
+end
+```
+
 ### User-provided cache key
 
 In most cases you want your cache key to depend on the resolved object (say, `ActiveRecord` model). You can do that by passing an argument to the `#cache_fragment` method in a similar way to Rails views [`#cache` method](https://guides.rubyonrails.org/caching_with_rails.html#fragment-caching):
@@ -198,6 +213,7 @@ end
 
 The way cache key part is generated for the passed argument is the following:
 
+- Use `object_cache_key: "some_cache_key"` if passed to `cache_fragment`
 - Use `#graphql_cache_key` if implemented.
 - Use `#cache_key` (or `#cache_key_with_version` for modern Rails) if implemented.
 - Use `self.to_s` for _primitive_ types (strings, symbols, numbers, booleans).
@@ -314,6 +330,24 @@ end
 
 With this approach you can use `#cache_fragment` in any place you have an access to the `context`. When context is not available, the error `cannot find context, please pass it explicitly` will be thrown.
 
+## In–memory fragments
+
+If you have a fragment that accessed from multiple times (e.g., if you have a list of items that belong to the same owner, and owner is cached), you can avoid multiple cache reads by using `:keep_in_context` option:
+
+```ruby
+class QueryType < BaseObject
+  field :post, PostType, null: true do
+    argument :id, ID, required: true
+  end
+
+  def post(id:)
+    cache_fragment(keep_in_context: true, expires_in: 5.minutes) { Post.find(id) }
+  end
+end
+```
+
+This can reduce a number of cache calls but _increase_ memory usage, because the value returned from cache will be kept in the GraphQL context until the query is fully resolved.
+
 ## Limitations
 
 Caching does not work for Union types, because of the `Lookahead` implementation: it requires the exact type to be passed to the `selection` method (you can find the [discussion](https://github.com/rmosolgo/graphql-ruby/pull/3007) here). This method is used for cache key building, and I haven't found a workaround yet ([PR in progress](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/30)). If you get `Failed to look ahead the field` error — please pass `query_cache_key` explicitly:

data/lib/.rbnext/2.7/graphql/fragment_cache/cache_key_builder.rb

@@ -11,10 +11,24 @@ module GraphQL
 
     using(Module.new {
       refine Array do
+        def traverse_argument(argument)
+          return argument unless argument.is_a?(GraphQL::Schema::InputObject)
+
+          "{#{argument.map { |_1, _2| "#{_1}:#{traverse_argument(_2)}" }.sort.join(",")}}"
+        end
+
         def to_selections_key
           map { |val|
             children = val.selections.empty? ? "" : "[#{val.selections.to_selections_key}]"
-            "#{val.field.name}#{children}"
+
+            field_name = val.field.name
+
+            unless val.arguments.empty?
+              args = val.arguments.map { |_1, _2| "#{_1}:#{traverse_argument(_2)}" }.sort.join(",")
+              field_name += "(#{args})"
+            end
+
+            "#{field_name}#{children}"
           }.join(".")
         end
       end
@@ -113,8 +127,13 @@ module GraphQL
 
       def build
         Digest::SHA1.hexdigest("#{schema_cache_key}/#{query_cache_key}").then do |base_key|
-          next base_key unless object
-          "#{base_key}/#{object_key(object)}"
+          if @options[:object_cache_key]
+            "#{base_key}/#{@options[:object_cache_key]}"
+          elsif object
+            "#{base_key}/#{object_key(object)}"
+          else
+            base_key
+          end
         end
       end
 

data/lib/graphql/fragment_cache.rb

@@ -23,7 +23,7 @@ module GraphQL
       attr_reader :cache_store
 
       def use(schema_defn, options = {})
-        verify_interpreter!(schema_defn)
+        verify_interpreter_and_analysis!(schema_defn)
 
         schema_defn.tracer(Schema::Tracer)
         schema_defn.instrument(:query, Schema::Instrumentation)
@@ -44,17 +44,33 @@ module GraphQL
         @cache_store = store
       end
 
-      private
+      def graphql_ruby_1_12_or_later?
+        Gem::Dependency.new("graphql", ">= 1.12.0").match?("graphql", GraphQL::VERSION)
+      end
 
-      def verify_interpreter!(schema_defn)
-        unless schema_defn.interpreter?
-          raise StandardError,
-            "GraphQL::Execution::Interpreter should be enabled for fragment caching"
-        end
+      private
 
-        unless schema_defn.analysis_engine == GraphQL::Analysis::AST
-          raise StandardError,
-            "GraphQL::Analysis::AST should be enabled for fragment caching"
+      def verify_interpreter_and_analysis!(schema_defn)
+        if graphql_ruby_1_12_or_later?
+          unless schema_defn.interpreter?
+            raise StandardError,
+              "GraphQL::Execution::Execute should not be enabled for fragment caching"
+          end
+
+          unless schema_defn.analysis_engine == GraphQL::Analysis::AST
+            raise StandardError,
+              "GraphQL::Analysis should not be enabled for fragment caching"
+          end
+        else
+          unless schema_defn.interpreter?
+            raise StandardError,
+              "GraphQL::Execution::Interpreter should be enabled for fragment caching"
+          end
+
+          unless schema_defn.analysis_engine == GraphQL::Analysis::AST
+            raise StandardError,
+              "GraphQL::Analysis::AST should be enabled for fragment caching"
+          end
         end
       end
     end

data/lib/graphql/fragment_cache/cache_key_builder.rb

@@ -11,10 +11,24 @@ module GraphQL
 
     using(Module.new {
       refine Array do
+        def traverse_argument(argument)
+          return argument unless argument.is_a?(GraphQL::Schema::InputObject)
+
+          "{#{argument.map { "#{_1}:#{traverse_argument(_2)}" }.sort.join(",")}}"
+        end
+
         def to_selections_key
           map { |val|
             children = val.selections.empty? ? "" : "[#{val.selections.to_selections_key}]"
-            "#{val.field.name}#{children}"
+
+            field_name = val.field.name
+
+            unless val.arguments.empty?
+              args = val.arguments.map { "#{_1}:#{traverse_argument(_2)}" }.sort.join(",")
+              field_name += "(#{args})"
+            end
+
+            "#{field_name}#{children}"
           }.join(".")
         end
       end
@@ -113,8 +127,13 @@ module GraphQL
 
       def build
         Digest::SHA1.hexdigest("#{schema_cache_key}/#{query_cache_key}").then do |base_key|
-          next base_key unless object
-          "#{base_key}/#{object_key(object)}"
+          if @options[:object_cache_key]
+            "#{base_key}/#{@options[:object_cache_key]}"
+          elsif object
+            "#{base_key}/#{object_key(object)}"
+          else
+            base_key
+          end
         end
       end
 

data/lib/graphql/fragment_cache/cacher.rb

@@ -20,17 +20,21 @@ module GraphQL
         private
 
         def batched_persist(query)
-          query.context.fragments.group_by(&:options).each do |options, group|
+          select_valid_fragments(query).group_by(&:options).each do |options, group|
             hash = group.map { |fragment| [fragment.cache_key, fragment.value] }.to_h
             FragmentCache.cache_store.write_multi(hash, **options)
           end
         end
 
         def persist(query)
-          query.context.fragments.each do |fragment|
+          select_valid_fragments(query).each do |fragment|
             FragmentCache.cache_store.write(fragment.cache_key, fragment.value, **fragment.options)
           end
         end
+
+        def select_valid_fragments(query)
+          query.context.fragments.select(&:with_final_value?)
+        end
       end
     end
   end

data/lib/graphql/fragment_cache/ext/context_fragments.rb

@@ -13,6 +13,10 @@ module GraphQL
         def fragments
           namespace(:fragment_cache)[:fragments] ||= []
         end
+
+        def loaded_fragments
+          namespace(:fragment_cache)[:loaded] ||= {}
+        end
       end
     end
   end

data/lib/graphql/fragment_cache/field_extension.rb

@@ -49,7 +49,7 @@ module GraphQL
 
         cache_fragment_options = @cache_options.merge(object: object_for_key)
 
-        object.cache_fragment(cache_fragment_options) do
+        object.cache_fragment(**cache_fragment_options) do
           resolved_value == NOT_RESOLVED ? yield(object, arguments) : resolved_value
         end
       end

data/lib/graphql/fragment_cache/fragment.rb

@@ -4,6 +4,8 @@ require "graphql/fragment_cache/cache_key_builder"
 
 module GraphQL
   module FragmentCache
+    using Ext
+
     # Represents a single fragment to cache
     class Fragment
       attr_reader :options, :path, :context
@@ -16,28 +18,46 @@ module GraphQL
 
       NIL_IN_CACHE = Object.new
 
-      def read
-        FragmentCache.cache_store.read(cache_key).tap do |cached|
-          return NIL_IN_CACHE if cached.nil? && FragmentCache.cache_store.exist?(cache_key)
-        end
+      def read(keep_in_context = false)
+        return read_from_context { value_from_cache } if keep_in_context
+
+        value_from_cache
       end
 
       def cache_key
         @cache_key ||= CacheKeyBuilder.call(path: path, query: context.query, **options)
       end
 
+      def with_final_value?
+        !final_value.nil?
+      end
+
       def value
         final_value.dig(*path)
       end
 
       private
 
+      def read_from_context
+        if (loaded_value = context.loaded_fragments[cache_key])
+          return loaded_value
+        end
+
+        yield.tap { |value| context.loaded_fragments[cache_key] = value }
+      end
+
+      def value_from_cache
+        FragmentCache.cache_store.read(cache_key).tap do |cached|
+          return NIL_IN_CACHE if cached.nil? && FragmentCache.cache_store.exist?(cache_key)
+        end
+      end
+
       def interpreter_context
         context.namespace(:interpreter)
       end
 
       def final_value
-        @final_value ||= interpreter_context[:runtime].final_value
+        @final_value ||= context.query.result["data"]
       end
     end
   end

data/lib/graphql/fragment_cache/object_helpers.rb

@@ -11,9 +11,13 @@ module GraphQL
       extend Forwardable
 
       def self.included(base)
-        return if base < GraphQL::Execution::Interpreter::HandlesRawValue
+        return if base.method_defined?(:raw_value)
 
-        base.include(GraphQL::Execution::Interpreter::HandlesRawValue)
+        base.include(Module.new {
+          def raw_value(obj)
+            GraphQL::Execution::Interpreter::RawValue.new(obj)
+          end
+        })
       end
 
       NO_OBJECT = Object.new
@@ -27,9 +31,10 @@ module GraphQL
         context_to_use = context if context_to_use.nil? && respond_to?(:context)
         raise ArgumentError, "cannot find context, please pass it explicitly" unless context_to_use
 
-        fragment = Fragment.new(context_to_use, options)
+        fragment = Fragment.new(context_to_use, **options)
 
-        if (cached = fragment.read)
+        keep_in_context = options.delete(:keep_in_context)
+        if (cached = fragment.read(keep_in_context))
           return cached == Fragment::NIL_IN_CACHE ? nil : raw_value(cached)
         end
 

data/lib/graphql/fragment_cache/schema/tracer.rb

@@ -23,7 +23,7 @@ module GraphQL
           end
 
           def verify_connections!(context)
-            return if context.schema.new_connections?
+            return if GraphQL::FragmentCache.graphql_ruby_1_12_or_later? || context.schema.new_connections?
 
             raise StandardError,
               "GraphQL::Pagination::Connections should be enabled for connection caching"

data/lib/graphql/fragment_cache/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module FragmentCache
-    VERSION = "1.3.0"
+    VERSION = "1.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-fragment_cache
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.6.0
 platform: ruby
 authors:
 - DmitryTsepelev
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -150,6 +150,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.9
+- !ruby/object:Gem::Dependency
+  name: graphql-batch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fragment cache for graphql-ruby
 email:
 - dmitry.a.tsepelev@gmail.com
@@ -190,7 +204,7 @@ metadata:
   homepage_uri: https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache
   source_code_uri: https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache
   changelog_uri: https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -205,8 +219,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Fragment cache for graphql-ruby
 test_files: []