Reference scopes stack fix

Author: p1c2u

openapi_spec_validator/decorators.py

@@ -18,7 +18,8 @@ def __init__(self, instance_resolver):
     def __call__(self, func):
         def wrapped(validator, schema_element, instance, schema):
             if not isinstance(instance, dict) or '$ref' not in instance:
-                return func(validator, schema_element, instance, schema)
+                yield from func(validator, schema_element, instance, schema)
+                return
 
             ref = instance['$ref']
 
@@ -29,7 +30,7 @@ def wrapped(validator, schema_element, instance, schema):
             self._attach_scope(instance)
             with self.visiting.visit(ref):
                 with self.instance_resolver.resolving(ref) as target:
-                    return func(validator, schema_element, target, schema)
+                    yield from func(validator, schema_element, target, schema)
 
         return wrapped
 

tests/integration/data/v3.0/parent-reference/common.yaml

@@ -0,0 +1,20 @@
+schemas:
+  Model:
+    type: object
+    required:
+      - id
+    properties:
+      id:
+        type: integer
+        format: int32
+  Error:
+    type: object
+    required:
+      - code
+      - message
+    properties:
+      code:
+        type: integer
+        format: int32
+      message:
+        type: string

tests/integration/data/v3.0/parent-reference/openapi.yaml

@@ -0,0 +1,36 @@
+openapi: "3.0.0"
+info:
+  version: 1.0.0
+  title: OpenAPI Petstore
+  license:
+    name: MIT
+servers:
+  - url: http://petstore.swagger.io/v1
+paths:
+  /pets:
+    get:
+      summary: List all pets
+      operationId: listPets
+      tags:
+        - pets
+      parameters:
+        - name: limit
+          in: query
+          description: How many items to return at one time (max 100)
+          required: false
+          schema:
+            type: integer
+            format: int32
+      responses:
+        '200':
+          description: Expected response to a valid request
+          content:
+            application/json:
+              schema:
+                $ref: "spec/components.yaml#/schemas/Pet"
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "common.yaml#/schemas/Error"

tests/integration/data/v3.0/parent-reference/spec/components.yaml

@@ -0,0 +1,12 @@
+schemas:
+  Pet:
+    type: object
+    allOf:
+      - $ref: "../common.yaml#/schemas/Model"
+    required:
+      - name
+    properties:
+      name:
+        type: string
+      tag:
+        type: string

tests/integration/data/v3.0/petstore-separate/spec/schemas/Pets.yaml

@@ -1,3 +1,3 @@
 type: array
 items:
-  $ref: "schemas/Pet.yaml"
+  $ref: "Pet.yaml"

tests/integration/test_validate.py

@@ -51,6 +51,19 @@ def spec(self, factory):
         return factory.spec_from_file(self.spec_file)
 
 
+class TestLocalParentReferenceExample(BaseTestValidOpeAPIv3Validator):
+
+    spec_file = "data/v3.0/parent-reference/openapi.yaml"
+
+    @pytest.fixture
+    def spec_url(self, factory):
+        return factory.spec_url(self.spec_file)
+
+    @pytest.fixture
+    def spec(self, factory):
+        return factory.spec_from_file(self.spec_file)
+
+
 class TestPetstoreExample(BaseTestValidOpeAPIv3Validator):
 
     @pytest.fixture