trophonius 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cf39904e7500cbacbd16e8f3a78a1df4efa2ded1d64b4c6703c2a1a28c62c9c
-  data.tar.gz: d14b38291d4f6a49b3cd825fabdc82ce676c14d27afc738c80c42c6f61ee7144
+  metadata.gz: b5cfb56042719c5acb4e4005f9faa66a0f748e7929226a10bcc2993a531f0d14
+  data.tar.gz: a735cdd0c6af4547795fda4a06fbaacd9e006d295f538b7a18da620585ccb309
 SHA512:
-  metadata.gz: 9508bca471f2602c71c1d8be927ed848e19d5d937f66a90bb2b71eb8d34bb59f904d3dbc1ffabaa1053c244e29d89ec25e333d83a01c9b6716f91871fee86732
-  data.tar.gz: 2a98ea6373a6c7ac63ba72b0f13a3852ebbaffbbfca9bab5f8e6c4aabd40e534bbc4ac05249bdd5f0c183674444977c5a2e8853e4d8bfd2ec6dd8bcb5d27afac
+  metadata.gz: 16a5eaaf5690005ff1830edcde19d9a91f7bf7eeaee8f379c123eb4ce1ffcc0bd607d1314f14525387da742744f80fc028882f85f1d3dcba42c9f4ff696f91b8
+  data.tar.gz: 1a22f058592aa168c601ca5419fa8beb6a0c277367a0e797228083e6d80aff79bec7dad65eb9c578cb89834ca2bfdf85b6047829eef0b3d8c38fe93f97770f52

data/lib/trophonius_query.rb

@@ -7,6 +7,7 @@ require 'trophonius_error'
 module Trophonius
   class Trophonius::Query
     attr_reader :response
+    attr_accessor :presort_script, :presort_scriptparam, :prerequest_script, :prerequest_scriptparam, :post_request_script, :post_request_scriptparam
 
     ##
     # Creates a new instance of the Trophonius::Query class
@@ -20,6 +21,12 @@ module Trophonius
       @trophonius_model = trophonius_model
       @limit = limit
       @offset = offset
+      @presort_script = ''
+      @presort_scriptparam = ''
+      @prerequest_script = ''
+      @prerequest_scriptparam = ''
+      @post_request_script = ''
+      @post_request_scriptparam = ''
     end
 
     ##
@@ -60,6 +67,66 @@ module Trophonius
       args[1]
     end
 
+    ##
+    # Adds a post-request script to the request
+    #
+    # @param [args] arguments containing a String with the name of the script
+    # @return [Trophonius::Model] updated base model
+    def set_post_request_script(args)
+      args[1].current_query.post_request_script = args[0]
+      args[1]
+    end
+
+    ##
+    # Adds a post-request scriptparameter to the request
+    #
+    # @param [args] arguments containing a String with the name of the scriptparameter
+    # @return [Trophonius::Model] updated base model
+    def set_post_request_script_param(args)
+      args[1].current_query.post_request_scriptparam = args[0]
+      args[1]
+    end
+
+    ##
+    # Adds a pre-request script to the request
+    #
+    # @param [args] arguments containing a String with the name of the script
+    # @return [Trophonius::Model] updated base model
+    def set_prerequest_script(args)
+      args[1].current_query.prerequest_script = args[0]
+      args[1]
+    end
+
+    ##
+    # Adds a pre-request scriptparameter to the request
+    #
+    # @param [args] arguments containing a String with the name of the scriptparameter
+    # @return [Trophonius::Model] updated base model
+    def set_prerequest_script_param(args)
+      args[1].current_query.prerequest_scriptparam = args[0]
+      args[1]
+    end
+
+    ##
+    # Adds a pre-sort script to the request
+    #
+    # @param [args] arguments containing a String with the name of the script
+    # @return [Trophonius::Model] updated base model
+    def set_presort_script(args)
+      args[1].current_query.presort_script = args[0]
+      args[1]
+    end
+
+    ##
+    # Adds a pre-request scriptparameter to the request
+    #
+    # @param [args] arguments containing a String with the name of the scriptparameter
+    # @return [Trophonius::Model] updated base model
+    def set_presort_script_param(args)
+      args[1].current_query.presort_scriptparam = args[0]
+      args[1]
+    end
+
     ##
     # Adds a find request to the original query, resulting in an "Or" find-request for FileMaker
     #
@@ -125,7 +192,6 @@ module Trophonius
             }/layouts/#{@trophonius_model.layout_name}/_find"
           )
         )
-
       new_field_data = @current_query.map { |_q| {} }
 
       @trophonius_model.create_translations if @trophonius_model.translations.keys.empty?
@@ -149,6 +215,21 @@ module Trophonius
           end
       end
 
+      if @post_request_script.present?
+        body.merge!(script: @post_request_script)
+        body.merge!('script.param' => @post_request_script_param) if @post_request_script_param.present?
+      end
+
+      if @prerequest_script.present?
+        body.merge!(script: @prerequest_script)
+        body.merge!('script.param' => @prerequest_script_param) if @prerequest_script_param.present?
+      end
+
+      if @presort_script.present?
+        body.merge!(script: @presort_script)
+        body.merge!('script.param' => @presort_script_param) if @presort_script_param.present?
+      end
+
       if @portal_limits
         portal_hash = { portal: @portal_limits.map { |portal_name, limit| "#{portal_name}" } }
         body.merge!(portal_hash)
@@ -157,6 +238,7 @@ module Trophonius
 
       body = body.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(@trophonius_model.layout_name, @trophonius_model.non_modifiable_fields).send(method, *args, &block)
@@ -178,7 +260,26 @@ module Trophonius
       else
         r_results = response['response']['data']
         ret_val = RecordSet.new(@trophonius_model.layout_name, @trophonius_model.non_modifiable_fields)
+
         r_results.each do |r|
+          r['fieldData'].merge!('post_request_script_result' => response['response']['scriptResult']) if response['response']['scriptResult']
+
+          if response['response']['scriptResult.presort']
+            r['fieldData'].merge!('presort_script_result' => response['response']['scriptResult.presort'])
+          end
+
+          if response['response']['scriptResult.prerequest']
+            r['fieldData'].merge!('prerequest_script_result' => response['response']['scriptResult.prerequest'])
+          end
+
+          r['fieldData'].merge!('post_request_script_error' => response['response']['scriptError']) if response['response']['scriptError']
+
+          r['fieldData'].merge!('presort_script_error' => response['response']['scriptError.presort']) if response['response']['scriptError.presort']
+
+          if response['response']['scriptError.prerequest']
+            r['fieldData'].merge!('prerequest_script_error' => response['response']['scriptError.prerequest'])
+          end
+
           hash = @trophonius_model.build_result(r)
           ret_val << hash
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trophonius
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Kempen Automatisering