whiplash-app 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29188ceeacb00228aee15d9f56ab151aac8b491c43b05463d25e648114fbb8ac
-  data.tar.gz: 93b8d38a3809d3e30d570f4acfe1ad3007f3754273d2ae1cf7299f3f4ce0f113
+  metadata.gz: af0e2584ec8d271d28ae6e773358050f539cc0a49f260507900cdfd2f9cb8d37
+  data.tar.gz: c56bd7ecbc582ebf360a71f142098b1043975c65cc54254469a80aa308d656c4
 SHA512:
-  metadata.gz: 8a952642f993be0711907cbef3567362f7eb55026c43f22a2d0a1a83e40c24742d5f26db1e9ab0ca36ad7ca8479c9b04e3dc5b930cc8eebfa97b09a7d9e834ca
-  data.tar.gz: a2e597b3658c0cdfec8727e44f91a5b6050871ab62d876f59fddcfb8c9412aba62bd0ecac8a4d300ffc5a85002553e746234cde7b70bbdf29c656655fff43a87
+  metadata.gz: d937fbb0f4e06b25efee934edef18e7a791a67b3c24a12a07b6757253458b0a9d35acde7ecc9f7de78f2ffa86a3650ace8c595d1ad15e5557e35ff23b23534eb
+  data.tar.gz: 345f2b474912b83daa0f6c8e0ee11b9dccc154d9353248da8f92142b0f27e659e7700cd6cd5c388c86a47be913668d1c1d060081dcf04366abfb20eba928e081

data/lib/whiplash/app.rb

@@ -20,11 +20,18 @@ module Whiplash
 
     def initialize(token=nil, options={})
       opts = options.with_indifferent_access
+      token ||= cache_store["whiplash_api_token"]
       @token = format_token(token) unless token.nil?
       @customer_id = options[:customer_id]
       @shop_id = options[:shop_id]
     end
 
+    def self.whiplash_api_token
+      store = Moneta.new(:Redis, host: ENV["REDIS_HOST"], port: ENV["REDIS_PORT"], password: ENV["REDIS_PASSWORD"], expires: 7200)
+      cache_store = Moneta::Namespace.new store, Whiplash::App::Caching.namespace_value
+      cache_store["whiplash_api_token"]
+    end
+
     def client
       OAuth2::Client.new(ENV["WHIPLASH_CLIENT_ID"], ENV["WHIPLASH_CLIENT_SECRET"], site: api_url)
     end
@@ -57,7 +64,7 @@ module Whiplash
 
     def token_expired?
       return token.expired? unless token.blank?
-      return true unless cache_store.has_key?("whiplash_api_token")
+      return true unless cache_store.key?("whiplash_api_token")
       return true if cache_store["whiplash_api_token"].blank?
       false
     end

data/lib/whiplash/app/caching.rb

@@ -7,13 +7,13 @@ module Whiplash
       def cache_store
         if ENV["REDIS_HOST"]
           store = Moneta.new(:Redis, host: ENV["REDIS_HOST"], port: ENV["REDIS_PORT"], password: ENV["REDIS_PASSWORD"], expires: 7200)
-          Moneta::Namespace.new store, namespace_value
+          Moneta::Namespace.new store, Whiplash::App::Caching.namespace_value
         else
           Moneta.new(:File, dir: "tmp", expires: 7200)
         end
       end
 
-      def namespace_value
+      def self.namespace_value
         ENV["REDIS_NAMESPACE"] || ENV["WHIPLASH_CLIENT_ID"]
       end
 

data/lib/whiplash/app/connections.rb

@@ -33,7 +33,7 @@ module Whiplash
       def app_request!(options = {})
         begin
           response = app_request(options)
-          return response.body if response.success?
+          return response if response.success?
           message = response.body if response.body.is_a? String
           message = response.body.dig('error') if response.body.respond_to?(:dig)
           store_whiplash_error!(response.status)

data/lib/whiplash/app/version.rb

@@ -1,5 +1,5 @@
 module Whiplash
   class App
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whiplash-app
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Don Sullivan, Mark Dickson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2