graphql-persisted_queries 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a8319ef6ac9b60ce31f69b86163c9c77f700b2d663da6ab10018b76c96ebc2f
-  data.tar.gz: b197af199c9699cda0a7c3c5491d2f22b110b77f61a7632a1982ca3acbc49292
+  metadata.gz: fa710e0a1af1fe00953679781bf408f3c78201b67920671f9af36ff57edefcc0
+  data.tar.gz: cc46697bf61938af0d4359fb9b5bf4898f3bc5108b4f562f94d3003a857064a6
 SHA512:
-  metadata.gz: 2f6f9f3d32aad7d89b263f60701c30f06cba0bb43934fa18360e70ef979c1bdf1f28050859b92788040a600e8d803d850f753383d700243dbdea0b59973bcaf5
-  data.tar.gz: 5505e5d9b983b8dc2a510dd17fe417eee561bc337da0deb203030b6f0889732ea46b5d76dc9694d5129ddc7538f43467040dcbe907651863b6a26d3c9888a2b3
+  metadata.gz: 6028cb87dc1e0c7a78f18f29c7afbff2d2aae46fadbec983d6ebbb217016523a8722f27c993570b914b3fec6cebe0d16ad26e7091844a0e60f4bf0d80217cb11
+  data.tar.gz: a0d0dada8b7f34298a69aed43dd988ce077e010866faf33c8d206375ee0cb2f00afed1f0794753983a5b2b01f266888f7988d77a031f33c6f55d2779abd62e35

data/.github/workflows/rspec.yml

@@ -23,6 +23,7 @@ jobs:
           "gemfiles/graphql_1_12_0.gemfile",
           "gemfiles/graphql_1_12_4.gemfile",
           "gemfiles/graphql_1_13_7.gemfile",
+          "gemfiles/graphql_1_13_16.gemfile",
           "gemfiles/graphql_2_0_0.gemfile",
           "gemfiles/graphql_master.gemfile"
         ]

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## master
 
+## 1.6.1 (2022-11-17)
+
+- [PR#60](https://github.com/DmitryTsepelev/graphql-ruby-persisted_queries/pull/60)
+Handle situations when prepare_ast happens before instrumentation ([@DmitryTsepelev][])
+
 ## 1.6.0 (2022-10-10)
 
 - [PR#57](https://github.com/DmitryTsepelev/graphql-ruby-persisted_queries/pull/57) Refactor code to use instrumentation instead of a monkey patch, deprecate graphql-ruby 1.10 and 1.11 ([@DmitryTsepelev][])

data/README.md

@@ -1,4 +1,4 @@
-# GraphQL::PersistedQueries
+# GraphQL::PersistedQueries ![](https://ruby-gem-downloads-badge.herokuapp.com/graphql-persisted_queries?type=total)
 
 `GraphQL::PersistedQueries` is the implementation of [persisted queries](https://www.apollographql.com/docs/react/api/link/persisted-queries/) for [graphql-ruby](https://github.com/rmosolgo/graphql-ruby). With this plugin your backend will cache all the queries, while frontend will send the full query only when it's not found at the backend storage.
 
@@ -6,13 +6,6 @@
 - 🤝**Clients share cached queries** – it's enough to miss cache only once for each unique query
 - 🎅**Works for clients without persisted query support**
 
-
-<p align="center">
-  <a href="https://evilmartians.com/?utm_source=graphql-ruby-persisted_queries">
-    <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54">
-  </a>
-</p>
-
 ## Getting started
 
 First of all, install and configure [apollo's persisted queries](https://www.apollographql.com/docs/react/api/link/persisted-queries/) on the front–end side:
@@ -92,6 +85,10 @@ An experimental tracing feature can be enabled by setting `tracing: true` when c
 > 📖 Read more about the gem internals: [Persisted queries in GraphQL:
 Slim down Apollo requests to your Ruby application](https://evilmartians.com/chronicles/persisted-queries-in-graphql-slim-down-apollo-requests-to-your-ruby-application)
 
+## Credits
+
+Initially sponsored by [Evil Martians](http://evilmartians.com).
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/DmitryTsepelev/graphql-ruby-persisted_queries.

data/gemfiles/graphql_1_13_16.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "graphql", "~> 1.13.16"
+
+gemspec path: "../"

data/lib/graphql/persisted_queries/compiled_queries/instrumentation.rb

@@ -10,26 +10,14 @@ module GraphQL
           def before_query(query)
             return unless query.context[:extensions]
 
-            resolver = resolver_for(query)
-            if (document = resolver.fetch)
-              query.fulfill_document(document)
-            else
-              query.not_loaded_document!
-            end
-
-            return if document || query.query_string
+            query.try_load_document!
+            return if query.document || query.query_string
 
             query.persisted_query_not_found!
             query.context.errors << GraphQL::ExecutionError.new(NotFound::MESSAGE)
           end
 
           def after_query(*); end
-
-          private
-
-          def resolver_for(query)
-            CompiledQueries::Resolver.new(query.schema, query.context[:extensions])
-          end
         end
       end
     end

data/lib/graphql/persisted_queries/compiled_queries/query_patch.rb

@@ -5,14 +5,6 @@ module GraphQL
     module CompiledQueries
       # Patches GraphQL::Query to support compiled queries
       module QueryPatch
-        def fulfill_document(document)
-          @document = document
-        end
-
-        def not_loaded_document!
-          @not_loaded_document = true
-        end
-
         def persisted_query_not_found!
           @persisted_query_not_found = true
         end
@@ -22,17 +14,29 @@ module GraphQL
         end
 
         def prepare_ast
-          return super unless @context[:extensions]
+          return super if @context[:extensions].nil? || @document
+
+          try_load_document!
 
           super.tap do
             if @context.errors.any?(&method(:not_found_error?))
               @context.errors.select!(&method(:not_found_error?))
             end
 
-            resolver.persist(query_string, @document) if @not_loaded_document && query_string
+            if @persisted_document_not_found && query_string
+              resolver.persist(query_string, @document)
+            end
           end
         end
 
+        def try_load_document!
+          return if @document || @persisted_document_not_found
+
+          compiled_query_resolver = CompiledQueries::Resolver.new(schema, context[:extensions])
+          @document = compiled_query_resolver.fetch
+          @persisted_document_not_found = @document.nil?
+        end
+
         private
 
         def resolver

data/lib/graphql/persisted_queries/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module PersistedQueries
-    VERSION = "1.6.0"
+    VERSION = "1.6.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-persisted_queries
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -138,6 +138,7 @@ files:
 - docs/tracing.md
 - gemfiles/graphql_1_12_0.gemfile
 - gemfiles/graphql_1_12_4.gemfile
+- gemfiles/graphql_1_13_16.gemfile
 - gemfiles/graphql_1_13_7.gemfile
 - gemfiles/graphql_2_0_0.gemfile
 - gemfiles/graphql_master.gemfile