trophonius 2.1 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 386e8ae48aba1dd8e6898dcbc16dde02e4acd506658676a146ddc646d96d2929
-  data.tar.gz: 59c8f91b771e3175347f9fa6fc87b522878e3c2cb9f1cb468f3a78b7cf85c616
+  metadata.gz: b7e8354023ac2793edf55b987cb32151705e4e36d173e4ce543e85f18cb54cea
+  data.tar.gz: b8445ef34040269df2bcb9d6183359fa36107410126d2065707a76b768188125
 SHA512:
-  metadata.gz: beca517abee0fd0db44a9e1cc96f16a5014e061101b8818aaa7f368ac597eecff3aaf4968f3ddd063732a2df36f7c8fa841d322b46599062b0a45b57887ae0d3
-  data.tar.gz: 71b436a45681c37c4bd6b8f3ce34d35e0cb11badb4356a32b2f1be8ebf7eb29af21c88e51a41d5166f2762bee0af4773a628d28f0cd1f7371ab7c45bc4873d24
+  metadata.gz: ab653916b39228ed1de20c164d7aa9a1c1fd151ab1b9dac251efd827561e974b832c7ebbb080e2dc18719752ad2a6f2a9684abe32a088499fb4c934ac1797a6b
+  data.tar.gz: fcbb644e94eb52245bc2300f4b13307f2f707a451c2d1826fc94c4d1daaa9f02a800a1d40d5ff1d0a935603ee022d59bfbe6b0a1355145bec6175c00b2b9ff67

data/lib/config.rb

@@ -1,7 +1,3 @@
-# require 'time'
-# require 'date_time'
-# require 'date'
-
 require 'active_support/configurable'
 require 'ethon'
 
@@ -27,7 +23,9 @@ 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 }
+    config_accessor(:callbacks) { { before_create: [], before_update: [], before_destroy: [], after_create: [], after_update: [], after_destroy: [] } }
   end
 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
@@ -167,7 +171,7 @@ module Trophonius
     # Tests whether the FileMaker token is still valid
     # @return [Boolean] True if the token is valid False if invalid
     def test_connection
-      return last_connection.nil? || last_connection < Time.now - (15 * 60) if Trophonius.config.layout_name == ''
+      return !last_connection.nil? && last_connection > Time.now - (15 * 60) if Trophonius.config.layout_name == ''
 
       path = "/layouts/#{Trophonius.config.layout_name}/records?_limit=1"
       response =

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
 
     ##

data/lib/error.rb

@@ -18,6 +18,7 @@ module Trophonius
     class FileError < StandardError; end # :nodoc:
     class CommandError < StandardError; end # :nodoc:
     class ConnectionError < StandardError; end # :nodoc:
+    class FileNotOpenError < StandardError; end # :nodoc:
     class EmptyFindError < StandardError; end # :nodoc:
     class ValidationError < StandardError; end # :nodoc:
     class DateValueError < ValidationError; end # :nodoc:
@@ -223,7 +224,9 @@ module Trophonius
         # when "738"
         # when "800"
         # when "801"
-        # when "802"
+      when '802'
+      when '802'
+        raise FileNotOpenError.new, 'Could not open FileMaker file on server'
         # when "803"
         # when "804"
         # when "805"

data/lib/fm_date.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 class Date
   def to_fm
     strftime('%m/%d/%Y')

data/lib/fm_date_time.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 class DateTime
   def self.parse_fm_timestamp(timestamp)
     DateTime.strptime(timestamp, '%m/%d/%Y %H:%M:%S')

data/lib/fm_time.rb

@@ -1,3 +1,6 @@
+require 'date'
+require 'time'
+
 class Time
   def to_fm
     strftime('%m-%d-%Y %H:%M:%S')

data/lib/model.rb

@@ -37,10 +37,89 @@ module Trophonius
       @configuration.translations = {}
       @configuration.has_many_relations = {}
       @configuration.belongs_to_relations = {}
+      @configuration.callbacks = { before_create: [], before_update: [], before_destroy: [], after_create: [], after_update: [], after_destroy: [] }
       @offset = ''
       @limit = ''
     end
 
+    def self.scope(name, procedure, *_args)
+      define_singleton_method(name) do |*args|
+        procedure.arity.zero? ? procedure.call : procedure.call(*args)
+      end
+    end
+
+    def self.after_create(procedure, args)
+      @configuration.callbacks[:after_create].push({ name: procedure, args: args })
+    end
+
+    def self.run_after_create
+      @configuration.callbacks[:after_create].each do |callback|
+        procedure = callback[:name]
+        args = callback[:args]
+        procedure.is_a?(Proc) ? procedure.call(*args) : send(procedure, *args)
+      end
+    end
+
+    def self.after_update(procedure, args)
+      @configuration.callbacks[:after_update].push({ name: procedure, args: args })
+    end
+
+    def self.run_after_update
+      @configuration.callbacks[:after_update].each do |callback|
+        procedure = callback[:name]
+        args = callback[:args]
+        procedure.is_a?(Proc) ? procedure.call(*args) : send(procedure, *args)
+      end
+    end
+
+    def self.after_destroy(procedure, args)
+      @configuration.callbacks[:after_destroy].push({ name: procedure, args: args })
+    end
+
+    def self.run_after_destroy
+      @configuration.callbacks[:after_destroy].each do |callback|
+        procedure = callback[:name]
+        args = callback[:args]
+        procedure.is_a?(Proc) ? procedure.call(*args) : send(procedure, *args)
+      end
+    end
+
+    def self.before_create(procedure, args)
+      @configuration.callbacks[:before_create].push({ name: procedure, args: args })
+    end
+
+    def self.run_before_create
+      @configuration.callbacks[:before_create].each do |callback|
+        procedure = callback[:name]
+        args = callback[:args]
+        procedure.is_a?(Proc) ? procedure.call(*args) : send(procedure, *args)
+      end
+    end
+
+    def self.before_update(procedure, args)
+      @configuration.callbacks[:before_update].push({ name: procedure, args: args })
+    end
+
+    def self.run_before_update
+      @configuration.callbacks[:before_update].each do |callback|
+        procedure = callback[:name]
+        args = callback[:args]
+        procedure.is_a?(Proc) ? procedure.call(*args) : send(procedure, *args)
+      end
+    end
+
+    def self.before_destroy(procedure, args)
+      @configuration.callbacks[:before_destroy].push({ name: procedure, args: args })
+    end
+
+    def self.run_before_destroy
+      @configuration.callbacks[:before_destroy].each do |callback|
+        procedure = callback[:name]
+        args = callback[:args]
+        procedure.is_a?(Proc) ? procedure.call(*args) : send(procedure, *args)
+      end
+    end
+
     ##
     # Add a belongs to relationship.
     #
@@ -190,6 +269,7 @@ module Trophonius
     #   Model.create(fieldOne: "Data")
     def self.create(field_data, portal_data: {})
       create_translations if @configuration.translations.keys.empty?
+      run_before_create
 
       field_data.transform_keys! { |k| (@configuration.translations[k.to_s] || k).to_s }
 
@@ -209,6 +289,8 @@ module Trophonius
       new_record = DatabaseRequest.make_request("/layouts/#{layout_name}/records/#{response['response']['recordId']}", 'get', '{}')
       record = build_result(new_record['response']['data'][0])
       record.send(:define_singleton_method, 'result_count') { 1 }
+      run_after_create
+
       record
     end
 
@@ -268,6 +350,7 @@ module Trophonius
 
       url = "layouts/#{layout_name}/records/#{record_id}"
       response = DatabaseRequest.make_request(url, 'delete', '{}')
+
       if response['messages'][0]['code'] == '0'
         true
       else

data/lib/record.rb

@@ -22,13 +22,17 @@ module Trophonius
       @modifiable_fields = {}
       @modified_fields = {}
       @model_name = model
-      @model = ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.classify(ActiveSupport::Inflector.singularize(model_name)))
+      @model = model_name.instance_of?(String) ? ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.classify(ActiveSupport::Inflector.singularize(model_name))) : model_name
       @layout_name = @model.layout_name
       define_field_methods(fm_record)
       define_portal_methods(fm_record)
       super()
     end
 
+    def to_param
+      record_id.to_s
+    end
+
     def []=(field, new_val)
       modifiable_fields[field] = new_val
       modified_fields[field] = new_val
@@ -182,8 +186,10 @@ module Trophonius
     def save
       url = "layouts/#{layout_name}/records/#{record_id}"
 
+      @model.run_before_update
       body = "{\"fieldData\": #{modified_fields.to_json}}"
       response = DatabaseRequest.make_request(url, 'patch', body)
+      @model.run_after_update
       response['messages'][0]['code'] == '0' ? true : Error.throw_error(response['messages'][0]['code'])
     end
 
@@ -195,7 +201,9 @@ module Trophonius
     def delete
       url = "layouts/#{layout_name}/records/#{record_id}"
 
+      @model.run_before_destroy
       response = DatabaseRequest.make_request(url, 'delete', '{}')
+      @model.run_after_destroy
       response['messages'][0]['code'] == '0' ? true : Error.throw_error(response['messages'][0]['code'])
     end
 
@@ -210,6 +218,7 @@ module Trophonius
       url = "layouts/#{layout_name}/records/#{record_id}"
       field_data.each_key { |field| modifiable_fields[field] = field_data[field] }
       field_data.transform_keys! { |k| (@model.translations[k.to_s] || k).to_s }
+      @model.run_before_update
 
       portal_data.each do |portal_name, values|
         values.map do |record|
@@ -232,6 +241,7 @@ module Trophonius
       return throw_field_missing(field_data) if code == '102'
       return Error.throw_error(code) if code != '0'
 
+      @model.run_after_update
       true
     end
 

data/lib/single.rb

@@ -13,6 +13,14 @@ module Trophonius
       @all_fields = {}
     end
 
+    def non_modifiable_fields
+      []
+    end
+
+    def layout_name
+      @config[:layout_name]
+    end
+
     def where(fieldData)
       uri = URI::RFC2396_Parser.new
       url =
@@ -114,7 +122,7 @@ module Trophonius
     private
 
     def build_result(result)
-      hash = Trophonius::Record.new(result, 'Single')
+      record = Trophonius::Record.new(result, self)
       record.layout_name = @config[:layout_name]
       record
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trophonius
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: 2.1.7
 platform: ruby
 authors:
 - Kempen Automatisering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2024-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis