singer-python 5.14.0__tar.gz → 5.14.1__tar.gz

{singer_python-5.14.0/singer_python.egg-info → singer-python-5.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: singer-python
-Version: 5.14.0
+Version: 5.14.1
 Summary: Singer.io utility library
 Home-page: http://singer.io
 Author: Stitch
@@ -18,10 +18,3 @@ Requires-Dist: ipython; extra == "dev"
 Requires-Dist: ipdb; extra == "dev"
 Requires-Dist: nose; extra == "dev"
 Requires-Dist: singer-tools; extra == "dev"
-Dynamic: author
-Dynamic: classifier
-Dynamic: home-page
-Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: summary

{singer_python-5.14.0 → singer-python-5.14.1}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 import subprocess
 
 setup(name="singer-python",
-      version='5.14.0',
+      version='5.14.1',
       description="Singer.io utility library",
       author="Stitch",
       classifiers=['Programming Language :: Python :: 3 :: Only'],

{singer_python-5.14.0 → singer-python-5.14.1}/singer/schema_generation.py

@@ -18,19 +18,33 @@ def add_observations(acc, path, data):
         for key in data:
             add_observations(acc, path + ["object", key], data[key])
     elif isinstance(data, list):
+        if len(data) == 0:
+            add_observations(acc, path + ["array"], None)
         for item in data:
             add_observations(acc, path + ["array"], item)
     elif isinstance(data, str):
-        # If the string parses as a date, add an observation that its a date
         try:
-            data = dateutil.parser.parse(data)
-        except (dateutil.parser.ParserError, OverflowError):
-            data = None
-        if data:
+            # If the string parses as a int, add an observation that it's a integer
+            int(data)
+            add_observation(acc, path + ["integer"])
+            return acc
+        except (ValueError, TypeError):
+            pass
+        try:
+            # If the string parses as a float, add an observation that it's a number
+            float(data)
+            add_observation(acc, path + ["number"])
+            return acc
+        except (ValueError, TypeError):
+            pass
+        try:
+            # If the string parses as a date, add an observation that it's a date
+            dateutil.parser.parse(data)
             add_observation(acc, path + ["date"])
-        else:
-            add_observation(acc, path + ["string"])
-
+            return acc
+        except (dateutil.parser.ParserError, OverflowError):
+            pass
+        add_observation(acc, path + ["string"])
     elif isinstance(data, bool):
         add_observation(acc, path + ["boolean"])
     elif isinstance(data, int):

{singer_python-5.14.0 → singer-python-5.14.1}/singer/transform.py

@@ -266,13 +266,13 @@ class Transformer:
             else:
                 return False, None
 
-        elif schema.get("format") == "date-time":
+        elif typ == "string" and schema.get("format") == "date-time":
             data = self._transform_datetime(data)
             if data is None:
                 return False, None
 
             return True, data
-        elif schema.get("format") == "singer.decimal":
+        elif typ == "string" and schema.get("format") == "singer.decimal":
             if data is None:
                 return False, None
 

{singer_python-5.14.0 → singer-python-5.14.1/singer_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: singer-python
-Version: 5.14.0
+Version: 5.14.1
 Summary: Singer.io utility library
 Home-page: http://singer.io
 Author: Stitch
@@ -18,10 +18,3 @@ Requires-Dist: ipython; extra == "dev"
 Requires-Dist: ipdb; extra == "dev"
 Requires-Dist: nose; extra == "dev"
 Requires-Dist: singer-tools; extra == "dev"
-Dynamic: author
-Dynamic: classifier
-Dynamic: home-page
-Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: summary

{singer_python-5.14.0 → singer-python-5.14.1}/tests/test_transform.py

@@ -25,7 +25,7 @@ class TestTransform(unittest.TestCase):
 
     def test_multi_type_object_transform(self):
         schema =  {"type": ["null", "object", "string"],
-                   "properties": {"whatever": {"type": "date-time",
+                   "properties": {"whatever": {"type": "string",
                                                "format": "date-time"}}}
         data = {"whatever": "2017-01-01"}
         expected = {"whatever": "2017-01-01T00:00:00.000000Z"}
@@ -36,7 +36,7 @@ class TestTransform(unittest.TestCase):
 
     def test_multi_type_array_transform(self):
         schema =  {"type": ["null", "array", "integer"],
-                   "items": {"type": "date-time", "format": "date-time"}}
+                   "items": {"type": "string", "format": "date-time"}}
         data = ["2017-01-01"]
         expected = ["2017-01-01T00:00:00.000000Z"]
         self.assertEqual(expected, transform(data, schema))