trophonius 1.2.4.2 → 1.2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3938dd85580ae34b5085bbb05c1e20adc506522cde540f3edb8af4a1b902e5cb
-  data.tar.gz: e9e0520cd32790cf07fb90c074e90ef087403481f67e950559b579b800bf7526
+  metadata.gz: 04e90580a6f6b8261e1f174ece304d0525262cd7e22605193836c91b4cb5ec6b
+  data.tar.gz: 7ec63bfeb0127b6523b5df68d2633660a228f286bfdca8dd410afb252b530c11
 SHA512:
-  metadata.gz: 42bae32f929cc8d8ff095147c54c836db4a8b2429b4166297529cde2dbf14dff68802a725f214284587ea84aef4c391b5ba579fbe49539184fbe419d960725bd
-  data.tar.gz: 3b04dcc00d655b555c65e4b96a1326a1da3c9f26ef711cff5fa95fda1d3e0c3aa5c69c3714d55dff0d65f78ffd9d2db88d11c71057c244693eac88373ed8634f
+  metadata.gz: 0473fd285c85aa00443299b961a80324232dfe0303ea037e22fe221b34d930fa8947752a49571830ac41e097dcc45700ba3cb84e77440394c3d68016d312e826
+  data.tar.gz: b35054768da222d37ec7825e3d5c4a64bf21c9ff201f77174d6560bdfea2bb6c4a42c3c76d4298ac0bf1e161293593049a9e5dee429aea06ad505d2fc1a3f182

data/lib/trophonius_connection.rb

@@ -70,18 +70,17 @@ module Trophonius
 
       begin
         parsed = JSON.parse(temp.response_body)
-        Error.throw_error(response['messages'][0]['code']) if parsed['messages'][0]['code'] != '0'
-        return parsed['response']['token']
       rescue Exception => e
         Error.throw_error('1631')
       end
+      Error.throw_error(parsed['messages'][0]['code']) if parsed['messages'][0]['code'] != '0'
+      return parsed['response']['token']
     end
 
     ##
     # Returns the last received token
     # @return [String] the last valid *token* used to connect with the FileMaker data api
     def self.token
-      token = Trophonius::RedisManager.get_key(key: 'token')
       return Trophonius.config.redis_connection ? Trophonius::RedisManager.get_key(key: 'token') : @token
     end
 
@@ -89,7 +88,7 @@ module Trophonius
     # Returns the receive time of the last received token
     # @return [Time] Returns the receive time of the last received token
     def self.last_connection
-      last = Trophonius::RedisManager.get_key(key: 'last_connection')
+      last = Trophonius.config.redis_connection ? Trophonius::RedisManager.get_key(key: 'last_connection') : nil
       last = last.nil? ? nil : Time.parse(last)
       Trophonius.config.redis_connection ? last : @last_connection
     end

data/lib/trophonius_redis_manager.rb

@@ -2,10 +2,12 @@ module Trophonius
   # the RedisManager module is used to create a (single) connection to a redis store.
   module Trophonius::RedisManager
     def self.connect
-      if ENV['REDIS_URL'] && ENV['REDIS_URL'] != ''
-        @redis ||= Redis.new(url: ENV['REDIS_URL'])
-      else
-        @redis ||= Redis.new
+      if Trophonius.config.redis_connection
+        if ENV['REDIS_URL'] && ENV['REDIS_URL'] != ''
+          @redis ||= Redis.new(url: ENV['REDIS_URL'])
+        else
+          @redis ||= Redis.new
+        end
       end
       return nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trophonius
 version: !ruby/object:Gem::Version
-  version: 1.2.4.2
+  version: 1.2.4.6
 platform: ruby
 authors:
 - Kempen Automatisering