wrappi 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13686ad4035cddda1cbf1ef0c76cd1d67d221900dd2bcf929e41daff2f81b1dd
-  data.tar.gz: 4d313c68d7d3c401ce78d0dbd5a8c088f6818767d7e6807a8620f3e0f2acf751
+  metadata.gz: 6b03e938b92d159fc98e69873c1c1ca4a5a26ddd9c44867109311421100d981b
+  data.tar.gz: e6aa982e2956cbaef78d4e25db2a341ada0d28a4cdbce08bf5e5d661ffa9be29
 SHA512:
-  metadata.gz: 7a1a0fc2bbff8c668f246b15562bff9c33d098b22f2cd4b12a5342425f8242bf6fb5a2aeb2578e1a1c283b05340a83aab942fd5b9fea2b208d3572c24f03da9e
-  data.tar.gz: e4f5f5490059cb6fa8469c44583271186445273d46ca9cc77d139f90b38feefade82cc2617b6eb8a1d7ee17b15b3605ad3c7db472e472cdc759c7b1389f4b2de
+  metadata.gz: edd52700c58b67a461c8d7652ebd01d4d471feff4e6bbba873c0cba9e4b6f485b4b55b2e1638f5ed5ea9ead082248bdb8ff8f542e76411d62a9831fd22fb62fe
+  data.tar.gz: 396cd19b742ad2d2df71629afb01ab5796607dd999606701e9bb36830cd4b17fe3d636692350ae916953c610de5ca5f15782879e7ea5ace9910f79195231af89

data/README.md

@@ -266,7 +266,7 @@ end
 | follow_redirects | Boolean `or` block -> Boolean              | true                    |          |
 | body_type        | Symbol, one of: :json,:form,:body          | :json                   |          |
 | cache            | Boolean `or` block -> Boolean              | proc { options[:cache] }|          |
-| cache_options    | Hash `or` block -> Hash                    |                         |          |
+| cache_options    | block -> Hash                              |                         |          |
 | retry_if         | block                                      |                         |          |
 | retry_options    | Hash `or` block -> Hash                    |                         |          |
 | around_request   | block                                      |                         |          |
@@ -484,16 +484,17 @@ It holds the common configuration for all the endpoints (`Wrappi::Endpoint`).
     default: `proc { options[:cache] }`
   - __cache_options:__ Options for the `cache` to receive on `write`
    ```ruby
-     cache_options expires_in: 12, another_opt: true
+     cache_options do
+       { expires_in: 12, another_opt: true }
+     end
    ```
 
    default: `{}`
   - __retry_if:__ Block to evaluate if request has to be retried. In the block are
-    yielded `Response` and `Endpoint` instances. If the block returns `true` the request will be retried.
+    yielded `Response` instance. If the block returns `true` the request will be retried.
     ```ruby
-      retry_if do |response, endpoint|
-        endpoint.class #=> MyEndpoint
-        response.error? # => true or false
+      retry_if do |response|
+        response.status != 200 # => true or false
       end
     ```
 

data/lib/wrappi/endpoint.rb

@@ -3,7 +3,7 @@ module Wrappi
   class Endpoint < Miller.base(
     :verb, :client, :path, :default_params,
     :headers, :follow_redirects, :basic_auth,
-    :body_type, :retry_options, :cache, :cache_options,
+    :body_type, :retry_options, :cache, #:cache_options,
     :async_callback,
     default_config: {
       verb: :get,
@@ -14,7 +14,7 @@ module Wrappi
       follow_redirects: true,
       body_type: :json,
       cache: proc { options[:cache] },
-      cache_options: {},
+      # cache_options: {},
       async_callback: proc {},
       basic_auth: proc { client.basic_auth }
     }
@@ -73,6 +73,10 @@ module Wrappi
       @retry_if = block
     end
 
+    def self.cache_options(&block)
+      @cache_options = block
+    end
+
     def perform_async_callback(async_options = {})
       instance_exec(async_options, &async_callback)
     end
@@ -89,6 +93,9 @@ module Wrappi
     def retry_if
       self.class.instance_variable_get(:@retry_if)
     end
+    def cache_options
+      self.class.instance_variable_get(:@cache_options)
+    end
 
     private
 

data/lib/wrappi/executer/cacher.rb

@@ -10,7 +10,7 @@ module Wrappi
         cached = cache.read(cache_key)
         return CachedResponse.new(cached) if cached
         response = yield
-        cache.write(cache_key, response.to_h, cache_options) if response.success?
+        cache.write(cache_key, response.to_h, cache_options(response)) if response.success?
         response
       end
 
@@ -27,8 +27,8 @@ module Wrappi
         end
       end
 
-      def cache_options
-        endpoint.cache_options
+      def cache_options(response)
+        endpoint.cache_options ? endpoint.cache_options.call(response) : {}
       end
 
       def cache

data/lib/wrappi/version.rb

@@ -1,3 +1,3 @@
 module Wrappi
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wrappi
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Artur Pañach
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler