trophonius 1.2.6.3 → 1.2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ae60ee7f5268ca52e52b3debe45b23fb345a1e6fb82e98753225cf05d2bfdab
-  data.tar.gz: 5851e544d81d093338fec8b5ae2cd5f54888e9e52c291d0a3a2566e89af29726
+  metadata.gz: f64c4285e902e34390d654a1766180aebae9a4c3bb483286d442b02284813390
+  data.tar.gz: c85fc16b8bd2179865d3d75709be1b44a15d17aded4ae5ee6a2820bbf16e0488
 SHA512:
-  metadata.gz: 564cf24b8f721c61e1522973d863bf5aa0c78c80745d31571183475b01cac5aa2b7f05aaa373ad1d375801223b75e18dfb2d631b6ed44064cedf2e8cb61eaef3
-  data.tar.gz: c3351a53038cb94963b37dd0b1e1b943ccc8a5991b26fcf31879d0e7de1980bb5b2e76d0ea029ff288b43dc455a9d7fb01c2ef8a808fd44f7dddd172f0c351e6
+  metadata.gz: 59ba939131882022370de145757b09fc5c3b03775314ee08e298d383d0cf6a2d7796ae98706cf98b806dcd58ed7df5d6fd07656ec811df3b0d136775f5abf926
+  data.tar.gz: 2df0e98f4da6fc84658faf26632b65e52574efea36dea08b11131dfd5234b43f3612693efbf5d741e11c7c2fe0f924989ea7496db57e39c01a89c8d57756292a

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_model.rb

@@ -169,9 +169,11 @@ module Trophonius
     def self.create(fieldData)
       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?
@@ -199,9 +201,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 +223,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 +266,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 +291,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 +316,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 +443,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])
@@ -156,9 +160,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 +179,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 +199,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 +237,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,21 @@ 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
+        puts "Error was #{e}"
         Error.throw_error('1631')
       end
     end
@@ -52,7 +53,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 +76,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,7 +84,14 @@ 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
 
@@ -96,7 +100,14 @@ module Trophonius
     #
     # @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 +118,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trophonius
 version: !ruby/object:Gem::Version
-  version: 1.2.6.3
+  version: 1.2.6.4
 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: []
@@ -97,7 +91,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.