trophonius 1.2.6.4 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f64c4285e902e34390d654a1766180aebae9a4c3bb483286d442b02284813390
-  data.tar.gz: c85fc16b8bd2179865d3d75709be1b44a15d17aded4ae5ee6a2820bbf16e0488
+  metadata.gz: 193ec5a1a1a35715519760565271544fe7d14e56670ff533b30449db17a9739f
+  data.tar.gz: 7b241ecfc24897f44d288fbb912c22fb950b1e645eddb1ed4b2cccaeb6022198
 SHA512:
-  metadata.gz: 59ba939131882022370de145757b09fc5c3b03775314ee08e298d383d0cf6a2d7796ae98706cf98b806dcd58ed7df5d6fd07656ec811df3b0d136775f5abf926
-  data.tar.gz: 2df0e98f4da6fc84658faf26632b65e52574efea36dea08b11131dfd5234b43f3612693efbf5d741e11c7c2fe0f924989ea7496db57e39c01a89c8d57756292a
+  metadata.gz: 3c4e65f40f0f8e484ebf35418c9ec26b998f0c9cbd4610e449ec5f0c0abf2c49daec033b8c0929b8f15979f785a461218607b4f075a4d877b3dab6637f50c57e
+  data.tar.gz: 7b64990a532ca0944514746d78b56adc39ea5b175c3d683ff284a09a101ad4f15fb94c391e8fee67223baf50bb4d5ad2dc6cb34c593f9cf8abf0a5b0fe3e5395

data/lib/trophonius_config.rb

@@ -13,6 +13,7 @@ module Trophonius
     config_accessor(:username) { 'Admin' }
     config_accessor(:password) { '' }
     config_accessor(:ssl) { true }
+    config_accessor(:fm_18) { false }
     config_accessor(:count_result_script) { '' }
     config_accessor(:layout_name) { '' }
     config_accessor(:non_modifiable_fields) { [] }

data/lib/trophonius_model.rb

@@ -112,7 +112,16 @@ module Trophonius
     #
     # @return [Hash] translations of the fields Rails -> FileMaker
     def self.create_translations
-      self.first
+      if Trophonius.config.fm_18
+        field_names = Trophonius::Request.get_layout_field_names(layout_name)
+        field_names.each do |field|
+          @configuration.translations.merge!(
+            { "#{ActiveSupport::Inflector.parameterize(ActiveSupport::Inflector.underscore(field.to_s), separator: '_').downcase}" => "#{field}" }
+          )
+        end
+      else
+        self.first
+      end
       @configuration.translations
     end
 
@@ -166,7 +175,7 @@ module Trophonius
     #
     # @return [Record] the created record
     #   Model.create(fieldOne: "Data")
-    def self.create(fieldData)
+    def self.create(fieldData, portalData: {})
       url =
         URI(
           URI.escape(
@@ -184,7 +193,26 @@ module Trophonius
           new_field_data.merge!({ "#{k}" => fieldData[k] })
         end
       end
-      body = "{\"fieldData\": #{new_field_data.to_json}}"
+
+      new_portal_data = {}
+      portalData.each do |portal_name, portal_values|
+        new_portal_data.merge!(
+          portal_name =>
+            portal_values.map do |record|
+              record.inject({}) do |new_hash, (key, value)|
+                new_hash["#{portal_name}::#{key}"] = value
+                new_hash
+              end
+            end
+        )
+      end
+
+      body =
+        if new_portal_data != {}
+          "{\"fieldData\": #{new_field_data.to_json}, \"portalData\": #{new_portal_data.to_json}}"
+        else
+          "{\"fieldData\": #{new_field_data.to_json} }"
+        end
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'post', body)
       if response['messages'][0]['code'] != '0'
         if response['messages'][0]['code'] == '102'

data/lib/trophonius_query.rb

@@ -42,6 +42,24 @@ module Trophonius
       @current_query
     end
 
+    ##
+    # Returns the current portal limits
+    #
+    # @return [Hash] Hash representing the portal limits
+    def build_portal_limits()
+      @portal_limits ||= {}
+    end
+
+    ##
+    # Adds a portal limit to the request
+    #
+    # @param [args] arguments containing a Hash with the format {portalName: requiredLimit}
+    # @return [Trophonius::Model] updated base model
+    def set_portal_limits(args)
+      args[1].current_query.build_portal_limits.merge!(args[0])
+      args[1]
+    end
+
     ##
     # Adds a find request to the original query, resulting in an "Or" find-request for FileMaker
     #
@@ -107,6 +125,7 @@ module Trophonius
             }/layouts/#{@trophonius_model.layout_name}/_find"
           )
         )
+
       new_field_data = @current_query.map { |_q| {} }
 
       @trophonius_model.create_translations if @trophonius_model.translations.keys.empty?
@@ -120,21 +139,23 @@ module Trophonius
         end
       end
       if @offset.nil? || @limit.nil? || @offset == '' || @limit == '' || @offset == 0 || @limit == 0
-        body =
-          if @current_sort.nil?
-            { query: new_field_data, limit: '100000' }.to_json
-          else
-            { query: new_field_data, sort: @current_sort, limit: '100000' }.to_json
-          end
+        body = @current_sort.nil? ? { query: new_field_data, limit: '100000' } : { query: new_field_data, sort: @current_sort, limit: '100000' }
       else
         body =
           if @current_sort.nil?
-            { query: new_field_data, limit: @limit.to_s, offset: @offset.to_s }.to_json
+            { query: new_field_data, limit: @limit.to_s, offset: @offset.to_s }
           else
-            { query: new_field_data, sort: @current_sort, limit: @limit.to_s, offset: @offset.to_s }.to_json
+            { query: new_field_data, sort: @current_sort, limit: @limit.to_s, offset: @offset.to_s }
           end
       end
 
+      if @portal_limits
+        portal_hash = { portal: @portal_limits.map { |portal_name, limit| "#{portal_name}" } }
+        body.merge!(portal_hash)
+        @portal_limits.each { |portal_name, limit| body.merge!({ "limit.#{portal_name}" => limit.to_s }) }
+      end
+
+      body = body.to_json
       response = Request.make_request(url, "Bearer #{Request.get_token}", 'post', body)
       if response['messages'][0]['code'] != '0'
         if response['messages'][0]['code'] == '101' || response['messages'][0]['code'] == '401'

data/lib/trophonius_record.rb

@@ -152,6 +152,36 @@ module Trophonius
       end
     end
 
+    ##
+    # Runs a FileMaker script from the context of the Model.
+    #
+    # @param [String] script: the FileMaker script to run
+    #
+    # @param [String] scriptparameter: the parameter required by the FileMaker script
+    #
+    # @return [String]: string representing the script result returned by FileMaker
+    def run_script(script: '', 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/#{record_id}?script=#{script}&script.param=#{scriptparameter}"
+          )
+        )
+
+      result = Request.make_request(url, "Bearer #{Request.get_token}", 'get', '{}')
+
+      if result['messages'][0]['code'] != '0'
+        Error.throw_error(result['messages'][0]['code'])
+      elsif result['response']['scriptResult'] == '403'
+        Error.throw_error(403)
+      else
+        ret_val = result['response']['scriptResult']
+        return ret_val || true
+      end
+    end
+
     ##
     # Saves the last changes made to the Record to FileMaker.
     # Throws a FileMaker error if save failed

data/lib/trophonius_request.rb

@@ -37,7 +37,6 @@ module Trophonius
       begin
         JSON.parse(temp.response_body)
       rescue Exception => e
-        puts "Error was #{e}"
         Error.throw_error('1631')
       end
     end
@@ -95,6 +94,26 @@ module Trophonius
       make_request(url, "Bearer #{get_token}", 'get', '{}')
     end
 
+    ##
+    # Retrieves the fieldnames of a layout
+    #
+    # @return [JSON] The fieldnames of a layout
+    def self.get_layout_field_names(layout_name)
+      url =
+        URI(
+          URI.escape(
+            "http#{Trophonius.config.ssl == true ? 's' : ''}://#{Trophonius.config.host}/fmi/data/v1/databases/#{
+              Trophonius.config.database
+            }/layouts/#{layout_name}"
+          )
+        )
+      begin
+        make_request(url, "Bearer #{get_token}", 'get', '{}')['response']['fieldMetaData'].map { |field| field['name'] }
+      rescue Exception
+        Error.throw_error('1631')
+      end
+    end
+
     ##
     # Runs a FileMaker script
     #

data/lib/trophonius_single.rb

@@ -0,0 +1,216 @@
+require 'trophonius_date'
+require 'trophonius_time'
+require 'trophonius_error'
+require 'trophonius_record'
+require 'trophonius_recordset'
+
+module Trophonius
+  class Trophonius::Single
+    attr_reader :query
+    def initialize(config:)
+      @config = config
+      @query = {}
+      @translations = {}
+      @all_fields = {}
+    end
+
+    def where(fieldData)
+      url =
+        URI(
+          URI.escape(
+            "http#{@config[:ssl] == true ? 's' : ''}://#{@config[:host]}/fmi/data/v1/databases/#{@config[:database]}/layouts/#{
+              @config[:layout_name]
+            }/_find"
+          )
+        )
+      @query.merge!(query: [fieldData])
+      @query.merge!(limit: '10000000')
+      token = setup_connection
+      response = make_request(url, token, 'post', @query.to_json)
+
+      r_results = response['response']['data']
+      if response['messages'][0]['code'] != '0' && response['messages'][0]['code'] != '401'
+        close_connection(token)
+        Error.throw_error(response['messages'][0]['code'])
+      elsif response['messages'][0]['code'] == '401'
+        close_connection(token)
+        return RecordSet.new(@config[:layout_name], @config[:non_modifiable_fields])
+      else
+        ret_val = RecordSet.new(@config[:layout_name], @config[:non_modifiable_fields])
+        r_results.each do |r|
+          hash = build_result(r)
+          ret_val << hash
+        end
+      end
+      @query = {}
+      close_connection(token)
+
+      return ret_val
+    end
+
+    def run_script(script:, scriptparameter:)
+      url =
+        URI(
+          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}"
+          )
+        )
+
+      token = setup_connection
+      result = make_request(url, "Bearer #{token}", 'get', '{}')
+      ret_val = ''
+
+      if result['messages'][0]['code'] != '0'
+        close_connection(token)
+        Error.throw_error(result['messages'][0]['code'])
+      elsif result['response']['scriptResult'] == '403'
+        close_connection(token)
+        Error.throw_error(403)
+      else
+        ret_val = result['response']['scriptResult']
+      end
+
+      close_connection(token)
+
+      return ret_val
+    end
+
+    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}" => "#{key}" }
+        )
+        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_with_index 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
+      return hash
+    end
+
+    def make_request(url_param, token, method, body, params = '')
+      ssl_verifyhost = @config[:local_network] ? 0 : 2
+      ssl_verifypeer = !@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: "Bearer #{token}" }
+        )
+      temp = request.run
+      begin
+        JSON.parse(temp.response_body)
+      rescue Exception => e
+        close_connection(token)
+        Error.throw_error('1631')
+      end
+    end
+
+    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"))
+      request =
+        Typhoeus::Request.new(
+          url,
+          method: :post,
+          body:
+            if @config[:external_name].nil? || @config[:external_name].empty?
+              {}
+            else
+              {
+                fmDataSource: [{ database: @config[:external_name], username: @config[:external_username], password: @config[:external_password] }]
+              }.to_json
+            end,
+          params: {},
+          ssl_verifyhost: ssl_verifyhost,
+          ssl_verifypeer: ssl_verifypeer,
+          headers: {
+            'Content-Type' => 'application/json', Authorization: "Basic #{Base64.strict_encode64("#{@config[:username]}:#{@config[:password]}")}"
+          }
+        )
+      temp = request.run
+      begin
+        parsed = JSON.parse(temp.response_body)
+      rescue Exception => e
+        Error.throw_error('1631')
+      end
+      Error.throw_error(parsed['messages'][0]['code']) if parsed['messages'][0]['code'] != '0'
+      return parsed['response']['token']
+    end
+
+    def close_connection(token)
+      url =
+        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]
+
+      request =
+        Typhoeus::Request.new(
+          url,
+          method: :delete,
+          params: {},
+          ssl_verifyhost: ssl_verifyhost,
+          ssl_verifypeer: ssl_verifypeer,
+          headers: { 'Content-Type' => 'application/json' }
+        )
+      temp = request.run
+
+      begin
+        parsed = JSON.parse(temp.response_body)
+      rescue Exception => e
+        Error.throw_error('1631')
+      end
+      Error.throw_error(parsed['messages'][0]['code']) if parsed['messages'][0]['code'] != '0'
+      return true
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trophonius
 version: !ruby/object:Gem::Version
-  version: 1.2.6.4
+  version: 1.3.1
 platform: ruby
 authors:
 - Kempen Automatisering
@@ -71,6 +71,7 @@ files:
 - 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: