trophonius 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6fdab7a86338046934a0fe85d3745072bf6c039ada8846b463662e2bba64001
-  data.tar.gz: fafd0b28308fa6cba72ae44c4c5b09fe2530f1128546850e7e7e9467f68102d0
+  metadata.gz: 8b2cf487b05747dd90e7c4e0bd6b98f0b8ab2175c7c11da8ea69acd06c11eaab
+  data.tar.gz: 0ea9bfe33c04b6ef4a26966afd7baaee43c874b89ac1a6ca3b5aa9576a5693d6
 SHA512:
-  metadata.gz: a62b3fa93dd8262b5cc06a6565e1feda26aa7ae9cf31907f94a6f023c38dbf9f7e2aa6936fce77e4618e0eb3abbbf9f6b596f0c786f129460bc69a1cea6683e2
-  data.tar.gz: 79485e8a01856c16afde75cd8a5fac25bdf6f3846c89d8099d9444cb34fe7d1fed3b2957e2c4c543b42b4dd599abe071e62c2c2b0b5acdd747938e39dd6d1605
+  metadata.gz: a566aaf863a1d39dbd5496a6321c34ec8c5536afb0f5d735b9ad3a829584e81a6c58a7238cc96d5a3317c40f2efeac92c76039e5731d5244afc8ffae5934f1a7
+  data.tar.gz: e0ba771d1ee7f466eb5eee6660b06e48c10516ca4e9c12e74a35149ca578e35a8c7da63fcb2d6d3ad2be27c2c96a60d1f747be36c6ee799c41f620c6b05708f6

data/lib/trophonius_model.rb

@@ -7,8 +7,6 @@ require "trophonius_error"
 module Trophonius
   # This class will retrieve the records from the FileMaker database and build a RecordSet filled with Record objects. One Record object represents a record in FileMaker.
   class Trophonius::Model
-    # Contains all the fields on the model (modifiable and non_modifiable)
-    attr_reader :all_fields
 
     ##
     # Sets up the configuration for the model. 
@@ -19,7 +17,8 @@ module Trophonius
       @configuration ||= Configuration.new
       @configuration.layout_name = configuration[:layout_name]
       @configuration.non_modifiable_fields = configuration[:non_modifiable_fields]
-      @all_fields = {}
+      @configuration.all_fields = {}
+      @configuration.translations = {}
     end
 
     ##
@@ -34,6 +33,16 @@ module Trophonius
       @configuration.non_modifiable_fields
     end
 
+    ##
+    # Returns the translations of the fields
+    def self.translations
+      @configuration.translations
+    end
+    
+    def self.create_translations
+      self.first
+    end
+
     ##
     # Creates and saves a record in FileMaker
     # 
@@ -43,7 +52,18 @@ module Trophonius
     #   Model.create(fieldOne: "Data")
     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")
-      body = "{\"fieldData\": #{fieldData.to_json}}"
+      new_field_data = {}
+      if @configuration.translations.keys.empty?
+        create_translations
+      end
+      fieldData.keys.each do |k|
+        if @configuration.translations.keys.include?(k.to_s)
+          new_field_data.merge!({"#{@configuration.translations[k.to_s]}" => fieldData[k]})
+        else
+          new_field_data.merge!({"#{k}" => fieldData[k]})
+        end
+      end
+      body = "{\"fieldData\": #{new_field_data.to_json}}"
       response = Request.make_request(url, "Bearer #{Request.get_token}", "post", body)
       if response["messages"][0]["code"] != "0"
         Error.throw_error(response["messages"][0]["code"])
@@ -66,7 +86,18 @@ module Trophonius
     #   Model.where(fieldOne: "Data")
     def self.where(fieldData)
       url = URI("http#{Trophonius.config.ssl == true ? "s" : ""}://#{Trophonius.config.host}/fmi/data/v1/databases/#{Trophonius.config.database}/layouts/#{self.layout_name}/_find")
-      body = {query: [fieldData], limit:"100000"}.to_json
+      new_field_data = {}
+      if @configuration.translations.keys.empty?
+        create_translations
+      end
+      fieldData.keys.each do |k|
+        if @configuration.translations.keys.include?(k.to_s)
+          new_field_data.merge!({"#{@configuration.translations[k.to_s]}" => fieldData[k]})
+        else
+          new_field_data.merge!({"#{k}" => fieldData[k]})
+        end
+      end
+      body = {query: [new_field_data], limit:"100000"}.to_json
       response = Request.make_request(url, "Bearer #{Request.get_token}", "post", body)
       if response["messages"][0]["code"] != "0"
         return RecordSet.new(self.layout_name, self.non_modifiable_fields) if response["messages"][0]["code"] == "101" || response["messages"][0]["code"] == "401"
@@ -125,10 +156,21 @@ module Trophonius
     #
     # @param [Hash] fieldData: A hash containing the fields to edit and the new data to fill them with
     #
-    # @return [Boolean] True if the delete was successful 
+    # @return [Boolean] True if the delete was successful
     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}")
-      body = "{\"fieldData\": #{fieldData.to_json}}"
+      new_field_data = {}
+      if @configuration.translations.keys.empty?
+        create_translations
+      end
+      fieldData.keys.each do |k|
+        if @configuration.translations.keys.include?(k.to_s)
+          new_field_data.merge!({"#{@configuration.translations[k.to_s]}" => fieldData[k]})
+        else
+          new_field_data.merge!({"#{k}" => fieldData[k]})
+        end
+      end
+      body = "{\"fieldData\": #{new_field_data.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"])
@@ -149,11 +191,12 @@ module Trophonius
       hash.layout_name = layout_name
       result["fieldData"].keys.each do |key|
         # unless key[/\s/] || key[/\W/]
+        @configuration.translations.merge!({ "#{ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_').downcase}" => "#{key}" })
         hash.send(:define_singleton_method, ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_')) do
           hash[key]
         end
         unless non_modifiable_fields&.include?(key)
-          @all_fields.merge!(ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_').downcase => ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_'))
+          @configuration.all_fields.merge!(ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_').downcase => ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_'))
           hash.send(:define_singleton_method, "#{ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_')}=") do |new_val|
             hash[key] = new_val
             hash.modifiable_fields[key] = new_val
@@ -196,7 +239,7 @@ module Trophonius
         Error.throw_error(results["messages"][0]["code"])
       else
         r_results = results["response"]["data"]
-        ret_val = r_results.empty? ? Trophonius::Record.new({}) : build_result(r_results[0])
+        ret_val = r_results.empty? ? Trophonius::Record.new() : build_result(r_results[0])
         ret_val.send(:define_singleton_method, "result_count") do
           r_results.empty? ? 0 : 1
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trophonius
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Kempen Automatisering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus