graphql-fragment_cache 1.13.1 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fe4856af12987ff49d92ed9551c46cb64634d48a0112c323436e953ec55990a
-  data.tar.gz: 0d69c3d4096474724b0ec6b409bb5ecdbbcda5b81f20e5ae035e1ae1c77f18ce
+  metadata.gz: 44be1de2fded16cfd021afebe96ce647616225fdbe5de8b140099d2c1bb16f94
+  data.tar.gz: 94fb9a82b527c9786d81fed29e821416038c0b20a63f33fe765fc76abf0a9c24
 SHA512:
-  metadata.gz: 19f8d2bb9bc21a2bb0b79244e230fbede1b19e60beeadee2d0e7197b4a531d044bc5ca85120300c70a7ef2892e125a2a89b820e86a6aad14c5bd7e4fc572ebbf
-  data.tar.gz: 136ba3362d1c7fddad10dac6c27f4f3b95b624d0c14dedef3cd28afa63a61330a5d4f95b92a2aeed47b70dfbfb5bf7690cc0f9695561d56a1e34d0fd2ebfd691
+  metadata.gz: c10be9f09dcddd09f175452f86071330fe3cb72e9d5875169e20c000372a88ec44e9c9830154e5d2016af177e55852ccf3ae2594e5069e939be4ab0a43676a24
+  data.tar.gz: 5ded87b46c9757d28ac95028d16f2e2e71c3ed3d5252285898cc033dff835e61bff6aa7777633b8798eed6fb9dcecacf78d0e0623f1952f74139be8b66a9beee

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+## 1.14.0 (2022-10-26)
+
+- [PR#85](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/85) Support passing Symbols to `if:` and `unless:` ([@palkan][])
+
+- [PR#85](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/85) Fix conditional caching ([@palkan][])
+
 ## 1.13.1 (2022-10-12)
 
 - [PR#84](https://github.com/DmitryTsepelev/graphql-ruby-fragment_cache/pull/84) Fix Renew Cache Read Multi Bug ([@KTSCode][])

data/README.md

@@ -300,6 +300,12 @@ end
 field :post, PostType, cache_fragment: {if: -> { current_user.nil? }} do
   argument :id, ID, required: true
 end
+
+# or
+
+field :post, PostType, cache_fragment: {if: :current_user?} do
+  argument :id, ID, required: true
+end
 ```
 
 ## Default options

data/lib/graphql/fragment_cache/field_extension.rb

@@ -35,6 +35,12 @@ module GraphQL
 
         @context_key = @cache_options.delete(:context_key)
         @cache_key = @cache_options.delete(:cache_key)
+
+        @if = @cache_options.delete(:if)
+        @unless = @cache_options.delete(:unless)
+
+        # Make sure we do not modify options, since they're global
+        @cache_options.freeze
       end
 
       NOT_RESOLVED = Object.new
@@ -42,11 +48,20 @@ module GraphQL
       def resolve(object:, arguments:, **_options)
         resolved_value = NOT_RESOLVED
 
-        if @cache_options[:if].is_a?(Proc)
-          @cache_options[:if] = object.instance_exec(&@cache_options[:if])
+        if @if.is_a?(Proc) && !object.instance_exec(&@if)
+          return yield(object, arguments)
+        end
+
+        if @if.is_a?(Symbol) && !object.send(@if)
+          return yield(object, arguments)
         end
-        if @cache_options[:unless].is_a?(Proc)
-          @cache_options[:unless] = object.instance_exec(&@cache_options[:unless])
+
+        if @unless.is_a?(Proc) && object.instance_exec(&@unless)
+          return yield(object, arguments)
+        end
+
+        if @unless.is_a?(Symbol) && object.send(@unless)
+          return yield(object, arguments)
         end
 
         object_for_key = if @context_key
@@ -56,6 +71,7 @@ module GraphQL
         elsif @cache_key == :value
           resolved_value = yield(object, arguments)
         end
+
         cache_fragment_options = @cache_options.merge(object: object_for_key)
 
         object.cache_fragment(**cache_fragment_options) do

data/lib/graphql/fragment_cache/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   module FragmentCache
-    VERSION = "1.13.1"
+    VERSION = "1.14.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-fragment_cache
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.14.0
 platform: ruby
 authors:
 - DmitryTsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2022-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql