Removed webserver, minor changes

.gitignore

@@ -21,6 +21,8 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+.hypothesis/
+test/.hypothesis/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

pagan/generator.py

@@ -7,6 +7,7 @@
 import os
 import sys
 
+from builtins import bytes
 
 class FalseHashError(Exception):
     """ """
@@ -103,12 +104,7 @@ def hash_input(inpt, algo=HASH_SHA256):
     elif (algo == HASH_SHA512):
         hashcode = hashlib.sha512()
 
-    if sys.version_info.major == 2:
-        inpt = bytes(inpt)
-    else:
-        inpt = bytes(inpt, "utf-8")
-
-    hashcode.update(inpt)
+    hashcode.update(bytes(inpt, "utf-8"))
     hexhash = hashcode.hexdigest()
     return hexhash
 
@@ -270,8 +266,10 @@ def setup_pixelmap(hashcode):
 
 
 def generate(str, alg):
-    """Generates an PIL image avatar based on the given
-    input String. Acts as the main accessor to pagan."""
+    """Generates an PIL image avatar based on the given input String.
+
+    Acts as the main accessor to pagan.
+    """
     img = Image.new(IMAGE_MODE, IMAGE_SIZE, BACKGROUND_COLOR)
     hashcode = hash_input(str, alg)
     pixelmap = setup_pixelmap(hashcode)
@@ -280,18 +278,20 @@ def generate(str, alg):
 
 
 def generate_by_hash(hashcode):
-    """Generates an PIL image avatar based on the given
-    hash String. Acts as the main accessor to pagan."""
+    """Generates an PIL image avatar based on the given hash String.
+
+    Acts as the main accessor to pagan.
+    """
     img = Image.new(IMAGE_MODE, IMAGE_SIZE, BACKGROUND_COLOR)
     if len(hashcode) < 32:
         print ("hashcode must have lenght >= 32, %s" % hashcode)
         raise FalseHashError
 
-    allowed = "0123456789abcdef"
-    hashcheck = [c in allowed for c in hashcode]
-    if False in hashcheck:
-        print ("hashcode has not allowed structure %s" % hashcode)
-        raise FalseHashError
+    allowed = "0123456789ABCDEFabcdef"
+    for c in hashcode:
+        if c not in allowed:
+            print ("hashcode has not allowed structure %s" % hashcode)
+            raise FalseHashError
 
     pixelmap = setup_pixelmap(hashcode)
     draw_image(pixelmap, img)

pagan/pagan.py

@@ -3,7 +3,7 @@
 import os
 
 
-class Avatar():
+class Avatar(object):
 
     # Default output path is in the current working directory.
     DEFAULT_OUTPUT_PATH = os.path.join(os.getcwd(), "output/")
@@ -18,8 +18,9 @@ def __init__(self, inpt, hashfun=DEFAULT_HASHFUN):
         self.img = self.__create_image(inpt, hashfun)
 
     def __create_image(self, inpt, hashfun):
-        """Creates the avatar based on the input and
-        the chosen hash function."""
+        """Creates the avatar based on the input and the chosen hash function.
+
+        """
         if hashfun not in generator.HASHES.keys():
             print ("Unknown or unsupported hash function. Using default: %s"
                    % self.DEFAULT_HASHFUN)
@@ -29,22 +30,24 @@ def __create_image(self, inpt, hashfun):
         return generator.generate(inpt, algo)
 
     def show(self):
-        """Shows a preview of the avatar in an external
-        image viewer."""
+        """Shows a preview of the avatar in an external image viewer."""
         self.img.show()
 
     def change(self, inpt, hashfun=DEFAULT_HASHFUN):
         """Change the avatar by providing a new input.
-        Uses the standard hash function if no one is given."""
+
+        Uses the standard hash function if no one is given.
+        """
         self.img = self.__create_image(inpt, hashfun)
 
     def save(self, path=DEFAULT_OUTPUT_PATH, filename=DEFAULT_FILENAME):
-        """Saves a avatar under the given output path to
-        a given filename. The file ending ".png" is appended
+        """Saves a avatar under the given output path to a given filename.
+
+        The file ending ".png" is appended
         automatically. If the path does not exist, it will be
         created. When no parameters are omitted, a default path
-        and/or filename will be used."""
-
+        and/or filename will be used.
+        """
         # Creates a path when it does not exist.
         if not os.path.exists(path):
             os.makedirs(path)
@@ -56,6 +59,7 @@ def save(self, path=DEFAULT_OUTPUT_PATH, filename=DEFAULT_FILENAME):
         # Saves the image under the given filepath.
         filepath = ("%s%s.png" % (path, filename))
         filepath = os.path.join(path, "%s.png" % filename)
+
         # FIXIT: filepath without SUFFIX, print writes false filename
         print ("Saving: %s" % filepath)
         self.img.save(filepath, 'PNG')

setup.py

@@ -25,6 +25,6 @@
         'Environment :: Web Environment',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ],
-    install_requires=['Pillow>=2.3.0']
+    install_requires=['Pillow>=2.3.0', 'future']
 
 )

test/test_bin_pagan.py

@@ -0,0 +1,46 @@
+import os
+from subprocess import PIPE
+from subprocess import Popen
+
+
+def test_simple_call():
+    """check if calling the script simply works and yields no error"""
+    p = Popen(["pagan", "--noshow", "--output=/tmp/0101010101.png", "0101"],
+              stdout=PIPE, stderr=PIPE)
+    stdout, stderr = p.communicate()
+    assert stdout
+    assert not stderr
+
+
+def test_simple_call_err():
+    """fail if called with wrong arguments"""
+    p = Popen(["pagan", "--output=/tmp/0101010101.png", "--err", "0101"],
+              stdout=PIPE, stderr=PIPE)
+    stdout, stderr = p.communicate()
+    assert not stdout
+    assert stderr
+
+
+def test_simple_call_err_no_input():
+    """fail if no input given"""
+    p = Popen(["pagan", "--output=/tmp/0101010101.png"],
+              stdout=PIPE, stderr=PIPE)
+    stdout, stderr = p.communicate()
+    assert not stdout
+    assert stderr
+
+
+def test_replace_chars_in_filename():
+    """test replace chars in filename, if only called with input
+
+    no punctuation allowed, so replace "one.png" with "one-png"
+    """
+    p = Popen(["pagan", "--noshow", "/tmp/one.png"],
+              stdout=PIPE, stderr=PIPE)
+    stdout, stderr = p.communicate()
+    assert not stderr
+    assert stdout
+    expected_filename = "-tmp-one-png.png"
+    assert os.path.isfile(expected_filename)
+    if os.path.isfile(expected_filename):
+        os.unlink(expected_filename)

test/test_generator.py

@@ -22,4 +22,4 @@ def test_generate_by_hash():
         img = pagan.generator.generate_by_hash(md5.hexdigest()[:2])
 
     with pytest.raises(pagan.generator.FalseHashError):
-        img = pagan.generator.generate_by_hash(md5.hexdigest()+"A")
+        img = pagan.generator.generate_by_hash(md5.hexdigest()+"G")

test/test_hypo.py

@@ -0,0 +1,14 @@
+# -*- coding: latin-1 -*-
+import pagan
+from hypothesis import given
+import hypothesis.strategies as st
+
+
+@given(st.text(), st.integers())
+def test_hypo(inpt, hashnr):
+    img = pagan.Avatar(inpt, hashnr)
+    assert (img.img)
+
+
+if __name__ == "__main__":
+    test_hypo()

test/test_pagan.py

@@ -1,4 +1,7 @@
 # -*- coding: latin-1 -*-
+import os
+import random
+import string
 import tempfile
 import pagan
 
@@ -49,10 +52,22 @@ def test_save():
     img0.save(tmpdir, tmpfile)
 
 
+def test_save_new_dir():
+    """save file in not existing directory"""
+    img0 = pagan.Avatar("1")
+    tmpdir = tempfile.gettempdir()
+    testdir = ''.join(random.SystemRandom().choice(string.digits)
+                      for _ in range(12))
+    testdir = os.path.join(tmpdir, testdir)
+    testfile = tempfile.mkstemp("", dir=tmpdir)[1].split("/")[-1]
+    img0.save(testdir, testfile)
+
+
 if __name__ == "__main__":
     test_create()
     test_diffrent_hash()
     test_umlaute()
     test_show()
     test_change()
     test_save()
+    test_save_new_dir()

tools/console/pagan

@@ -3,6 +3,7 @@
 
 import argparse
 import os
+import string
 import pagan
 from pagan import generator
 
@@ -11,29 +12,41 @@ parser.add_argument("input", nargs="+",
                     help="string, basis of avatar computing")
 parser.add_argument("--show", action="store_true",
                     help="show avatar in external editor, default behavior")
+parser.add_argument("--noshow", action="store_true",
+                    help="don't show avatar in external editor")
 parser.add_argument("--output",
                     help="save image to specific output path")
 parser.add_argument("--hash", default="MD5",
                     help="use hash function, allowed %s, default %s" %
-                    (generator.HASHES.values(), list(generator.HASHES.values())[0]))
+                    (generator.HASHES.values(), "MD5"))
 
 args = parser.parse_args()
 
-slogan = " ".join(args.input)
+INPUT = " ".join(args.input)
 
 if args.hash and args.hash not in generator.HASHES.values():
     HASH = ""
 elif args.hash and args.hash in generator.HASHES.values():
-    HASH = list(generator.HASHES.values()).index(args.hash)
+    # dict.keys() must not be right ordered
+    for key in generator.HASHES:
+        if args.hash == generator.HASHES[key]:
+            HASH = key
+            break
 
-if not args.output:
+if not args.output and not args.noshow:
     args.show = True
 
-img = pagan.Avatar(slogan, HASH)
-if args.show:
+img = pagan.Avatar(INPUT, HASH)
+if not args.noshow and args.show:
     img.show()
 
 if args.output:
     img.save(*os.path.split(args.output))
 else:
-    img.save(os.getcwd(), filename=args.input[0])
+    filename = args.input[0]
+    # make filename save again
+    allowed = string.ascii_letters + string.digits + "+-_"
+    filename = "".join([((c in allowed) and c or "-") for c in filename])
+
+    img.save(os.getcwd(),
+             filename=filename)