trophonius 2.1 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 386e8ae48aba1dd8e6898dcbc16dde02e4acd506658676a146ddc646d96d2929
-  data.tar.gz: 59c8f91b771e3175347f9fa6fc87b522878e3c2cb9f1cb468f3a78b7cf85c616
+  metadata.gz: 6ecc1055be56103548bd16bca808ff5a939e0ee7bbb2650d92f14cfb8e4d18da
+  data.tar.gz: 5b7319bc6b276601a9208db83771f7e2b94c1a981d43f752f5af74370ddad44d
 SHA512:
-  metadata.gz: beca517abee0fd0db44a9e1cc96f16a5014e061101b8818aaa7f368ac597eecff3aaf4968f3ddd063732a2df36f7c8fa841d322b46599062b0a45b57887ae0d3
-  data.tar.gz: 71b436a45681c37c4bd6b8f3ce34d35e0cb11badb4356a32b2f1be8ebf7eb29af21c88e51a41d5166f2762bee0af4773a628d28f0cd1f7371ab7c45bc4873d24
+  metadata.gz: 2922556fcf044ffd33a83f7b2645d866e22f4be011813c833eecbb087e9563e9c9f15c72954645544ffc6bad2982b1f66057de0696f35febd3be9878f6bdf006
+  data.tar.gz: bf26bdb6b2ce439f4d302fdd3075c9fc07d73acbdfe0dd0ec5981e2ebad5c2ef89735a69d419e812b77bc965f72f730c8fef1335fae0f04d8355d95597ef93d8

data/lib/config.rb

@@ -27,6 +27,7 @@ module Trophonius
     config_accessor(:belongs_to_relations) { {} }
     config_accessor(:local_network) { false }
     config_accessor(:redis_connection) { false }
+    config_accessor(:redis_no_verify) { false }
     config_accessor(:pool_size) { 5 }
     config_accessor(:debug) { false }
   end

data/lib/connectors/connection.rb

@@ -2,9 +2,11 @@ require 'time'
 require 'base64'
 require 'securerandom'
 require 'connectors/redis_manager'
+require 'debug_printer'
 
 module Trophonius
   class Connection
+    include DebugPrinter
     attr_reader :id
 
     def initialize
@@ -24,6 +26,49 @@ module Trophonius
       end
     end
 
+    ##
+    # Disconnects from the FileMaker server
+    #
+    def disconnect
+      uri = URI::RFC2396_Parser.new
+      url =
+        URI(
+          uri.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/sessions/#{Trophonius.config.redis_connection ? Trophonius::RedisManager.get_key(key: 'token') : @token}"
+          )
+        )
+      ssl_verifyhost = Trophonius.config.local_network ? 0 : 2
+      ssl_verifypeer = !Trophonius.config.local_network
+
+      request =
+        Typhoeus::Request.new(
+          url,
+          method: :delete,
+          params: {},
+          ssl_verifyhost: ssl_verifyhost,
+          ssl_verifypeer: ssl_verifypeer,
+          headers: { 'Content-Type' => 'application/json' }
+        )
+      temp = request.run
+
+      begin
+        parsed = JSON.parse(temp.response_body)
+
+        DebugPrinter.print_debug('RECEIVED DISCONNECT', parsed)
+      rescue StandardError => e
+        puts e
+        puts e.backtrace
+        Error.throw_error('1631')
+      end
+      Error.throw_error(parsed['messages'][0]['code']) if parsed['messages'][0]['code'] != '0'
+      Trophonius::RedisManager.disconnect! if Trophonius.config.redis_connection
+      @token = nil
+      @last_connection = nil
+      true
+    end
+
     private
 
     ##
@@ -113,47 +158,6 @@ module Trophonius
       parsed['response']['token']
     end
 
-    ##
-    # Disconnects from the FileMaker server
-    #
-    def disconnect
-      uri = URI::RFC2396_Parser.new
-      url =
-        URI(
-          uri.escape(
-            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
-              Trophonius.config.database
-            }/sessions/#{Trophonius.config.redis_connection ? Trophonius::RedisManager.get_key(key: 'token') : @token}"
-          )
-        )
-      ssl_verifyhost = Trophonius.config.local_network ? 0 : 2
-      ssl_verifypeer = !Trophonius.config.local_network
-
-      request =
-        Typhoeus::Request.new(
-          url,
-          method: :delete,
-          params: {},
-          ssl_verifyhost: ssl_verifyhost,
-          ssl_verifypeer: ssl_verifypeer,
-          headers: { 'Content-Type' => 'application/json' }
-        )
-      temp = request.run
-
-      begin
-        parsed = JSON.parse(temp.response_body)
-      rescue StandardError => e
-        puts e
-        puts e.backtrace
-        Error.throw_error('1631')
-      end
-      Error.throw_error(parsed['messages'][0]['code']) if parsed['messages'][0]['code'] != '0'
-      Trophonius::RedisManager.disconnect! if Trophonius.config.redis_connection
-      @token = nil
-      @last_connection = nil
-      true
-    end
-
     ##
     # Returns the receive time of the last received token
     # @return [Time] Returns the receive time of the last received token

data/lib/connectors/connection_manager.rb

@@ -1,10 +1,14 @@
+require 'debug_printer'
 module Trophonius
   class ConnectionManager
+    include DebugPrinter
     def initialize
       @connections = {}
       Trophonius.config.pool_size.times do
         connection = Connection.new
         @connections[connection.id] = { connection: connection, queue: [] }
+
+        DebugPrinter.print_debug('CONNECTION CREATED', @connections[connection.id].inspect)
       end
     end
 
@@ -22,6 +26,10 @@ module Trophonius
       nil
     end
 
+    def disconnect_all
+      @connections.each { |_connection_id, connection| connection[:connection].disconnect }
+    end
+
     private
 
     def auth_header_bearer(id)

data/lib/connectors/redis_manager.rb

@@ -2,14 +2,15 @@ module Trophonius
   # the RedisManager module is used to create a (single) connection to a redis store.
   module Trophonius::RedisManager
     def self.connect
-      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
+      return unless Trophonius.config.redis_connection
+
+      redis_url = ENV.fetch('REDIS_URL')
+      options = {}
+      options.merge!(url: redis_url) if redis_url && redis_url != ''
+      options.merge!(ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE }) if Trophonius.config.redis_no_verify
+      @redis ||= Redis.new(options)
+
+      nil
     end
 
     ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trophonius
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: 2.1.5
 platform: ruby
 authors:
 - Kempen Automatisering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2024-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
 summary: Link between Ruby (on Rails) and FileMaker.