arkaan 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eebe941e4b49edb670452878122f9fdaab8f5d8a
-  data.tar.gz: 2499a92b741d4a6caf46a72b8cd01ea6a2cd561b
+  metadata.gz: 3a31199bbce66658b871208d0b4225f242842912
+  data.tar.gz: b1c6d940b08a683cfeffd51858bf9177ae9cd3a5
 SHA512:
-  metadata.gz: c707fd2f08439d13c3b309aabb506977fdfb6dfdf458ae19d850e256c577c38f92acc9857488cec7b7360990bff4ea528abb924116edc9ca76dd21ad710d3f4c
-  data.tar.gz: bd34382eeaa742be1e29ed5d6b839ddb954d6984aa78ddfd1778a721555138d6eeb13726b50425e2c70d179b778a3fe7a69280df10d3ba66d17dce3bb99d1920
+  metadata.gz: a2769ae73df7c8280fd6f32e0f23f4b9b5d7a365dbad5c23f9e5df4cb751726145ab065e44074c4e7b498cd9833ef8388143a14ea11ed1838084bb6b5fd75df9
+  data.tar.gz: 008b88cd408d6cb199cf8dc005f8d7113bc9d5ee6de9e294b79896f8636562641df8cb27d8460ea69de507a0788dc8e52435ef23b551278bed0287bcea7393b1

data/lib/arkaan/utils/controller.rb

@@ -3,13 +3,14 @@ module Arkaan
     # Base controller to handle the standard error when accessing the API.
     # @author Vincent Courtois <courtois.vincenet@outlook.com>
     class Controller < Sinatra::Base
+
       before do
-        @parameters = JSON.parse(request.body.read.to_s) rescue {}
-        if get_param('app_key').nil? || get_param('token').nil?
-          halt 400, {message: 'bad_request'}.to_json
-        end
-        gateway = Arkaan::Monitoring::Gateway.where(token: get_param('token')).first
-        application = Arkaan::OAuth::Application.where(key: get_param('app_key')).first
+        add_body_to_params
+        check_presence('token', 'app_key')
+
+        gateway = Arkaan::Monitoring::Gateway.where(token: params['token']).first
+        application = Arkaan::OAuth::Application.where(key: params['app_key']).first
+
         if gateway.nil?
           halt 404, {message: 'gateway_not_found'}.to_json
         elsif application.nil?
@@ -19,11 +20,21 @@ module Arkaan
         end
       end
 
-      # Gets a parameters from the parsed body hash, or the parsed querystring hash.
-      # @param [String] key - the key of the parameter to get.
-      # @return [any] the value associated with the key.
-      def get_param(key)
-        return (params.nil? || params[key].nil? ? @parameters[key] : params[key])
+      # 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)
+        fields.each do |field|
+          halt 400, {message: 'bad_request'}.to_json if params[field].nil?
+        end
+      end
+
+      # Adds the parsed body to the parameters, overwriting the parameters of the querystring with the values
+      # of the SON body if they have similar keys.
+      def add_body_to_params
+        parsed_body = JSON.parse(request.body.read.to_s) rescue {}
+        parsed_body.keys.each do |key|
+          params[key] = parsed_body[key]
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arkaan
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Vincent Courtois