trophonius 1.4.2.1 → 1.4.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0949793d21332ffb6c5af748bfa63343381852320139c87d0ac42eebb081e9a
-  data.tar.gz: 9a15a879d7aa1ba1cec4429922336d455cc0b7ceb9976dc0eb5208a4e596ba61
+  metadata.gz: c25ac6f70f1f81be6d74ee6c429c9eba4b9398ed946c95db4afbef9edd5d7427
+  data.tar.gz: 2e5ff0271d0c59bf9b0c0698c828036a29241d52bef858b4742322ae57696a04
 SHA512:
-  metadata.gz: fbc67931cd98a46274da0d322d8d3e7e5a5a45e65cce58f38e24eb151d9ff27967272f64000b66b33afdf3ad56266db63a3965b32ffaa1568204f373639f9928
-  data.tar.gz: c4311588cec27ccaa4af3f5112cc90a65d266395e54d27d0e105a25ee17aeff07ec260cb788fa430343338308f9526b743c0830fa8aa213da26ee98d424d97b2
+  metadata.gz: 36392a0d5088283582cfdaeb8c06fff3c51d9f049c1e7e942d83a49dfab727af868fad7d86adfe79ffdf9d587fa5fc5034c02009467c4fef86dd3fcf3c421914
+  data.tar.gz: 3a17c5d3f9a7d6bbe3fbfb4e279b5f5000363827c2c22c2a5215e6f6cc7a9782701fd5217cc18ab43f0d394aa6ca7122a4536928aafd31e435f68996e6e65e82

data/lib/trophonius.rb

@@ -3,6 +3,7 @@ require 'trophonius_model'
 require 'trophonius_config'
 require 'trophonius_date'
 require 'trophonius_time'
+require 'trophonius_date_time'
 
 module Trophonius # :nodoc:
   def self.configuration

data/lib/trophonius_connection.rb

@@ -36,9 +36,10 @@ module Trophonius
       end
       ssl_verifyhost = Trophonius.config.local_network ? 0 : 2
       ssl_verifypeer = !Trophonius.config.local_network
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          uri.escape(
             "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/sessions"
           )
         )
@@ -83,9 +84,10 @@ module Trophonius
     # Disconnects from the FileMaker server
     #
     def self.disconnect
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          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}"
@@ -137,9 +139,10 @@ module Trophonius
     # Tests whether the FileMaker token is still valid
     # @return [Boolean] True if the token is valid False if invalid
     def self.test_connection
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          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"

data/lib/trophonius_date.rb

@@ -3,5 +3,9 @@ class Date
     self.strftime('%m/%d/%Y')
   end
 
+  def self.from_fm(fm_date)
+    Date.strptime(fm_date, '%m/%d/%Y')
+  end
+
   alias convert_to_fm to_fm
 end

data/lib/trophonius_model.rb

@@ -176,9 +176,10 @@ module Trophonius
     # @return [Record] the created record
     #   Model.create(fieldOne: "Data")
     def self.create(fieldData, portalData: {})
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          uri.escape(
             "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
               Trophonius.config.database
             }/layouts/#{layout_name}/records"
@@ -229,7 +230,7 @@ module Trophonius
       else
         url =
           URI(
-            URI.escape(
+            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']}"
@@ -249,9 +250,10 @@ 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)
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          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"
@@ -292,9 +294,10 @@ module Trophonius
     #
     # @return [Record] the record
     def self.find(record_id)
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          uri.escape(
             "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
               Trophonius.config.database
             }/layouts/#{layout_name}/records/#{record_id}"
@@ -317,9 +320,10 @@ module Trophonius
     #
     # @return [Boolean] True if the delete was successful
     def self.delete(record_id)
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          uri.escape(
             "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
               Trophonius.config.database
             }/layouts/#{layout_name}/records/#{record_id}"
@@ -342,9 +346,10 @@ module Trophonius
     #
     # @return [Boolean] True if the delete was successful
     def self.edit(record_id, fieldData)
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          uri.escape(
             "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
               Trophonius.config.database
             }/layouts/#{layout_name}/records/#{record_id}"
@@ -466,12 +471,13 @@ module Trophonius
     #
     # @return [RecordSet]: a RecordSet containing all the Record objects that correspond to the FileMaker records.
     def self.all(sort: {})
+      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(
+            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}"
@@ -480,7 +486,7 @@ module Trophonius
       else
         url =
           URI(
-            URI.escape(
+            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}"

data/lib/trophonius_query.rb

@@ -184,9 +184,10 @@ module Trophonius
     #
     # @return Response of the called method
     def run_query(method, *args, &block)
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          uri.escape(
             "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
               Trophonius.config.database
             }/layouts/#{@trophonius_model.layout_name}/_find"
@@ -217,17 +218,17 @@ module Trophonius
 
       if @post_request_script.present?
         body.merge!(script: @post_request_script)
-        body.merge!('script.param' => @post_request_script_param) if @post_request_scriptparam.present?
+        body.merge!('script.param' => @post_request_scriptparam) if @post_request_scriptparam.present?
       end
 
       if @prerequest_script.present?
         body.merge!(script: @prerequest_script)
-        body.merge!('script.param' => @prerequest_script_param) if @prerequest_scriptparam.present?
+        body.merge!('script.prerequest.param' => @prerequest_scriptparam) if @prerequest_scriptparam.present?
       end
 
       if @presort_script.present?
         body.merge!(script: @presort_script)
-        body.merge!('script.param' => @presort_script_param) if @presort_scriptparam.present?
+        body.merge!('script.presort.param' => @presort_scriptparam) if @presort_scriptparam.present?
       end
 
       if @portal_limits

data/lib/trophonius_record.rb

@@ -32,9 +32,10 @@ module Trophonius
           layout = model.layout_name
           model.create_translations if model.translations.keys.empty?
 
+          uri = URI::RFC2396_Parser.new
           url =
             URI(
-              URI.escape(
+              uri.escape(
                 "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
                   Trophonius.config.database
                 }/layouts/#{layout}/_find"
@@ -94,9 +95,10 @@ module Trophonius
           layout = pk_model.layout_name
           pk_model.create_translations if pk_model.translations.keys.empty?
 
+          uri = URI::RFC2396_Parser.new
           url =
             URI(
-              URI.escape(
+              uri.escape(
                 "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
                   Trophonius.config.database
                 }/layouts/#{layout}/_find"
@@ -150,6 +152,12 @@ module Trophonius
       else
         super
       end
+    rescue NameError => e
+      if e.message.include?('constant')
+        Error.throw_error('102', e.message.split(' ')[-1], layout_name)
+      else
+        raise e
+      end
     end
 
     ##
@@ -161,9 +169,10 @@ module Trophonius
     #
     # @return [String]: string representing the script result returned by FileMaker
     def run_script(script: '', scriptparameter: '')
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          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}"
@@ -188,9 +197,10 @@ module Trophonius
     #
     # @return [True] if successful
     def save
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          uri.escape(
             "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
               Trophonius.config.database
             }/layouts/#{layout_name}/records/#{record_id}"
@@ -207,9 +217,10 @@ module Trophonius
     #
     # @return [True] if successful
     def delete
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          uri.escape(
             "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
               Trophonius.config.database
             }/layouts/#{layout_name}/records/#{record_id}"
@@ -227,9 +238,10 @@ module Trophonius
     #
     # @return [True] if successful
     def update(fieldData)
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          uri.escape(
             "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
               Trophonius.config.database
             }/layouts/#{layout_name}/records/#{record_id}"
@@ -265,9 +277,10 @@ module Trophonius
     #
     # @return [True] if successful
     def upload(container_name:, container_repetition: 1, file:)
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          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}"

data/lib/trophonius_request.rb

@@ -83,9 +83,10 @@ module Trophonius
     #
     # @return [JSON] The first record from FileMaker
     def self.retrieve_first(layout_name)
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          uri.escape(
             "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
               Trophonius.config.database
             }/layouts/#{layout_name}/records?_limit=1"
@@ -99,9 +100,10 @@ module Trophonius
     #
     # @return [JSON] The fieldnames of a layout
     def self.get_layout_field_names(layout_name)
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          uri.escape(
             "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
               Trophonius.config.database
             }/layouts/#{layout_name}"
@@ -119,9 +121,10 @@ module Trophonius
     #
     # @return [JSON] The script result from FileMaker
     def self.run_script(script, scriptparameter, layout_name)
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          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}"
@@ -135,11 +138,12 @@ 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
         url =
           URI(
-            URI.escape(
+            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}#{
@@ -150,7 +154,7 @@ module Trophonius
       else
         url =
           URI(
-            URI.escape(
+            uri.escape(
               "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
                 Trophonius.config.database
               }/layouts/#{layout_name}/records?_limit=10000000#{

data/lib/trophonius_single.rb

@@ -15,9 +15,10 @@ module Trophonius
     end
 
     def where(fieldData)
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          uri.escape(
             "http#{@config[:ssl] == true ? 's' : ''}://#{@config[:host]}/fmi/data/v1/databases/#{@config[:database]}/layouts/#{
               @config[:layout_name]
             }/_find"
@@ -49,9 +50,10 @@ module Trophonius
     end
 
     def first
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          uri.escape(
             "http#{@config[:ssl] == true ? 's' : ''}://#{@config[:host]}/fmi/data/v1/databases/#{@config[:database]}/layouts/#{
               @config[:layout_name]
             }/records?_limit=1"
@@ -81,9 +83,10 @@ module Trophonius
     end
 
     def run_script(script:, scriptparameter:)
+      uri = URI::RFC2396_Parser.new
       url =
         URI(
-          URI.escape(
+          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}"
@@ -91,7 +94,7 @@ module Trophonius
         )
 
       token = setup_connection
-      result = make_request(url, "Bearer #{token}", 'get', '{}')
+      result = make_request(url, "#{token}", 'get', '{}')
       ret_val = ''
 
       if result['messages'][0]['code'] != '0'
@@ -189,7 +192,8 @@ module Trophonius
     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"))
+      uri = URI::RFC2396_Parser.new
+      url = URI(uri.escape("http#{@config[:ssl] == true ? 's' : ''}://#{@config[:host]}/fmi/data/v1/databases/#{@config[:database]}/sessions"))
       request =
         Typhoeus::Request.new(
           url,
@@ -220,8 +224,9 @@ module Trophonius
     end
 
     def close_connection(token)
+      uri = URI::RFC2396_Parser.new
       url =
-        URI(URI.escape("http#{@config[:ssl] == true ? 's' : ''}://#{@config[:host]}/fmi/data/v1/databases/#{@config[:database]}/sessions/#{token}"))
+        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]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trophonius
 version: !ruby/object:Gem::Version
-  version: 1.4.2.1
+  version: 1.4.3.3
 platform: ruby
 authors:
 - Kempen Automatisering
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Link between Ruby (on Rails) and FileMaker.