trophonius 1.4.2.2 → 1.4.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbc6e79b6244e3db4d69057e9502565a77b4aed5c053872332d4015bd6a28d95
-  data.tar.gz: 128ec494f7a33e45dd6300c3b9c5386f297cf0384a16c43c170b59cd9d8b5e10
+  metadata.gz: 4d52cbe0f01bc7cb86fdd330790404ecf956631db54c0997b00a2418dfe681d9
+  data.tar.gz: e8f4d3da5dc60152dcd9ea8e88d6b6511b6bb62fc197158d4eadc63b3596fbf7
 SHA512:
-  metadata.gz: 17cc7cf2bb12e56a07683b5bd26c4d33f872945b88ef707b5b61621eed79aa5e1b79d2e879b9a86ca564e19f49df7daab9632fc9874b70d307ac11b848092ed4
-  data.tar.gz: 260b16ca4aede6110a88e415ad4b676ea9475bb321c6d68ece2464004595272da4eedafdf41f8e122b9ddaea2369a36abdb598f5166715ff9b420390343cb896
+  metadata.gz: 97fbbbeacba35f6bd111a4ab3ec424954aa3e75a344f0afe508da30f2ec58b8ec5ed23e5be9bfb5051661d101edc13f99e65ae81b395766a6ca4ee584d4b6cc6
+  data.tar.gz: b80e60772da1d002dd648852231adff14195087ba96d4551095446e129e128073a9d54ecad69602ab47e66381e50954064f8f066b9a9fd81be2fdcfffde84073

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"
@@ -221,12 +222,12 @@ module Trophonius
       end
 
       if @prerequest_script.present?
-        body.merge!(script: @prerequest_script)
+        body.merge!("script.prerequest" => @prerequest_script)
         body.merge!('script.prerequest.param' => @prerequest_scriptparam) if @prerequest_scriptparam.present?
       end
 
       if @presort_script.present?
-        body.merge!(script: @presort_script)
+        body.merge!("script.presort" => @presort_script)
         body.merge!('script.presort.param' => @presort_scriptparam) if @presort_scriptparam.present?
       end
 

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.2
+  version: 1.4.3.4
 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.0.9
 signing_key:
 specification_version: 4
 summary: Link between Ruby (on Rails) and FileMaker.