graphql-fragment_cache 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d83b3ff9d3e9cc91b6f013214d2cc4d97c6d2fc8bd377bf38d1f68dd7f935c23
-  data.tar.gz: d349157e8c6856c06b5a3ae76915399ae77fc04153093ef9551bb75b45629cb4
+  metadata.gz: 1c1bfd3dbaadd053ae1e47ac16d1cb244410adeae3424b30d58b04516447bfe6
+  data.tar.gz: 10de0c52b16423e65db745433a61aef94c795edca3b4b47c3ef834f7118d0a5f
 SHA512:
-  metadata.gz: 759813c8b9ae4373d9890519aa88573eb9a504771eca25ea7d7ddc2a35b972f172e1fb7e86bbd2f52447886e3c781178cfc7491c9a7257ce436ae411a32395fb
-  data.tar.gz: 78c75d761fc3154dd4a4622a36c5b0f7bbc4b26c31eb4bf3e3c6be4423be8ae64923d7207f02217142c213fa80e039410e2d079403c0258efd82543d9866e41d
+  metadata.gz: 54ad113a7ef913df0c283c130bae045621dd99298bb1e658e6a4e00440fa29a6ac3d39f45789b49f9cc8a09ddaf34fe4af18560ebbc1c41d73e33d6e539e9b10
+  data.tar.gz: b36091bf683d1018e47ae0fcfd5e69fedad20d4a7b20687a67315d721efa63a5b5df158cb8142ed6342b5ae77c3bd41d08a281299d16f0fcd10d74107e5db78e

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 0.1.7 (2020-06-02)
+
+- [PR#23](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/23) Avoid extra queries after restoring connection from cache ([@DmitryTsepelev][])
+
 ## 0.1.6 (2020-05-30)
 
 - [PR#22](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/22) Properly cache entites inside collections ([@DmitryTsepelev][])

data/lib/graphql/fragment_cache.rb

@@ -4,10 +4,11 @@ require "graphql"
 
 require "graphql/fragment_cache/ext/context_fragments"
 require "graphql/fragment_cache/ext/graphql_cache_key"
-
-require "graphql/fragment_cache/schema_patch"
 require "graphql/fragment_cache/object"
-require "graphql/fragment_cache/instrumentation"
+
+require "graphql/fragment_cache/schema/patch"
+require "graphql/fragment_cache/schema/tracer"
+require "graphql/fragment_cache/schema/instrumentation"
 
 require "graphql/fragment_cache/memory_store"
 
@@ -22,8 +23,9 @@ module GraphQL
       def use(schema_defn, options = {})
         verify_interpreter!(schema_defn)
 
-        schema_defn.instrument(:query, Instrumentation)
-        schema_defn.extend(SchemaPatch)
+        schema_defn.tracer(Schema::Tracer)
+        schema_defn.instrument(:query, Schema::Instrumentation)
+        schema_defn.extend(Schema::Patch)
       end
 
       def cache_store=(store)

data/lib/graphql/fragment_cache/cacher.rb

@@ -10,9 +10,7 @@ module GraphQL
         def call(query)
           return unless query.context.fragments?
 
-          final_value = query.context.namespace(:interpreter)[:runtime].final_value
-
-          query.context.fragments.each { _1.persist(final_value) }
+          query.context.fragments.each(&:persist)
         end
       end
     end

data/lib/graphql/fragment_cache/fragment.rb

@@ -6,22 +6,24 @@ module GraphQL
   module FragmentCache
     # Represents a single fragment to cache
     class Fragment
-      attr_reader :options, :path, :context, :raw_connection
+      attr_reader :options, :path, :context
 
-      attr_writer :raw_connection
+      attr_accessor :resolved_value
 
       def initialize(context, **options)
         @context = context
         @options = options
-        @path = context.namespace(:interpreter)[:current_path]
+        @path = interpreter_context[:current_path]
       end
 
       def read
         FragmentCache.cache_store.read(cache_key)
       end
 
-      def persist(final_value)
-        value = raw_connection || resolve(final_value)
+      def persist
+        # Connections are not available from the runtime object, so
+        # we rely on Schema::Tracer to save it for us
+        value = resolved_value || resolve_from_runtime
         FragmentCache.cache_store.write(cache_key, value, **options)
       end
 
@@ -31,9 +33,17 @@ module GraphQL
         @cache_key ||= CacheKeyBuilder.call(path: path, query: context.query, **options)
       end
 
-      def resolve(final_value)
+      def interpreter_context
+        context.namespace(:interpreter)
+      end
+
+      def resolve_from_runtime
         final_value.dig(*path)
       end
+
+      def final_value
+        @final_value ||= interpreter_context[:runtime].final_value
+      end
     end
   end
 end

data/lib/graphql/fragment_cache/object_helpers.rb

@@ -6,8 +6,6 @@ module GraphQL
   module FragmentCache
     using Ext
 
-    RawConnection = Struct.new(:items, :nodes, :paged_nodes_offset, :has_previous_page, :has_next_page)
-
     # Adds #cache_fragment method
     module ObjectHelpers
       extend Forwardable
@@ -28,35 +26,15 @@ module GraphQL
         end
 
         (block_given? ? block.call : object_to_cache).tap do |resolved_value|
-          cache_value(resolved_value, fragment)
+          context.fragments << fragment
         end
       end
 
       private
 
       def restore_cached_value(cached)
-        connection? ? restore_cached_connection(cached) : raw_value(cached)
-      end
-
-      def cache_value(resolved_value, fragment)
-        if connection?
-          unless context.schema.new_connections?
-            raise StandardError,
-              "GraphQL::Pagination::Connections should be enabled for connection caching"
-          end
-
-          connection = wrap_connection(resolved_value)
-
-          fragment.raw_connection = RawConnection.new(
-            connection.items,
-            connection.nodes,
-            connection.instance_variable_get(:@paged_nodes_offset),
-            connection.has_previous_page,
-            connection.has_next_page
-          )
-        end
-
-        context.fragments << fragment
+        # If we return connection object from resolver, Interpreter stops processing it
+        connection? ? cached : raw_value(cached)
       end
 
       def field
@@ -66,19 +44,6 @@ module GraphQL
       def interpreter_context
         @interpreter_context ||= context.namespace(:interpreter)
       end
-
-      def restore_cached_connection(raw_connection)
-        wrap_connection(raw_connection.items).tap do |connection|
-          connection.instance_variable_set(:@nodes, raw_connection.nodes)
-          connection.instance_variable_set(:@paged_nodes_offset, raw_connection.paged_nodes_offset)
-          connection.instance_variable_set(:@has_previous_page, raw_connection.has_previous_page)
-          connection.instance_variable_set(:@has_next_page, raw_connection.has_next_page)
-        end
-      end
-
-      def wrap_connection(object)
-        context.schema.connections.wrap(field, object, interpreter_context[:current_arguments], context)
-      end
     end
   end
 end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "graphql/fragment_cache/cacher"
+
+module GraphQL
+  module FragmentCache
+    module Schema
+      # Adds hook for saving cached values after query is resolved
+      module Instrumentation
+        module_function
+
+        def before_query(query)
+        end
+
+        def after_query(query)
+          return unless query.valid?
+
+          Cacher.call(query)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "digest/sha1"
+
+module GraphQL
+  module FragmentCache
+    module Schema
+      # Patches GraphQL::Schema to support fragment cache
+      module Patch
+        def schema_cache_key
+          @schema_cache_key ||= Digest::SHA1.hexdigest(to_definition)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module GraphQL
+  # Plugin definition
+  module FragmentCache
+    module Schema
+      class Tracer
+        using Ext
+
+        class << self
+          def trace(key, data)
+            yield.tap do |resolved_value|
+              next unless connection_to_cache?(key, data)
+
+              # We need to attach connection object to fragment and save it later
+              context = data[:query].context
+              verify_connections!(context)
+              cache_connection(resolved_value, context)
+            end
+          end
+
+          private
+
+          def connection_to_cache?(key, data)
+            key == "execute_field" && data[:field].connection?
+          end
+
+          def verify_connections!(context)
+            return if context.schema.new_connections?
+
+            raise StandardError,
+              "GraphQL::Pagination::Connections should be enabled for connection caching"
+          end
+
+          def cache_connection(resolved_value, context)
+            current_path = context.namespace(:interpreter)[:current_path]
+            fragment = context.fragments.find { |fragment| fragment.path == current_path }
+            fragment.resolved_value = resolved_value if fragment
+          end
+        end
+      end
+    end
+  end
+end

data/lib/graphql/fragment_cache/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module FragmentCache
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-fragment_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -149,7 +149,6 @@ files:
 - bin/console
 - bin/setup
 - lib/.rbnext/2.7/graphql/fragment_cache/cache_key_builder.rb
-- lib/.rbnext/2.7/graphql/fragment_cache/cacher.rb
 - lib/.rbnext/2.7/graphql/fragment_cache/ext/graphql_cache_key.rb
 - lib/graphql-fragment_cache.rb
 - lib/graphql/fragment_cache.rb
@@ -159,13 +158,14 @@ files:
 - lib/graphql/fragment_cache/ext/graphql_cache_key.rb
 - lib/graphql/fragment_cache/field_extension.rb
 - lib/graphql/fragment_cache/fragment.rb
-- lib/graphql/fragment_cache/instrumentation.rb
 - lib/graphql/fragment_cache/memory_store.rb
 - lib/graphql/fragment_cache/object.rb
 - lib/graphql/fragment_cache/object_helpers.rb
 - lib/graphql/fragment_cache/rails/cache_key_builder.rb
 - lib/graphql/fragment_cache/railtie.rb
-- lib/graphql/fragment_cache/schema_patch.rb
+- lib/graphql/fragment_cache/schema/instrumentation.rb
+- lib/graphql/fragment_cache/schema/patch.rb
+- lib/graphql/fragment_cache/schema/tracer.rb
 - lib/graphql/fragment_cache/version.rb
 homepage: https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache
 licenses:

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

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module GraphQL
-  module FragmentCache
-    using Ext
-
-    # Saves resolved fragment values to cache store
-    module Cacher
-      class << self
-        def call(query)
-          return unless query.context.fragments?
-
-          final_value = query.context.namespace(:interpreter)[:runtime].final_value
-
-          query.context.fragments.each { |_1| _1.persist(final_value) }
-        end
-      end
-    end
-  end
-end

data/lib/graphql/fragment_cache/instrumentation.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require "graphql/fragment_cache/cacher"
-
-module GraphQL
-  module FragmentCache
-    # Adds hook for saving cached values after query is resolved
-    module Instrumentation
-      module_function
-
-      def before_query(query)
-      end
-
-      def after_query(query)
-        return unless query.valid?
-
-        Cacher.call(query)
-      end
-    end
-  end
-end

data/lib/graphql/fragment_cache/schema_patch.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-require "digest/sha1"
-
-module GraphQL
-  module FragmentCache
-    # Patches GraphQL::Schema to support fragment cache
-    module SchemaPatch
-      def schema_cache_key
-        @schema_cache_key ||= Digest::SHA1.hexdigest(to_definition)
-      end
-    end
-  end
-end