trophonius 1.2.4.2 → 1.2.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3938dd85580ae34b5085bbb05c1e20adc506522cde540f3edb8af4a1b902e5cb
-  data.tar.gz: e9e0520cd32790cf07fb90c074e90ef087403481f67e950559b579b800bf7526
+  metadata.gz: c79101c445307adbbb319a9cf07fed8e2b0fb3ae6d17a213833452ff9252f6cd
+  data.tar.gz: 21e0bc3a18a443f3576699100c48cf4f1db6b9efe4a031d5c52a26c95a4cb464
 SHA512:
-  metadata.gz: 42bae32f929cc8d8ff095147c54c836db4a8b2429b4166297529cde2dbf14dff68802a725f214284587ea84aef4c391b5ba579fbe49539184fbe419d960725bd
-  data.tar.gz: 3b04dcc00d655b555c65e4b96a1326a1da3c9f26ef711cff5fa95fda1d3e0c3aa5c69c3714d55dff0d65f78ffd9d2db88d11c71057c244693eac88373ed8634f
+  metadata.gz: cfef37d5c0ddca6ac545d76ed5b62df8b8f1514f247cdf6749ab0925ac33a0d889fe6f11ba9a75985164c81e7b8ffb91c24c13df79ba53e4475aa53f3e27ec37
+  data.tar.gz: 6afb02d5bc0d8d8a33853ffc1eff5f1f7cceb4026a665e74f6ff01d3b7189a616e9cc127b8e9962ea8fa23abb381661d5c8dbb4602588668abf8168d2784be7d

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_model.rb

@@ -32,6 +32,40 @@ module Trophonius
       @limit = ''
     end
 
+    ##
+    # Sets up the configuration for the model.
+    #
+    # @param [Hash] configuration: the hash containing the config to setup the model correctly.
+    #   configuration = {layout_name: "theFileMakerLayoutForThisModel", non_modifiable_fields: ["an", "array", "containing", "calculation_fields", "etc."]}
+    def self.config(configuration)
+      @configuration ||= Configuration.new
+      @configuration.layout_name = configuration[:layout_name]
+      @configuration.non_modifiable_fields = configuration[:non_modifiable_fields]
+      @configuration.all_fields = {}
+      @configuration.translations = {}
+      @offset = ''
+      @limit = ''
+    end
+
+    ##
+    # Add a has many relationship.
+    #
+    # @param [Symbol] model_name: the name of the model to build a relation with
+    # @param [String] primary_key: the name of the field containing the primary to build the relation over
+    # @param [String] foreign_key: the name of the field containing the primary to build the relation over
+    #
+    # @return [Trophonius::Model] Self
+    def self.has_many(model_name, primary_key:, foreign_key:)
+      @configuration ||= Configuration.new
+      @configuration.layout_name = configuration[:layout_name]
+      @configuration.non_modifiable_fields = configuration[:non_modifiable_fields]
+      @configuration.all_fields = {}
+      @configuration.translations = {}
+      @offset = ''
+      @limit = ''
+      self
+    end
+
     ##
     # Limits the found record set.
     #

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.2
+  version: 1.2.4.10
 platform: ruby
 authors:
 - Kempen Automatisering
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 6.x
 description: An easy to use link between Ruby (on Rails) and FileMaker using the FileMaker
   Data-API.
 email: