Add custom_formats parameter when validating $ref

Author: abravalheri

Diff for: fastjsonschema/generator.py

@@ -137,8 +137,7 @@ def generate_validation_function(self, uri, name):
         self._validation_functions_done.add(uri)
         self.l('')
         with self._resolver.resolving(uri) as definition:
-            args = "data, custom_formats={}" if self._custom_formats else "data"
-            with self.l('def {}({}):', name, args):
+            with self.l('def {}(data, custom_formats={{}}):', name):
                 self.generate_func_code_block(definition, 'data', 'data', clear_variables=True)
                 self.l('return data')
 
@@ -192,7 +191,7 @@ def generate_ref(self):
             if uri not in self._validation_functions_done:
                 self._needed_validation_functions[uri] = name
             # call validation function
-            self.l('{}({variable})', name)
+            self.l('{}({variable}, custom_formats)', name)
 
 
     # pylint: disable=invalid-name

Diff for: tests/test_compile_to_code.py

@@ -88,11 +88,37 @@ def test_compile_complex_one_of_all_of():
 
 
 def test_compile_to_code_custom_format():
-    formats = {'identifier': str.isidentifier}
-    code = compile_to_code({'type': 'string', 'format': 'identifier'}, formats=formats)
+    formats = {'my-format': str.isidentifier}
+    code = compile_to_code({'type': 'string', 'format': 'my-format'}, formats=formats)
     with open('temp/schema_3.py', 'w') as f:
         f.write(code)
     from temp.schema_3 import validate
-    assert validate("identifier", formats) == "identifier"
-    with pytest.raises(JsonSchemaValueException):
-        validate("not-identifier", formats)
+    assert validate("valid", formats) == "valid"
+    with pytest.raises(JsonSchemaValueException) as exc:
+        validate("not-valid", formats)
+    assert exc.value.message == "data must be my-format"
+
+
+def test_compile_to_code_custom_format_with_refs():
+    schema = {
+        'type': 'object',
+        'properties': {
+            'a': {'$ref': '#/definitions/a'}
+        },
+        'definitions': {
+            'a': {
+                '$id': '#/definitions/a',
+                'type': 'array',
+                'items': {'type': 'string', 'format': 'my-format'}
+            }
+        }
+    }
+    formats = {'my-format': str.isidentifier}
+    code = compile_to_code(schema, formats=formats)
+    with open('temp/schema_4.py', 'w') as f:
+        f.write(code)
+    from temp.schema_4 import validate
+    assert validate({"a": ["identifier"]}, formats) is not None
+    with pytest.raises(JsonSchemaValueException) as exc:
+        validate({"a": ["identifier", "not-valid"]}, formats)
+    assert exc.value.message == "data[1] must be my-format"