Merge pull request #14 from NioGreek/patch-0x00

implemeted fill()

clashgap/__init__.py

@@ -1,5 +1,6 @@
 from ._clash import Clash
 from ._gap import gap
+from ._fill import fill
 
 __version__ = '0.2.0'
 

clashgap/_clash.py

@@ -1,4 +1,5 @@
 from ._gap import gap
+from ._fill import fill
 
 class Clash:
     def __init__(self, clash):
@@ -7,8 +8,11 @@ def __init__(self, clash):
     def gap(self):
         return self._gap
 
-    def __repr__(self):
-        return str(self._gap)
+    def fill(self):
+        return fill(self._gap)
 
     def __str__(self):
         return str(self._gap)
+
+    def __repr__(self):
+        return str(self._gap)

clashgap/_fill.py

@@ -0,0 +1,11 @@
+def fill(gap):
+    res = ["", ""]
+    for g in gap:
+        if isinstance(g, str):
+            res[0] += g
+            res[1] += g
+        else: #type(g) is list
+            res[0] += g[0]
+            res[1] += g[1]
+
+    return res

clashgap/_gap.py

@@ -1,9 +1,9 @@
 # This file contains the gap implementation and all the functions required for it
 
-def list_has(arr, index):
+def _list_has(arr, index):
     return (len(arr) > index)
 
-def collision(arr, brr):
+def _collision(arr, brr):
     for i, _ in enumerate(arr):
         collision = brr.find(arr[i])
         if collision != -1:
@@ -15,10 +15,10 @@ def gap(clash):
     buff = ['', '']
     for i, _ in enumerate(clash[0]):
         buff[0] += clash[0][i]
-        if list_has(clash[1], i):
+        if _list_has(clash[1], i):
             buff[1] += clash[1][i]
 
-        o, l = collision(buff[0], buff[1])
+        o, l = _collision(buff[0], buff[1])
 
         if o != -1:
             if buff[0][:o] or buff[1][:l]:

tests/test_clash.py

@@ -4,8 +4,11 @@
 def test_gap():
     assert clash.gap() == [['sp', 'h'], 'am']
 
+def test_str():
+    assert str(clash) == "[['sp', 'h'], 'am']"
+
 def test_repr():
     assert repr(clash) == "[['sp', 'h'], 'am']"
 
-def test_str():
-    assert str(clash) == "[['sp', 'h'], 'am']"
+def test_fill():
+    assert clash.fill() == ["spam", "ham"]

tests/test_fill.py

@@ -0,0 +1,5 @@
+import clashgap as cg
+
+def test_fill():
+    assert cg.fill([["sp", "h"], "am"]) == ["spam", "ham"]
+

tests/test_gap.py

@@ -2,11 +2,12 @@
 
 def test_list_has():
     arr = [1, 2]
-    assert cg._gap.list_has(arr, 1) == True
-    assert cg._gap.list_has(arr, 2) == False
+    assert cg._gap._list_has(arr, 0) == True
+    assert cg._gap._list_has(arr, 1) == True
+    assert cg._gap._list_has(arr, 2) == False
 
 def test_collision():
-    assert cg._gap.collision("spam", "ham") == (2, 1)
+    assert cg._gap._collision("spam", "ham") == (2, 1)
 
 def test_gap():
     assert cg.gap(["spam", "ham"]) == [['sp', 'h'], 'am']