trophonius 1.4.5.5 → 2.1

data/lib/{trophonius_record.rb → record.rb}

@@ -1,28 +1,37 @@
 # frozen_string_literal: true
 
+# require 'time'
+# require 'date_time'
+# require 'date'
+require 'active_support/inflector'
 require 'json'
-require 'trophonius_config'
+require 'config'
+require 'translator'
 
 module Trophonius
   # This class will hold a singular record
   #
   # A Record is contained in a RecordSet and has methods to retrieve data from the fields inside the Record-hash
-  class Trophonius::Record < Hash
+  class Record < Hash
+    include Trophonius::Translator
     attr_accessor :record_id, :model_name, :layout_name, :modifiable_fields, :modified_fields
 
     ##
     # Initializes a new Record
-    def initialize(model = '')
+    def initialize(fm_record = {}, model = '')
       @modifiable_fields = {}
       @modified_fields = {}
-      model_name = model
+      @model_name = model
       @model = ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.classify(ActiveSupport::Inflector.singularize(model_name)))
-
-      super
+      @layout_name = @model.layout_name
+      define_field_methods(fm_record)
+      define_portal_methods(fm_record)
+      super()
     end
 
     def []=(field, new_val)
       modifiable_fields[field] = new_val
+      modified_fields[field] = new_val
       super
     end
 
@@ -36,16 +45,7 @@ module Trophonius
           layout = model.layout_name
           model.create_translations if model.translations.keys.empty?
 
-          uri = URI::RFC2396_Parser.new
-          url =
-            URI(
-              uri.escape(
-                "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
-                  Trophonius.config.database
-                }/layouts/#{layout}/_find"
-              )
-            )
-
+          url = "/layouts/#{layout}/_find"
           foreign_key_field = if model.translations.key?(relation[:foreign_key])
                                 model.translations[relation[:foreign_key]].to_s
                               else
@@ -59,7 +59,7 @@ module Trophonius
                               end
 
           body = { query: [{ foreign_key_field => self[primary_key_field].to_s }], limit: 100_000 }.to_json
-          response = Request.make_request(url, "Bearer #{Request.get_token}", 'post', body)
+          response = DatabaseRequest.make_request(url, 'post', body)
 
           if response['messages'][0]['code'] == '0'
             r_results = response['response']['data']
@@ -75,7 +75,7 @@ module Trophonius
 
           else
             if response['messages'][0]['code'] == '102'
-              results = Request.retrieve_first(layout)
+              results = DatabaseRequest.retrieve_first(layout)
               if results['messages'][0]['code'] == '0'
                 r_results = results['response']['data']
                 ret_val = r_results.empty? ? Error.throw_error('102') : r_results[0]['fieldData']
@@ -97,15 +97,7 @@ 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(
-                "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
-                  Trophonius.config.database
-                }/layouts/#{layout}/_find"
-              )
-            )
+          url = "/layouts/#{layout}/_find"
 
           foreign_key_field = if fk_model.translations.key?(relation[:foreign_key])
                                 fk_model.translations[relation[:foreign_key]].to_s
@@ -121,7 +113,7 @@ module Trophonius
 
           body = { query: [{ primary_key_field => self[foreign_key_field].to_s }], limit: 1 }.to_json
 
-          response = Request.make_request(url, "Bearer #{Request.get_token}", 'post', body)
+          response = DatabaseRequest.make_request(url, 'post', body)
           if response['messages'][0]['code'] == '0'
             r_results = response['response']['data']
             ret_val = RecordSet.new(layout, pk_model.non_modifiable_fields)
@@ -136,7 +128,7 @@ module Trophonius
 
           else
             if response['messages'][0]['code'] == '102'
-              results = Request.retrieve_first(layout)
+              results = DatabaseRequest.retrieve_first(layout)
               if results['messages'][0]['code'] == '0'
                 r_results = results['response']['data']
                 ret_val = r_results.empty? ? Error.throw_error('102') : r_results[0]['fieldData']
@@ -169,17 +161,8 @@ 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(
-            "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}"
-          )
-        )
-
-      result = Request.make_request(url, "Bearer #{Request.get_token}", 'get', '{}')
+      url = "layouts/#{layout_name}/records/#{record_id}?script=#{script}&script.param=#{scriptparameter}"
+      result = DatabaseRequest.make_request(url, 'get', '{}')
 
       if result['messages'][0]['code'] != '0'
         Error.throw_error(result['messages'][0]['code'])
@@ -197,17 +180,10 @@ module Trophonius
     #
     # @return [True] if successful
     def save
-      uri = URI::RFC2396_Parser.new
-      url =
-        URI(
-          uri.escape(
-            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
-              Trophonius.config.database
-            }/layouts/#{layout_name}/records/#{record_id}"
-          )
-        )
+      url = "layouts/#{layout_name}/records/#{record_id}"
+
       body = "{\"fieldData\": #{modified_fields.to_json}}"
-      response = Request.make_request(url, "Bearer #{Request.get_token}", 'patch', body)
+      response = DatabaseRequest.make_request(url, 'patch', body)
       response['messages'][0]['code'] == '0' ? true : Error.throw_error(response['messages'][0]['code'])
     end
 
@@ -217,16 +193,9 @@ module Trophonius
     #
     # @return [True] if successful
     def delete
-      uri = URI::RFC2396_Parser.new
-      url =
-        URI(
-          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', '{}')
+      url = "layouts/#{layout_name}/records/#{record_id}"
+
+      response = DatabaseRequest.make_request(url, 'delete', '{}')
       response['messages'][0]['code'] == '0' ? true : Error.throw_error(response['messages'][0]['code'])
     end
 
@@ -238,56 +207,32 @@ module Trophonius
     #
     # @return [True] if successful
     def update(field_data, portal_data: {})
-      uri = URI::RFC2396_Parser.new
-      url =
-        URI(
-          uri.escape(
-            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
-              Trophonius.config.database
-            }/layouts/#{layout_name}/records/#{record_id}"
-          )
-        )
+      url = "layouts/#{layout_name}/records/#{record_id}"
       field_data.each_key { |field| modifiable_fields[field] = field_data[field] }
-      new_portal_data = {}
-      portal_data.each do |portal_name, portal_values|
-        new_portal_data.merge!(
-          portal_name =>
-            portal_values.map do |record|
-              record.each_with_object({}) do |(key, value), new_hash|
-                if key.to_s.downcase.include?('id') && key.to_s.downcase.include?('record')
-                  new_hash['recordId'] = value
-                else
-                  new_hash["#{portal_name}::#{key}"] = value
-                end
-              end
-            end
-        )
-      end
-      body =
-        if new_portal_data == {}
-          "{\"fieldData\": #{field_data.to_json} }"
-        else
-          "{\"fieldData\": #{field_data.to_json}, \"portalData\": #{new_portal_data.to_json}}"
-        end
+      field_data.transform_keys! { |k| (@model.translations[k.to_s] || k).to_s }
 
-      puts "BODY SENT TO FILEMAKER WAS: #{body}"
-      response = Request.make_request(url, "Bearer #{Request.get_token}", 'patch', body)
-      if response['messages'][0]['code'] == '0'
-        true
-      else
-        if response['messages'][0]['code'] == '102'
-          results = Request.retrieve_first(layout_name)
-          if results['messages'][0]['code'] == '0'
-            r_results = results['response']['data']
-            Error.throw_error('102') if r_results.empty?
-            ret_val = r_results[0]['fieldData']
-            Error.throw_error('102', (field_data.keys.map { |key| key.to_s.downcase } - ret_val.keys.map(&:downcase)).flatten.join(', '), layout_name)
-          else
-            Error.throw_error('102')
+      portal_data.each do |portal_name, values|
+        values.map do |record|
+          record.transform_keys! do |k|
+            if k.to_s.downcase.include?('id') && k.to_s.downcase.include?('record')
+              'recordId'
+            else
+              "#{portal_name}::#{k}"
+            end
           end
         end
-        Error.throw_error(response['messages'][0]['code'])
       end
+
+      body = { fieldData: field_data }
+      body.merge!({ portalData: portal_data }) if portal_data.present?
+
+      response = DatabaseRequest.make_request(url, 'patch', body.to_json)
+      code = response['messages'][0]['code']
+
+      return throw_field_missing(field_data) if code == '102'
+      return Error.throw_error(code) if code != '0'
+
+      true
     end
 
     ##
@@ -300,18 +245,61 @@ module Trophonius
     #
     # @return [True] if successful
     def upload(container_name:, file:, container_repetition: 1)
-      uri = URI::RFC2396_Parser.new
-      url =
-        URI(
-          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)
+      url = "layouts/#{layout_name}/records/#{record_id}/containers/#{container_name}/#{container_repetition}"
+
+      response = DatabaseRequest.upload_file_request(url, file)
       response['messages'][0]['code'] == '0' ? true : Error.throw_error(response['messages'][0]['code'])
     end
+
+    private
+
+    def define_field_assignment(field_name, key)
+      define_singleton_method("#{field_name}=") do |new_val|
+        self[key] = new_val
+        modifiable_fields[key] = new_val
+        modified_fields[key] = new_val
+      end
+    end
+
+    def define_field_methods(fm_record)
+      @record_id = fm_record['recordId']
+
+      fm_record['fieldData'].each_key do |key|
+        method_name = methodize_field(key)
+        define_singleton_method(method_name) { self[key] }
+        merge!({ key => fm_record['fieldData'][key] })
+
+        next if @model.non_modifiable_fields.include?(key)
+
+        modifiable_fields.merge!({ key => fm_record['fieldData'][key] })
+        define_field_assignment(method_name, key)
+      end
+    end
+
+    def define_portal_methods(fm_record)
+      fm_record['portalData'].each_key do |key|
+        method_name = methodize_field(key)
+        define_singleton_method(method_name) { self[key] }
+        fm_record['portalData'][key].each do |portal_record|
+          portal_record.each_key do |inner_key|
+            inner_method = methodize_portal_field(inner_key)
+            portal_record.send(:define_singleton_method, inner_method.to_s) { portal_record[inner_key] }
+            portal_record.send(:define_singleton_method, 'record_id') { portal_record['recordId'] }
+          end
+        end
+        merge!({ key => fm_record['portalData'][key] })
+      end
+    end
+
+    def throw_field_missing(field_data)
+      results = DatabaseRequest.retrieve_first(layout_name)
+      if results['messages'][0]['code'] == '0' && !results['response']['data'].empty?
+        r_results = results['response']['data']
+        ret_val = r_results[0]['fieldData']
+        Error.throw_error('102', (field_data.keys.map(&:downcase) - ret_val.keys.map(&:downcase)).flatten.join(', '), layout_name)
+      else
+        Error.throw_error('102')
+      end
+    end
   end
 end

data/lib/{trophonius_recordset.rb → recordset.rb}

@@ -1,11 +1,11 @@
 require 'json'
-require 'trophonius_config'
-require 'trophonius_model'
-require 'trophonius_connection'
+require 'config'
+require 'model'
+require 'connectors/connection'
 
 module Trophonius
   # A RecordSet contains all records, as Record, retrieved from the FileMaker database
-  class Trophonius::RecordSet < Array
+  class RecordSet < Array
     attr_accessor :result_count, :layout_name, :non_modifiable_fields, :records
 
     class EmptyParameterError < ArgumentError; end # :nodoc:
@@ -38,8 +38,7 @@ module Trophonius
 
       temp = Trophonius::Model
       temp.config layout_name: layout_name, non_modifiable_fields: non_modifiable_fields
-      retval = temp.where(fielddata)
-      retval
+      temp.where(fielddata)
     end
 
     ##

data/lib/{trophonius_single.rb → single.rb}

@@ -1,11 +1,9 @@
-require 'trophonius_date'
-require 'trophonius_time'
-require 'trophonius_error'
-require 'trophonius_record'
-require 'trophonius_recordset'
+require 'error'
+require 'record'
+require 'recordset'
 
 module Trophonius
-  class Trophonius::Single
+  class Single
     attr_reader :query
 
     def initialize(config:)
@@ -116,56 +114,9 @@ module Trophonius
     private
 
     def build_result(result)
-      hash = Trophonius::Record.new
-      hash.record_id = result['recordId']
-      hash.layout_name = @config[:layout_name]
-      hash.model_name = 'Single'
-
-      result['fieldData'].keys.each do |key|
-        # unless key[/\s/] || key[/\W/]
-        @translations.merge!(
-          { ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_').downcase.to_s => key.to_s }
-        )
-        hash.send(:define_singleton_method, ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_')) do
-          hash[key]
-        end
-        unless @config[: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: '_')
-          )
-          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
-            hash.modified_fields[key] = new_val
-          end
-        end
-        # end
-        hash.merge!({ key => result['fieldData'][key] })
-        hash.modifiable_fields.merge!({ key => result['fieldData'][key] }) unless @config[:non_modifiable_fields]&.include?(key)
-      end
-      result['portalData'].keys.each do |key|
-        unless key[/\s/] || key[/\W/]
-          hash.send(:define_singleton_method, ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(key.to_s), separator: '_')) do
-            hash[key]
-          end
-        end
-        result['portalData'][key].each do |inner_hash|
-          inner_hash.keys.each do |inner_key|
-            inner_method =
-              ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(inner_key.gsub(/\w+::/, '').to_s), separator: '_')
-            unless inner_method[/\s/] || inner_method[/\W/]
-              inner_hash.send(:define_singleton_method, inner_method.to_s) { inner_hash[inner_key] }
-              inner_hash.send(:define_singleton_method, 'record_id') { inner_hash['recordId'] }
-            end
-          end
-        end
-        hash.merge!({ key => result['portalData'][key] })
-      end
-      hash
+      hash = Trophonius::Record.new(result, 'Single')
+      record.layout_name = @config[:layout_name]
+      record
     end
 
     def make_request(url_param, token, method, body, params = '')
@@ -184,7 +135,8 @@ module Trophonius
       temp = request.run
       begin
         JSON.parse(temp.response_body)
-      rescue Exception => e
+      rescue StandardError => e
+        puts e
         close_connection(token)
         Error.throw_error('1631')
       end
@@ -217,7 +169,8 @@ module Trophonius
       temp = request.run
       begin
         parsed = JSON.parse(temp.response_body)
-      rescue Exception => e
+      rescue StandardError => e
+        puts e
         Error.throw_error('1631')
       end
       Error.throw_error(parsed['messages'][0]['code']) if parsed['messages'][0]['code'] != '0'
@@ -244,7 +197,8 @@ module Trophonius
 
       begin
         parsed = JSON.parse(temp.response_body)
-      rescue Exception => e
+      rescue StandardError => e
+        puts e
         Error.throw_error('1631')
       end
       Error.throw_error(parsed['messages'][0]['code']) if parsed['messages'][0]['code'] != '0'

data/lib/translator.rb

@@ -0,0 +1,15 @@
+# require 'time'
+# require 'date_time'
+# require 'date'
+require 'active_support/inflector'
+module Trophonius
+  module Translator
+    def methodize_field(field_name)
+      ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(field_name), separator: '_').downcase
+    end
+
+    def methodize_portal_field(field_name)
+      ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(field_name.gsub(/\w+::/, '').to_s), separator: '_')
+    end
+  end
+end

data/lib/trophonius.rb

@@ -1,9 +1,11 @@
-require 'trophonius_request'
-require 'trophonius_model'
-require 'trophonius_config'
-require 'trophonius_date'
-require 'trophonius_time'
-require 'trophonius_date_time'
+require 'fm_time'
+require 'fm_date_time'
+require 'fm_date'
+
+require 'connectors/database_request'
+require 'connectors/connection_manager'
+require 'model'
+require 'config'
 
 module Trophonius # :nodoc:
   def self.configuration
@@ -13,11 +15,15 @@ module Trophonius # :nodoc:
 
   def self.configure
     yield configuration
+    @connection_manager ||= ConnectionManager.new
+    @configuration
+  end
+
+  def self.connection_manager
+    @connection_manager
   end
 
   def self.config
     @configuration
   end
-
-  private
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trophonius
 version: !ruby/object:Gem::Version
-  version: 1.4.5.5
+  version: '2.1'
 platform: ruby
 authors:
 - Kempen Automatisering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-19 00:00:00.000000000 Z
+date: 2023-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -59,22 +59,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/config.rb
+- lib/connectors/connection.rb
+- lib/connectors/connection_manager.rb
+- lib/connectors/database_request.rb
+- lib/connectors/redis_manager.rb
+- lib/debug_printer.rb
+- lib/error.rb
+- lib/fm_date.rb
+- lib/fm_date_time.rb
+- lib/fm_time.rb
 - lib/generators/trophonius_generator.rb
 - lib/generators/trophonius_model_generator.rb
+- lib/model.rb
+- lib/query.rb
+- lib/record.rb
+- lib/recordset.rb
+- lib/single.rb
+- lib/translator.rb
 - lib/trophonius.rb
-- lib/trophonius_config.rb
-- lib/trophonius_connection.rb
-- lib/trophonius_date.rb
-- lib/trophonius_date_time.rb
-- lib/trophonius_error.rb
-- lib/trophonius_model.rb
-- lib/trophonius_query.rb
-- lib/trophonius_record.rb
-- lib/trophonius_recordset.rb
-- lib/trophonius_redis_manager.rb
-- lib/trophonius_request.rb
-- lib/trophonius_single.rb
-- lib/trophonius_time.rb
 homepage: https://github.com/Willem-Jan/Trophonius
 licenses:
 - MIT
@@ -95,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
+rubygems_version: 3.4.7
 signing_key:
 specification_version: 4
 summary: Link between Ruby (on Rails) and FileMaker.