graphql-fragment_cache 1.17.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2c544bc2742643748c5e36c59b3414def73c22e6f7c4b5080504751ea564ecd
-  data.tar.gz: b61980525863502ea4f30eeb96fee11dbc11a906ab98b863ed0ece7f9d97d1e9
+  metadata.gz: da685d54588830a63cc96b79d9348f496c3d9e114b8bbd39353d89bbf734a2be
+  data.tar.gz: e97d85a3bb1b1ef33b50f9b784f14d5cf0662a220cb46b3e0195422775ca230a
 SHA512:
-  metadata.gz: aac16bb6d2541e573796043ebf2da2ffa171918730ad95f4613db1f6b20cb1156a4a1cb3d70b7e0c39be57a6d56d2cfd3a27d95470c0c316f8f95a756bf83377
-  data.tar.gz: 85349b218d754a716db3aa8165e8de64a92b48c22e4b4b1615e612d041000701a090c643fa6b6e68326bb51a3688df2eb71f84604a1bfd19034eb01201453b26
+  metadata.gz: 435e71e009c537926c19b2089815b8633a91f0f30caf49fbc45c71d227ff9923867a52c01ed9a0e0e8eff4c51bfa7887371af5ce51281c74bc0be7fcd9566f82
+  data.tar.gz: 87eadfeba581e7ad08a492ae9c82c6a40406def445b1284943dfa55c320426d7135401761561e3fd7ad1c7c99a987b0a52ec1fc6c5c3a229b8ce5ee5a77e3bc6

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## master
 
+## 1.18.1 (2023-01-06)
+
+- [PR#96](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/96) Properly pass arguments to `write_multi` ([@DmitryTsepelev][])
+
+## 1.18.0 (2022-12-28)
+
+- [PR#94](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/94) Ruby 3 support ([@DmitryTsepelev][])
+
 ## 1.17.0 (2022-11-09)
 
 - [PR#92](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/92) Make cache keys human-readable ([@jeromedalbert][])

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

@@ -128,7 +128,7 @@ module GraphQL
 
       attr_reader :query, :path, :object, :schema
 
-      def initialize(object: nil, query:, path:, **options)
+      def initialize(query:, path:, object: nil, **options)
         @object = object
         @query = query
         @schema = query.schema
@@ -181,23 +181,21 @@ module GraphQL
       end
 
       def path_cache_key
-        @path_cache_key ||= begin
-          @options.fetch(:path_cache_key) do
-            lookahead = query.lookahead
+        @path_cache_key ||= @options.fetch(:path_cache_key) do
+          lookahead = query.lookahead
 
-            path.map { |field_name|
-              # Handle cached fields inside collections:
-              next field_name if field_name.is_a?(Integer)
+          path.map { |field_name|
+            # Handle cached fields inside collections:
+            next field_name if field_name.is_a?(Integer)
 
-              lookahead = lookahead.selection_with_alias(field_name)
-              raise "Failed to look ahead the field: #{field_name}" if lookahead.is_a?(::GraphQL::Execution::Lookahead::NullLookahead)
+            lookahead = lookahead.selection_with_alias(field_name)
+            raise "Failed to look ahead the field: #{field_name}" if lookahead.is_a?(::GraphQL::Execution::Lookahead::NullLookahead)
 
-              next lookahead.field.name if lookahead.arguments.empty?
+            next lookahead.field.name if lookahead.arguments.empty?
 
-              args = lookahead.arguments.map { |_1, _2| "#{_1}:#{traverse_argument(_2)}" }.sort.join(",")
-              "#{lookahead.field.name}(#{args})"
-            }.join("/")
-          end
+            args = lookahead.arguments.map { |_1, _2| "#{_1}:#{traverse_argument(_2)}" }.sort.join(",")
+            "#{lookahead.field.name}(#{args})"
+          }.join("/")
         end
       end
 

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

@@ -42,7 +42,8 @@ module GraphQL
 end
       end
 
-      def write(key, value, expires_in: default_expires_in, **options)
+      def write(key, value, options = {})
+        expires_in = options[:expires_in] || default_expires_in
         key = key.to_s
         @storage[key] = Entry.new(value: value, expires_at: expires_in ? Time.now + expires_in : nil)
       end

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

@@ -128,7 +128,7 @@ module GraphQL
 
       attr_reader :query, :path, :object, :schema
 
-      def initialize(object: nil, query:, path:, **options)
+      def initialize(query:, path:, object: nil, **options)
         @object = object
         @query = query
         @schema = query.schema
@@ -181,23 +181,21 @@ module GraphQL
       end
 
       def path_cache_key
-        @path_cache_key ||= begin
-          @options.fetch(:path_cache_key) do
-            lookahead = query.lookahead
+        @path_cache_key ||= @options.fetch(:path_cache_key) do
+          lookahead = query.lookahead
 
-            path.map { |field_name|
-              # Handle cached fields inside collections:
-              next field_name if field_name.is_a?(Integer)
+          path.map { |field_name|
+            # Handle cached fields inside collections:
+            next field_name if field_name.is_a?(Integer)
 
-              lookahead = lookahead.selection_with_alias(field_name)
-              raise "Failed to look ahead the field: #{field_name}" if lookahead.is_a?(::GraphQL::Execution::Lookahead::NullLookahead)
+            lookahead = lookahead.selection_with_alias(field_name)
+            raise "Failed to look ahead the field: #{field_name}" if lookahead.is_a?(::GraphQL::Execution::Lookahead::NullLookahead)
 
-              next lookahead.field.name if lookahead.arguments.empty?
+            next lookahead.field.name if lookahead.arguments.empty?
 
-              args = lookahead.arguments.map { |_1, _2| "#{_1}:#{traverse_argument(_2)}" }.sort.join(",")
-              "#{lookahead.field.name}(#{args})"
-            }.join("/")
-          end
+            args = lookahead.arguments.map { |_1, _2| "#{_1}:#{traverse_argument(_2)}" }.sort.join(",")
+            "#{lookahead.field.name}(#{args})"
+          }.join("/")
         end
       end
 

data/lib/graphql/fragment_cache/cache_key_builder.rb

@@ -128,7 +128,7 @@ module GraphQL
 
       attr_reader :query, :path, :object, :schema
 
-      def initialize(object: nil, query:, path:, **options)
+      def initialize(query:, path:, object: nil, **options)
         @object = object
         @query = query
         @schema = query.schema
@@ -181,23 +181,21 @@ module GraphQL
       end
 
       def path_cache_key
-        @path_cache_key ||= begin
-          @options.fetch(:path_cache_key) do
-            lookahead = query.lookahead
+        @path_cache_key ||= @options.fetch(:path_cache_key) do
+          lookahead = query.lookahead
 
-            path.map { |field_name|
-              # Handle cached fields inside collections:
-              next field_name if field_name.is_a?(Integer)
+          path.map { |field_name|
+            # Handle cached fields inside collections:
+            next field_name if field_name.is_a?(Integer)
 
-              lookahead = lookahead.selection_with_alias(field_name)
-              raise "Failed to look ahead the field: #{field_name}" if lookahead.is_a?(::GraphQL::Execution::Lookahead::NullLookahead)
+            lookahead = lookahead.selection_with_alias(field_name)
+            raise "Failed to look ahead the field: #{field_name}" if lookahead.is_a?(::GraphQL::Execution::Lookahead::NullLookahead)
 
-              next lookahead.field.name if lookahead.arguments.empty?
+            next lookahead.field.name if lookahead.arguments.empty?
 
-              args = lookahead.arguments.map { "#{_1}:#{traverse_argument(_2)}" }.sort.join(",")
-              "#{lookahead.field.name}(#{args})"
-            }.join("/")
-          end
+            args = lookahead.arguments.map { "#{_1}:#{traverse_argument(_2)}" }.sort.join(",")
+            "#{lookahead.field.name}(#{args})"
+          }.join("/")
         end
       end
 

data/lib/graphql/fragment_cache/cacher.rb

@@ -47,7 +47,7 @@ module GraphQL
             hash = group.map { |fragment| [fragment.cache_key, fragment.value] }.to_h
 
             begin
-              FragmentCache.cache_store.write_multi(hash, **options)
+              FragmentCache.cache_store.write_multi(hash, options)
             rescue => e
               raise WriteMultiError.new(e, hash)
             end
@@ -56,9 +56,9 @@ module GraphQL
 
         def persist(query)
           select_valid_fragments(query).each do |fragment|
-            FragmentCache.cache_store.write(fragment.cache_key, fragment.value, **fragment.options)
+            FragmentCache.cache_store.write(fragment.cache_key, fragment.value, fragment.options)
           rescue => e
-            raise WriteError.new(e, fragment.cache_key, fragment.value)
+            raise WriteError.new(e, fragment.cache_key, fragment.value), e
           end
         end
 

data/lib/graphql/fragment_cache/field_extension.rb

@@ -77,7 +77,7 @@ module GraphQL
         cache_fragment_options = @cache_options.merge(object: object_for_key)
 
         object.cache_fragment(**cache_fragment_options) do
-          resolved_value == NOT_RESOLVED ? yield(object, arguments) : resolved_value
+          (resolved_value == NOT_RESOLVED) ? yield(object, arguments) : resolved_value
         end
       end
     end

data/lib/graphql/fragment_cache/memory_store.rb

@@ -42,7 +42,8 @@ module GraphQL
         end
       end
 
-      def write(key, value, expires_in: default_expires_in, **options)
+      def write(key, value, options = {})
+        expires_in = options[:expires_in] || default_expires_in
         key = key.to_s
         @storage[key] = Entry.new(value: value, expires_at: expires_in ? Time.now + expires_in : nil)
       end

data/lib/graphql/fragment_cache/object_helpers.rb

@@ -24,9 +24,9 @@ module GraphQL
       NO_OBJECT = Object.new
 
       def cache_fragment(object_to_cache = NO_OBJECT, **options, &block)
-        raise ArgumentError, "Block or argument must be provided" unless block_given? || object_to_cache != NO_OBJECT
+        raise ArgumentError, "Block or argument must be provided" unless block || object_to_cache != NO_OBJECT
         unless GraphQL::FragmentCache.enabled
-          return block_given? ? block.call : object_to_cache
+          return block ? block.call : object_to_cache
         end
 
         unless options.delete(:default_options_merged)
@@ -36,7 +36,7 @@ module GraphQL
         if options.key?(:if) || options.key?(:unless)
           disabled = options.key?(:if) ? !options.delete(:if) : options.delete(:unless)
           if disabled
-            return block_given? ? block.call : object_to_cache
+            return block ? block.call : object_to_cache
           end
         end
 

data/lib/graphql/fragment_cache/schema/lazy_cache_resolver.rb

@@ -28,7 +28,7 @@ module GraphQL
           cached = @lazy_state[:resolved_fragments][@fragment]
 
           if cached
-            return cached == Fragment::NIL_IN_CACHE ? nil : GraphQL::Execution::Interpreter::RawValue.new(cached)
+            return (cached == Fragment::NIL_IN_CACHE) ? nil : GraphQL::Execution::Interpreter::RawValue.new(cached)
           end
 
           (@block ? @block.call : @object_to_cache).tap do |resolved_value|

data/lib/graphql/fragment_cache/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module FragmentCache
-    VERSION = "1.17.0"
+    VERSION = "1.18.1"
   end
 end

data/lib/graphql/fragment_cache.rb

@@ -55,7 +55,7 @@ module GraphQL
         @cache_store = store
       end
 
-      alias skip_cache_when_query_has_errors? skip_cache_when_query_has_errors
+      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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-fragment_cache
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.1
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2.0
+        version: 3.1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2.0
+        version: 3.1.2.1
 description: Fragment cache for graphql-ruby
 email:
 - dmitry.a.tsepelev@gmail.com
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Fragment cache for graphql-ruby