graphql-fragment_cache 1.18.2 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 215c608d8efe694c8ef1a29d9b28017a1d3761e1e94ccd6fc4e0537bda1b8147
-  data.tar.gz: 6e6e3844588d2609800fdb1457497274ab2d3ef7f8a451453f7de80392b6035c
+  metadata.gz: d8651322b53be7ad271913264155cb392c3ee945651806765f2a83545c3653dc
+  data.tar.gz: d80ec3c3e8cea7c27cb595582374e324c4b43571b3f459616d03036cc4411293
 SHA512:
-  metadata.gz: fb42ddae446779eba82de1b482d244e657bfbde228319c89efe37d3a3a97b0cea77235e3211ca2d82fc885b4f06ffc2933136f739dfe50a6ff3d128d11c8ed16
-  data.tar.gz: 85bb1ae8bc9707567757a20fb57bf6824c75b245f79db88fefb8c63e3e3c4fd37f2bbd3cb80c98a394e88f4fb3c13f90f78c27a9db06f02cb65091f5163d2a7e
+  metadata.gz: e846bc977828d95548c7e763a7eddb75de0e45a0d6cf950dc14973e10aae7df442fb31086874d06faecc01d16176abbb3e67f06a6c3082e53cea333b649d0685
+  data.tar.gz: 1fa660ff60d1d04b2750e15b0aca8c884a94f5c73e7a079584c2ba76272321c909af3fabb38badbe4d70c7280cc2e5cb2e4fbf70b917b69c0293c4dbbe2045ac

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## master
 
+## 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][])
+
 ## 1.18.2 (2023-02-21)
 
 - [PR#100](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/100) Fix an error when `path_cache_key` is nil ([@rince][])
@@ -177,3 +185,4 @@
 [@frostmark]: https://github.com/frostmark
 [@KTSCode]: https://github.com/KTSCode
 [@rince]: https://github.com/rince
+[@camero2734]: https://github.com/camero2734

data/README.md

@@ -469,7 +469,7 @@ def cached_author_inside_batch
 end
 ```
 
-2. Caching does not work for Union types, because of the `Lookahead` implementation: it requires the exact type to be passed to the `selection` method (you can find the [discussion](https://github.com/rmosolgo/graphql-ruby/pull/3007) here). This method is used for cache key building, and I haven't found a workaround yet ([PR in progress](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/30)). If you get `Failed to look ahead the field` error — please pass `query_cache_key` explicitly:
+2. Caching does not work for Union types, because of the `Lookahead` implementation: it requires the exact type to be passed to the `selection` method (you can find the [discussion](https://github.com/rmosolgo/graphql-ruby/pull/3007) here). This method is used for cache key building, and I haven't found a workaround yet ([PR in progress](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/30)). If you get `Failed to look ahead the field` error — please pass `path_cache_key` explicitly:
 
 ```ruby
 field :cached_avatar_url, String, null: false

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

@@ -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/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module FragmentCache
-    VERSION = "1.18.2"
+    VERSION = "1.20.0"
   end
 end

data/lib/graphql/fragment_cache.rb

@@ -32,7 +32,14 @@ module GraphQL
         verify_interpreter_and_analysis!(schema_defn)
 
         schema_defn.tracer(Schema::Tracer)
-        schema_defn.instrument(:query, Schema::Instrumentation)
+
+        if graphql_ruby_after_2_2_5?
+          schema_defn.trace_with(GraphQL::Tracing::LegacyHooksTrace)
+          schema_defn.instance_exec { own_instrumenters[:query] << Schema::Instrumentation }
+        else
+          schema_defn.instrument(:query, Schema::Instrumentation)
+        end
+
         schema_defn.extend(Schema::Patch)
         schema_defn.lazy_resolve(Schema::LazyCacheResolver, :resolve)
 
@@ -65,6 +72,14 @@ module GraphQL
         check_graphql_version "> 2.0.13"
       end
 
+      def graphql_ruby_before_2_1_4?
+        check_graphql_version "< 2.1.4"
+      end
+
+      def graphql_ruby_after_2_2_5?
+        check_graphql_version "> 2.2.5"
+      end
+
       private
 
       def check_graphql_version(predicate)
@@ -78,7 +93,6 @@ module GraphQL
               "GraphQL::Execution::Interpreter should be enabled for fragment caching"
           end
 
-          puts "schema_defn.analysis_engine #{schema_defn.analysis_engine}"
           unless schema_defn.analysis_engine == GraphQL::Analysis::AST
             raise StandardError,
               "GraphQL::Analysis::AST 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.18.2
+  version: 1.20.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2024-03-02 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
@@ -228,7 +229,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:
   - - ">="