graphql-result_cache 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a82a463a163e049de4904d6c8ccc2dcd434ba9f2d9b8cc290a607691b7444086
-  data.tar.gz: a1614159c06e2924a3a11c082bae2668da3acd315ddc881ed70d01a9889ef6a5
+  metadata.gz: c49ef03b8c247374a8b3374471873c4a921dc9fc1b4a4e9e379e2d6f04a61cdd
+  data.tar.gz: bc292f89395de326e1e84feee22a648fe4a553d7151f0e50dd46a11a234a5adf
 SHA512:
-  metadata.gz: f5437965558d61fbb534ac2cef46c51b70f9a1ba08550dc3aece6b474bb3501b7fbcd53a386f999f5efbe776c0e41fb56bef632c3a5c238687bd516fb6503a46
-  data.tar.gz: bf03d88d2fa2a4fab03522f1b14321ddf35076ae3781a4e545c0f683d25b5d1c5d03f25364fa74deb2c350f5becb9ba0b1c4cabf452b9a602cbb41b93cee640d
+  metadata.gz: 7acd578c4015a18728af29976c44267cd11bf79978db95164c8a01f82bc4aeb2e076080fe87440448b08eea17b4e652ad588711e5c581704cf678ecb78f779f4
+  data.tar.gz: a072f2778e71b313151a4af9f6683f2ec633c12da1cfd477b2db596f4ab8b8b057f91d4cfbb5e386705eb8d80f817e5d2022afc802cb5a19b3d79e1bfc5827a9

data/README.md

@@ -110,15 +110,10 @@ GraphQL::ResultCache.configure do |config|
 end
 ```
 
-When the query is an introspection, you can set the value to avoid getting the nullable type for a non-null type.
+When using with introspection, you need to assign custom introspection to avoid getting the nullable type for a non-null type.
 ```ruby
-class GraphqlController < ApplicationController
-  def execute
-    # ...
-    GraphQL::ResultCache.introspection = params[:query].include? '__schema'
-    result = MySchema.execute(params[:query], variables: ensure_hash(params[:variables]), context: context, operation_name: params[:operationName])  
-    render json: GraphQL::ResultCache::Result.new(result)
-  end
+class MySchema < GraphQL::Schema
+  introspection ::GraphQL::ResultCache::Introspection
 end
 ```
 

data/lib/graphql/result_cache/field.rb

@@ -9,6 +9,7 @@ module GraphQL
       def to_graphql
         field_defn = super # Returns a GraphQL::Field
         field_defn.metadata[:result_cache] = @result_cache_config
+        field_defn.metadata[:original_non_null] = true if @result_cache_config && field_defn.type.non_null?
         field_defn
       end
     end

data/lib/graphql/result_cache/field_instrument.rb

@@ -12,7 +12,7 @@ module GraphQL
         cached_resolve_proc = cached_resolve(field)
         field.redefine do
           resolve(cached_resolve_proc)
-          type(field.type.of_type) if !::GraphQL::ResultCache.introspection? && field.type.non_null?
+          type(field.type.of_type) if field.type.non_null?
         end
       end
 

data/lib/graphql/result_cache/introspection/field_type.rb

@@ -0,0 +1,13 @@
+module GraphQL
+  module ResultCache
+    module Introspection
+      class FieldType < ::GraphQL::Introspection::FieldType
+
+        def type
+          @object.metadata[:original_non_null] && !@object.type.non_null? ? @object.type.to_non_null_type : @object.type
+        end
+
+      end
+    end
+  end
+end

data/lib/graphql/result_cache/introspection.rb

@@ -0,0 +1,8 @@
+module GraphQL
+  module ResultCache
+    module Introspection
+    end
+  end
+end
+
+require 'graphql/result_cache/introspection/field_type'

data/lib/graphql/result_cache/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module ResultCache
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/lib/graphql/result_cache.rb

@@ -3,6 +3,7 @@ require 'graphql/result_cache/version'
 require 'graphql/result_cache/field'
 require 'graphql/result_cache/result'
 require 'graphql/result_cache/field_instrument'
+require 'graphql/result_cache/introspection'
 
 module GraphQL
   module ResultCache
@@ -16,9 +17,6 @@ module GraphQL
       # c.client_hash = -> { Rails.cache.read(:deploy_version) }
       attr_accessor :client_hash
 
-      attr_accessor :introspection
-      alias introspection? introspection
-
       # ```
       # GraphQL::ResultCache.configure do |c|
       #   c.namespace = "GraphQL:Result"
@@ -34,7 +32,6 @@ module GraphQL
     # Default configuration
     @expires_in = 3600              # 1.hour
     @namespace = 'GraphQL:Result'
-    @introspection = false
 
     def self.use(schema_def, options: {})
       schema_def.instrument(:field, ::GraphQL::ResultCache::FieldInstrument.new)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-result_cache
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ying Fu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,6 +90,8 @@ files:
 - lib/graphql/result_cache/context_config.rb
 - lib/graphql/result_cache/field.rb
 - lib/graphql/result_cache/field_instrument.rb
+- lib/graphql/result_cache/introspection.rb
+- lib/graphql/result_cache/introspection/field_type.rb
 - lib/graphql/result_cache/key.rb
 - lib/graphql/result_cache/rails.rb
 - lib/graphql/result_cache/result.rb