graphql-persisted_queries 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a8319ef6ac9b60ce31f69b86163c9c77f700b2d663da6ab10018b76c96ebc2f
-  data.tar.gz: b197af199c9699cda0a7c3c5491d2f22b110b77f61a7632a1982ca3acbc49292
+  metadata.gz: 430993c73790f83784c3e048a8fa0a4032f2fa5809b725265b5600b6ca8b5a01
+  data.tar.gz: 10aaa0422835323129d2e771f9bcfa68c4b8d24563ff7b8fb0f341b29dc92dd4
 SHA512:
-  metadata.gz: 2f6f9f3d32aad7d89b263f60701c30f06cba0bb43934fa18360e70ef979c1bdf1f28050859b92788040a600e8d803d850f753383d700243dbdea0b59973bcaf5
-  data.tar.gz: 5505e5d9b983b8dc2a510dd17fe417eee561bc337da0deb203030b6f0889732ea46b5d76dc9694d5129ddc7538f43467040dcbe907651863b6a26d3c9888a2b3
+  metadata.gz: c8cf0e07efa3c4a2ea92af6014333c3adc08f1471357b3cc31f1d93779e5af3920e7c71b308bff62f34366211fd5912baadd9780cc2978c9b4185582524f9181
+  data.tar.gz: f001860c11580ae570e25875f548a167ec878d87545befb39b7ee13a58385e2d2fda86a0919745030b915fed8bd84b3cc6200462c467b320e823cb43a9785047

data/.github/workflows/rspec.yml

@@ -18,11 +18,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6, 2.7, 3.0]
+        ruby: [2.7, '3.0', 3.1]
         gemfile: [
           "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,17 @@
 
 ## master
 
+## 1.7.0 (2023-02-02)
+
+- [PR#62](https://github.com/DmitryTsepelev/graphql-ruby-persisted_queries/pull/62)
+Fix double hashing of keys in case of redis_with_local_cache_store adapter ([@mpospelov][])
+- [PR#62](https://github.com/DmitryTsepelev/graphql-ruby-persisted_queries/pull/62) Drop tracers= implementation as it's no longer valid ([@mpospelov][])
+
+## 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][])
@@ -107,3 +118,4 @@
 [@ogidow]: https://github.com/ogidow
 [@rbviz]: https://github.com/rbviz
 [@louim]: https://github.com/louim
+[@mpospelov]: https://github.com/mpospelov

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,12 +6,11 @@
 - 🤝**Clients share cached queries** – it's enough to miss cache only once for each unique query
 - 🎅**Works for clients without persisted query support**
 
+Used in production by:
 
-<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>
+- [Yammer by Microsoft](https://github.com/DmitryTsepelev/graphql-ruby-persisted_queries/issues/20#issuecomment-587945989)
+- Toptal
+- _Want to be here? Let me know_ 🙂
 
 ## Getting started
 
@@ -92,6 +91,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/graphql-persisted_queries.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.add_dependency "graphql", ">= 1.12"
 

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/store_adapters/base_store_adapter.rb

@@ -12,7 +12,8 @@ module GraphQL
           @name = :base
         end
 
-        def fetch_query(hash, compiled_query: false)
+        def fetch_query(hash, options = {})
+          compiled_query = options[:compiled_query] || false
           key = build_key(hash, compiled_query)
 
           fetch(key).tap do |result|
@@ -26,8 +27,6 @@ module GraphQL
           trace("save_query", adapter: @name) { save(key, query) }
         end
 
-        protected
-
         def fetch(_hash)
           raise NotImplementedError
         end

data/lib/graphql/persisted_queries/store_adapters/memcached_store_adapter.rb

@@ -17,8 +17,6 @@ module GraphQL
           @name = :memcached
         end
 
-        protected
-
         def fetch(hash)
           @dalli_proc.call { |dalli| dalli.get(key_for(hash)) }
         end

data/lib/graphql/persisted_queries/store_adapters/memory_store_adapter.rb

@@ -10,8 +10,6 @@ module GraphQL
           @name = :memory
         end
 
-        protected
-
         def fetch(hash)
           @storage[hash]
         end

data/lib/graphql/persisted_queries/store_adapters/redis_store_adapter.rb

@@ -17,8 +17,6 @@ module GraphQL
           @name = :redis
         end
 
-        protected
-
         def fetch(hash)
           @redis_proc.call { |redis| redis.get(key_for(hash)) }
         end

data/lib/graphql/persisted_queries/store_adapters/redis_with_local_cache_store_adapter.rb

@@ -22,29 +22,19 @@ module GraphQL
           @name = :redis_with_local_cache
         end
 
-        # We don't need to implement our own traces for this adapter since the
-        # underlying adapters will emit the proper events for us.  However,
-        # since tracers can be defined at any time, we need to pass them through.
-        def tracers=(tracers)
-          @memory_adapter.tracers = tracers
-          @redis_adapter.tracers = tracers
-        end
-
-        protected
-
         def fetch(hash)
-          result = @memory_adapter.fetch_query(hash)
+          result = @memory_adapter.fetch(hash)
           result ||= begin
-            inner_result = @redis_adapter.fetch_query(hash)
-            @memory_adapter.save_query(hash, inner_result) if inner_result
+            inner_result = @redis_adapter.fetch(hash)
+            @memory_adapter.save(hash, inner_result) if inner_result
             inner_result
           end
           result
         end
 
         def save(hash, query)
-          @redis_adapter.save_query(hash, query)
-          @memory_adapter.save_query(hash, query)
+          @redis_adapter.save(hash, query)
+          @memory_adapter.save(hash, query)
         end
 
         private

data/lib/graphql/persisted_queries/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module PersistedQueries
-    VERSION = "1.6.0"
+    VERSION = "1.7.0"
   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.7.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2023-02-02 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
@@ -181,14 +182,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Persisted queries for graphql-ruby