arkaan 0.10.25 → 0.10.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2ef14b2c1f588710861147b8caec88e963f6c77
-  data.tar.gz: f7f72fbd08d32e782c247153f8b6d4c160ba1c35
+  metadata.gz: a37206a363fbd1abfd39eaf523806cc5333be64a
+  data.tar.gz: ee2630ff98416b797383e412d3a2914144a4ecb9
 SHA512:
-  metadata.gz: bde03c13292ac906a29bcde791e165ddd11490c9e86945e2cdf8eb1a0ad5bf38d85c68a49d1574fa444b5bb431102031eec9d119d52b278741fdd044b37ddd07
-  data.tar.gz: cacde25515002f9bc1c06dd6858ec2060f0ab2d491d006da27c930d634f5ee9d9c0ab267ada31ad45e07a76daad3a6767b8d37cd4256258e4484287aa311ecfe
+  metadata.gz: 8893753ce12fb24b6b79dfa29b3a146a8550a63cfc95550538f2c791678e1519855a931483f83b7b88ddb0378ca8bae42b7ec3fa4ea152648aa79f190c03c1f9
+  data.tar.gz: e998007ef7567d3ec439cf1cf29b9c3388aedc434e63a39d95352189307b4fc5435a0f5cc404fcc96b821fa41e1714184c07bfc57f343f18c01c355cca3c2f91

data/lib/arkaan/monitoring/service.rb

@@ -15,6 +15,9 @@ module Arkaan
       # @!attribute [rw] path
       #   @return [String] the path the service will be mapped on in the API.
       field :path, type: String, default: '/'
+      # @!attribute [rw] test_mode
+      #   @return [Boolean] TRUE if the service is currently in test mode and thus the gateway shall only qurty local instances.
+      field :test_mode, type: Boolean, default: false
 
       # @!attribute [rw] creator
       #   @return [Arkaan::Account] the creator of this service.

data/lib/arkaan/utils/controller.rb

@@ -5,17 +5,7 @@ module Arkaan
     class Controller < Arkaan::Utils::ControllerWithoutFilter
 
       before do
-        add_body_to_params
-        check_presence('token', 'app_key', route: 'common')
-
-        gateway = Arkaan::Monitoring::Gateway.where(token: params['token']).first
-        @application = Arkaan::OAuth::Application.where(key: params['app_key']).first
-        
-        if gateway.nil?
-          custom_error(404, 'common.token.unknown')
-        elsif @application.nil?
-          custom_error(404, 'common.app_key.unknown')
-        end
+        before_checks
       end
     end
   end

data/lib/arkaan/utils/controller_without_filter.rb

@@ -54,6 +54,20 @@ module Arkaan
         config_file File.join(File.dirname(file), '..', 'config', 'errors.yml')
       end
 
+      def before_checks
+        add_body_to_params
+        check_presence('token', 'app_key', route: 'common')
+
+        gateway = Arkaan::Monitoring::Gateway.where(token: params['token']).first
+        @application = Arkaan::OAuth::Application.where(key: params['app_key']).first
+        
+        if gateway.nil?
+          custom_error(404, 'common.token.unknown')
+        elsif @application.nil?
+          custom_error(404, 'common.app_key.unknown')
+        end
+      end
+
       # Checks the presence of several fields given as parameters and halts the execution if it's not present.
       # @param fields [Array<String>] an array of fields names to search in the parameters
       def check_presence(*fields, route:)
@@ -143,7 +157,7 @@ module Arkaan
         handle_arkaan_exception(exception)
       end
 
-      error StandardError do
+      error StandardError do |exception|
         custom_error(500, 'system_error.unknown_field.unknown_error')
       end
     end

data/lib/arkaan/utils/micro_service.rb

@@ -134,7 +134,7 @@ module Arkaan
       end
 
       def load_mongoid_configuration
-        Mongoid.load!(File.join(location, 'config', 'mongoid.yml'))
+        Mongoid.load!(File.join(location, 'config', 'mongoid.yml'), ENV['RACK_ENV'] || :development)
       end
 
       def load_standard_files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arkaan
 version: !ruby/object:Gem::Version
-  version: 0.10.25
+  version: 0.10.26
 platform: ruby
 authors:
 - Vincent Courtois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-13 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec