graphql-fragment_cache 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 515ec358aecf867ce2d2ec5ac82003d802dc6c31d6402d62593a626ac5bad81e
-  data.tar.gz: 8b1b3d82c0fb808a2cd826c710047635ba141895843ff7b804a301848d266ff5
+  metadata.gz: 8fd575d2efddb52ef6d0f878b40823baae40cedec5aa683ba5f6a1b39b98bffe
+  data.tar.gz: eba1c06d3650d395575bd96927f831fc206f797b47afa9ebfcfff9adbf2ecf1d
 SHA512:
-  metadata.gz: 2c2dd089bf31f6d2491fc7d904d8ca356a2dfbc2cace258fe1e3b49c18dc59a64805a1cb96655bfb23eacc62ed027198365491759005b232354a2ee8ed41e605
-  data.tar.gz: 92309ef8b7ee62a5fd85007a88be932874f996d12ee08a1e81530d90fa3138dc631f90ad6a6f41c3952338001e10cefbeb1691bcea7891ba9b2f4027543e659d
+  metadata.gz: 5fe016ab01f8b8076b1cc6680f8a09ad9bf1ab9d7f5c798a308465fd0d6d80dd6da24ef5855aa35660d9b8cce0529ab59cb6a45b7b971c58d4f8a9e761b80ff9
+  data.tar.gz: 0430b991c22524be88e3741f700d5c02ac65186f4cf40e7f06440b737c345bba8e44748a9e8d6ef1293356e21ee7560595b5e1563c28da7bb5f88008f7174360

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 1.0.3 (2020-08-31)
+
+- [PR#29](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/29) Cache result JSON instead of connection objects ([@DmitryTsepelev][])
+
 ## 1.0.2 (2020-08-19)
 
 - [PR#28](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/28) Support #keys method for GraphQL::FragmentCache::MemoryStore instance ([@reabiliti][])

data/lib/graphql/fragment_cache.rb

@@ -6,6 +6,8 @@ require "graphql/fragment_cache/ext/context_fragments"
 require "graphql/fragment_cache/ext/graphql_cache_key"
 require "graphql/fragment_cache/object"
 
+require "graphql/fragment_cache/connections/patch"
+
 require "graphql/fragment_cache/schema/patch"
 require "graphql/fragment_cache/schema/tracer"
 require "graphql/fragment_cache/schema/instrumentation"
@@ -26,6 +28,8 @@ module GraphQL
         schema_defn.tracer(Schema::Tracer)
         schema_defn.instrument(:query, Schema::Instrumentation)
         schema_defn.extend(Schema::Patch)
+
+        GraphQL::Pagination::Connections.prepend(Connections::Patch)
       end
 
       def cache_store=(store)

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module GraphQL
+  module FragmentCache
+    module Connections
+      # Patches GraphQL::Pagination::Connections to support raw values
+      module Patch
+        if Gem::Dependency.new("graphql", ">= 1.11.0").match?("graphql", GraphQL::VERSION)
+          def wrap(field, parent, items, arguments, context, *options)
+            raw_value?(items) ? items : super
+          end
+        else
+          def wrap(field, object, arguments, context, *options)
+            raw_value?(object) ? object : super
+          end
+        end
+
+        private
+
+        def raw_value?(value)
+          GraphQL::Execution::Interpreter::RawValue === value
+        end
+      end
+    end
+  end
+end

data/lib/graphql/fragment_cache/fragment.rb

@@ -8,8 +8,6 @@ module GraphQL
     class Fragment
       attr_reader :options, :path, :context
 
-      attr_accessor :resolved_value
-
       def initialize(context, **options)
         @context = context
         @options = options
@@ -25,9 +23,7 @@ module GraphQL
       end
 
       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
+        value = final_value.dig(*path)
         FragmentCache.cache_store.write(cache_key, value, **options)
       end
 
@@ -41,10 +37,6 @@ module GraphQL
         context.namespace(:interpreter)
       end
 
-      def resolve_from_runtime
-        final_value.dig(*path)
-      end
-
       def final_value
         @final_value ||= interpreter_context[:runtime].final_value
       end

data/lib/graphql/fragment_cache/object_helpers.rb

@@ -22,8 +22,7 @@ module GraphQL
         fragment = Fragment.new(context, options)
 
         if (cached = fragment.read)
-          return nil if cached == Fragment::NIL_IN_CACHE
-          return restore_cached_value(cached)
+          return cached == Fragment::NIL_IN_CACHE ? nil : raw_value(cached)
         end
 
         (block_given? ? block.call : object_to_cache).tap do |resolved_value|
@@ -33,11 +32,6 @@ module GraphQL
 
       private
 
-      def restore_cached_value(cached)
-        # If we return connection object from resolver, Interpreter stops processing it
-        connection? ? cached : raw_value(cached)
-      end
-
       def field
         interpreter_context[:current_field]
       end

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

@@ -10,18 +10,15 @@ module GraphQL
         class << self
           def trace(key, data)
             yield.tap do |resolved_value|
-              next unless connection_to_cache?(key, data)
+              next unless connection_field?(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)
+              verify_connections!(data[:query].context)
             end
           end
 
           private
 
-          def connection_to_cache?(key, data)
+          def connection_field?(key, data)
             key == "execute_field" && data[:field].connection?
           end
 
@@ -31,12 +28,6 @@ module GraphQL
             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

data/lib/graphql/fragment_cache/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module FragmentCache
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-fragment_cache
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -168,6 +168,7 @@ files:
 - lib/graphql/fragment_cache.rb
 - lib/graphql/fragment_cache/cache_key_builder.rb
 - lib/graphql/fragment_cache/cacher.rb
+- lib/graphql/fragment_cache/connections/patch.rb
 - lib/graphql/fragment_cache/ext/context_fragments.rb
 - lib/graphql/fragment_cache/ext/graphql_cache_key.rb
 - lib/graphql/fragment_cache/field_extension.rb