Support aiohttp 1.1 (#54)

* Fix incompatibility with aiohttp 1.1

* Revert "Fix incompatibility with aiohttp 1.1"

This reverts commit 44ccada.

* Adopt to aiohttp 1.1

* Use proper method

Author: asvetlov

aiohttp_cors/cors_config.py

@@ -389,7 +389,7 @@ def add(self,
         else:
             # UrlDispatcher.
 
-            if isinstance(routing_entity, web.Resource):
+            if isinstance(routing_entity, (web.Resource, web.StaticResource)):
                 # New Resource - use new router adapter.
                 return self._resources_cors_impl.add(routing_entity, config)
 

aiohttp_cors/urldispatcher_router_adapter.py

@@ -121,7 +121,8 @@ def __init__(self,
 
     def add_preflight_handler(
             self,
-            routing_entity: Union[web.Resource, web.ResourceRoute],
+            routing_entity: Union[web.Resource, web.StaticResource,
+                                  web.ResourceRoute],
             handler):
         """Add OPTIONS handler for all routes defined by `routing_entity`.
 
@@ -142,6 +143,19 @@ def add_preflight_handler(
             self._preflight_routes.add(preflight_route)
             self._resources_with_preflight_handlers.add(resource)
 
+        elif isinstance(routing_entity, web.StaticResource):
+            resource = routing_entity
+
+            # Add preflight handler for Resource, if not yet added.
+
+            if resource in self._resources_with_preflight_handlers:
+                # Preflight handler already added for this resource.
+                return
+
+            preflight_route = resource.set_options_route(handler)
+            self._preflight_routes.add(preflight_route)
+            self._resources_with_preflight_handlers.add(resource)
+
         elif isinstance(routing_entity, web.ResourceRoute):
             route = routing_entity
 
@@ -182,11 +196,12 @@ def is_cors_enabled_on_request(self, request: web.Request) -> bool:
 
     def set_config_for_routing_entity(
             self,
-            routing_entity: Union[web.Resource, web.ResourceRoute],
+            routing_entity: Union[web.Resource, web.StaticResource,
+                                  web.ResourceRoute],
             config):
         """Record configuration for resource or it's route."""
 
-        if isinstance(routing_entity, web.Resource):
+        if isinstance(routing_entity, (web.Resource, web.StaticResource)):
             resource = routing_entity
 
             # Add resource configuration or fail if it's already added.
@@ -393,11 +408,10 @@ def get_preflight_request_config(
             requested_method: str):
         assert self.is_preflight_request(preflight_request)
 
-        # TODO: Test difference between request.raw_path and request.path.
-        path = preflight_request.path
+        request = preflight_request.clone(method=requested_method)
         for route, config in self._route_config.items():
             match_info, allowed_methods = yield from route.resource.resolve(
-                requested_method, path)
+                request)
             if match_info is not None:
                 return collections.ChainMap(config, self._default_config)
         else: