graphql-fragment_cache 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66fc20ed7d15e85c1d4ce2890d6b28c368a75e3e06ef69ff186470b5a0953567
-  data.tar.gz: 4d0d3f12716b8d4d5be627411121cbdba2d067991ea1d6874f3b2891f2636a4a
+  metadata.gz: fb58b8735fa1b7a92dae359467252e366bf34da888f46ef98db0737db7b6dfc4
+  data.tar.gz: 037dd3a8c61ed1f359b50d6ae0e4ae7f169d825fb5c6da8cf0ee8968c6e1b9b4
 SHA512:
-  metadata.gz: 5758f73fc04e6e63246b6d21899891220f4e7a7733561a72b6b652a26a6f7bd602425d95d14d2711f15a90865caf907d78244c253243541fd414fa59c93c4954
-  data.tar.gz: bea6d191cdaba4f7b5ed13250c1d5aaec02e0aafbd44cc8b9d29f5a8dba3718f43db62f683df01d3946ff611603f6dd5a6bba2001344ada4d29143c8aae8291a
+  metadata.gz: 6eef1102518837f505b077f515b7a6e38a6e37993f072921193e30a2a877aec2e67899e8d256b23738cabda2bddf7a8e99967743c14b504afcedd389e2d23734
+  data.tar.gz: cb110783f67fb0674065fae17ff860e6c2a81a2fde04f5800634c689f2a1bcf01a54d5183e0ffbf5359d709a9b5493d967be39809abccf91fb5701b00eac7f7f

data/CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ## 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)
@@ -128,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/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/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module FragmentCache
-    VERSION = "1.11.0"
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-fragment_cache
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-26 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -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
@@ -234,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Fragment cache for graphql-ruby