graphql-persisted_queries 1.8.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 348a66b5ed4c013fe7c41a01a752acdca8ecf2eac99f5365ac7cc11b3a6bcd4d
-  data.tar.gz: 2c15c37b4f4f451d12ab946f86e7df67a393af8d897ec0ec718924520ea5ee7b
+  metadata.gz: 74e2464a2988d654dffdc3f52efc8fbd3ecb86cc11980fb3000a5dcf30577287
+  data.tar.gz: d65ffe6edc09ef61039e7f671aa2105f015ab3c49aa1df906a980f641b061aac
 SHA512:
-  metadata.gz: d1ec95cdd3be52b3eb1fd91eaabfffcd67642185c214272b512d0320a17e7344554ae996b0af5f43b7e9c6b69e951268ba0a34b7b0ffe850d3f0a3c38eb5d1b9
-  data.tar.gz: 0ed5474fe161e4f4f1dfec4582f258c33217846bd9a1a607969a9f388d56740c55cb97be0f85184f30c90df56908c7dd224eac48fc7a343d83eb9c7615ea7c71
+  metadata.gz: 9b919241a30472097a837e9a4f4ccaf60d0b6aee05e54244da678939d74845cd790c9b089535031cc178a62ecf84fffbf6a99c07dadac9f115b441d318f6281a
+  data.tar.gz: 6d3e37e77fc7ba9c0859af116d6e18a7bfdd4a11a6bf5326b301d320857d485a96a4acd3261fc460f0aaf935ff8069d55e071c93d5cd05afa71c3f921036a146

data/.github/workflows/rspec.yml

@@ -18,20 +18,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, '3.0', 3.1, 3.2, 3.3]
+        ruby: [3.1, 3.2, 3.3, 3.4]
         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_1_0.gemfile",
           "gemfiles/graphql_2_2_5.gemfile",
-          "gemfiles/graphql_master.gemfile"
+          "gemfiles/graphql_2_3_11.gemfile",
+          "gemfiles/graphql_master.gemfile",
         ]
+        exclude:
+          - ruby: "3.1"
+            gemfile: gemfiles/graphql_2_3_11.gemfile
+          - ruby: "3.1"
+            gemfile: gemfiles/graphql_master.gemfile
 
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: /home/runner/bundle
         key: bundle-${{ matrix.ruby }}-${{ matrix.gemfile }}-${{ hashFiles(matrix.gemfile) }}-${{ hashFiles('**/*.gemspec') }}

data/.github/workflows/rubocop.yml

@@ -17,5 +17,5 @@ jobs:
         ruby-version: 2.7
     - name: Lint Ruby code with RuboCop
       run: |
-        bundle install --gemfile gemfiles/graphql_1_12_0.gemfile --jobs 4 --retry 3
-        bundle exec --gemfile gemfiles/graphql_1_12_0.gemfile rubocop
+        bundle install --gemfile gemfiles/graphql_2_0_0.gemfile --jobs 4 --retry 3
+        bundle exec --gemfile gemfiles/graphql_2_0_0.gemfile rubocop

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change log
 
-## master
+## 1.8.2 (2025-06-12)
+
+- [PR#79](https://github.com/DmitryTsepelev/graphql-ruby-persisted_queries/pull/79)
+Deprecate old ruby and gql versions ([@DmitryTsepelev][])
+- [PR#78](https://github.com/DmitryTsepelev/graphql-ruby-persisted_queries/pull/78)
+Migrate CompiledQueries instrumentation to tracer ([@DmitryTsepelev][])
+
+## 1.8.1 (2024-06-01)
+
+- [PR#77](https://github.com/DmitryTsepelev/graphql-ruby-persisted_queries/pull/77)
+Fix serialization of Document (broken by [this change](https://github.com/rmosolgo/graphql-ruby/commit/7de7a1f98d4299abc1fb7deb5ca0ed2190867ab6)) ([@DmitryTsepelev][])
 
 ## 1.8.0 (2024-03-31)
 

data/README.md

@@ -12,6 +12,8 @@ Used in production by:
 - Toptal
 - _Want to be here? Let me know_ 🙂
 
+You can support my open–source work [here](https://boosty.to/dmitry_tsepelev).
+
 ## 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:

data/gemfiles/{graphql_1_12_0.gemfile → graphql_2_3_11.gemfile}

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

data/graphql-persisted_queries.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.7"
 
-  spec.add_dependency "graphql", ">= 1.12"
+  spec.add_dependency "graphql", ">= 2.0"
+  spec.add_dependency "base64"
 
   spec.add_development_dependency "rspec", "~> 3.9"
   spec.add_development_dependency "rake", ">= 10.0"

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

@@ -8,6 +8,8 @@ module GraphQL
         class << self
           # Actions to perform before the query resolution
           def before_query(query)
+            query = query.query if query.class.name == "GraphQL::Query::Partial"
+
             return unless query.context[:extensions]
 
             query.try_load_document!
@@ -19,6 +21,22 @@ module GraphQL
 
           def after_query(*); end
         end
+
+        # Instrumentations were deprecated in 2.2.5, this is a module to migrate to new interface
+        module Tracer
+          def execute_query(query:)
+            GraphQL::PersistedQueries::CompiledQueries::Instrumentation.before_query(query)
+            super
+          end
+
+          def execute_multiplex(multiplex:)
+            multiplex.queries.each do |query|
+              GraphQL::PersistedQueries::CompiledQueries::Instrumentation.before_query(query)
+            end
+
+            super
+          end
+        end
       end
     end
   end

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

@@ -7,6 +7,28 @@ module GraphQL
       class Resolver
         include GraphQL::PersistedQueries::ResolverHelpers
 
+        # Patch to support custom serialization
+        class GraphQL::Language::Parser # rubocop:disable Style/ClassAndModuleChildren
+          SEP = "|"
+
+          def _dump(*)
+            [
+              @graphql_str,
+              JSON.generate("filename": @filename, "max_tokens": @max_tokens, "document": @document)
+            ].join(SEP)
+          end
+
+          def self._load(args)
+            graphql_str, raw_kwargs = args.split(SEP)
+
+            new(graphql_str,
+                filename: raw_kwargs["filename"],
+                max_tokens: raw_kwargs["max_tokens"]).tap do |parser|
+              parser.instance_variable_set(:@document, raw_kwargs["document"])
+            end
+          end
+        end
+
         def initialize(schema, extensions)
           @schema = schema
           @extensions = extensions

data/lib/graphql/persisted_queries/schema_patch.rb

@@ -26,8 +26,7 @@ module GraphQL
 
         def configure_compiled_queries(schema)
           if graphql_ruby_after_2_2_5?
-            schema.trace_with(GraphQL::Tracing::LegacyHooksTrace)
-            schema.instance_exec { own_instrumenters[:query] << CompiledQueries::Instrumentation }
+            schema.trace_with(GraphQL::PersistedQueries::CompiledQueries::Instrumentation::Tracer)
           else
             schema.instrument :query, CompiledQueries::Instrumentation
           end
@@ -78,7 +77,10 @@ module GraphQL
       end
 
       def verify_http_method=(verify)
-        query_analyzer(prepare_analyzer) if verify
+        return unless verify
+
+        require "graphql/persisted_queries/analyzers/http_method_ast_analyzer"
+        query_analyzer(Analyzers::HttpMethodAstAnalyzer)
       end
 
       def persisted_queries_tracing_enabled?
@@ -94,18 +96,6 @@ module GraphQL
           persisted_query_store.tracers = tracers if persisted_queries_tracing_enabled?
         end
       end
-
-      private
-
-      def prepare_analyzer
-        if using_ast_analysis?
-          require "graphql/persisted_queries/analyzers/http_method_ast_analyzer"
-          Analyzers::HttpMethodAstAnalyzer
-        else
-          require "graphql/persisted_queries/analyzers/http_method_analyzer"
-          Analyzers::HttpMethodAnalyzer.new
-        end
-      end
     end
   end
 end

data/lib/graphql/persisted_queries/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module PersistedQueries
-    VERSION = "1.8.0"
+    VERSION = "1.8.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-persisted_queries
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.2
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-31 00:00:00.000000000 Z
+date: 2025-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -137,13 +151,10 @@ files:
 - docs/http_cache.md
 - docs/skip_query_preprocessing.md
 - 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_2_1_0.gemfile
 - gemfiles/graphql_2_2_5.gemfile
+- gemfiles/graphql_2_3_11.gemfile
 - gemfiles/graphql_master.gemfile
 - graphql-persisted_queries.gemspec
 - lib/graphql/persisted_queries.rb
@@ -192,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Persisted queries for graphql-ruby

data/gemfiles/graphql_1_12_4.gemfile

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

data/gemfiles/graphql_1_13_16.gemfile

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

data/gemfiles/graphql_1_13_7.gemfile

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