trophonius 1.4.3.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d52cbe0f01bc7cb86fdd330790404ecf956631db54c0997b00a2418dfe681d9
-  data.tar.gz: e8f4d3da5dc60152dcd9ea8e88d6b6511b6bb62fc197158d4eadc63b3596fbf7
+  metadata.gz: 1bf03ee96abeebc7cf0bd49e76e0a678f9b083d53b08e1f524406ddfe6d5334d
+  data.tar.gz: 9ffce8e42068d7312fa7aa2be4f55451456a97aa2f99cca90d5e18374721e5cb
 SHA512:
-  metadata.gz: 97fbbbeacba35f6bd111a4ab3ec424954aa3e75a344f0afe508da30f2ec58b8ec5ed23e5be9bfb5051661d101edc13f99e65ae81b395766a6ca4ee584d4b6cc6
-  data.tar.gz: b80e60772da1d002dd648852231adff14195087ba96d4551095446e129e128073a9d54ecad69602ab47e66381e50954064f8f066b9a9fd81be2fdcfffde84073
+  metadata.gz: 7d03bd618f06ee984613254b9885857c78a4048a5fb2b5bb24ca378af44a05955afb4fc9f723bba5786eaede62c04c9ad41600e21f0b3ccd5f8991169bf25e88
+  data.tar.gz: cca1ac1dbcb0a89cb44912591085ebfacdf3a80cf0d681013c14e6c8afd710f1a55b8d76bf258648c668232235c50c9dc3c187abb1844bc32f053bc9be9bf630

data/lib/trophonius_connection.rb

@@ -13,8 +13,8 @@ module Trophonius
       if Trophonius.config.redis_connection
         Trophonius::RedisManager.set_key(key: 'token', value: setup_connection)
         Trophonius::RedisManager.set_key(key: 'last_connection', value: Time.now)
-        token = Trophonius::RedisManager.get_key(key: 'token')
-        token
+        Trophonius::RedisManager.get_key(key: 'token')
+
       else
         @token = setup_connection
         @last_connection = Time.now
@@ -70,14 +70,21 @@ module Trophonius
           }
         )
       temp = request.run
+      body = temp.response_body
+      headers = temp.headers
+      code = temp.code
+
+      puts "RESPONSE FROM FILEMAKER (CONNECT) WAS #{body}"
 
       begin
-        parsed = JSON.parse(temp.response_body)
+        parsed = JSON.parse(body)
       rescue Exception => e
+        puts e
+        puts e.backtrace
         Error.throw_error('1631')
       end
       Error.throw_error(parsed['messages'][0]['code']) if parsed['messages'][0]['code'] != '0'
-      return parsed['response']['token']
+      parsed['response']['token']
     end
 
     ##
@@ -116,14 +123,14 @@ module Trophonius
       Trophonius::RedisManager.disconnect! if Trophonius.config.redis_connection
       @token = nil
       @last_connection = nil
-      return true
+      true
     end
 
     ##
     # Returns the last received token
     # @return [String] the last valid *token* used to connect with the FileMaker data api
     def self.token
-      return Trophonius.config.redis_connection ? Trophonius::RedisManager.get_key(key: 'token') : @token
+      Trophonius.config.redis_connection ? Trophonius::RedisManager.get_key(key: 'token') : @token
     end
 
     ##
@@ -157,7 +164,7 @@ module Trophonius
         temp = request.run
         JSON.parse(temp.response_body)['messages'][0]['code'] == '0'
       rescue StandardError
-        return false
+        false
       end
     end
 

data/lib/trophonius_error.rb

@@ -9,6 +9,7 @@ module Trophonius
     class LayoutUnexistingError < NoMethodError; end # :nodoc:
     class InvalidTokenError < StandardError; end # :nodoc:
     class UnauthenticatedError < StandardError; end # :nodoc:
+    class AuthenticationError < StandardError; end # :nodoc:
     class FieldNotModifiableError < StandardError; end # :nodoc:
     class ResponseNotYetImplementedError < StandardError; end # :nodoc:
     class UnknownFileMakerError < StandardError; end # :nodoc:
@@ -25,8 +26,12 @@ module Trophonius
     class ValueOutOfRangeError < ValidationError; end # :nodoc:
     class ValueNotUniqueError < ValidationError; end # :nodoc:
     class ValueNotExistingError < ValidationError; end # :nodoc:
+    class ValueListNotExistingError < ValidationError; end # :nodoc:
     class ValueNotInValuelistError < ValidationError; end # :nodoc:
     class ValueFailedCalculationError < ValidationError; end # :nodoc:
+    class RecordLockedError < ValidationError; end # :nodoc:
+    class EntityLockedError < ValidationError; end # :nodoc:
+    class MissingEntityError < ValidationError; end # :nodoc:
 
     ##
     # Throws an error corresponding to the error number
@@ -55,38 +60,52 @@ module Trophonius
         raise RecordNotFoundError.new, 'Empty result'
       when '9'
         raise UnauthenticatedError.new, 'User has insufficient privileges'
-        # when "10"
-        # when "11"
-        # when "12"
-        # when "13"
-        # when "14"
-        # when "15"
-        # when "16"
-        # when "17"
-        # when "16"
-        # when "18"
-        # when "19"
-        # when "09"
-        # when "20"
-        # when "21"
-        # when "100"
+      when '10'
+        raise MissingEntityError.new, 'Requested data is missing'
+      when '11'
+        raise ValidationError.new, 'Name is not valid'
+      when '12'
+        raise ValidationError.new, 'Name already exists'
+      when '13'
+        raise EntityLockedError.new, 'File or object is in use'
+      when '14'
+        raise ValueOutOfRangeError.new, 'Out of range'
+      when '15'
+        raise NumberValueError.new, 'Cant divide by zero'
+      when '16'
+        raise CommandError.new, 'Operation failed; request retry (for example, a user query)'
+      when '17'
+        raise ValidationError.new, 'Attempt to convert foreign character set to UTF-16 failed'
+      when '18'
+        raise AuthenticationError.new, 'Client must provide account information to proceed'
+      when '19'
+        raise ValidationError.new, 'String contains characters other than A-Z, a-z, 0-9 (ASCII)'
+      when '20'
+        raise CommandError.new, 'Command/operation canceled by triggered script'
+      when '21'
+        raise CommandError.new, 'Request not supported (for example, when creating a hard link on a file system that does not support hard links)'
+      when '100'
+        raise MissingEntityError.new, 'File is missing'
       when '101'
         raise RecordNotFoundError.new, "Record #{more_info} was not found"
       when '102'
-        if more_info != 0
-          raise FieldUnexistingError.new, "Following field(s) #{more_info} do not exist on layout #{layout_info}"
-        else
-          raise FieldUnexistingError.new, 'Field does not exist'
-        end
-        # when "103"
+        raise FieldUnexistingError.new, 'Field does not exist' if more_info.zero?
+
+        raise FieldUnexistingError.new, "Following field(s) #{more_info} do not exist on layout #{layout_info}"
+      when '103'
+        raise MissingEntityError.new, 'Relationship is missing'
       when '104'
         raise ScriptUnexistingError.new, 'Script does not exist'
       when '105'
         raise LayoutUnexistingError.new, 'Layout does not exist'
-        # when "106"
-        # when "107"
-        # when "108"
-        # when "109"
+      when '106'
+        raise MissingEntityError.new, 'Table is missing'
+      when '107'
+        raise MissingEntityError.new, 'Index is missing'
+      when '108'
+        raise ValueListNotExistingError.new, 'ValueList does not exist'
+      when '109'
+        raise MissingEntityError.new, 'Privilege set is missing'
         # when "110"
         # when "111"
         # when "112"
@@ -119,7 +138,8 @@ module Trophonius
         # when "217"
         # when "218"
         # when "300"
-        # when "301"
+      when '301'
+        raise RecordLockedError.new, 'Record is locked by a FileMaker client'
         # when "302"
         # when "303"
         # when "304"

data/lib/trophonius_model.rb

@@ -62,7 +62,7 @@ module Trophonius
     #
     # @return [Trophonius::Model] Self
     def self.paginate(page, limit)
-      @offset = ((page * limit - limit) + 1).to_s
+      @offset = (((page * limit) - limit) + 1).to_s
       @limit = limit.to_s
       self
     end
@@ -116,16 +116,16 @@ module Trophonius
         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}" }
+            { ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(field.to_s), separator: '_').downcase.to_s => field.to_s }
           )
         end
       else
-        self.first
+        first
       end
       @configuration.translations
     end
 
-    def self.method_missing(method, *args, &block)
+    def self.method_missing(method, *args)
       new_instance = Trophonius::Model.new(config: @configuration)
       new_instance.current_query = Trophonius::Query.new(trophonius_model: self, limit: @limit, offset: @offset)
       args << new_instance
@@ -140,7 +140,7 @@ module Trophonius
         ret_val = @current_query.run_query(method, *args, &block)
         @limit = ''
         @offset = ''
-        return ret_val
+        ret_val
       end
     end
 
@@ -149,10 +149,10 @@ module Trophonius
     # @param [Hash] fieldData: the data to find
     #
     # @return [Trophonius::Model] new instance of the model
-    def self.where(fieldData)
+    def self.where(field_data)
       new_instance = Trophonius::Model.new(config: @configuration)
       new_instance.current_query = Trophonius::Query.new(trophonius_model: self, limit: @limit, offset: @offset)
-      new_instance.current_query.build_query[0].merge!(fieldData)
+      new_instance.current_query.build_query[0].merge!(field_data)
       new_instance
     end
 
@@ -163,8 +163,8 @@ module Trophonius
     # @param [Hash] fieldData: the data to find
     #
     # @return [Trophonius::Model] new instance of the model
-    def where(fieldData)
-      @current_query.build_query[0].merge!(fieldData)
+    def where(field_data)
+      @current_query.build_query[0].merge!(field_data)
       self
     end
 
@@ -175,7 +175,7 @@ module Trophonius
     #
     # @return [Record] the created record
     #   Model.create(fieldOne: "Data")
-    def self.create(fieldData, portalData: {})
+    def self.create(field_data, portalData: {})
       uri = URI::RFC2396_Parser.new
       url =
         URI(
@@ -187,11 +187,11 @@ module Trophonius
         )
       new_field_data = {}
       create_translations if @configuration.translations.keys.empty?
-      fieldData.keys.each do |k|
+      field_data.keys.each do |k|
         if @configuration.translations.keys.include?(k.to_s)
-          new_field_data.merge!({ "#{@configuration.translations[k.to_s]}" => fieldData[k] })
+          new_field_data.merge!({ @configuration.translations[k.to_s].to_s => field_data[k] })
         else
-          new_field_data.merge!({ "#{k}" => fieldData[k] })
+          new_field_data.merge!({ k.to_s => field_data[k] })
         end
       end
 
@@ -200,34 +200,21 @@ module Trophonius
         new_portal_data.merge!(
           portal_name =>
             portal_values.map do |record|
-              record.inject({}) do |new_hash, (key, value)|
+              record.each_with_object({}) do |(key, value), new_hash|
                 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
+        if new_portal_data == {}
           "{\"fieldData\": #{new_field_data.to_json} }"
+        else
+          "{\"fieldData\": #{new_field_data.to_json}, \"portalData\": #{new_portal_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'
-          results = Request.retrieve_first(layout_name)
-          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', (new_field_data.keys.map(&:downcase) - ret_val.keys.map(&:downcase)).flatten.join(', '), layout_name)
-          end
-        end
-        Error.throw_error(response['messages'][0]['code'])
-      else
+      if response['messages'][0]['code'] == '0'
         url =
           URI(
             uri.escape(
@@ -238,7 +225,19 @@ module Trophonius
           )
         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 }
-        return ret_val
+        ret_val
+      else
+        if response['messages'][0]['code'] == '102'
+          results = Request.retrieve_first(layout_name)
+          if results['messages'][0]['code'] == '0'
+            r_results = results['response']['data']
+            ret_val = r_results.empty? ? Error.throw_error('102') : r_results[0]['fieldData']
+            Error.throw_error('102', (new_field_data.keys.map(&:downcase) - ret_val.keys.map(&:downcase)).flatten.join(', '), layout_name)
+          else
+            Error.throw_error('102')
+          end
+        end
+        Error.throw_error(response['messages'][0]['code'])
       end
     end
 
@@ -249,41 +248,42 @@ module Trophonius
     #
     # @return [Record] a Record object that correspond to FileMaker record fitting the find request
     #   Model.find_by(fieldOne: "Data")
-    def self.find_by(fieldData)
+    def self.find_by(field_data)
       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
-            }/layouts/#{self.layout_name}/_find?_limit=1"
+            }/layouts/#{layout_name}/_find?_limit=1"
           )
         )
       new_field_data = {}
       create_translations if @configuration.translations.keys.empty?
-      fieldData.keys.each do |k|
+      field_data.keys.each do |k|
         if @configuration.translations.keys.include?(k.to_s)
-          new_field_data.merge!({ "#{@configuration.translations[k.to_s]}" => fieldData[k] })
+          new_field_data.merge!({ @configuration.translations[k.to_s].to_s => field_data[k] })
         else
-          new_field_data.merge!({ "#{k}" => fieldData[k] })
+          new_field_data.merge!({ k.to_s => field_data[k] })
         end
       end
       body = { query: [new_field_data], limit: '100000' }.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'
-          return RecordSet.new(self.layout_name, self.non_modifiable_fields)
-        end
-        Error.throw_error(response['messages'][0]['code'])
-      else
+      if response['messages'][0]['code'] == '0'
         r_results = response['response']['data']
-        ret_val = RecordSet.new(self.layout_name, self.non_modifiable_fields)
+        ret_val = RecordSet.new(layout_name, non_modifiable_fields)
         r_results.each do |r|
           hash = build_result(r)
           ret_val << hash
         end
-        return ret_val.first
+        ret_val.first
+      else
+        if response['messages'][0]['code'] == '101' || response['messages'][0]['code'] == '401'
+          return RecordSet.new(layout_name, non_modifiable_fields)
+        end
+
+        Error.throw_error(response['messages'][0]['code'])
       end
     end
 
@@ -304,12 +304,12 @@ module Trophonius
           )
         )
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'get', '{}')
-      if response['messages'][0]['code'] != '0'
-        Error.throw_error(response['messages'][0]['code'], record_id)
-      else
+      if response['messages'][0]['code'] == '0'
         ret_val = build_result(response['response']['data'][0])
         ret_val.send(:define_singleton_method, 'result_count') { 1 }
-        return ret_val
+        ret_val
+      else
+        Error.throw_error(response['messages'][0]['code'], record_id)
       end
     end
 
@@ -330,10 +330,10 @@ module Trophonius
           )
         )
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'delete', '{}')
-      if response['messages'][0]['code'] != '0'
-        Error.throw_error(response['messages'][0]['code'])
+      if response['messages'][0]['code'] == '0'
+        true
       else
-        return true
+        Error.throw_error(response['messages'][0]['code'])
       end
     end
 
@@ -345,7 +345,7 @@ module Trophonius
     # @param [Hash] fieldData: A hash containing the fields to edit and the new data to fill them with
     #
     # @return [Boolean] True if the delete was successful
-    def self.edit(record_id, fieldData)
+    def self.edit(record_id, field_data)
       uri = URI::RFC2396_Parser.new
       url =
         URI(
@@ -357,16 +357,16 @@ module Trophonius
         )
       new_field_data = {}
       create_translations if @configuration.translations.keys.empty?
-      fieldData.keys.each do |k|
+      field_data.keys.each do |k|
         if @configuration.translations.keys.include?(k.to_s)
-          new_field_data.merge!({ "#{@configuration.translations[k.to_s]}" => fieldData[k] })
+          new_field_data.merge!({ @configuration.translations[k.to_s].to_s => field_data[k] })
         else
-          new_field_data.merge!({ "#{k}" => fieldData[k] })
+          new_field_data.merge!({ k.to_s => field_data[k] })
         end
       end
       body = "{\"fieldData\": #{new_field_data.to_json}}"
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'patch', body)
-      response['messages'][0]['code'] != '0' ? Error.throw_error(response['messages'][0]['code']) : true
+      response['messages'][0]['code'] == '0' ? true : Error.throw_error(response['messages'][0]['code'])
     end
 
     ##
@@ -376,7 +376,7 @@ module Trophonius
     #
     # @return [Record] A Record with singleton_methods for the fields where possible
     def self.build_result(result)
-      hash = Trophonius::Record.new
+      hash = Trophonius::Record.new(name)
       hash.record_id = result['recordId']
       hash.layout_name = layout_name
       hash.model_name = name
@@ -384,7 +384,7 @@ module Trophonius
       result['fieldData'].keys.each do |key|
         # unless key[/\s/] || key[/\W/]
         @configuration.translations.merge!(
-          { "#{ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_').downcase}" => "#{key}" }
+          { ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_').downcase.to_s => key.to_s }
         )
         hash.send(:define_singleton_method, ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_')) do
           hash[key]
@@ -413,7 +413,7 @@ module Trophonius
             hash[key]
           end
         end
-        result['portalData'][key].each_with_index do |inner_hash|
+        result['portalData'][key].each 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: '_')
@@ -425,7 +425,7 @@ module Trophonius
         end
         hash.merge!({ key => result['portalData'][key] })
       end
-      return hash
+      hash
     end
 
     ##
@@ -434,13 +434,13 @@ module Trophonius
     # @return [Record]: a Record corresponding to the FileMaker record.
     def self.first
       results = Request.retrieve_first(layout_name)
-      if results['messages'][0]['code'] != '0'
-        Error.throw_error(results['messages'][0]['code'])
-      else
+      if results['messages'][0]['code'] == '0'
         r_results = results['response']['data']
         ret_val = r_results.empty? ? Trophonius::Record.new : build_result(r_results[0])
         ret_val.send(:define_singleton_method, 'result_count') { r_results.empty? ? 0 : 1 }
-        return ret_val
+        ret_val
+      else
+        Error.throw_error(results['messages'][0]['code'])
       end
     end
 
@@ -459,8 +459,8 @@ module Trophonius
       elsif result['response']['scriptResult'] == '403'
         Error.throw_error(403)
       else
-        ret_val = result['response']['scriptResult']
-        return ret_val
+        result['response']['scriptResult']
+
       end
     end
 
@@ -474,39 +474,37 @@ module Trophonius
       uri = URI::RFC2396_Parser.new
       results = Request.retrieve_all(layout_name, sort)
       count = results['response']['scriptResult'].to_i
-      unless @limit.empty? || @offset.empty?
-        url =
-          URI(
-            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(
-            uri.escape(
-              "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+      url = if @limit.empty? || @offset.empty?
+              URI(
+                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
+                )
+              )
+            else
+              URI(
+                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}"
+                )
+              )
+            end
       @limit = ''
       @offset = ''
       results = Request.make_request(url, "Bearer #{Request.get_token}", 'get', '{}')
-      if results['messages'][0]['code'] != '0'
-        Error.throw_error(results['messages'][0]['code'])
-      else
+      if results['messages'][0]['code'] == '0'
         r_results = results['response']['data']
-        ret_val = RecordSet.new(self.layout_name, self.non_modifiable_fields)
+        ret_val = RecordSet.new(layout_name, non_modifiable_fields)
         r_results.each do |r|
           hash = build_result(r)
           ret_val << hash
         end
         ret_val.result_count = count
-        return ret_val
+        ret_val
+      else
+        Error.throw_error(results['messages'][0]['code'])
       end
     end
   end

data/lib/trophonius_record.rb

@@ -12,9 +12,13 @@ module Trophonius
 
     ##
     # Initializes a new Record
-    def initialize
+    def initialize(model = '')
       @modifiable_fields = {}
       @modified_fields = {}
+      model_name = model
+      @model = ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.classify(ActiveSupport::Inflector.singularize(model_name)))
+
+      super
     end
 
     def []=(field, new_val)
@@ -42,40 +46,22 @@ module Trophonius
               )
             )
 
-          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
+          foreign_key_field = if model.translations.key?(relation[:foreign_key])
+                                model.translations[relation[:foreign_key]].to_s
+                              else
+                                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
+          primary_key_field = if pk_model.translations.key?(relation[:primary_key])
+                                pk_model.translations[relation[:primary_key]].to_s
+                              else
+                                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
+          if response['messages'][0]['code'] == '0'
             r_results = response['response']['data']
             ret_val = RecordSet.new(layout, model.non_modifiable_fields)
             r_results.each do |r|
@@ -83,7 +69,23 @@ module Trophonius
               ret_val << hash
             end
             @response = ret_val
-            return @response
+            @response
+          elsif response['messages'][0]['code'] == '101' || response['messages'][0]['code'] == '401'
+            RecordSet.new(layout, model.non_modifiable_fields)
+
+          else
+            if response['messages'][0]['code'] == '102'
+              results = Request.retrieve_first(layout)
+              if results['messages'][0]['code'] == '0'
+                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)
+              else
+                Error.throw_error('102')
+              end
+            end
+            Error.throw_error(response['messages'][0]['code'])
           end
         end
       elsif ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.classify(ActiveSupport::Inflector.singularize(method))).respond_to?('first')
@@ -105,40 +107,22 @@ module Trophonius
               )
             )
 
-          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
+          foreign_key_field = if fk_model.translations.key?(relation[:foreign_key])
+                                fk_model.translations[relation[:foreign_key]].to_s
+                              else
+                                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
+          primary_key_field = if pk_model.translations.key?(relation[:primary_key])
+                                pk_model.translations[relation[:primary_key]].to_s
+                              else
+                                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
+          if response['messages'][0]['code'] == '0'
             r_results = response['response']['data']
             ret_val = RecordSet.new(layout, pk_model.non_modifiable_fields)
             r_results.each do |r|
@@ -146,7 +130,23 @@ module Trophonius
               ret_val << hash
             end
             @response = ret_val
-            return @response.first
+            @response.first
+          elsif response['messages'][0]['code'] == '101' || response['messages'][0]['code'] == '401'
+            RecordSet.new(layout, pk_model.non_modifiable_fields)
+
+          else
+            if response['messages'][0]['code'] == '102'
+              results = Request.retrieve_first(layout)
+              if results['messages'][0]['code'] == '0'
+                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)
+              else
+                Error.throw_error('102')
+              end
+            end
+            Error.throw_error(response['messages'][0]['code'])
           end
         end
       else
@@ -187,7 +187,7 @@ module Trophonius
         Error.throw_error(403)
       else
         ret_val = result['response']['scriptResult']
-        return ret_val || true
+        ret_val || true
       end
     end
 
@@ -208,7 +208,7 @@ module Trophonius
         )
       body = "{\"fieldData\": #{modified_fields.to_json}}"
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'patch', body)
-      response['messages'][0]['code'] != '0' ? Error.throw_error(response['messages'][0]['code']) : true
+      response['messages'][0]['code'] == '0' ? true : Error.throw_error(response['messages'][0]['code'])
     end
 
     ##
@@ -227,17 +227,17 @@ module Trophonius
           )
         )
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'delete', '{}')
-      response['messages'][0]['code'] != '0' ? Error.throw_error(response['messages'][0]['code']) : true
+      response['messages'][0]['code'] == '0' ? true : Error.throw_error(response['messages'][0]['code'])
     end
 
     ##
     # Changes and saves the corresponding record in FileMaker
     # Throws a FileMaker error if save failed
     #
-    # @param [Hash] fieldData: Fields to be changed and data to fill the fields with
+    # @param [Hash] field_data: Fields to be changed and data to fill the fields with
     #
     # @return [True] if successful
-    def update(fieldData)
+    def update(field_data, portal_data: {})
       uri = URI::RFC2396_Parser.new
       url =
         URI(
@@ -247,23 +247,47 @@ module Trophonius
             }/layouts/#{layout_name}/records/#{record_id}"
           )
         )
-      fieldData.keys.each { |field| modifiable_fields[field] = fieldData[field] }
-      body = "{\"fieldData\": #{fieldData.to_json}}"
+      field_data.each_key { |field| modifiable_fields[field] = field_data[field] }
+      new_portal_data = {}
+      portal_data.each do |portal_name, portal_values|
+        new_portal_data.merge!(
+          portal_name =>
+            portal_values.map do |record|
+              record.each_with_object({}) do |(key, value), new_hash|
+                if key.to_s.downcase.include?('id') && key.to_s.downcase.include?('record')
+                  new_hash['recordId'] = value
+                else
+                  new_hash["#{portal_name}::#{key}"] = value
+                end
+              end
+            end
+        )
+      end
+      body =
+        if new_portal_data == {}
+          "{\"fieldData\": #{field_data.to_json} }"
+        else
+          "{\"fieldData\": #{field_data.to_json}, \"portalData\": #{new_portal_data.to_json}}"
+        end
+
+      puts "BODY SENT TO FILEMAKER WAS: #{body}"
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'patch', body)
-      if response['messages'][0]['code'] != '0'
+      puts "RESPONSE FROM FILEMAKER WAS: #{response}"
+      if response['messages'][0]['code'] == '0'
+        true
+      else
         if response['messages'][0]['code'] == '102'
           results = Request.retrieve_first(layout_name)
-          if results['messages'][0]['code'] != '0'
-            Error.throw_error('102')
-          else
+          if results['messages'][0]['code'] == '0'
             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)
+            Error.throw_error('102') if r_results.empty?
+            ret_val = r_results[0]['fieldData']
+            Error.throw_error('102', (field_data.keys.map { |key| key.to_s.downcase } - ret_val.keys.map(&:downcase)).flatten.join(', '), layout_name)
+          else
+            Error.throw_error('102')
           end
         end
         Error.throw_error(response['messages'][0]['code'])
-      else
-        true
       end
     end
 
@@ -276,7 +300,7 @@ module Trophonius
     # @param [Tempfile or File] file: File to upload
     #
     # @return [True] if successful
-    def upload(container_name:, container_repetition: 1, file:)
+    def upload(container_name:, file:, container_repetition: 1)
       uri = URI::RFC2396_Parser.new
       url =
         URI(
@@ -288,7 +312,7 @@ module Trophonius
         )
 
       response = Request.upload_file_request(url, "Bearer #{Request.get_token}", file)
-      response['messages'][0]['code'] != '0' ? Error.throw_error(response['messages'][0]['code']) : true
+      response['messages'][0]['code'] == '0' ? true : Error.throw_error(response['messages'][0]['code'])
     end
   end
 end

data/lib/trophonius_request.rb

@@ -139,25 +139,25 @@ module Trophonius
     # @return [JSON] The first 10000000 records from FileMaker
     def self.retrieve_all(layout_name, sort)
       uri = URI::RFC2396_Parser.new
-      if !sort.empty?
-        sort_order = sort.to_json.to_s
+      if sort.empty?
         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}#{
+              }/layouts/#{layout_name}/records?_limit=10000000#{
                 Trophonius.config.count_result_script == '' ? '' : "&script=#{Trophonius.config.count_result_script}"
               }"
             )
           )
       else
+        sort_order = sort.to_json.to_s
         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#{
+              }/layouts/#{layout_name}/records?_limit=10000000&_sort=#{sort_order}#{
                 Trophonius.config.count_result_script == '' ? '' : "&script=#{Trophonius.config.count_result_script}"
               }"
             )

data/lib/trophonius_single.rb

@@ -7,6 +7,7 @@ require 'trophonius_recordset'
 module Trophonius
   class Trophonius::Single
     attr_reader :query
+
     def initialize(config:)
       @config = config
       @query = {}
@@ -46,7 +47,7 @@ module Trophonius
       @query = {}
       close_connection(token)
 
-      return ret_val
+      ret_val
     end
 
     def first
@@ -79,7 +80,7 @@ module Trophonius
       end
       close_connection(token)
 
-      return ret_val
+      ret_val
     end
 
     def run_script(script:, scriptparameter:)
@@ -94,7 +95,7 @@ module Trophonius
         )
 
       token = setup_connection
-      result = make_request(url, "#{token}", 'get', '{}')
+      result = make_request(url, token.to_s, 'get', '{}')
       ret_val = ''
 
       if result['messages'][0]['code'] != '0'
@@ -109,7 +110,7 @@ module Trophonius
 
       close_connection(token)
 
-      return ret_val
+      ret_val
     end
 
     private
@@ -123,7 +124,7 @@ module Trophonius
       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}" }
+          { ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_').downcase.to_s => key.to_s }
         )
         hash.send(:define_singleton_method, ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_')) do
           hash[key]
@@ -152,7 +153,7 @@ module Trophonius
             hash[key]
           end
         end
-        result['portalData'][key].each_with_index do |inner_hash|
+        result['portalData'][key].each 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: '_')
@@ -164,7 +165,7 @@ module Trophonius
         end
         hash.merge!({ key => result['portalData'][key] })
       end
-      return hash
+      hash
     end
 
     def make_request(url_param, token, method, body, params = '')
@@ -220,7 +221,7 @@ module Trophonius
         Error.throw_error('1631')
       end
       Error.throw_error(parsed['messages'][0]['code']) if parsed['messages'][0]['code'] != '0'
-      return parsed['response']['token']
+      parsed['response']['token']
     end
 
     def close_connection(token)
@@ -247,7 +248,7 @@ module Trophonius
         Error.throw_error('1631')
       end
       Error.throw_error(parsed['messages'][0]['code']) if parsed['messages'][0]['code'] != '0'
-      return true
+      true
     end
   end
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: trophonius
 version: !ruby/object:Gem::Version
-  version: 1.4.3.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Kempen Automatisering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2022-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: redis
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.0'
 description: A lightweight, easy to use link between Ruby (on Rails) and FileMaker
   using the FileMaker Data-API.
 email:
@@ -78,7 +78,8 @@ files:
 homepage: https://github.com/Willem-Jan/Trophonius
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: