trophonius 1.2.6.2 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bc9d3598ba559ee5887065d65fe023952f2192a1a5472d23d431304ba4d4cf7
-  data.tar.gz: dd179a8dc6dfa8810f91e877a04ee5af8d2ec592dbc6f9b2230ecefb86cb9eb1
+  metadata.gz: 3bab56e5694a58dfcb36972cd8a7f24b16960b7a6efe520b2ba1c29dbc5a650b
+  data.tar.gz: a525c8cda877a52cc8f5d2afe4dbdaf6297c26abd52b738305b78fd28d34dbd1
 SHA512:
-  metadata.gz: 102ec3dc23e80c19ec238051454363f1d263e5e209b60f86cfad6d1498e03e65273ff2127ea57fbb61d83e1bcd7d1f715fe187b78b465bcfc3f95700a1f2e6d1
-  data.tar.gz: 535b030eb950218d4bb54d1a554834c03e402abc56bff1c40e44637467c8274b47c7657b0d73b18f95da4a8d95b8d4a304c5873cfa2cbb37fd60beb6cb899c82
+  metadata.gz: 14f3fa2154b15daec4104705c81a77f3e44f4301add7764580e6c9a534c14952ce1bba44a4154258fd06e343e3cb7f8747c5fb7cb16d4475b843af05a96338bb
+  data.tar.gz: 852d63509a6ec296d9818fdcd688f478b4afc94ced0dd834d09201ba2ec7f2a96fdb54d04e7cf11f7f8753c6559cf5afee4ffd4ad1dfd972b2167c81b7f65e4b

data/lib/trophonius_config.rb

@@ -13,6 +13,7 @@ module Trophonius
     config_accessor(:username) { 'Admin' }
     config_accessor(:password) { '' }
     config_accessor(:ssl) { true }
+    config_accessor(:fm_18) { false }
     config_accessor(:count_result_script) { '' }
     config_accessor(:layout_name) { '' }
     config_accessor(:non_modifiable_fields) { [] }

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(
@@ -83,11 +85,12 @@ module Trophonius
     def self.disconnect
       url =
         URI(
-          "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
-          }"
+          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}"
+          )
         )
-      puts url
       ssl_verifyhost = Trophonius.config.local_network ? 0 : 2
       ssl_verifypeer = !Trophonius.config.local_network
 
@@ -136,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

@@ -2,4 +2,6 @@ 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_model.rb

@@ -112,7 +112,16 @@ module Trophonius
     #
     # @return [Hash] translations of the fields Rails -> FileMaker
     def self.create_translations
-      self.first
+      if Trophonius.config.fm_18
+        field_names = Trophonius::Request.get_layout_field_names(layout_name)
+        field_names.each do |field|
+          @configuration.translations.merge!(
+            { "#{ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(field.to_s), separator: '_').downcase}" => "#{field}" }
+          )
+        end
+      else
+        self.first
+      end
       @configuration.translations
     end
 
@@ -166,12 +175,14 @@ module Trophonius
     #
     # @return [Record] the created record
     #   Model.create(fieldOne: "Data")
-    def self.create(fieldData)
+    def self.create(fieldData, portalData: {})
       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?
@@ -182,7 +193,26 @@ module Trophonius
           new_field_data.merge!({ "#{k}" => fieldData[k] })
         end
       end
-      body = "{\"fieldData\": #{new_field_data.to_json}}"
+
+      new_portal_data = {}
+      portalData.each do |portal_name, portal_values|
+        new_portal_data.merge!(
+          portal_name =>
+            portal_values.map do |record|
+              record.inject({}) do |new_hash, (key, value)|
+                new_hash["#{portal_name}::#{key}"] = value
+                new_hash
+              end
+            end
+        )
+      end
+
+      body =
+        if new_portal_data != {}
+          "{\"fieldData\": #{new_field_data.to_json}, \"portalData\": #{new_portal_data.to_json}}"
+        else
+          "{\"fieldData\": #{new_field_data.to_json} }"
+        end
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'post', body)
       if response['messages'][0]['code'] != '0'
         if response['messages'][0]['code'] == '102'
@@ -199,9 +229,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 }
@@ -219,9 +251,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?
@@ -260,9 +294,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'
@@ -283,9 +319,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'
@@ -306,9 +344,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?
@@ -431,16 +471,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

@@ -34,9 +34,11 @@ module Trophonius
 
           url =
             URI(
-              "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
-                Trophonius.config.database
-              }/layouts/#{layout}/_find"
+              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])
@@ -94,9 +96,11 @@ module Trophonius
 
           url =
             URI(
-              "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
-                Trophonius.config.database
-              }/layouts/#{layout}/_find"
+              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])
@@ -148,6 +152,36 @@ module Trophonius
       end
     end
 
+    ##
+    # Runs a FileMaker script from the context of the Model.
+    #
+    # @param [String] script: the FileMaker script to run
+    #
+    # @param [String] scriptparameter: the parameter required by the FileMaker script
+    #
+    # @return [String]: string representing the script result returned by FileMaker
+    def run_script(script: '', 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/#{record_id}?script=#{script}&script.param=#{scriptparameter}"
+          )
+        )
+
+      result = Request.make_request(url, "Bearer #{Request.get_token}", 'get', '{}')
+
+      if result['messages'][0]['code'] != '0'
+        Error.throw_error(result['messages'][0]['code'])
+      elsif result['response']['scriptResult'] == '403'
+        Error.throw_error(403)
+      else
+        ret_val = result['response']['scriptResult']
+        return ret_val || true
+      end
+    end
+
     ##
     # Saves the last changes made to the Record to FileMaker.
     # Throws a FileMaker error if save failed
@@ -156,9 +190,11 @@ module Trophonius
     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}"
+          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)
@@ -173,9 +209,11 @@ module Trophonius
     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}"
+          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', '{}')
       response['messages'][0]['code'] != '0' ? Error.throw_error(response['messages'][0]['code']) : true
@@ -191,9 +229,11 @@ module Trophonius
     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}"
+          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}}"
@@ -227,9 +267,11 @@ module Trophonius
     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}"
+          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)

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,20 @@ 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
         Error.throw_error('1631')
       end
     end
@@ -52,7 +52,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 +75,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,16 +83,50 @@ 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
 
+    ##
+    # Retrieves the fieldnames of a layout
+    #
+    # @return [JSON] The fieldnames of a layout
+    def self.get_layout_field_names(layout_name)
+      url =
+        URI(
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/layouts/#{layout_name}"
+          )
+        )
+      begin
+        make_request(url, "Bearer #{get_token}", 'get', '{}')['response']['fieldMetaData'].map { |field| field['name'] }
+      rescue Exception
+        Error.throw_error('1631')
+      end
+    end
+
     ##
     # Runs a FileMaker script
     #
     # @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 +137,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_single.rb

@@ -0,0 +1,211 @@
+require 'trophonius_date'
+require 'trophonius_time'
+require 'trophonius_error'
+require 'trophonius_record'
+require 'trophonius_recordset'
+
+module Trophonius
+  class Trophonius::Single
+    attr_reader :query
+    def initialize(config:)
+      @config = config
+      @query = {}
+      @translations = {}
+      @all_fields = {}
+    end
+
+    def where(fieldData)
+      url =
+        URI(
+          URI.escape(
+            "http#{@config[:ssl] == true ? 's' : ''}://#{@config[:host]}/fmi/data/v1/databases/#{@config[:database]}/layouts/#{
+              @config[:layout_name]
+            }/_find"
+          )
+        )
+      @query.merge!(query: [fieldData])
+      @query.merge!(limit: '10000000')
+      token = setup_connection
+      response = make_request(url, token, 'post', @query.to_json)
+
+      r_results = response['response']['data']
+      if response['messages'][0]['code'] != '0' && response['messages'][0]['code'] != '401'
+        Error.throw_error(response['messages'][0]['code'])
+      elsif response['messages'][0]['code'] == '401'
+        return RecordSet.new(@config[:layout_name], @config[:non_modifiable_fields])
+      else
+        ret_val = RecordSet.new(@config[:layout_name], @config[:non_modifiable_fields])
+        r_results.each do |r|
+          hash = build_result(r)
+          ret_val << hash
+        end
+      end
+      @query = {}
+      close_connection(token)
+
+      return ret_val
+    end
+
+    def run_script(script:, scriptparameter:)
+      url =
+        URI(
+          URI.escape(
+            "http#{@config[:ssl] == true ? 's' : ''}://#{@config[:host]}/fmi/data/v1/databases/#{@config[:database]}/layouts/#{
+              @config[:layout_name]
+            }/records?_limit=1&script=#{script}&script.param=#{scriptparameter}"
+          )
+        )
+
+      token = setup_connection
+      result = make_request(url, "Bearer #{token}", 'get', '{}')
+      ret_val = ''
+
+      if result['messages'][0]['code'] != '0'
+        Error.throw_error(result['messages'][0]['code'])
+      elsif result['response']['scriptResult'] == '403'
+        Error.throw_error(403)
+      else
+        ret_val = result['response']['scriptResult']
+      end
+
+      close_connection(token)
+
+      return ret_val
+    end
+
+    private
+
+    def build_result(result)
+      hash = Trophonius::Record.new
+      hash.record_id = result['recordId']
+      hash.layout_name = @config[:layout_name]
+      hash.model_name = 'Single'
+
+      result['fieldData'].keys.each do |key|
+        # unless key[/\s/] || key[/\W/]
+        @translations.merge!(
+          { "#{ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_').downcase}" => "#{key}" }
+        )
+        hash.send(:define_singleton_method, ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_')) do
+          hash[key]
+        end
+        unless @config[:non_modifiable_fields]&.include?(key)
+          @all_fields.merge!(
+            ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_').downcase =>
+              ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_')
+          )
+          hash.send(
+            :define_singleton_method,
+            "#{ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_')}="
+          ) do |new_val|
+            hash[key] = new_val
+            hash.modifiable_fields[key] = new_val
+            hash.modified_fields[key] = new_val
+          end
+        end
+        # end
+        hash.merge!({ key => result['fieldData'][key] })
+        hash.modifiable_fields.merge!({ key => result['fieldData'][key] }) unless @config[:non_modifiable_fields]&.include?(key)
+      end
+      result['portalData'].keys.each do |key|
+        unless key[/\s/] || key[/\W/]
+          hash.send(:define_singleton_method, ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_')) do
+            hash[key]
+          end
+        end
+        result['portalData'][key].each_with_index do |inner_hash|
+          inner_hash.keys.each do |inner_key|
+            inner_method =
+              ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(inner_key.gsub(/\w+::/, '').to_s), separator: '_')
+            unless inner_method[/\s/] || inner_method[/\W/]
+              inner_hash.send(:define_singleton_method, inner_method.to_s) { inner_hash[inner_key] }
+              inner_hash.send(:define_singleton_method, 'record_id') { inner_hash['recordId'] }
+            end
+          end
+        end
+        hash.merge!({ key => result['portalData'][key] })
+      end
+      return hash
+    end
+
+    def make_request(url_param, token, method, body, params = '')
+      ssl_verifyhost = @config[:local_network] ? 0 : 2
+      ssl_verifypeer = !@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: "Bearer #{token}" }
+        )
+      temp = request.run
+      begin
+        JSON.parse(temp.response_body)
+      rescue Exception => e
+        Error.throw_error('1631')
+      end
+    end
+
+    def setup_connection
+      ssl_verifyhost = @config[:local_network] ? 0 : 2
+      ssl_verifypeer = !@config[:local_network]
+      url = URI(URI.escape("http#{@config[:ssl] == true ? 's' : ''}://#{@config[:host]}/fmi/data/v1/databases/#{@config[:database]}/sessions"))
+      request =
+        Typhoeus::Request.new(
+          url,
+          method: :post,
+          body:
+            if @config[:external_name].nil? || @config[:external_name].empty?
+              {}
+            else
+              {
+                fmDataSource: [{ database: @config[:external_name], username: @config[:external_username], password: @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("#{@config[:username]}:#{@config[:password]}")}"
+          }
+        )
+      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'
+      return parsed['response']['token']
+    end
+
+    def close_connection(token)
+      url =
+        URI(URI.escape("http#{@config[:ssl] == true ? 's' : ''}://#{@config[:host]}/fmi/data/v1/databases/#{@config[:database]}/sessions/#{token}"))
+      ssl_verifyhost = @config[:local_network] ? 0 : 2
+      ssl_verifypeer = !@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'
+      return true
+    end
+  end
+end

data/lib/trophonius_time.rb

@@ -2,4 +2,5 @@ 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.6.2
+  version: 1.2.8
 platform: ruby
 authors:
 - Kempen Automatisering
@@ -42,24 +42,18 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.1
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.1
-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: []
@@ -69,6 +63,7 @@ files:
 - 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
@@ -76,6 +71,7 @@ files:
 - lib/trophonius_recordset.rb
 - lib/trophonius_redis_manager.rb
 - lib/trophonius_request.rb
+- lib/trophonius_single.rb
 - lib/trophonius_time.rb
 homepage: https://github.com/Willem-Jan/Trophonius
 licenses:
@@ -96,7 +92,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.