graphql-fragment_cache 1.9.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 120cfa12166d6db93a1aa709916694555f102d9c8ebeca53ccaba76182360c27
-  data.tar.gz: ae01a7172430cbe6993ec0c8fabaa7024ab5786000869df42c95bd544f1e73f3
+  metadata.gz: fb58b8735fa1b7a92dae359467252e366bf34da888f46ef98db0737db7b6dfc4
+  data.tar.gz: 037dd3a8c61ed1f359b50d6ae0e4ae7f169d825fb5c6da8cf0ee8968c6e1b9b4
 SHA512:
-  metadata.gz: 39ecafa948ec5b2a5c4954520e3d68709dafcaae53a4f12b5748ecedd7576f40e0e73705f7abdcb5e39f66e3e07506493547a3ed19a2e6d3f19246e53a6d5f23
-  data.tar.gz: 9bb830762f4c155d70b068409fa8b1ddd49b34ebab0b4ce156d2e00a05127b1abd229dec4a61b029b6a60557254b6e0c650c7bc34b82bd713512acd6fcae4a63
+  metadata.gz: 6eef1102518837f505b077f515b7a6e38a6e37993f072921193e30a2a877aec2e67899e8d256b23738cabda2bddf7a8e99967743c14b504afcedd389e2d23734
+  data.tar.gz: cb110783f67fb0674065fae17ff860e6c2a81a2fde04f5800634c689f2a1bcf01a54d5183e0ffbf5359d709a9b5493d967be39809abccf91fb5701b00eac7f7f

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## master
 
+## 1.11.0 (2022-02-26)
+
+- [PR#70](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/70), [PR#82](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/82) Add #read_multi for fragments ([@daukadolt][], [@frostmark][])
+- [PR#79](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/79) Support graphql-ruby 2.0.0 ([@DmitryTsepelev][])
+
+## 1.10.0 (2022-01-30)
+
+- [PR#77](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/77) Drop Ruby 2.5 support, add Ruby 3.0 ([@DmitryTsepelev][])
+
 ## 1.9.1 (2021-11-28)
 
 - [PR#76](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/76) Freeze parser version ([@DmitryTsepelev][])
@@ -120,3 +129,5 @@
 [@bbugh]: https://github.com/bbugh
 [@jeromedalbert]: https://github.com/jeromedalbert
 [@mretzak]: https://github.com/mretzak
+[@daukadolt]: https://github.com/daukadolt
+[@frostmark]: https://github.com/frostmark

data/README.md

@@ -17,13 +17,10 @@ end
 
 ## Getting started
 
-Add the gem to your Gemfile `gem 'graphql-fragment_cache'` and add the plugin to your schema class (make sure to turn interpreter mode on with AST analysis!):
+Add the gem to your Gemfile `gem 'graphql-fragment_cache'` and add the plugin to your schema class:
 
 ```ruby
 class GraphqSchema < GraphQL::Schema
-  use GraphQL::Execution::Interpreter
-  use GraphQL::Analysis::AST
-
   use GraphQL::FragmentCache
 
   query QueryType
@@ -69,15 +66,6 @@ class QueryType < BaseObject
 end
 ```
 
-If you use [connections](https://graphql-ruby.org/pagination/connection_concepts.html) and plan to cache them—please turn on [brand new](https://github.com/rmosolgo/graphql-ruby/blob/master/lib/graphql/pagination/connections.rb#L5) connections hierarchy in your schema:
-
-```ruby
-class GraphqSchema < GraphQL::Schema
-  # ...
-  use GraphQL::Pagination::Connections
-end
-```
-
 ## Cache key generation
 
 Cache keys consist of the following parts: namespace, implicit key, and explicit key.

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

@@ -62,7 +62,12 @@ module GraphQL
           next_field_name = alias_node.name
 
           # From https://github.com/rmosolgo/graphql-ruby/blob/1a9a20f3da629e63ea8e5ee8400be82218f9edc3/lib/graphql/execution/lookahead.rb#L91
-          next_field_defn = get_class_based_field(selected_type, next_field_name)
+          next_field_defn =
+            if GraphQL::FragmentCache.graphql_ruby_before_2_0?
+              get_class_based_field(selected_type, next_field_name)
+            else
+              @query.get_field(selected_type, next_field_name)
+            end
 
           alias_selections[name] =
             if next_field_defn

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

@@ -62,7 +62,12 @@ module GraphQL
           next_field_name = alias_node.name
 
           # From https://github.com/rmosolgo/graphql-ruby/blob/1a9a20f3da629e63ea8e5ee8400be82218f9edc3/lib/graphql/execution/lookahead.rb#L91
-          next_field_defn = get_class_based_field(selected_type, next_field_name)
+          next_field_defn =
+            if GraphQL::FragmentCache.graphql_ruby_before_2_0?
+              get_class_based_field(selected_type, next_field_name)
+            else
+              @query.get_field(selected_type, next_field_name)
+            end
 
           alias_selections[name] =
             if next_field_defn

data/lib/graphql/fragment_cache/cache_key_builder.rb

@@ -62,7 +62,12 @@ module GraphQL
           next_field_name = alias_node.name
 
           # From https://github.com/rmosolgo/graphql-ruby/blob/1a9a20f3da629e63ea8e5ee8400be82218f9edc3/lib/graphql/execution/lookahead.rb#L91
-          next_field_defn = get_class_based_field(selected_type, next_field_name)
+          next_field_defn =
+            if GraphQL::FragmentCache.graphql_ruby_before_2_0?
+              get_class_based_field(selected_type, next_field_name)
+            else
+              @query.get_field(selected_type, next_field_name)
+            end
 
           alias_selections[name] =
             if next_field_defn

data/lib/graphql/fragment_cache/field_extension.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "graphql/fragment_cache/schema/lazy_cache_resolver"
+
 module GraphQL
   module FragmentCache
     # Wraps resolver with cache method

data/lib/graphql/fragment_cache/fragment.rb

@@ -8,19 +8,41 @@ module GraphQL
 
     # Represents a single fragment to cache
     class Fragment
+      NIL_IN_CACHE = Object.new
+
+      class << self
+        def read_multi(fragments)
+          unless FragmentCache.cache_store.respond_to?(:read_multi)
+            return fragments.map { |f| [f, f.read] }.to_h
+          end
+
+          fragments_to_cache_keys = fragments
+            .map { |f| [f, f.cache_key] }.to_h
+
+          cache_keys = fragments_to_cache_keys.values
+
+          cache_keys_to_values = FragmentCache.cache_store.read_multi(*cache_keys)
+
+          fetched_fragments_to_values = cache_keys_to_values
+            .map { |key, val| [fragments_to_cache_keys.key(key), val] }
+            .to_h
+
+          fetched_fragments_to_values
+        end
+      end
+
       attr_reader :options, :path, :context
 
       def initialize(context, **options)
         @context = context
+        @keep_in_context = options.delete(:keep_in_context)
         @options = options
         @path = interpreter_context[:current_path]
       end
 
-      NIL_IN_CACHE = Object.new
-
-      def read(keep_in_context = false)
+      def read
         return nil if context[:renew_cache] == true
-        return read_from_context { value_from_cache } if keep_in_context
+        return read_from_context { value_from_cache } if @keep_in_context
 
         value_from_cache
       end

data/lib/graphql/fragment_cache/object_helpers.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "graphql/fragment_cache/fragment"
+require "graphql/fragment_cache/schema/lazy_cache_resolver"
 
 module GraphQL
   module FragmentCache
@@ -44,14 +45,7 @@ module GraphQL
 
         fragment = Fragment.new(context_to_use, **options)
 
-        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
-
-        (block_given? ? block.call : object_to_cache).tap do |resolved_value|
-          context_to_use.fragments << fragment
-        end
+        GraphQL::FragmentCache::Schema::LazyCacheResolver.new(fragment, context_to_use, object_to_cache, &block)
       end
     end
   end

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

@@ -0,0 +1,41 @@
+require "graphql/fragment_cache/fragment"
+
+module GraphQL
+  module FragmentCache
+    module Schema
+      using Ext
+      class LazyCacheResolver
+        def initialize(fragment, query_ctx, object_to_cache, &block)
+          @fragment = fragment
+          @query_ctx = query_ctx
+          @object_to_cache = object_to_cache
+          @lazy_state = query_ctx[:lazy_cache_resolver_statez] ||= {
+            pending_fragments: Set.new,
+            resolved_fragments: {}
+          }
+          @block = block
+
+          @lazy_state[:pending_fragments] << @fragment
+        end
+
+        def resolve
+          unless @lazy_state[:resolved_fragments].key?(@fragment)
+            resolved_fragments = Fragment.read_multi(@lazy_state[:pending_fragments].to_a)
+            @lazy_state[:pending_fragments].clear
+            resolved_fragments.each { |key, value| @lazy_state[:resolved_fragments][key] = value }
+          end
+
+          cached = @lazy_state[:resolved_fragments][@fragment]
+
+          if cached
+            return cached == Fragment::NIL_IN_CACHE ? nil : GraphQL::Execution::Interpreter::RawValue.new(cached)
+          end
+
+          (@block ? @block.call : @object_to_cache).tap do |resolved_value|
+            @query_ctx.fragments << @fragment
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ module GraphQL
           end
 
           def verify_connections!(context)
-            return if GraphQL::FragmentCache.graphql_ruby_1_12_or_later? || context.schema.new_connections?
+            return if 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.9.1"
+    VERSION = "1.12.0"
   end
 end

data/lib/graphql/fragment_cache.rb

@@ -11,6 +11,7 @@ require "graphql/fragment_cache/connections/patch"
 require "graphql/fragment_cache/schema/patch"
 require "graphql/fragment_cache/schema/tracer"
 require "graphql/fragment_cache/schema/instrumentation"
+require "graphql/fragment_cache/schema/lazy_cache_resolver"
 
 require "graphql/fragment_cache/memory_store"
 
@@ -30,6 +31,7 @@ module GraphQL
         schema_defn.tracer(Schema::Tracer)
         schema_defn.instrument(:query, Schema::Instrumentation)
         schema_defn.extend(Schema::Patch)
+        schema_defn.lazy_resolve(Schema::LazyCacheResolver, :resolve)
 
         GraphQL::Pagination::Connections.prepend(Connections::Patch)
       end
@@ -50,29 +52,20 @@ module GraphQL
         @cache_store = store
       end
 
-      def graphql_ruby_1_12_or_later?
-        Gem::Dependency.new("graphql", ">= 1.12.0").match?("graphql", GraphQL::VERSION)
+      def graphql_ruby_before_2_0?
+        Gem::Dependency.new("graphql", "< 2.0.0").match?("graphql", GraphQL::VERSION)
       end
 
       private
 
       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
+        if graphql_ruby_before_2_0?
           unless schema_defn.interpreter?
             raise StandardError,
               "GraphQL::Execution::Interpreter should be enabled for fragment caching"
           end
 
+          puts "schema_defn.analysis_engine #{schema_defn.analysis_engine}"
           unless schema_defn.analysis_engine == GraphQL::Analysis::AST
             raise StandardError,
               "GraphQL::Analysis::AST should be enabled for fragment caching"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-fragment_cache
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.12.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-28 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: ruby-next
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +209,7 @@ files:
 - lib/graphql/fragment_cache/rails/cache_key_builder.rb
 - lib/graphql/fragment_cache/railtie.rb
 - lib/graphql/fragment_cache/schema/instrumentation.rb
+- lib/graphql/fragment_cache/schema/lazy_cache_resolver.rb
 - lib/graphql/fragment_cache/schema/patch.rb
 - lib/graphql/fragment_cache/schema/tracer.rb
 - lib/graphql/fragment_cache/version.rb
@@ -227,14 +228,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.31
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Fragment cache for graphql-ruby