graphql-fragment_cache 1.19.0 → 1.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4dd3472ddcbe18e4c306b81770b5a9fa2dbe306968d1e16f2d98e81630bfec8
-  data.tar.gz: 96c8cd920f0e46041c803527bbe3679841daa169aae82db6d627747eaf4632b9
+  metadata.gz: 1290ae93c3ed819164a80214348eb8539ca1f502d66494c78b67a70442cc377f
+  data.tar.gz: 90bab17ae895c6164ae77da598d7afa3073ca0e0cb6b6f21f848fc4038d71a89
 SHA512:
-  metadata.gz: c308ffcdfdb6fc7529ec3d094109cf7d21db8380b598435d6274e5b1f89a14110ece6fda565d9bc6429ae907066795597c8815f3e745c9a646033d246b2d1f2d
-  data.tar.gz: 806ef15a72ca9eec45e4cde2e35ba43ceb29194c9ed23d77aa776bd3721a77f4d1b04ae8dc3d189e285be12a3cacd5dd1415faba7f57c745c55cb505eca6322e
+  metadata.gz: ae23bb92581ad0a5527516675ea08ad1668ea98dc6bf63e85411576f5e1321a5db679c0fe24111abdd1db8629577d67bfc5f2223f9cca69c7c94ca3f57cd779a
+  data.tar.gz: 07b1772b1862c3a7905894321b17ddf8b3beec3520565e654530b185d269746f8f94c3fa397fa9707bf41afbcb51cc5d6332b81fd2f571d492aab1d05c66529b

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## master
 
+## 1.20.1 (2024-04-03)
+
+- [PR#112](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/112) fix tracer deprecation warnings ([@diegofigueroa][])
+- [PR#109](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/109) Remove `Lookahead` patch in modern versions of graphql-ruby ([@DmitryTsepelev][])
+
+## 1.20.0 (2024-03-02)
+
+- [PR#108](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/108) Use trace_with instead of deprecated instrument method  ([@camero2734][])
+
 ## 1.19.0 (2023-11-03)
 
 - [PR#104](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/104) Support graphql-ruby 2.1.4 ([@DmitryTsepelev][])
@@ -181,3 +190,5 @@
 [@frostmark]: https://github.com/frostmark
 [@KTSCode]: https://github.com/KTSCode
 [@rince]: https://github.com/rince
+[@camero2734]: https://github.com/camero2734
+[@diegofigueroa]: https://github.com/diegofigueroa

data/lib/.rbnext/2.3/graphql/fragment_cache/cache_key_builder.rb

@@ -76,7 +76,7 @@ module GraphQL
               arguments = arguments.is_a?(::GraphQL::Execution::Interpreter::Arguments) ? arguments.keyword_arguments : arguments
               @ast_nodes.each do |ast_node|
                 ast_node.selections.each do |selection|
-                  if GraphQL::FragmentCache.graphql_ruby_after_2_0_13?
+                  if GraphQL::FragmentCache.graphql_ruby_after_2_0_13? && GraphQL::FragmentCache.graphql_ruby_before_2_1_4?
                     find_selected_nodes(selection, next_field_defn, arguments: arguments, matches: next_nodes)
                   else
                     find_selected_nodes(selection, next_field_name, next_field_defn, arguments: arguments, matches: next_nodes)
@@ -212,7 +212,7 @@ module GraphQL
       end
 
       def object_key(obj)
-        ((!obj.nil?) || nil) && obj._graphql_cache_key
+        ((((__safe_lvar__ = obj) || true) && (!__safe_lvar__.nil? || nil)) && __safe_lvar__._graphql_cache_key)
       end
     end
   end

data/lib/.rbnext/2.3/graphql/fragment_cache/memory_store.rb

@@ -33,13 +33,13 @@ module GraphQL
 
       def read(key)
         key = key.to_s
-        ((!storage[key].nil?) || nil) && storage[key].then do |entry|
+        ((((__safe_lvar__ = storage[key]) || true) && (!__safe_lvar__.nil? || nil)) && __safe_lvar__.then { |entry|
   if entry.expired?
     delete(key)
     next
   end
   entry.value
-end
+})
       end
 
       def write(key, value, options = {})

data/lib/.rbnext/2.5/graphql/fragment_cache/cacher.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module GraphQL
+  module FragmentCache
+    using Ext
+
+    class WriteError < StandardError
+      attr_reader :key, :value, :original_error
+
+      def initialize(original_error, key, value)
+        @original_error = original_error
+        @key = key
+        @value = value
+
+        super(original_error.message)
+      end
+    end
+
+    class WriteMultiError < StandardError
+      attr_reader :values, :original_error
+
+      def initialize(original_error, values)
+        @original_error = original_error
+        @values = values
+
+        super(original_error.message)
+      end
+    end
+
+    # Saves resolved fragment values to cache store
+    module Cacher
+      class << self
+        def call(query)
+          return unless query.context.fragments?
+
+          if FragmentCache.cache_store.respond_to?(:write_multi)
+            batched_persist(query)
+          else
+            persist(query)
+          end
+        end
+
+        private
+
+        def batched_persist(query)
+          select_valid_fragments(query).group_by(&:options).each do |options, group|
+            hash = group.map { |fragment| [fragment.cache_key, fragment.value] }.to_h
+
+            begin
+              FragmentCache.cache_store.write_multi(hash, options)
+            rescue => e
+              raise WriteMultiError.new(e, hash)
+            end
+          end
+        end
+
+        def persist(query)
+          select_valid_fragments(query).each do |fragment|
+            begin;FragmentCache.cache_store.write(fragment.cache_key, fragment.value, fragment.options)
+          rescue => e
+            raise WriteError.new(e, fragment.cache_key, fragment.value), e;end
+          end
+        end
+
+        def select_valid_fragments(query)
+          query.context.fragments.select(&:with_final_value?)
+        end
+      end
+    end
+  end
+end

data/lib/.rbnext/2.7/graphql/fragment_cache/cache_key_builder.rb

@@ -76,7 +76,7 @@ module GraphQL
               arguments = arguments.is_a?(::GraphQL::Execution::Interpreter::Arguments) ? arguments.keyword_arguments : arguments
               @ast_nodes.each do |ast_node|
                 ast_node.selections.each do |selection|
-                  if GraphQL::FragmentCache.graphql_ruby_after_2_0_13?
+                  if GraphQL::FragmentCache.graphql_ruby_after_2_0_13? && GraphQL::FragmentCache.graphql_ruby_before_2_1_4?
                     find_selected_nodes(selection, next_field_defn, arguments: arguments, matches: next_nodes)
                   else
                     find_selected_nodes(selection, next_field_name, next_field_defn, arguments: arguments, matches: next_nodes)

data/lib/graphql/fragment_cache/cache_key_builder.rb

@@ -53,64 +53,66 @@ module GraphQL
           alias_selection(name, **kwargs)
         end
 
-        def alias_selection(name, selected_type: @selected_type, arguments: nil)
-          return alias_selections[name] if alias_selections.key?(name)
+        if GraphRubyVersion.before_2_1_4?
+          def alias_selection(name, selected_type: @selected_type, arguments: nil)
+            return alias_selections[name] if alias_selections.key?(name)
 
-          alias_node = lookup_alias_node(ast_nodes, name)
-          return ::GraphQL::Execution::Lookahead::NULL_LOOKAHEAD unless alias_node
+            alias_node = lookup_alias_node(ast_nodes, name)
+            return ::GraphQL::Execution::Lookahead::NULL_LOOKAHEAD unless alias_node
 
-          next_field_name = alias_node.name
+            next_field_name = alias_node.name
 
-          # From https://github.com/rmosolgo/graphql-ruby/blob/1a9a20f3da629e63ea8e5ee8400be82218f9edc3/lib/graphql/execution/lookahead.rb#L91
-          next_field_defn =
-            if GraphQL::FragmentCache.graphql_ruby_before_2_0?
-              get_class_based_field(selected_type, next_field_name)
-            else
-              @query.get_field(selected_type, next_field_name)
-            end
+            # From https://github.com/rmosolgo/graphql-ruby/blob/1a9a20f3da629e63ea8e5ee8400be82218f9edc3/lib/graphql/execution/lookahead.rb#L91
+            next_field_defn =
+              if GraphRubyVersion.before_2_0?
+                get_class_based_field(selected_type, next_field_name)
+              else
+                @query.get_field(selected_type, next_field_name)
+              end
 
-          alias_selections[name] =
-            if next_field_defn
-              next_nodes = []
-              arguments = @query.arguments_for(alias_node, next_field_defn)
-              arguments = arguments.is_a?(::GraphQL::Execution::Interpreter::Arguments) ? arguments.keyword_arguments : arguments
-              @ast_nodes.each do |ast_node|
-                ast_node.selections.each do |selection|
-                  if GraphQL::FragmentCache.graphql_ruby_after_2_0_13? && GraphQL::FragmentCache.graphql_ruby_before_2_1_4?
-                    find_selected_nodes(selection, next_field_defn, arguments: arguments, matches: next_nodes)
-                  else
-                    find_selected_nodes(selection, next_field_name, next_field_defn, arguments: arguments, matches: next_nodes)
+            alias_selections[name] =
+              if next_field_defn
+                next_nodes = []
+                arguments = @query.arguments_for(alias_node, next_field_defn)
+                arguments = arguments.is_a?(::GraphQL::Execution::Interpreter::Arguments) ? arguments.keyword_arguments : arguments
+                @ast_nodes.each do |ast_node|
+                  ast_node.selections.each do |selection|
+                    if GraphRubyVersion.after_2_0_13? && GraphRubyVersion.before_2_1_4?
+                      find_selected_nodes(selection, next_field_defn, arguments: arguments, matches: next_nodes)
+                    else
+                      find_selected_nodes(selection, next_field_name, next_field_defn, arguments: arguments, matches: next_nodes)
+                    end
                   end
                 end
-              end
 
-              if next_nodes.any?
-                ::GraphQL::Execution::Lookahead.new(query: @query, ast_nodes: next_nodes, field: next_field_defn, owner_type: selected_type)
+                if next_nodes.any?
+                  ::GraphQL::Execution::Lookahead.new(query: @query, ast_nodes: next_nodes, field: next_field_defn, owner_type: selected_type)
+                else
+                  ::GraphQL::Execution::Lookahead::NULL_LOOKAHEAD
+                end
               else
                 ::GraphQL::Execution::Lookahead::NULL_LOOKAHEAD
               end
-            else
-              ::GraphQL::Execution::Lookahead::NULL_LOOKAHEAD
-            end
-        end
+          end
 
-        def alias_selections
-          return @alias_selections if defined?(@alias_selections)
-          @alias_selections ||= {}
-        end
+          def alias_selections
+            return @alias_selections if defined?(@alias_selections)
+            @alias_selections ||= {}
+          end
 
-        def lookup_alias_node(nodes, name)
-          return if nodes.empty?
+          def lookup_alias_node(nodes, name)
+            return if nodes.empty?
 
-          nodes.find do |node|
-            if node.is_a?(GraphQL::Language::Nodes::FragmentSpread)
-              node = @query.fragments[node.name]
-              raise("Invariant: Can't look ahead to nonexistent fragment #{node.name} (found: #{@query.fragments.keys})") unless node
-            end
+            nodes.find do |node|
+              if node.is_a?(GraphQL::Language::Nodes::FragmentSpread)
+                node = @query.fragments[node.name]
+                raise("Invariant: Can't look ahead to nonexistent fragment #{node.name} (found: #{@query.fragments.keys})") unless node
+              end
 
-            return node if node.alias?(name)
-            child = lookup_alias_node(node.children, name)
-            return child if child
+              return node if node.alias?(name)
+              child = lookup_alias_node(node.children, name)
+              return child if child
+            end
           end
         end
       end

data/lib/graphql/fragment_cache/graphql_ruby_version.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+using RubyNext
+
+module GraphQL
+  module FragmentCache
+    module GraphRubyVersion
+      module_function
+
+      def before_2_0?
+        check_graphql_version "< 2.0.0"
+      end
+
+      def after_2_0_13?
+        check_graphql_version "> 2.0.13"
+      end
+
+      def before_2_1_4?
+        check_graphql_version "< 2.1.4"
+      end
+
+      def after_2_2_5?
+        check_graphql_version "> 2.2.5"
+      end
+
+      def check_graphql_version(predicate)
+        Gem::Dependency.new("graphql", predicate).match?("graphql", GraphQL::VERSION)
+      end
+    end
+  end
+end

data/lib/graphql/fragment_cache/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module FragmentCache
-    VERSION = "1.19.0"
+    VERSION = "1.20.1"
   end
 end

data/lib/graphql/fragment_cache.rb

@@ -2,6 +2,8 @@
 
 require "graphql"
 
+require "graphql/fragment_cache/graphql_ruby_version"
+
 require "graphql/fragment_cache/ext/context_fragments"
 require "graphql/fragment_cache/ext/graphql_cache_key"
 require "graphql/fragment_cache/object"
@@ -31,8 +33,14 @@ module GraphQL
       def use(schema_defn, options = {})
         verify_interpreter_and_analysis!(schema_defn)
 
-        schema_defn.tracer(Schema::Tracer)
-        schema_defn.instrument(:query, Schema::Instrumentation)
+        if GraphRubyVersion.after_2_2_5?
+          schema_defn.trace_with(GraphQL::Tracing::LegacyHooksTrace)
+          schema_defn.instance_exec { own_instrumenters[:query] << Schema::Instrumentation }
+        else
+          schema_defn.tracer(Schema::Tracer)
+          schema_defn.instrument(:query, Schema::Instrumentation)
+        end
+
         schema_defn.extend(Schema::Patch)
         schema_defn.lazy_resolve(Schema::LazyCacheResolver, :resolve)
 
@@ -57,18 +65,6 @@ module GraphQL
 
       alias_method :skip_cache_when_query_has_errors?, :skip_cache_when_query_has_errors
 
-      def graphql_ruby_before_2_0?
-        check_graphql_version "< 2.0.0"
-      end
-
-      def graphql_ruby_after_2_0_13?
-        check_graphql_version "> 2.0.13"
-      end
-
-      def graphql_ruby_before_2_1_4?
-        check_graphql_version "< 2.1.4"
-      end
-
       private
 
       def check_graphql_version(predicate)
@@ -76,7 +72,7 @@ module GraphQL
       end
 
       def verify_interpreter_and_analysis!(schema_defn)
-        if graphql_ruby_before_2_0?
+        if GraphRubyVersion.before_2_0?
           unless schema_defn.interpreter?
             raise StandardError,
               "GraphQL::Execution::Interpreter should be enabled for fragment caching"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-fragment_cache
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 1.20.1
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2024-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.9
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: graphql-batch
   requirement: !ruby/object:Gem::Requirement
@@ -168,16 +168,16 @@ dependencies:
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.2.1
+        version: '0'
 description: Fragment cache for graphql-ruby
 email:
 - dmitry.a.tsepelev@gmail.com
@@ -192,6 +192,7 @@ files:
 - bin/setup
 - lib/.rbnext/2.3/graphql/fragment_cache/cache_key_builder.rb
 - lib/.rbnext/2.3/graphql/fragment_cache/memory_store.rb
+- lib/.rbnext/2.5/graphql/fragment_cache/cacher.rb
 - lib/.rbnext/2.7/graphql/fragment_cache/cache_key_builder.rb
 - lib/.rbnext/2.7/graphql/fragment_cache/ext/graphql_cache_key.rb
 - lib/graphql-fragment_cache.rb
@@ -203,6 +204,7 @@ files:
 - lib/graphql/fragment_cache/ext/graphql_cache_key.rb
 - lib/graphql/fragment_cache/field_extension.rb
 - lib/graphql/fragment_cache/fragment.rb
+- lib/graphql/fragment_cache/graphql_ruby_version.rb
 - lib/graphql/fragment_cache/memory_store.rb
 - lib/graphql/fragment_cache/object.rb
 - lib/graphql/fragment_cache/object_helpers.rb
@@ -228,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="