arkaan 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f2e4fd6566216dd4bc532d36c16c0bfc2af3879
-  data.tar.gz: fe0cc0a6b1a32e76eb8f77af001c80e21402aec7
+  metadata.gz: '057528c0fc0b7cf0a8fe4277d95ec306335275be'
+  data.tar.gz: 6dbb9551a932b8cbab69fc8247fb25c03c54c6a4
 SHA512:
-  metadata.gz: 2495d4bd6c2b7187afeb06020ed31c397ad072523ff61d693952cd4c17ad9586cca12372b3f46b555e6d5168b7baa989280e542cc67257987742fe1e6f341909
-  data.tar.gz: fbf03545f56d27cc2812424cbac42cb2581faced47284561683e5826aff215cab84a499d33e2d8823f6ecff489ed0c1409e2708fd6ab13ecf45598c226ecb436
+  metadata.gz: 2a5d9b711367175109942b3dca458a1acfedf443caa04d7672363c66f32fbf1528381dff35fdedd048e04667844137a2ed668eccb39504944f5b16d886ac6f0e
+  data.tar.gz: 8088aa88b8c56adba51d9f849cad10ab614afd6749e3436e878a83890613ec1c5df963b470e58d5b09d9799882ba0eb7af080e9133fae19c299f6465416e58ae

data/lib/arkaan/utils/controller_without_filter.rb

@@ -31,6 +31,8 @@ module Arkaan
       # @param premium [Boolean] TRUE to make the route premium, FALSE otherwise.
       def self.declare_route_with(verb, path, premium, options, &block)
         service = Arkaan::Utils::MicroService.instance.service
+        complete_path = "#{Arkaan::Utils::MicroService.instance.path}#{path == '/' ? '' : path}"
+
         unless service.nil? || !service.routes.where(path: path, verb: verb).first.nil?
           route = Arkaan::Monitoring::Route.create(path: path, verb: verb, premium: premium, service: service)
           if !options.nil? && !options[:authenticated].nil?
@@ -42,7 +44,7 @@ module Arkaan
           end
         end
         if premium
-          self.public_send(verb, path) do
+          self.public_send(verb, complete_path) do
             @sinatra_route = parse_current_route
             if !@application.premium?
               custom_error(403, 'common.app_key.forbidden')
@@ -50,7 +52,7 @@ module Arkaan
             instance_eval(&block)
           end
         else
-          self.public_send(verb, path, &block)
+          self.public_send(verb, complete_path, &block)
         end
       end
 
@@ -133,6 +135,7 @@ module Arkaan
       # @param status [Integer] the HTTP status to halt the application with.
       # @param path [String] the path in the configuration file to access the URL.
       def custom_error(status, path)
+
         route, field, error = path.split('.')
         docs = settings.errors[route][field][error] rescue ''
         halt status, {status: status, field: field, error: error, docs: docs}.to_json

data/lib/arkaan/utils/micro_service.rb

@@ -20,6 +20,9 @@ module Arkaan
       # @!attribute [r] type
       #   @return [Symbol] the type of instance the application is declaring
       attr_reader :type
+      # @!attribute [rw] controller_classes
+      #   @return [Array<Class>] an array of controller classes to run
+      attr_accessor :controller_classes
 
       def initialize
         @location = false
@@ -27,6 +30,13 @@ module Arkaan
         @instance = false
         @name = false
         @type = ENV['INSTANCE_TYPE'] || :heroku
+        @controller_classes = []
+      end
+
+      # Add a controller class to the controllers to use.
+      # @param classname [Class] the class to add to the controller to load at startup.
+      def add_controller_class(classname)
+        @controller_classes << classname
       end
 
       # Determines if the application can be loaded (all the parameters have been correctly set)

metadata

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