trophonius 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b396a3a21ea6764173b3b4fed6300f00f332280132bd73986d02f77871f9f00
-  data.tar.gz: 6d7bf9d341969a63a2321283ac7cc26c40d842137bb2a29a677bf3de81b4c9cd
+  metadata.gz: 5d1c4de653b4f48f81cf9ea3b8ced6ffce09cd7583d2b23b0fe17de97cfa2e9d
+  data.tar.gz: 0c41d739871de40caabf04ed8fd2575a39320b839fe0064b6bdc616722ef0eef
 SHA512:
-  metadata.gz: ce349193edf1388c9404b0ef65a379b1b6187050b90dea35d81e7301a3d081de5be0cd731c068da73cf9e3bbdc399744974aa698b8d70e6e3d742c109507025a
-  data.tar.gz: 5a1d947924e1ba3fcf0ab8ceb2db5ade50ff5eabe6a2a33ba51942eb3f5edb38d434874c0eedd7196cfc24b47568dbc1266ec3c983ad4d43f0f1028bc70d103a
+  metadata.gz: f232aaf25f6a72e0e8e2779eae555f4e467ff013e436d0cc18e2cd9510e523ecace64e0e93b9a93d14b121d3ef071954410e9649ee88434274a3e8a39eba7dc1
+  data.tar.gz: 2c90e1062b92195726377d4a7a07efb1a365a5916d8a35c90dbfddd12f8aaf49c2c84bf8c3954a34708d93a3abf920d9c3138be8acd32b3a749726fd2fcf7589

data/lib/trophonius_error.rb

@@ -17,11 +17,13 @@ module Trophonius
     class FileError < StandardError; end # :nodoc:
     class CommandError < StandardError; end # :nodoc:
     class ConnectionError < StandardError; end # :nodoc:
+    class EmptyFindError < StandardError; end # :nodoc:
+    class ValidationError < StandardError; end # :nodoc:
 
     ##
     # Throws an error corresponding to the error number
     # :args: error_id, more_info
-    def self.throw_error(error_id, more_info = 0)
+    def self.throw_error(error_id, more_info = 0, layout_info = nil)
       case error_id
       when '-1'
         raise UnknownFileMakerError.new, 'Unknown Error Ocurred'
@@ -45,252 +47,258 @@ 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'
+      # 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 '101'
-        raise RecordNotFoundError.new, "Record #{more_info} was not found"
+        raise RecordNotFoundError.new, 'Record #{more_info} was not found'
       when '102'
-        raise FieldUnexistingError.new, 'Field does not exist'
-      # when "103"
+        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'
       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 "110"
-      # when "111"
-      # when "112"
-      # when "113"
-      # when "114"
-      # when "115"
-      # when "116"
-      # when "117"
-      # when "118"
-      # when "130"
-      # when "131"
-      # when "200"
+      # when '106'
+      # when '107'
+      # when '108'
+      # when '109'
+      # when '110'
+      # when '111'
+      # when '112'
+      # when '113'
+      # when '114'
+      # when '115'
+      # when '116'
+      # when '117'
+      # when '118'
+      # when '130'
+      # when '131'
+      # when '200'
       when '201'
         raise FieldNotModifiableError.new, 'Trying to write to a read-only field'
-      # when "202"
-      # when "203"
-      # when "204"
-      # when "205"
-      # when "206"
-      # when "207"
-      # when "208"
-      # when "209"
-      # when "210"
-      # when "211"
-      # when "212"
-      # when "213"
-      # when "214"
-      # when "215"
-      # when "216"
-      # when "217"
-      # when "218"
-      # when "300"
-      # when "301"
-      # when "302"
-      # when "303"
-      # when "304"
-      # when "306"
-      # when "307"
-      # when "308"
-      # when "400"
+      # when '202'
+      # when '203'
+      # when '204'
+      # when '205'
+      # when '206'
+      # when '207'
+      # when '208'
+      # when '209'
+      # when '210'
+      # when '211'
+      # when '212'
+      # when '213'
+      # when '214'
+      # when '215'
+      # when '216'
+      # when '217'
+      # when '218'
+      # when '300'
+      # when '301'
+      # when '302'
+      # when '303'
+      # when '304'
+      # when '306'
+      # when '307'
+      # when '308'
+      when '400'
+        raise EmptyFindError.new, '	Find criteria are empty'
       when '401'
-        raise RecordNotFoundError.new, "Record #{more_info} was not found"
-      # when "402"
+        raise RecordNotFoundError.new, 'Record #{more_info} was not found'
+      # when '402'
       when '403'
         raise UnauthenticatedError.new, 'You are unauthenticated to perform this request'
-      # when "404"
-      # when "405"
-      # when "406"
-      # when "407"
-      # when "408"
-      # when "409"
-      # when "410"
-      # when "412"
-      # when "413"
-      # when "414"
-      # when "415"
-      # when "416"
-      # when "417"
-      # when "418"
-      # when "500"
-      # when "501"
-      # when "502"
-      # when "503"
-      # when "504"
-      # when "505"
-      # when "506"
-      # when "507"
-      # when "508"
-      # when "509"
-      # when "510"
-      # when "511"
-      # when "512"
-      # when "513"
-      # when "600"
-      # when "601"
-      # when "602"
-      # when "603"
-      # when "700"
-      # when "706"
-      # when "707"
-      # when "708"
-      # when "711"
-      # when "714"
-      # when "715"
-      # when "716"
-      # when "717"
-      # when "718"
-      # when "719"
-      # when "720"
-      # when "721"
-      # when "722"
-      # when "723"
-      # when "724"
-      # when "725"
-      # when "726"
-      # when "727"
-      # when "729"
-      # when "730"
-      # when "731"
-      # when "732"
-      # when "733"
-      # when "734"
-      # when "735"
-      # when "736"
-      # when "738"
-      # when "800"
-      # when "801"
-      # when "802"
-      # when "803"
-      # when "804"
-      # when "805"
-      # when "806"
-      # when "807"
-      # when "808"
-      # when "809"
-      # when "810"
-      # when "811"
-      # when "812"
-      # when "813"
-      # when "814"
-      # when "815"
-      # when "816"
-      # when "817"
-      # when "819"
-      # when "820"
-      # when "821"
-      # when "822"
-      # when "823"
-      # when "824"
-      # when "825"
-      # when "826"
-      # when "827"
-      # when "850"
-      # when "851"
-      # when "852"
-      # when "853"
-      # when "900"
-      # when "901"
-      # when "902"
-      # when "903"
-      # when "905"
-      # when "906"
-      # when "920"
-      # when "921"
-      # when "922"
-      # when "923"
-      # when "951"
+      # when '404'
+      # when '405'
+      # when '406'
+      # when '407'
+      # when '408'
+      # when '409'
+      # when '410'
+      # when '412'
+      # when '413'
+      # when '414'
+      # when '415'
+      # when '416'
+      # when '417'
+      # when '418'
+      when '500'
+        raise ValidationError.new, 'Data value does not meet validation entry options (hint make sure your date values are formatted as MM/DD/YYYY)'
+      # when '501'
+      # when '502'
+      # when '503'
+      # when '504'
+      # when '505'
+      # when '506'
+      # when '507'
+      # when '508'
+      # when '509'
+      # when '510'
+      # when '511'
+      # when '512'
+      # when '513'
+      # when '600'
+      # when '601'
+      # when '602'
+      # when '603'
+      # when '700'
+      # when '706'
+      # when '707'
+      # when '708'
+      # when '711'
+      # when '714'
+      # when '715'
+      # when '716'
+      # when '717'
+      # when '718'
+      # when '719'
+      # when '720'
+      # when '721'
+      # when '722'
+      # when '723'
+      # when '724'
+      # when '725'
+      # when '726'
+      # when '727'
+      # when '729'
+      # when '730'
+      # when '731'
+      # when '732'
+      # when '733'
+      # when '734'
+      # when '735'
+      # when '736'
+      # when '738'
+      # when '800'
+      # when '801'
+      # when '802'
+      # when '803'
+      # when '804'
+      # when '805'
+      # when '806'
+      # when '807'
+      # when '808'
+      # when '809'
+      # when '810'
+      # when '811'
+      # when '812'
+      # when '813'
+      # when '814'
+      # when '815'
+      # when '816'
+      # when '817'
+      # when '819'
+      # when '820'
+      # when '821'
+      # when '822'
+      # when '823'
+      # when '824'
+      # when '825'
+      # when '826'
+      # when '827'
+      # when '850'
+      # when '851'
+      # when '852'
+      # when '853'
+      # when '900'
+      # when '901'
+      # when '902'
+      # when '903'
+      # when '905'
+      # when '906'
+      # when '920'
+      # when '921'
+      # when '922'
+      # when '923'
+      # when '951'
       when '952'
         raise InvalidTokenError.new, 'Could not retrieve a valid token from FileMaker, check your FileMaker server'
-      # when "954"
-      # when "955"
-      # when "956"
-      # when "957"
-      # when "958"
-      # when "959"
-      # when "960"
-      # when "1200"
-      # when "1201"
-      # when "1202"
-      # when "1203"
-      # when "1204"
-      # when "1205"
-      # when "1206"
-      # when "1207"
-      # when "1208"
-      # when "1209"
-      # when "1210"
-      # when "1211"
-      # when "1212"
-      # when "1213"
-      # when "1214"
-      # when "1215"
-      # when "1216"
-      # when "1217"
-      # when "1218"
-      # when "1219"
-      # when "1220"
-      # when "1221"
-      # when "1222"
-      # when "1223"
-      # when "1224"
-      # when "1225"
-      # when "1300"
-      # when "1301"
-      # when "1400"
-      # when "1401"
-      # when "1402"
-      # when "1403"
-      # when "1404"
-      # when "1405"
-      # when "1406"
-      # when "1407"
-      # when "1408"
-      # when "1409"
-      # when "1413"
-      # when "1414"
-      # when "1450"
-      # when "1451"
-      # when "1501"
-      # when "1502"
-      # when "1503"
-      # when "1504"
-      # when "1505"
-      # when "1506"
-      # when "1507"
-      # when "1550"
-      # when "1551"
-      # when "1626"
-      # when "1627"
-      # when "1628"
-      # when "1629"
-      # when "1630"
+      # when '954'
+      # when '955'
+      # when '956'
+      # when '957'
+      # when '958'
+      # when '959'
+      # when '960'
+      # when '1200'
+      # when '1201'
+      # when '1202'
+      # when '1203'
+      # when '1204'
+      # when '1205'
+      # when '1206'
+      # when '1207'
+      # when '1208'
+      # when '1209'
+      # when '1210'
+      # when '1211'
+      # when '1212'
+      # when '1213'
+      # when '1214'
+      # when '1215'
+      # when '1216'
+      # when '1217'
+      # when '1218'
+      # when '1219'
+      # when '1220'
+      # when '1221'
+      # when '1222'
+      # when '1223'
+      # when '1224'
+      # when '1225'
+      # when '1300'
+      # when '1301'
+      # when '1400'
+      # when '1401'
+      # when '1402'
+      # when '1403'
+      # when '1404'
+      # when '1405'
+      # when '1406'
+      # when '1407'
+      # when '1408'
+      # when '1409'
+      # when '1413'
+      # when '1414'
+      # when '1450'
+      # when '1451'
+      # when '1501'
+      # when '1502'
+      # when '1503'
+      # when '1504'
+      # when '1505'
+      # when '1506'
+      # when '1507'
+      # when '1550'
+      # when '1551'
+      # when '1626'
+      # when '1627'
+      # when '1628'
+      # when '1629'
+      # when '1630'
       when '1631'
         raise ConnectionError.new, 'An error occurred while attempting to connect to the FileMaker server'
-      # when "1632"
-      # when "1633"
+      # when '1632'
+      # when '1633'
       else
-        raise ResponseNotYetImplementedError.new, "An unknown error has been encountered: err_no was #{error_id}"
+        raise ResponseNotYetImplementedError.new, 'An unknown error has been encountered: err_no was #{error_id}'
       end
     end
   end

data/lib/trophonius_model.rb

@@ -146,6 +146,16 @@ module Trophonius
       body = "{\"fieldData\": #{new_field_data.to_json}}"
       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
         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"]}")

data/lib/trophonius_query.rb

@@ -88,6 +88,17 @@ module Trophonius
           RecordSet.new(@trophonius_model.layout_name, @trophonius_model.non_modifiable_fields).send(method, *args, &block)
           return
         else
+          if response["messages"][0]["code"] == "102"
+            results = Request.retrieve_first(@trophonius_model.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']
+              query_keys = new_field_data.map { |q| q.keys.map(&:downcase) }.uniq
+              Error.throw_error("102", (query_keys - ret_val.keys.map(&:downcase)).flatten.join(', '), @trophonius_model.layout_name) 
+            end
+          end
           Error.throw_error(response['messages'][0]['code'])
         end
       else

data/lib/trophonius_record.rb

@@ -68,7 +68,17 @@ module Trophonius
       body = "{\"fieldData\": #{fieldData.to_json}}"
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'patch', body)
       if response['messages'][0]['code'] != '0'
-        Error.throw_error(response['messages'][0]['code'])
+        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", (fieldData.keys.map(&:downcase) - ret_val.keys.map(&:downcase)).flatten.join(', '), layout_name) 
+          end
+        end
+        Error.throw_error(response["messages"][0]["code"])
       else
         true
       end

metadata

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