graphql-cache 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d20a6abf5bff1dee85af2a7fe01ca15513e4553f87f255f4c4cea9f1166bfeaa
-  data.tar.gz: 55c93f0e7fcf6f072dbd8728bddffe082fb006863786cba6d1c8cdb47a0abd75
+  metadata.gz: e2adeaaafa2b7714c4300a996c5ae17581269dec775277ef4f8b9ddcd90be16b
+  data.tar.gz: aebe2b614ab273b0e49fd7d2e5b997036196e69abd4a0db85a17db7715a084bc
 SHA512:
-  metadata.gz: 8f586d9f2b11cf724fbf4df6f5af9a2b839a4a527029a3c67b4786da7fe30acc45d0f0889657e4df7b38e5c21b792459c56a82fcf09dc6e2d39972ea1a117a65
-  data.tar.gz: '0669f17df94d9ecef5d14db5821c927f4747c826e87b737730e83653b2925df2834a3075d7cc635420179fe2daa493af38772744c05bbb06b7ac206132f58788'
+  metadata.gz: 5f57bcda1e5ae7db5cacacfde797f353b86abf1feaaf7b87a47315a0b945b32969d415ac9ab39eef837c3011f46921d7f3c48534d56741964da5ba599c244086
+  data.tar.gz: 9f9d0afb64baba52c851c1cfaab7142d9419abba765137187ac3853dbf48962214d093a83c73487fa225d99a849ddc1d12ca2612bb99ef4bcbbc67459cd5f5f8

data/.travis.yml

@@ -3,10 +3,10 @@ language: ruby
 rvm:
   - 2.5.0
 before_script:
+  - gem install bundler
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
-  - gem install bundler -v 1.16.1
 script: bundle exec rspec
 after_script:
   - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql-cache (0.2.0)
+    graphql-cache (0.2.1)
       graphql (~> 1.8.0.pre10)
 
 GEM
@@ -12,7 +12,7 @@ GEM
     coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.0)
-    graphql (1.8.0.pre11)
+    graphql (1.8.0)
     json (2.1.0)
     method_source (0.9.0)
     pry (0.11.3)

data/lib/graphql/cache/field.rb

@@ -2,6 +2,8 @@ require 'graphql'
 
 module GraphQL
   module Cache
+    # Custom field class implementation to allow for
+    # cache config keyword parameters
     class Field < ::GraphQL::Schema::Field
       # Override #initialize to take a new argument:
       def initialize(
@@ -10,11 +12,7 @@ module GraphQL
         **kwargs,
         &block
       )
-        @cache_config = if cache.is_a? Hash
-                          cache
-                        else
-                          { cache: cache }
-                        end
+        @cache_config = cache
         super(*args, **kwargs, &block)
       end
 

data/lib/graphql/cache/marshal.rb

@@ -30,14 +30,22 @@ module GraphQL
 
       def write(config)
         resolved = yield
-        expiry = config[:metadata][:expiry] || GraphQL::Cache.expiry
-
         document = Builder[resolved].deconstruct
 
-        cache.write(key, document, expires_in: expiry)
+        cache.write(key, document, expires_in: expiry(config))
         resolved
       end
 
+      def expiry(config)
+        cache_config = config[:metadata][:cache]
+
+        if cache_config.is_a?(Hash) && cache_config[:expiry]
+          config[:metadata][:cache][:expiry]
+        else
+          GraphQL::Cache.expiry
+        end
+      end
+
       def build(cached, config)
         Builder[cached].build(config)
       end

data/lib/graphql/cache/middleware.rb

@@ -39,7 +39,7 @@ module GraphQL
       def metadata_hash
         {
           metadata: {
-            cache: field_definition.metadata[:cache] || {}
+            cache: field_definition.metadata[:cache]
           }
         }
       end

data/lib/graphql/cache/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module Cache
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-cache
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Michael Kelly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler