trophonius 1.2.4.10 → 1.2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c79101c445307adbbb319a9cf07fed8e2b0fb3ae6d17a213833452ff9252f6cd
-  data.tar.gz: 21e0bc3a18a443f3576699100c48cf4f1db6b9efe4a031d5c52a26c95a4cb464
+  metadata.gz: f64c4285e902e34390d654a1766180aebae9a4c3bb483286d442b02284813390
+  data.tar.gz: c85fc16b8bd2179865d3d75709be1b44a15d17aded4ae5ee6a2820bbf16e0488
 SHA512:
-  metadata.gz: cfef37d5c0ddca6ac545d76ed5b62df8b8f1514f247cdf6749ab0925ac33a0d889fe6f11ba9a75985164c81e7b8ffb91c24c13df79ba53e4475aa53f3e27ec37
-  data.tar.gz: 6afb02d5bc0d8d8a33853ffc1eff5f1f7cceb4026a665e74f6ff01d3b7189a616e9cc127b8e9962ea8fa23abb381661d5c8dbb4602588668abf8168d2784be7d
+  metadata.gz: 59ba939131882022370de145757b09fc5c3b03775314ee08e298d383d0cf6a2d7796ae98706cf98b806dcd58ed7df5d6fd07656ec811df3b0d136775f5abf926
+  data.tar.gz: 2df0e98f4da6fc84658faf26632b65e52574efea36dea08b11131dfd5234b43f3612693efbf5d741e11c7c2fe0f924989ea7496db57e39c01a89c8d57756292a

data/lib/trophonius.rb

@@ -1,6 +1,8 @@
 require 'trophonius_request'
 require 'trophonius_model'
 require 'trophonius_config'
+require 'trophonius_date'
+require 'trophonius_time'
 
 module Trophonius # :nodoc:
   def self.configuration

data/lib/trophonius_config.rb

@@ -18,6 +18,8 @@ module Trophonius
     config_accessor(:non_modifiable_fields) { [] }
     config_accessor(:all_fields) { {} }
     config_accessor(:translations) { {} }
+    config_accessor(:has_many_relations) { {} }
+    config_accessor(:belongs_to_relations) { {} }
     config_accessor(:local_network) { false }
     config_accessor(:redis_connection) { false }
   end

data/lib/trophonius_connection.rb

@@ -38,7 +38,9 @@ module Trophonius
       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"
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/sessions"
+          )
         )
       request =
         Typhoeus::Request.new(
@@ -77,6 +79,44 @@ module Trophonius
       return parsed['response']['token']
     end
 
+    ##
+    # Disconnects from the FileMaker server
+    #
+    def self.disconnect
+      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 Exception => e
+        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
+      return true
+    end
+
     ##
     # Returns the last received token
     # @return [String] the last valid *token* used to connect with the FileMaker data api
@@ -99,9 +139,11 @@ module Trophonius
     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"
+          URI.escape(
+            "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 =

data/lib/trophonius_date.rb

@@ -0,0 +1,7 @@
+class Date
+  def to_fm
+    self.strftime('%m/%d/%Y')
+  end
+
+  alias convert_to_fm to_fm
+end

data/lib/trophonius_date_time.rb

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

data/lib/trophonius_error.rb

@@ -19,6 +19,14 @@ module Trophonius
     class ConnectionError < StandardError; end # :nodoc:
     class EmptyFindError < StandardError; end # :nodoc:
     class ValidationError < StandardError; end # :nodoc:
+    class DateValueError < ValidationError; end # :nodoc:
+    class TimeValueError < ValidationError; end # :nodoc:
+    class NumberValueError < ValidationError; end # :nodoc:
+    class ValueOutOfRangeError < ValidationError; end # :nodoc:
+    class ValueNotUniqueError < ValidationError; end # :nodoc:
+    class ValueNotExistingError < ValidationError; end # :nodoc:
+    class ValueNotInValuelistError < ValidationError; end # :nodoc:
+    class ValueFailedCalculationError < ValidationError; end # :nodoc:
 
     ##
     # Throws an error corresponding to the error number
@@ -140,14 +148,21 @@ module Trophonius
         # when "417"
         # when "418"
       when '500'
-        raise ValidationError.new, 'Data value does not meet validation entry options (hint make sure your date values are formatted as MM/DD/YYYY)'
-        # when "501"
-        # when "502"
-        # when "503"
-        # when "504"
-        # when "505"
-        # when "506"
-        # when "507"
+        raise DateValueError.new, 'Date value does not meet validation entry options (hint make sure your date values are formatted as MM/DD/YYYY)'
+      when '501'
+        raise TimeValueError.new, 'Time value does not meet validation entry options'
+      when '502'
+        raise NumberValueError.new, 'Number value does not meet validation entry options'
+      when '503'
+        raise ValueOutOfRangeError.new, 'Value in field is not within the range specified in validation entry options'
+      when '504'
+        raise ValueNotUniqueError.new, 'Value in field is not unique, as required in validation entry options'
+      when '505'
+        raise ValueNotExistingError.new, 'Value in field is not an existing value in the file, as required in validation entry options'
+      when '506'
+        raise ValueNotInValuelistError.new, 'Value in field is not listed in the value list specified in validation entry options'
+      when '507'
+        raise ValueFailedCalculationError.new, 'Value in field failed calculation test of validation entry options'
         # when "508"
         # when "509"
         # when "510"

data/lib/trophonius_model.rb

@@ -28,23 +28,20 @@ module Trophonius
       @configuration.non_modifiable_fields = configuration[:non_modifiable_fields]
       @configuration.all_fields = {}
       @configuration.translations = {}
+      @configuration.has_many_relations = {}
+      @configuration.belongs_to_relations = {}
       @offset = ''
       @limit = ''
     end
 
     ##
-    # Sets up the configuration for the model.
+    # Add a belongs to relationship.
     #
-    # @param [Hash] configuration: the hash containing the config to setup the model correctly.
-    #   configuration = {layout_name: "theFileMakerLayoutForThisModel", non_modifiable_fields: ["an", "array", "containing", "calculation_fields", "etc."]}
-    def self.config(configuration)
-      @configuration ||= Configuration.new
-      @configuration.layout_name = configuration[:layout_name]
-      @configuration.non_modifiable_fields = configuration[:non_modifiable_fields]
-      @configuration.all_fields = {}
-      @configuration.translations = {}
-      @offset = ''
-      @limit = ''
+    # @param [Symbol] model_name: the name of the model to build a relation with
+    # @param [String] primary_key: the name of the field containing the primary to build the relation over
+    # @param [String] foreign_key: the name of the field containing the primary to build the relation over
+    def self.belongs_to(model_name, primary_key:, foreign_key:)
+      @configuration.belongs_to_relations.merge!({ model_name => { primary_key: primary_key, foreign_key: foreign_key } })
     end
 
     ##
@@ -53,17 +50,8 @@ module Trophonius
     # @param [Symbol] model_name: the name of the model to build a relation with
     # @param [String] primary_key: the name of the field containing the primary to build the relation over
     # @param [String] foreign_key: the name of the field containing the primary to build the relation over
-    #
-    # @return [Trophonius::Model] Self
     def self.has_many(model_name, primary_key:, foreign_key:)
-      @configuration ||= Configuration.new
-      @configuration.layout_name = configuration[:layout_name]
-      @configuration.non_modifiable_fields = configuration[:non_modifiable_fields]
-      @configuration.all_fields = {}
-      @configuration.translations = {}
-      @offset = ''
-      @limit = ''
-      self
+      @configuration.has_many_relations.merge!({ model_name => { primary_key: primary_key, foreign_key: foreign_key } })
     end
 
     ##
@@ -87,6 +75,22 @@ module Trophonius
       @configuration.layout_name
     end
 
+    ##
+    # Returns the Hash containing the related parent models
+    #
+    # @return [Hash] child models
+    def self.has_many_relations
+      @configuration.has_many_relations
+    end
+
+    ##
+    # Returns the Hash containing the related parent models
+    #
+    # @return [Hash] parent models
+    def self.belongs_to_relations
+      @configuration.belongs_to_relations
+    end
+
     ##
     # Returns the fields that FileMaker won't allow us to modify
     #
@@ -165,9 +169,11 @@ module Trophonius
     def self.create(fieldData)
       url =
         URI(
-          "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{
-            layout_name
-          }/records"
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/layouts/#{layout_name}/records"
+          )
         )
       new_field_data = {}
       create_translations if @configuration.translations.keys.empty?
@@ -195,9 +201,11 @@ module Trophonius
       else
         url =
           URI(
-            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
-              Trophonius.config.database
-            }/layouts/#{layout_name}/records/#{response['response']['recordId']}"
+            URI.escape(
+              "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+                Trophonius.config.database
+              }/layouts/#{layout_name}/records/#{response['response']['recordId']}"
+            )
           )
         ret_val = build_result(Request.make_request(url, "Bearer #{Request.get_token}", 'get', '{}')['response']['data'][0])
         ret_val.send(:define_singleton_method, 'result_count') { 1 }
@@ -215,9 +223,11 @@ module Trophonius
     def self.find_by(fieldData)
       url =
         URI(
-          "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{
-            self.layout_name
-          }/_find?_limit=1"
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/layouts/#{self.layout_name}/_find?_limit=1"
+          )
         )
       new_field_data = {}
       create_translations if @configuration.translations.keys.empty?
@@ -256,9 +266,11 @@ module Trophonius
     def self.find(record_id)
       url =
         URI(
-          "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{
-            layout_name
-          }/records/#{record_id}"
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/layouts/#{layout_name}/records/#{record_id}"
+          )
         )
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'get', '{}')
       if response['messages'][0]['code'] != '0'
@@ -279,9 +291,11 @@ module Trophonius
     def self.delete(record_id)
       url =
         URI(
-          "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{
-            layout_name
-          }/records/#{record_id}"
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/layouts/#{layout_name}/records/#{record_id}"
+          )
         )
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'delete', '{}')
       if response['messages'][0]['code'] != '0'
@@ -302,9 +316,11 @@ module Trophonius
     def self.edit(record_id, fieldData)
       url =
         URI(
-          "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{
-            layout_name
-          }/records/#{record_id}"
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/layouts/#{layout_name}/records/#{record_id}"
+          )
         )
       new_field_data = {}
       create_translations if @configuration.translations.keys.empty?
@@ -330,6 +346,8 @@ module Trophonius
       hash = Trophonius::Record.new
       hash.record_id = result['recordId']
       hash.layout_name = layout_name
+      hash.model_name = name
+
       result['fieldData'].keys.each do |key|
         # unless key[/\s/] || key[/\W/]
         @configuration.translations.merge!(
@@ -425,16 +443,20 @@ module Trophonius
       unless @limit.empty? || @offset.empty?
         url =
           URI(
-            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
-              Trophonius.config.database
-            }/layouts/#{layout_name}/records?_offset=#{@offset}&_limit=#{@limit}"
+            URI.escape(
+              "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+                Trophonius.config.database
+              }/layouts/#{layout_name}/records?_offset=#{@offset}&_limit=#{@limit}"
+            )
           )
       else
         url =
           URI(
-            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
-              Trophonius.config.database
-            }/layouts/#{layout_name}/records?_limit=#{count == 0 ? 1_000_000 : count}"
+            URI.escape(
+              "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+                Trophonius.config.database
+              }/layouts/#{layout_name}/records?_limit=#{count == 0 ? 1_000_000 : count}"
+            )
           )
       end
       @limit = ''

data/lib/trophonius_query.rb

@@ -101,9 +101,11 @@ module Trophonius
     def run_query(method, *args, &block)
       url =
         URI(
-          "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{
-            @trophonius_model.layout_name
-          }/_find"
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/layouts/#{@trophonius_model.layout_name}/_find"
+          )
         )
       new_field_data = @current_query.map { |_q| {} }
 

data/lib/trophonius_record.rb

@@ -8,7 +8,7 @@ module Trophonius
   #
   # A Record is contained in a RecordSet and has methods to retrieve data from the fields inside the Record-hash
   class Trophonius::Record < Hash
-    attr_accessor :record_id, :layout_name, :modifiable_fields, :modified_fields
+    attr_accessor :record_id, :model_name, :layout_name, :modifiable_fields, :modified_fields
 
     ##
     # Initializes a new Record
@@ -22,20 +22,153 @@ module Trophonius
       super
     end
 
+    def method_missing(method, *args, &block)
+      if ActiveSupport::Inflector.pluralize(method).to_s == method.to_s
+        model = ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.classify(ActiveSupport::Inflector.singularize(method)))
+        pk_model = ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.classify(ActiveSupport::Inflector.singularize(model_name)))
+
+        if model.belongs_to_relations[ActiveSupport::Inflector.parameterize(model_name).to_sym]
+          relation = model.belongs_to_relations[ActiveSupport::Inflector.parameterize(model_name).to_sym]
+          layout = model.layout_name
+          model.create_translations if model.translations.keys.empty?
+
+          url =
+            URI(
+              URI.escape(
+                "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+                  Trophonius.config.database
+                }/layouts/#{layout}/_find"
+              )
+            )
+
+          if model.translations.key?(relation[:foreign_key])
+            foreign_key_field = model.translations[relation[:foreign_key]].to_s
+          else
+            foreign_key_field = relation[:foreign_key].to_s
+          end
+
+          if pk_model.translations.key?(relation[:primary_key])
+            primary_key_field = pk_model.translations[relation[:primary_key]].to_s
+          else
+            primary_key_field = relation[:primary_key].to_s
+          end
+
+          body = { query: [{ foreign_key_field => self[primary_key_field].to_s }], limit: 100_000 }.to_json
+          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'
+              resp = RecordSet.new(layout, model.non_modifiable_fields)
+              return resp
+            else
+              if response['messages'][0]['code'] == '102'
+                results = Request.retrieve_first(layout)
+                if results['messages'][0]['code'] != '0'
+                  Error.throw_error('102')
+                else
+                  r_results = results['response']['data']
+                  ret_val = r_results.empty? ? Error.throw_error('102') : r_results[0]['fieldData']
+                  query_keys = [foreign_key_field]
+                  Error.throw_error('102', (query_keys - ret_val.keys.map(&:downcase)).flatten.join(', '), layout)
+                end
+              end
+              Error.throw_error(response['messages'][0]['code'])
+            end
+          else
+            r_results = response['response']['data']
+            ret_val = RecordSet.new(layout, model.non_modifiable_fields)
+            r_results.each do |r|
+              hash = model.build_result(r)
+              ret_val << hash
+            end
+            @response = ret_val
+            return @response
+          end
+        end
+      elsif ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.classify(ActiveSupport::Inflector.singularize(method))).respond_to?('first')
+        fk_model = ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.classify(ActiveSupport::Inflector.singularize(model_name)))
+        pk_model = ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.classify(ActiveSupport::Inflector.singularize(method)))
+
+        if pk_model.has_many_relations[ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.pluralize(model_name)).to_sym]
+          relation = pk_model.has_many_relations[ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.pluralize(model_name)).to_sym]
+          layout = pk_model.layout_name
+          pk_model.create_translations if pk_model.translations.keys.empty?
+
+          url =
+            URI(
+              URI.escape(
+                "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+                  Trophonius.config.database
+                }/layouts/#{layout}/_find"
+              )
+            )
+
+          if fk_model.translations.key?(relation[:foreign_key])
+            foreign_key_field = fk_model.translations[relation[:foreign_key]].to_s
+          else
+            foreign_key_field = relation[:foreign_key].to_s
+          end
+
+          if pk_model.translations.key?(relation[:primary_key])
+            primary_key_field = pk_model.translations[relation[:primary_key]].to_s
+          else
+            primary_key_field = relation[:primary_key].to_s
+          end
+
+          body = { query: [{ primary_key_field => self[foreign_key_field].to_s }], limit: 1 }.to_json
+
+          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'
+              resp = RecordSet.new(layout, pk_model.non_modifiable_fields)
+              return resp
+            else
+              if response['messages'][0]['code'] == '102'
+                results = Request.retrieve_first(layout)
+                if results['messages'][0]['code'] != '0'
+                  Error.throw_error('102')
+                else
+                  r_results = results['response']['data']
+                  ret_val = r_results.empty? ? Error.throw_error('102') : r_results[0]['fieldData']
+                  query_keys = [primary_key_field]
+                  Error.throw_error('102', (query_keys - ret_val.keys.map(&:downcase)).flatten.join(', '), layout)
+                end
+              end
+              Error.throw_error(response['messages'][0]['code'])
+            end
+          else
+            r_results = response['response']['data']
+            ret_val = RecordSet.new(layout, pk_model.non_modifiable_fields)
+            r_results.each do |r|
+              hash = pk_model.build_result(r)
+              ret_val << hash
+            end
+            @response = ret_val
+            return @response.first
+          end
+        end
+      else
+        super
+      end
+    end
+
     ##
     # Saves the last changes made to the Record to FileMaker.
     # Throws a FileMaker error if save failed
     #
     # @return [True] if successful
     def save
-      url = URI("http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{layout_name}/records/#{record_id}")
+      url =
+        URI(
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/layouts/#{layout_name}/records/#{record_id}"
+          )
+        )
       body = "{\"fieldData\": #{modified_fields.to_json}}"
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'patch', body)
-      if response['messages'][0]['code'] != '0'
-        Error.throw_error(response['messages'][0]['code'])
-      else
-        true
-      end
+      response['messages'][0]['code'] != '0' ? Error.throw_error(response['messages'][0]['code']) : true
     end
 
     ##
@@ -44,13 +177,16 @@ module Trophonius
     #
     # @return [True] if successful
     def delete
-      url = URI("http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{layout_name}/records/#{record_id}")
+      url =
+        URI(
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/layouts/#{layout_name}/records/#{record_id}"
+          )
+        )
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'delete', '{}')
-      if response['messages'][0]['code'] != '0'
-        Error.throw_error(response['messages'][0]['code'])
-      else
-        true
-      end
+      response['messages'][0]['code'] != '0' ? Error.throw_error(response['messages'][0]['code']) : true
     end
 
     ##
@@ -61,24 +197,29 @@ module Trophonius
     #
     # @return [True] if successful
     def update(fieldData)
-      url = URI("http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{layout_name}/records/#{record_id}")
-      fieldData.keys.each do |field|
-        modifiable_fields[field] = fieldData[field]
-      end
+      url =
+        URI(
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/layouts/#{layout_name}/records/#{record_id}"
+          )
+        )
+      fieldData.keys.each { |field| modifiable_fields[field] = fieldData[field] }
       body = "{\"fieldData\": #{fieldData.to_json}}"
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'patch', body)
       if response['messages'][0]['code'] != '0'
-        if response["messages"][0]["code"] == "102"
+        if response['messages'][0]['code'] == '102'
           results = Request.retrieve_first(layout_name)
-          if results["messages"][0]["code"] != "0"
-            Error.throw_error("102")
+          if results['messages'][0]['code'] != '0'
+            Error.throw_error('102')
           else
-            r_results = results["response"]["data"]
-            ret_val = r_results.empty? ? Error.throw_error("102") : r_results[0]['fieldData']
-            Error.throw_error("102", (fieldData.keys.map(&:downcase) - ret_val.keys.map(&:downcase)).flatten.join(', '), layout_name) 
+            r_results = results['response']['data']
+            ret_val = r_results.empty? ? Error.throw_error('102') : r_results[0]['fieldData']
+            Error.throw_error('102', (fieldData.keys.map(&:downcase) - ret_val.keys.map(&:downcase)).flatten.join(', '), layout_name)
           end
         end
-        Error.throw_error(response["messages"][0]["code"])
+        Error.throw_error(response['messages'][0]['code'])
       else
         true
       end
@@ -94,14 +235,17 @@ module Trophonius
     #
     # @return [True] if successful
     def upload(container_name:, container_repetition: 1, file:)
-      url = URI("http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{layout_name}/records/#{record_id}/containers/#{container_name}/#{container_repetition}")
+      url =
+        URI(
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/layouts/#{layout_name}/records/#{record_id}/containers/#{container_name}/#{container_repetition}"
+          )
+        )
 
       response = Request.upload_file_request(url, "Bearer #{Request.get_token}", file)
-      if response['messages'][0]['code'] != '0'
-        Error.throw_error(response['messages'][0]['code'])
-      else
-        true
-      end
+      response['messages'][0]['code'] != '0' ? Error.throw_error(response['messages'][0]['code']) : true
     end
   end
 end

data/lib/trophonius_request.rb

@@ -4,7 +4,6 @@ require 'base64'
 require 'trophonius_connection'
 require 'uri'
 require 'net/http'
-
 module Trophonius
   module Trophonius::Request
     ##
@@ -24,19 +23,21 @@ module Trophonius
     def self.make_request(url_param, auth, method, body, params = '')
       ssl_verifyhost = Trophonius.config.local_network ? 0 : 2
       ssl_verifypeer = !Trophonius.config.local_network
-      request = Typhoeus::Request.new(
-        url_param,
-        method: method.to_sym,
-        body: body,
-        params: params,
-        ssl_verifyhost: ssl_verifyhost,
-        ssl_verifypeer: ssl_verifypeer,
-        headers: { 'Content-Type' => 'application/json', Authorization: auth.to_s }
-      )
+      request =
+        Typhoeus::Request.new(
+          url_param,
+          method: method.to_sym,
+          body: body,
+          params: params,
+          ssl_verifyhost: ssl_verifyhost,
+          ssl_verifypeer: ssl_verifypeer,
+          headers: { 'Content-Type' => 'application/json', Authorization: auth.to_s }
+        )
       temp = request.run
       begin
         JSON.parse(temp.response_body)
-      rescue Exception
+      rescue Exception => e
+        puts "Error was #{e}"
         Error.throw_error('1631')
       end
     end
@@ -52,7 +53,7 @@ module Trophonius
     #
     # @return [JSON] parsed json of the response
     def self.upload_file_request(url_param, auth, file)
-      url = URI(url_param)
+      url = URI(url_param.to_s)
 
       https = Net::HTTP.new(url.host, url.port)
       https.use_ssl = true
@@ -75,11 +76,7 @@ module Trophonius
     #
     # @return [String] a valid FileMaker token
     def self.get_token
-      if Connection.valid_connection?
-        Connection.token
-      else
-        Connection.connect
-      end
+      Connection.valid_connection? ? Connection.token : Connection.connect
     end
 
     ##
@@ -87,7 +84,14 @@ module Trophonius
     #
     # @return [JSON] The first record from FileMaker
     def self.retrieve_first(layout_name)
-      url = URI("http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{layout_name}/records?_limit=1")
+      url =
+        URI(
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/layouts/#{layout_name}/records?_limit=1"
+          )
+        )
       make_request(url, "Bearer #{get_token}", 'get', '{}')
     end
 
@@ -96,7 +100,14 @@ module Trophonius
     #
     # @return [JSON] The script result from FileMaker
     def self.run_script(script, scriptparameter, layout_name)
-      url = URI("http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{layout_name}/records?_limit=1&script=#{script}&script.param=#{scriptparameter}")
+      url =
+        URI(
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/layouts/#{layout_name}/records?_limit=1&script=#{script}&script.param=#{scriptparameter}"
+          )
+        )
       make_request(url, "Bearer #{get_token}", 'get', '{}')
     end
 
@@ -107,9 +118,27 @@ module Trophonius
     def self.retrieve_all(layout_name, sort)
       if !sort.empty?
         sort_order = sort.to_json.to_s
-        url = URI("http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{layout_name}/records?_limit=10000000_sort=#{sort_order}#{Trophonius.config.count_result_script == '' ? '' : "&script=#{Trophonius.config.count_result_script}"}")
+        url =
+          URI(
+            URI.escape(
+              "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+                Trophonius.config.database
+              }/layouts/#{layout_name}/records?_limit=10000000_sort=#{sort_order}#{
+                Trophonius.config.count_result_script == '' ? '' : "&script=#{Trophonius.config.count_result_script}"
+              }"
+            )
+          )
       else
-        url = URI("http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{layout_name}/records?_limit=10000000#{Trophonius.config.count_result_script == '' ? '' : "&script=#{Trophonius.config.count_result_script}"}")
+        url =
+          URI(
+            URI.escape(
+              "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+                Trophonius.config.database
+              }/layouts/#{layout_name}/records?_limit=10000000#{
+                Trophonius.config.count_result_script == '' ? '' : "&script=#{Trophonius.config.count_result_script}"
+              }"
+            )
+          )
       end
       make_request(url, "Bearer #{get_token}", 'get', '{}')
     end

data/lib/trophonius_time.rb

@@ -0,0 +1,6 @@
+class Time
+  def to_fm
+    self.strftime('%m-%d-%Y %H:%M:%S')
+  end
+  alias convert_to_fm to_fm
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trophonius
 version: !ruby/object:Gem::Version
-  version: 1.2.4.10
+  version: 1.2.6.4
 platform: ruby
 authors:
 - Kempen Automatisering
@@ -42,18 +42,18 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.x
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.x
-description: An easy to use link between Ruby (on Rails) and FileMaker using the FileMaker
-  Data-API.
+        version: '5.0'
+description: A lightweight, easy to use link between Ruby (on Rails) and FileMaker
+  using the FileMaker Data-API.
 email: 
 executables: []
 extensions: []
@@ -62,6 +62,8 @@ files:
 - lib/trophonius.rb
 - lib/trophonius_config.rb
 - lib/trophonius_connection.rb
+- lib/trophonius_date.rb
+- lib/trophonius_date_time.rb
 - lib/trophonius_error.rb
 - lib/trophonius_model.rb
 - lib/trophonius_query.rb
@@ -69,6 +71,7 @@ files:
 - lib/trophonius_recordset.rb
 - lib/trophonius_redis_manager.rb
 - lib/trophonius_request.rb
+- lib/trophonius_time.rb
 homepage: https://github.com/Willem-Jan/Trophonius
 licenses:
 - MIT
@@ -88,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Link between Ruby (on Rails) and FileMaker.