soar_sc_routing 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 891ece3dcea44d840af6368216d9e21ddbdecf74
-  data.tar.gz: 6592a06ade0f0db34f191cd3be9e9cf20373fb87
+  metadata.gz: e7711ac0ca595ce5f6836934567ae557f6705257
+  data.tar.gz: 1871d2e6936b468d491b9a8183a836cfedc52288
 SHA512:
-  metadata.gz: 02f58e8fe7f9d8b773d800f80e7b4dec71436d33623df0dbe77f257eb1ea50bb8143a163ba91812987cb515e6fb1cf903047ff24fae88883ed0bc822300ec106
-  data.tar.gz: 2dd5b2a535ec82ddcafc97825ebe6f72ab63ae16410b276ab673d11644952d4d52e8525f626719ac7e29757be1a47faca0f31f64306f4c4d2ed2afbdf30831a4
+  metadata.gz: 7d724e3768b15066d6653eeae580a33cef91913171a3c61b2e51cfd369a9c3755d88ea886d3969d6c175b4921c0143533b4927bb0a215d3e6df3548ecb8c01ff
+  data.tar.gz: 3fde980c6b3fb7981a0eec248ae69bc0f253d016814156473dfd5c0c7acf394e55086104924f0cd70a8a5fbb153e53b660ee0f218fb0bc10aa81b661b55283d7

data/README.md

@@ -74,7 +74,7 @@ Or install it yourself as:
 
 ```ruby
 class AuthenticatedRouterMeta < SoarScRouting::RouterMeta
-  def policy_am
+  def access_manager
     @policy_am ||= SoarPolicyAccessManager::PolicyAccessManager.new(SoarSc::service_registry)
     @policy_am
   end

data/lib/soar_sc_routing/base_router.rb

@@ -41,25 +41,30 @@ module SoarScRouting
     end
 
     def route_matched_path(request, path)
-      debug("matched #{path}",request.params['flow_identifier'])
+      debug("#{@route_meta.name} matched #{path}",request.params['flow_identifier'])
       http_code, content_type, body = @route_meta.routing[path].call(request)
       debug("controller returned #{http_code}, #{content_type}", request.params['flow_identifier'])
       return [http_code, content_type, body]
     end
 
     def route_path(request)
-      # Only allow POST requests
-      #if not request.post?
-      #  return SoarSc::Web::Views::Default.render(405, "")
-      #end
+      debug("#{@route_meta.name} attempting to match #{request.path}",request.params['flow_identifier'])
       @route_meta.routing.each do |path, block|
-        if matches = Regexp.new(path).match(request.path)
+        matches = Regexp.new(path).match(request.path)
+        if matches && request_verb_matches_route_verb?(request,@route_meta.lexicon)
           request.define_singleton_method(:regex_matches) { return matches.to_a }
           return route_matched_path(request, path)
         end
       end
-      debug("no match to #{request.path}",request.params['flow_identifier'])
+      debug("no match to #{request.path} on router #{@route_meta.name}",request.params['flow_identifier'])
       not_found
     end
+
+    private
+
+    def request_verb_matches_route_verb?(request,path_lexicon)
+      return false if path_lexicon.nil? or path_lexicon[request.path].nil?
+      path_lexicon[request.path]['method'].include?(request.env['REQUEST_METHOD'])
+    end
   end
 end

data/lib/soar_sc_routing/router_meta.rb

@@ -19,13 +19,15 @@ module SoarScRouting
     attr_accessor :service_names
     attr_accessor :policy_am
     attr_accessor :autenticate
+    attr_reader   :name
 
-    def initialize(configuration)
+    def initialize(configuration,name = 'router')
       @configuration = configuration
       @lexicon = {}
       @routing = {}
       @signed_routes = {}
       @service_names = {}
+      @name = name
       setup_routing_table
     end
 
@@ -35,8 +37,8 @@ module SoarScRouting
 
     def register_route(detail, startup_flow_id = nil)
       validate_detail(detail)
-      info("Registering service: #{detail}", startup_flow_id)
-      resource = SoarScRouting::Resource.new(detail['description'], "#{detail['service_name']}", detail['method'].upcase, detail['params'])
+      info("Registering service: #{detail} on router #{@name}", startup_flow_id)
+      resource = SoarScRouting::Resource.new(detail['description'], "#{detail['service_name']}", upcase(detail['method']), detail['params'])
       add_resource_route(detail['path'], resource, interpret_secured(detail), interpret_authorized(detail)) do |request|
         if detail['controller']
           delegate_to_controller_and_renderer(detail, startup_flow_id, request)
@@ -101,7 +103,7 @@ module SoarScRouting
         controller = Object::const_get(detail['controller']).new(@configuration)
       end
       http_code, body = controller.serve(request)
-      render_view(detail, http_code, body)      
+      render_view(detail, http_code, body)
     end
 
     def info(message, startup_flow_id)
@@ -150,6 +152,11 @@ module SoarScRouting
         authorized = 'AUTHORIZED' if not ['AUTHORIZED', 'UNAUTHORIZED'].include?(detail['nfrs']['authorization'])
       end
       authorized == 'AUTHORIZED'
-    end    
+    end
+
+    def upcase(methods)
+      return methods.map(&:upcase) if methods.is_a?(Array)
+      methods.upcase if methods.is_a?(String)
+    end
   end
 end

data/lib/soar_sc_routing/version.rb

@@ -1,3 +1,3 @@
 module SoarScRouting
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soar_sc_routing
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ernst Van Graan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsender