trophonius 1.2.4 → 1.2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a314aa079b0dc7fca08f9796cfed19723f93006d2fef258b59517e9b20dd8c7a
-  data.tar.gz: f75dccd8b89ef66f69f15289f41e0389d946a9c25a96fdc7a19391eb296aa19f
+  metadata.gz: ec0214fb6fc5a8cd1fd4d994cb7c5fee184a682199b5adf0120dd385cb31766d
+  data.tar.gz: 44ac6914a04de0e5662c38359073bad47b0db6033241b332ce54185c7149ab30
 SHA512:
-  metadata.gz: 88e13826eb573c46ad06bc4b6eb63a23769231a5a1134820b3b3a5c6e8ca208a5c7c95756eaf549d5a8c4e44e6be5f5a1fa2a3fdec86b3d80cdc60fab34c237b
-  data.tar.gz: cde2425883080994637eda7c571f3bfa4196c65118d798630e55bc1b7108d45a74a37dafe8f23dc7906becae35bcd39b36635ea4459fa125316655df8d0807b2
+  metadata.gz: 97a534c6e3453bdfbfa134af4dae74713537f035a4f45bc2a71ae7b9e54197feecdbcb812024e203a02772f177e3b61cc93ca377b74b97f25be61da7640c6b03
+  data.tar.gz: 8acb6b48dc37c6834c6b26e1abbdf135a8693b499dac8deddec8e17f365d43fd9e9f4759c6d11872723eea7e311d1cf3d1254ab460da75eaa74594ce02697422

data/lib/trophonius_connection.rb

@@ -70,18 +70,17 @@ module Trophonius
 
       begin
         parsed = JSON.parse(temp.response_body)
-        Error.throw_error(response['messages'][0]['code']) if parsed['messages'][0]['code'] != '0'
-        return parsed['response']['token']
       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
 
     ##
     # Returns the last received token
     # @return [String] the last valid *token* used to connect with the FileMaker data api
     def self.token
-      token = Trophonius::RedisManager.get_key(key: 'token')
       return Trophonius.config.redis_connection ? Trophonius::RedisManager.get_key(key: 'token') : @token
     end
 
@@ -89,7 +88,7 @@ module Trophonius
     # Returns the receive time of the last received token
     # @return [Time] Returns the receive time of the last received token
     def self.last_connection
-      last = Trophonius::RedisManager.get_key(key: 'last_connection')
+      last = Trophonius.config.redis_connection ? Trophonius::RedisManager.get_key(key: 'last_connection') : nil
       last = last.nil? ? nil : Time.parse(last)
       Trophonius.config.redis_connection ? last : @last_connection
     end

data/lib/trophonius_query.rb

@@ -68,7 +68,7 @@ module Trophonius
     # @param [args] arguments containing the limit and offset
     # @return [Trophonius::Model] updated base model
     def paginate(args)
-      @offset = args[0]
+      @offset = ((args[0] * args[1] - args[1]) + 1)
       @limit = args[1]
       args[2]
     end
@@ -136,8 +136,8 @@ module Trophonius
       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
+          resp = RecordSet.new(@trophonius_model.layout_name, @trophonius_model.non_modifiable_fields).send(method, *args, &block)
+          return resp
         else
           if response['messages'][0]['code'] == '102'
             results = Request.retrieve_first(@trophonius_model.layout_name)

data/lib/trophonius_redis_manager.rb

@@ -2,10 +2,12 @@ module Trophonius
   # the RedisManager module is used to create a (single) connection to a redis store.
   module Trophonius::RedisManager
     def self.connect
-      if ENV['REDIS_URL'] && ENV['REDIS_URL'] != ''
-        @redis ||= Redis.new(url: ENV['REDIS_URL'])
-      else
-        @redis ||= Redis.new
+      if Trophonius.config.redis_connection
+        if ENV['REDIS_URL'] && ENV['REDIS_URL'] != ''
+          @redis ||= Redis.new(url: ENV['REDIS_URL'])
+        else
+          @redis ||= Redis.new
+        end
       end
       return nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trophonius
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.4.8
 platform: ruby
 authors:
 - Kempen Automatisering
@@ -42,16 +42,22 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 6.x
 description: An easy to use link between Ruby (on Rails) and FileMaker using the FileMaker
   Data-API.
 email: