Support integers schema type (#2)

Author: Ferran Llamas

CHANGELOG.md

@@ -1,8 +1,7 @@
 1.0.6 (unreleased)
 ------------------
 
-- Nothing changed yet.
-
+- Support integers schema type [lferran]
 
 1.0.5 (2019-11-01)
 ------------------
@@ -36,4 +35,4 @@
 1.0.0 (2019-09-26)
 ------------------
 
-- initial
+- initial

enviral/__init__.py

@@ -114,6 +114,13 @@ def serialize(
                         # we attempt but ignore error
                         # allow validation to catch properly
                         pass
+                if schema_type == "integer":
+                    try:
+                        value = int(value)
+                    except ValueError:
+                        # we attempt but ignore error
+                        # allow validation to catch properly
+                        pass
                 if schema_type in ("object", "array"):
                     if value[0] in ("[", "{"):
                         try:

tests/test_serialize.py

@@ -22,12 +22,22 @@ def test_get_setting_from_env_with_prefix(env):
     assert settings["foo"] == "bar"
 
 
+
+def test_convert_number_setting_from_env(env):
+    for number, conversion in (("2", int), ("9.85", float)):
+        os.environ["FOO"] = number
+        settings = enviral.serialize(
+            {"type": "object", "properties": {"foo": {"type": "number"}}}
+        )
+        assert settings["foo"] == conversion(number)
+
+
 def test_convert_int_setting_from_env(env):
-    os.environ["FOO"] = "2"
+    os.environ["FOO"] = "250"
     settings = enviral.serialize(
-        {"type": "object", "properties": {"foo": {"type": "number"}}}
+        {"type": "object", "properties": {"foo": {"type": "integer"}}}
     )
-    assert settings["foo"] == 2
+    assert settings["foo"] == 250
 
 
 def test_convert_object_setting_from_env(env):

tests/test_validate.py

@@ -20,12 +20,35 @@ def test_validate_from_env(env):
     enviral.validate_env(schema)
 
 
-def test_validate_int_from_env(env):
+def test_validate_number_from_env(env):
     os.environ["FOO"] = "bar"
     schema = {"type": "object", "properties": {"foo": {"type": "number"}}}
     with pytest.raises(jsonschema.exceptions.ValidationError):
         enviral.validate_env(schema)
 
+    # Check int
     os.environ["FOO"] = "2"
     settings = enviral.validate_env(schema)
     assert settings["foo"] == 2
+
+    # Check float
+    os.environ["FOO"] = "2.25"
+    settings = enviral.validate_env(schema)
+    assert settings["foo"] == 2.25
+
+
+def test_validate_integer_from_env(env):
+    os.environ["FOO"] = "bar"
+    schema = {"type": "object", "properties": {"foo": {"type": "integer"}}}
+    with pytest.raises(jsonschema.exceptions.ValidationError):
+        enviral.validate_env(schema)
+
+    # Check int
+    os.environ["FOO"] = "50"
+    settings = enviral.validate_env(schema)
+    assert settings["foo"] == 50
+
+    # Float should fail
+    os.environ["FOO"] = "2.25"
+    with pytest.raises(jsonschema.exceptions.ValidationError):
+        enviral.validate_env(schema)