trophonius 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4464ed6343916c8184fbf969fd34d0c4d9bb433193b4f30673984bea9d005f5
-  data.tar.gz: 897ada3411fcb66e9764d416ec41fd955802c9c2e5008339ccab8f7e7a634690
+  metadata.gz: 0f55a33c411a7d8e30e6b71817c8f4becba9579bedbd1971d1d3edb184ad9974
+  data.tar.gz: '09e8776664aaf9cf5c8b87e1373f0f8455692c793d84ac93876d98c949aa783d'
 SHA512:
-  metadata.gz: 593fee10d75466548619fe51c883bf7b52d709144a5eb0e5cbb843bf69dd95d640e913d60bdaab622c8622594e41171ad2679e83f182a89e76e20d34d8366fbd
-  data.tar.gz: d100e8cc9b0e9b127a42d616e0e85d95f28002f665a88b7ed1ef23107b82822668212d5f7e2951db38233b7447e0ef5112e49e91d06c5bda13c855500e4df9ae
+  metadata.gz: f53e29093fcbd1d2917ccb35b2a313a7aaa533d47ea82251de514a4e642bec843d3b74e65db5dcb6657e7c5151ca9d02c68ad67b0c3db073ced60ab449c725b7
+  data.tar.gz: 19e3cd597557bb9016726b3518e169769dd24a297f65774555b7633e86b2a2c7ea17e34ad37f44bbd68bcc489b56fcc1050346338efa985c47d1022abe09af17

data/lib/trophonius_model.rb

@@ -13,8 +13,10 @@ module Trophonius
 
     def initialize(config:)
       @configuration = config
+      @offset = ""
+      @limit = ""
     end
-
+    
     ##
     # Sets up the configuration for the model.
     #
@@ -26,6 +28,21 @@ module Trophonius
       @configuration.non_modifiable_fields = configuration[:non_modifiable_fields]
       @configuration.all_fields = {}
       @configuration.translations = {}
+      @offset = ""
+      @limit = ""
+    end
+
+    ##
+    # Limits the found record set.
+    #
+    # @param [Integer] page: number of current page
+    # @param [Integer] limit: number of records retreived
+    #
+    # @return [Trophonius::Model] Self
+    def self.paginate(page, limit)
+      @offset = ((page * limit - limit) + 1).to_s
+      @limit = limit.to_s
+      self
     end
 
     ##
@@ -60,13 +77,12 @@ module Trophonius
       self.first
       @configuration.translations
     end
-    
+
     def self.method_missing(method, *args, &block)
       new_instance = Trophonius::Model.new(config: @configuration)
-      new_instance.current_query = Trophonius::Query.new(trophonius_model: self)
-      # new_instance.current_query.build_query[0].merge!(fieldData)
+      new_instance.current_query = Trophonius::Query.new(trophonius_model: self, limit: @limit, offset: @offset )
       args << new_instance
-      if new_instance.current_query.respond_to?(method)        
+      if new_instance.current_query.respond_to?(method)
         new_instance.current_query.send(method, args)
       end
     end
@@ -76,7 +92,10 @@ module Trophonius
         args << self
         @current_query.send(method, args)
       elsif @current_query.response.respond_to?(method)
-        @current_query.run_query(method, *args, &block)
+        ret_val = @current_query.run_query(method, *args, &block)
+        @limit = ''
+        @offset = ''
+        return ret_val
       end
     end
 
@@ -87,7 +106,7 @@ module Trophonius
     # @return [Trophonius::Model] new instance of the model
     def self.where(fieldData)
       new_instance = Trophonius::Model.new(config: @configuration)
-      new_instance.current_query = Trophonius::Query.new(trophonius_model: self)
+      new_instance.current_query = Trophonius::Query.new(trophonius_model: self, limit: @limit, offset: @offset )
       new_instance.current_query.build_query[0].merge!(fieldData)
       new_instance
     end
@@ -337,7 +356,13 @@ module Trophonius
     def self.all(sort: {})
       results = Request.retrieve_all(layout_name, sort)
       count = results["response"]["scriptResult"].to_i
-      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 ? 1000000 : count}")
+      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}")
+      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 ? 1000000 : count}")
+      end
+      @limit = ''
+      @offset = ''
       results = Request.make_request(url, "Bearer #{Request.get_token}", "get", "{}")
       if results["messages"][0]["code"] != "0"
         Error.throw_error(results["messages"][0]["code"])

data/lib/trophonius_query.rb

@@ -1,8 +1,8 @@
-require "json"
-require "trophonius_config"
-require "trophonius_record"
-require "trophonius_recordset"
-require "trophonius_error"
+require 'json'
+require 'trophonius_config'
+require 'trophonius_record'
+require 'trophonius_recordset'
+require 'trophonius_error'
 
 module Trophonius
   class Trophonius::Query
@@ -10,12 +10,16 @@ module Trophonius
 
     ##
     # Creates a new instance of the Trophonius::Query class
-    # 
-    # @param [Trophonius::Model] base model for the new query
+    #
+    # @param [Trophonius::Model] trophonius_model: base model for the new query
+    # @param [String] limit: Used for every query to set the limit
+    # @param [String] offset: Used for every query to set the offset
     # @return [Trophonius::Query] new instance of Trophonius::Query
-    def initialize(trophonius_model:)
+    def initialize(trophonius_model:, limit:, offset:)
       @response = RecordSet.new(trophonius_model.layout_name, trophonius_model.non_modifiable_fields)
       @trophonius_model = trophonius_model
+      @limit = limit
+      @offset = offset
     end
 
     ##
@@ -29,7 +33,7 @@ module Trophonius
     def inspect
       @current_query
     end
-    
+
     ##
     # Adds a find request to the original query, resulting in an "Or" find-request for FileMaker
     #
@@ -39,17 +43,17 @@ module Trophonius
       args[1].current_query.build_query << args[0]
       args[1]
     end
-    
+
     ##
     # Adds an omit request to the original query, resulting in an "omit" find for FileMaker
     #
     # @param [args] arguments containing a Hash containing the FileMaker omit request, and the base model object for the query
     # @return [Trophonius::Model] updated base model
     def not(args)
-      args[1].current_query.build_query << args[0].merge!({omit: true})
+      args[1].current_query.build_query << args[0].merge!(omit: true)
       args[1]
     end
-    
+
     ##
     # Performs the query in FileMaker
     #
@@ -57,33 +61,37 @@ module Trophonius
     # @param [*args] original arguments, will be passed to the method call
     # @param [&block] original block, will be passed to the method call
     #
-    # @return Response of the called method 
+    # @return Response of the called method
     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")
-      new_field_data = @current_query.map { |q| {} }
+      url = URI("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| {} }
       if @trophonius_model.translations.keys.empty?
         @trophonius_model.create_translations
       end
       @current_query.each_with_index do |query, index|
         query.keys.each do |k|
-          if @trophonius_model.translations.keys.include?(k.to_s)
-            new_field_data[index].merge!({"#{@trophonius_model.translations[k.to_s]}" => query[k].to_s})
+          if @trophonius_model.translations.key?(k.to_s)
+            new_field_data[index].merge!(@trophonius_model.translations[k.to_s].to_s => query[k].to_s)
           else
-            new_field_data[index].merge!({"#{k}" => query[k].to_s})
+            new_field_data[index].merge!(k.to_s => query[k].to_s)
           end
         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"
-        if response["messages"][0]["code"] == "101" || response["messages"][0]["code"] == "401"
+      if @offset.empty? || @limit.empty?
+        body = { query: new_field_data, limit: '100000' }.to_json
+      else
+        body = { query: new_field_data, limit: @limit.to_s, offset: @offset.to_s }.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'] == '101' || response['messages'][0]['code'] == '401'
           RecordSet.new(@trophonius_model.layout_name, @trophonius_model.non_modifiable_fields).send(method, *args, &block)
           return
         else
-          Error.throw_error(response["messages"][0]["code"])
+          Error.throw_error(response['messages'][0]['code'])
         end
       else
-        r_results = response["response"]["data"]
+        r_results = response['response']['data']
         ret_val = RecordSet.new(@trophonius_model.layout_name, @trophonius_model.non_modifiable_fields)
         r_results.each do |r|
           hash = @trophonius_model.build_result(r)
@@ -93,7 +101,7 @@ module Trophonius
         return @response.send(method, *args, &block)
       end
     end
-    
-    alias_method :to_s, :inspect
+
+    alias to_s inspect
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trophonius
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Kempen Automatisering