graphql-fragment_cache 1.16.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bcaf1bb938f830b5ae34b7b034e2ccbf8ce139e5da10db08e8ca52b658c0ed3
-  data.tar.gz: 5842f5166dc9cf69a276b3dee9836a43b757485ffe46f54031ce42341dfe797a
+  metadata.gz: 4e48196795d709c0be05c78989abeb3cd3f185f6d0545d4fe3719861dabb4456
+  data.tar.gz: e9efc489b2e3dd907e16db7c63930d8d7251096287c369122401221a97890946
 SHA512:
-  metadata.gz: e218c2d46cb5cc545d0374c86c64f46380b82a4c31dd67d0dcb06890e23c4156ed16cef838d3965ae54283e28ea7ba155d965920dbc1c9a722a64fff7c174b69
-  data.tar.gz: caa35cd10a7c657b838088b0ffd449b981ee3565483691619af1c839a184febccacf19620c31bfee26f434929218e2ecd4478a6edbca7bf97ae3a68245bbe316
+  metadata.gz: 3ef9f0b47cf0c465c692d7624db882b99e746be3412345d2ce5e2b77a8c6754323fe7c784eea345b1a7b91cf07b0c2bec4fc737299f0c97fa3dce5fb5bde0797
+  data.tar.gz: e7024e141fd80a08d30eea830812297b82737c2204c024c4375aacdaff4524baebc44c62506a3df62b947142e57463d0adf714c1f4ff1b4b3ec4d58dee785a5a

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## master
 
+## 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][])
+
 ## 1.16.0 (2022-11-06)
 
 - [PR#42](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/42) Raise helpful errors when write or write_multi fails  ([@DmitryTsepelev][])

data/README.md

@@ -1,4 +1,4 @@
-# GraphQL::FragmentCache ![CI](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/workflows/CI/badge.svg?branch=master)
+# GraphQL::FragmentCache ![CI](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/actions/workflows/rspec.yml/badge.svg?branch=master) ![](https://ruby-gem-downloads-badge.herokuapp.com/graphql-fragment_cache?type=total)
 
 `GraphQL::FragmentCache` powers up [graphql-ruby](https://graphql-ruby.org) with the ability to cache response _fragments_: you can mark any field as cached and it will never be resolved again (at least, while cache is valid). For instance, the following code caches `title` for each post:
 
@@ -9,12 +9,6 @@ class PostType < BaseObject
 end
 ```
 
-<p align="center">
-  <a href="https://evilmartians.com/?utm_source=graphql-ruby-fragment_cache">
-    <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54">
-  </a>
-</p>
-
 ## Getting started
 
 Add the gem to your Gemfile `gem 'graphql-fragment_cache'` and add the plugin to your schema class:
@@ -489,6 +483,8 @@ end
 
 Based on the original [gist](https://gist.github.com/palkan/faad9f6ff1db16fcdb1c071ec50e4190) by [@palkan](https://github.com/palkan) and [@ssnickolay](https://github.com/ssnickolay).
 
+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-fragment_cache](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache).

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
@@ -137,11 +137,17 @@ module GraphQL
       end
 
       def build
-        [
+        key_parts = [
           GraphQL::FragmentCache.namespace,
+          simple_path_cache_key,
           implicit_cache_key,
           object_cache_key
-        ].compact.join("/")
+        ]
+
+        key_parts
+          .compact
+          .map { |key_part| key_part.tr("/", "-") }
+          .join("/")
       end
 
       private
@@ -170,8 +176,12 @@ module GraphQL
         current_root.selections.to_selections_key
       end
 
+      def simple_path_cache_key
+        path_cache_key.split("(").first
+      end
+
       def path_cache_key
-        @options.fetch(:path_cache_key) do
+        @path_cache_key ||= @options.fetch(:path_cache_key) do
           lookahead = query.lookahead
 
           path.map { |field_name|

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
@@ -137,11 +137,17 @@ module GraphQL
       end
 
       def build
-        [
+        key_parts = [
           GraphQL::FragmentCache.namespace,
+          simple_path_cache_key,
           implicit_cache_key,
           object_cache_key
-        ].compact.join("/")
+        ]
+
+        key_parts
+          .compact
+          .map { |key_part| key_part.tr("/", "-") }
+          .join("/")
       end
 
       private
@@ -170,8 +176,12 @@ module GraphQL
         current_root.selections.to_selections_key
       end
 
+      def simple_path_cache_key
+        path_cache_key.split("(").first
+      end
+
       def path_cache_key
-        @options.fetch(:path_cache_key) do
+        @path_cache_key ||= @options.fetch(:path_cache_key) do
           lookahead = query.lookahead
 
           path.map { |field_name|

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
@@ -137,11 +137,17 @@ module GraphQL
       end
 
       def build
-        [
+        key_parts = [
           GraphQL::FragmentCache.namespace,
+          simple_path_cache_key,
           implicit_cache_key,
           object_cache_key
-        ].compact.join("/")
+        ]
+
+        key_parts
+          .compact
+          .map { |key_part| key_part.tr("/", "-") }
+          .join("/")
       end
 
       private
@@ -170,8 +176,12 @@ module GraphQL
         current_root.selections.to_selections_key
       end
 
+      def simple_path_cache_key
+        path_cache_key.split("(").first
+      end
+
       def path_cache_key
-        @options.fetch(:path_cache_key) do
+        @path_cache_key ||= @options.fetch(:path_cache_key) do
           lookahead = query.lookahead
 
           path.map { |field_name|

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.16.0"
+    VERSION = "1.18.0"
   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.16.0
+  version: 1.18.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-06 00:00:00.000000000 Z
+date: 2022-12-28 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