trophonius 2.1.5 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ecc1055be56103548bd16bca808ff5a939e0ee7bbb2650d92f14cfb8e4d18da
-  data.tar.gz: 5b7319bc6b276601a9208db83771f7e2b94c1a981d43f752f5af74370ddad44d
+  metadata.gz: b7e8354023ac2793edf55b987cb32151705e4e36d173e4ce543e85f18cb54cea
+  data.tar.gz: b8445ef34040269df2bcb9d6183359fa36107410126d2065707a76b768188125
 SHA512:
-  metadata.gz: 2922556fcf044ffd33a83f7b2645d866e22f4be011813c833eecbb087e9563e9c9f15c72954645544ffc6bad2982b1f66057de0696f35febd3be9878f6bdf006
-  data.tar.gz: bf26bdb6b2ce439f4d302fdd3075c9fc07d73acbdfe0dd0ec5981e2ebad5c2ef89735a69d419e812b77bc965f72f730c8fef1335fae0f04d8355d95597ef93d8
+  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'
 
@@ -30,5 +26,6 @@ module Trophonius
     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

@@ -171,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/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.5
+  version: 2.1.7
 platform: ruby
 authors:
 - Kempen Automatisering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-10-15 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.5.5
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: Link between Ruby (on Rails) and FileMaker.