trophonius 1.2.4.1 → 1.2.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c5fa0924dd1c64e76122e79ab2bf62626e71d5c185da9151df9a44d8581c536
-  data.tar.gz: 15ff6326afcc5d50250f0ef94d91f555f8751dcf98469edb36c146989520efeb
+  metadata.gz: 00a7c14bd030e2f9556582beaf62ed25cb47ee8472493d92d11780e110c9c001
+  data.tar.gz: d0d288c28853421f8e224a834b476b3997872dbb9d7d606ece5cfa0e00864671
 SHA512:
-  metadata.gz: e38494782549ad841d8fb6a76a9348ef2a5882b97dc8a06cabf42157e3958e7e13d6dbdb4d10f6ce3f07fe98dd59190fed409e068aa7ac536316df5deb331e46
-  data.tar.gz: 0aca3057049e2c303958ddba479fe40dae7ca6032b7362b7b50e34d7cf39645cbc343eee541b0470731d5a89ddbddd6d2ad3ca58cbc04e83a3d2c7df780d3f46
+  metadata.gz: f18b0ceb2b54cd6bbacfd3edcc84f1c3897aaa8dfbcc8041c5ab7dc9c45290667704ee79d9086a3bc895356bba1a6dd9af26580e0ed633c059b74601023aad38
+  data.tar.gz: ba7160a9f94509edb74ca0ab267cdf76e670dbf76013c190ed636395573637099d6e12cc84a51a394c8982f28cd46eac9c495f4df79358044874f500d19b8388

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_query.rb

@@ -136,8 +136,8 @@ module Trophonius
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'post', body)
       if response['messages'][0]['code'] != '0'
         if response['messages'][0]['code'] == '101' || response['messages'][0]['code'] == '401'
-          RecordSet.new(@trophonius_model.layout_name, @trophonius_model.non_modifiable_fields).send(method, *args, &block)
-          return
+          resp = RecordSet.new(@trophonius_model.layout_name, @trophonius_model.non_modifiable_fields).send(method, *args, &block)
+          return resp
         else
           if response['messages'][0]['code'] == '102'
             results = Request.retrieve_first(@trophonius_model.layout_name)

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.1
+  version: 1.2.4.9
 platform: ruby
 authors:
 - Kempen Automatisering
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.x
 description: An easy to use link between Ruby (on Rails) and FileMaker using the FileMaker
   Data-API.
 email: