trophonius 1.1.6 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d1c4de653b4f48f81cf9ea3b8ced6ffce09cd7583d2b23b0fe17de97cfa2e9d
-  data.tar.gz: 0c41d739871de40caabf04ed8fd2575a39320b839fe0064b6bdc616722ef0eef
+  metadata.gz: b838d18be991c51c6c3190b0a09c552852778726a803ea0cb5a9186e542fb63a
+  data.tar.gz: 36f06cb81b17c474e73684d9f42260a31ff3658c9607e6dbb3a1412ef2749079
 SHA512:
-  metadata.gz: f232aaf25f6a72e0e8e2779eae555f4e467ff013e436d0cc18e2cd9510e523ecace64e0e93b9a93d14b121d3ef071954410e9649ee88434274a3e8a39eba7dc1
-  data.tar.gz: 2c90e1062b92195726377d4a7a07efb1a365a5916d8a35c90dbfddd12f8aaf49c2c84bf8c3954a34708d93a3abf920d9c3138be8acd32b3a749726fd2fcf7589
+  metadata.gz: 043f1c4dc5584aa2627c0a0a6c438f5519b9797223025e5997fc7d0f6f4e1adf0889a9d5d4e41dcecab0049b48f468978f7edaa249ef4ebc7007e16426cb8543
+  data.tar.gz: c7493bb44cf5a9d87ad78d4b82fa61d61272aa8dc6eed200d9e20d82bbf0079265f86c2000e4585ff09259253e47802476c14595cf878739933c9a220a7f7b49

data/lib/trophonius_config.rb

@@ -19,5 +19,6 @@ module Trophonius
     config_accessor(:all_fields) { {} }
     config_accessor(:translations) { {} }
     config_accessor(:local_network) { false }
+    config_accessor(:redis_connection) { false }
   end
 end

data/lib/trophonius_connection.rb

@@ -1,6 +1,7 @@
+require 'time'
 require 'base64'
 require 'typhoeus'
-
+require 'trophonius_redis_manager'
 module Trophonius
   module Trophonius::Connection
     ##
@@ -9,9 +10,16 @@ module Trophonius
     # @return [String] the *token* used to connect with the FileMaker data api
 
     def self.connect
-      @token = setup_connection
-      @last_connection = Time.now
-      @token
+      if Trophonius.config.redis_connection
+        Trophonius::RedisManager.set_key(key: 'token', value: setup_connection)
+        Trophonius::RedisManager.set_key(key: 'last_connection', value: Time.now)
+        token = Trophonius::RedisManager.get_key(key: 'token')
+        token
+      else
+        @token = setup_connection
+        @last_connection = Time.now
+        @token
+      end
     end
 
     ##
@@ -20,28 +28,51 @@ module Trophonius
     # @return [String] the *token* used to connect with the FileMaker data api if successful
 
     def self.setup_connection
-      @token = ''
+      if Trophonius.config.redis_connection
+        Trophonius::RedisManager.set_key(key: 'token', value: '')
+        Trophonius::RedisManager.set_key(key: 'last_connection', value: nil)
+      else
+        @token = ''
+      end
       ssl_verifyhost = Trophonius.config.local_network ? 0 : 2
       ssl_verifypeer = !Trophonius.config.local_network
-      url = URI("http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/sessions")
-      request = Typhoeus::Request.new(
-        url,
-        method: :post,
-        body: Trophonius.config.external_name.empty? ? {} : { fmDataSource: [{ database: Trophonius.config.external_name, username: Trophonius.config.external_username, password: Trophonius.config.external_password }] }.to_json,
-        params: {},
-        ssl_verifyhost: ssl_verifyhost,
-        ssl_verifypeer: ssl_verifypeer,
-        headers: { 'Content-Type' => 'application/json', Authorization: "Basic #{Base64.strict_encode64("#{Trophonius.config.username}:#{Trophonius.config.password}")}" }
-      )
+      url =
+        URI(
+          "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/sessions"
+        )
+      request =
+        Typhoeus::Request.new(
+          url,
+          method: :post,
+          body:
+            if Trophonius.config.external_name.empty?
+              {}
+            else
+              {
+                fmDataSource: [
+                  {
+                    database: Trophonius.config.external_name,
+                    username: Trophonius.config.external_username,
+                    password: Trophonius.config.external_password
+                  }
+                ]
+              }.to_json
+            end,
+          params: {},
+          ssl_verifyhost: ssl_verifyhost,
+          ssl_verifypeer: ssl_verifypeer,
+          headers: {
+            'Content-Type' => 'application/json',
+            Authorization: "Basic #{Base64.strict_encode64("#{Trophonius.config.username}:#{Trophonius.config.password}")}"
+          }
+        )
       temp = request.run
 
       begin
         parsed = JSON.parse(temp.response_body)
-        if parsed['messages'][0]['code'] != '0'
-          Error.throw_error(response['messages'][0]['code'])
-        end
+        Error.throw_error(response['messages'][0]['code']) if parsed['messages'][0]['code'] != '0'
         return parsed['response']['token']
-      rescue Exception
+      rescue Exception => e
         Error.throw_error('1631')
       end
     end
@@ -50,29 +81,35 @@ module Trophonius
     # Returns the last received token
     # @return [String] the last valid *token* used to connect with the FileMaker data api
     def self.token
-      @token
+      token = Trophonius::RedisManager.get_key(key: 'token')
+      return Trophonius.config.redis_connection ? Trophonius::RedisManager.get_key(key: 'token') : @token
     end
 
     ##
     # 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_connection
+      last = Trophonius::RedisManager.get_key(key: 'last_connection')
+      last = last.nil? ? nil : Time.parse(last)
+      Trophonius.config.redis_connection ? last : @last_connection
     end
 
     ##
     # Tests whether the FileMaker token is still valid
     # @return [Boolean] True if the token is valid False if invalid
     def self.test_connection
-      url = URI("http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{Trophonius.config.layout_name}/records?_limit=1")
-      begin
-        request = Typhoeus::Request.new(
-          url,
-          method: :get,
-          body: {},
-          params: {},
-          headers: { 'Content-Type' => 'application/json', Authorization: "Bearer #{@token}" }
+      url =
+        URI(
+          "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{
+            Trophonius.config.layout_name
+          }/records?_limit=1"
         )
+      begin
+        request =
+          Typhoeus::Request.new(
+            url,
+            method: :get, body: {}, params: {}, headers: { 'Content-Type' => 'application/json', Authorization: "Bearer #{@token}" }
+          )
         temp = request.run
         JSON.parse(temp.response_body)['messages'][0]['code'] == '0'
       rescue StandardError
@@ -84,10 +121,10 @@ module Trophonius
     # Returns whether the current connection is still valid
     # @return [Boolean] True if the connection is valid False if invalid
     def self.valid_connection?
-      if test_connection == false
+      if Trophonius.config.layout_name != '' && test_connection == false
         false
       else
-        @last_connection.nil? ? false : (((Time.now - last_connection) / 60).round <= 15 || test_connection)
+        last_connection.nil? ? false : (((Time.now - last_connection) / 60).round <= 15 || test_connection)
       end
     end
   end

data/lib/trophonius_redis_manager.rb

@@ -0,0 +1,34 @@
+module Trophonius
+  module Trophonius::RedisManager
+    def self.connect
+      if ENV['REDIS_URL'] && ENV['REDIS_URL'] != ''
+        @redis ||= Redis.new(url: ENV['REDIS_URL'])
+      else
+        @redis ||= Redis.new
+      end
+    end
+
+    def self.key_exists?(key:)
+      connect unless connected?
+      !(@redis.get(key).nil? || @redis.get(key).empty?)
+    end
+
+    def self.get_key(key:)
+      connect unless connected?
+      @redis.get(key)
+    end
+
+    def self.set_key(key:, value:)
+      connect unless connected?
+      @redis.set(key, value)
+    end
+
+    def self.connected?
+      @redis.nil? == false && @redis.connected?
+    end
+
+    def self.disconnect
+      @redis.disconnect!
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trophonius
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.2.3
 platform: ruby
 authors:
 - Kempen Automatisering
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,7 @@ files:
 - lib/trophonius_query.rb
 - lib/trophonius_record.rb
 - lib/trophonius_recordset.rb
+- lib/trophonius_redis_manager.rb
 - lib/trophonius_request.rb
 homepage: https://github.com/Willem-Jan/Trophonius
 licenses:
@@ -87,8 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Link between Ruby (on Rails) and FileMaker.