Merge pull request #34 from kmckinnis/master

Made changes to allow the API to work with cual-id, UUID format

cualid/mint.py

@@ -36,6 +36,6 @@ def create_ids(n, id_length,
         if at_least_distance(hrid, hrids, d=min_distance):
             uuids.append(uuid_)
             hrids.append(hrid)
-            yield (uuid_, hrid)
+            yield (hrid, uuid_)
         else:
             failures += 1

cualid/tests/test_mint.py

@@ -3,6 +3,7 @@
 
 from cualid import create_ids
 from cualid.mint import at_least_distance
+import uuid
 
 
 class TestCreateIDS(unittest.TestCase):
@@ -16,6 +17,12 @@ def test_create_ids_fail(self):
         self.assertTrue(len(result) > 0)
         self.assertTrue(len(result) < 1000)
 
+    def test_create_ids_API(self):
+        id_length = 7
+        result = list(create_ids(100, id_length))
+        self.assertTrue(len(result[0][0]) == id_length)
+        self.assertTrue(type(result[0][1]) == uuid.UUID)
+
 
 class TestAtLeastDistance(unittest.TestCase):
 

scripts/cual-id

@@ -41,7 +41,7 @@ def sample_id_generator(number_of_ids, length, fail_threshold, existing_ids):
     collected = 0
     if existing_ids:
       existing_ids = parse_ids(existing_ids, 0)
-    for uuid_, hrid in create_ids(number_of_ids, length,
+    for hrid, uuid_ in create_ids(number_of_ids, length,
                                   failure_threshold=fail_threshold,
                                   existing_ids=existing_ids):
         collected += 1