shayaniox · shayaniox · Jun 11, 2018
diff --git a/README.md b/README.md
diff --git a/__init__.py b/__init__.py
diff --git a/__pycache__/__init__.cpython-36.pyc b/__pycache__/__init__.cpython-36.pyc
diff --git a/__pycache__/url_shortener.cpython-36.pyc b/__pycache__/url_shortener.cpython-36.pyc
diff --git a/data/devdata.db → a b/data/devdata.db → a
diff --git a/urlshortener/basedata/__init__.py → alsjdf b/urlshortener/basedata/__init__.py → alsjdf
diff --git a/data/api-documents/api/index.md b/data/api-documents/api/index.md
diff --git a/data/api-documents/api/legend.md b/data/api-documents/api/legend.md
diff --git a/data/logs/urlShortener-error.log b/data/logs/urlShortener-error.log
diff --git a/data/logs/urlShortener.log b/data/logs/urlShortener.log
diff --git a/data/logs/urlshortener-error.log b/data/logs/urlshortener-error.log
diff --git a/data/logs/urlshortener.log b/data/logs/urlshortener.log
diff --git a/gunicorn b/gunicorn
diff --git a/makomodules/__pycache__/index.mak.cpython-36.pyc b/makomodules/__pycache__/index.mak.cpython-36.pyc
diff --git a/makomodules/__pycache__/notfoundpage.html.cpython-36.pyc b/makomodules/__pycache__/notfoundpage.html.cpython-36.pyc
diff --git a/makomodules/__pycache__/successfully.mak.cpython-36.pyc b/makomodules/__pycache__/successfully.mak.cpython-36.pyc
diff --git a/urlshortener/makomodules/index.mak.py → makomodules/index.mak.py b/urlshortener/makomodules/index.mak.py → makomodules/index.mak.py
@@ -5,9 +5,9 @@
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1527585204.9788141
+_modified_time = 1526721920.9077945
 _enable_loop = True
-_template_filename = '/home/mohammad/workspace/urlshortener/urlshortener/templates/index.mak'
+_template_filename = '/home/mohammad/workspace/projects/urlshortner/templates/index.mak'
 _template_uri = 'index.mak'
 _source_encoding = 'ascii'
 _exports = []
@@ -18,14 +18,14 @@ def render_body(context,**pageargs):
     try:
         __M_locals = __M_dict_builtin(pageargs=pageargs)
         __M_writer = context.writer()
-        __M_writer('<html>\n<head><title>Url shortener</title></head>\n<body>\n        <div style="background-color:DodgerBlue;color:white;padding:20px;">\n        <form method="POST" action="/">\n        <strong>Iuput url:</strong>\n            <input type="text" name="url" />\n            <input type="submit" value="Submit" />\n        </form>\n        <form method="POST" action="/auth">\n            <input type="submit" value="Login" />\n        </form>\n        </div>\n</body>\n</html>\n')
+        __M_writer('<html>\n<head><title>Url shortener</title></head>\n<body>\n        <div style="background-color:DodgerBlue;color:white;padding:20px;">\n        <form method="POST" action="/urlshortener">\n        <strong>Iuput url:</strong>\n            <input type="text" name="url" />\n            <input type="submit" value="Submit" />\n        </form>\n        </div>\n</body>\n</html>\n')
         return ''
     finally:
         context.caller_stack._pop_frame()
 
 
 """
 __M_BEGIN_METADATA
-{"filename": "/home/mohammad/workspace/urlshortener/urlshortener/templates/index.mak", "uri": "index.mak", "source_encoding": "ascii", "line_map": {"16": 0, "21": 1, "27": 21}}
+{"filename": "/home/mohammad/workspace/projects/urlshortner/templates/index.mak", "uri": "index.mak", "source_encoding": "ascii", "line_map": {"16": 0, "21": 1, "27": 21}}
 __M_END_METADATA
 """
diff --git a/makomodules/notfoundpage.html.py b/makomodules/notfoundpage.html.py
@@ -0,0 +1,31 @@
+# -*- coding:ascii -*-
+from mako import runtime, filters, cache
+UNDEFINED = runtime.UNDEFINED
+STOP_RENDERING = runtime.STOP_RENDERING
+__M_dict_builtin = dict
+__M_locals_builtin = locals
+_magic_number = 10
+_modified_time = 1526721980.4338439
+_enable_loop = True
+_template_filename = '/home/mohammad/workspace/projects/urlshortner/templates/notfoundpage.html'
+_template_uri = 'notfoundpage.html'
+_source_encoding = 'ascii'
+_exports = []
+
+
+def render_body(context,**pageargs):
+    __M_caller = context.caller_stack._push_frame()
+    try:
+        __M_locals = __M_dict_builtin(pageargs=pageargs)
+        __M_writer = context.writer()
+        __M_writer('<html>\n<head><title>Url shortener</title></head>\n<body style="padding:80px;">\n            <div style="background-color:Gray;color:white;padding:20px;">\n            <h1 style="text-align:center;">Can not found page</h1>\n            </div>\n</body>\n</html>\n')
+        return ''
+    finally:
+        context.caller_stack._pop_frame()
+
+
+"""
+__M_BEGIN_METADATA
+{"filename": "/home/mohammad/workspace/projects/urlshortner/templates/notfoundpage.html", "uri": "notfoundpage.html", "source_encoding": "ascii", "line_map": {"16": 0, "21": 1, "27": 21}}
+__M_END_METADATA
+"""
diff --git a/urlshortener/makomodules/successfully.mak.py → makomodules/successfully.mak.py b/urlshortener/makomodules/successfully.mak.py → makomodules/successfully.mak.py
@@ -5,9 +5,9 @@
 __M_dict_builtin = dict
 __M_locals_builtin = locals
 _magic_number = 10
-_modified_time = 1527584278.3637245
+_modified_time = 1526736931.5179572
 _enable_loop = True
-_template_filename = '/home/mohammad/workspace/urlshortener/urlshortener/templates/successfully.mak'
+_template_filename = '/home/mohammad/workspace/urlshortener/templates/successfully.mak'
 _template_uri = 'successfully.mak'
 _source_encoding = 'ascii'
 _exports = []
@@ -19,18 +19,16 @@ def render_body(context,**pageargs):
         __M_locals = __M_dict_builtin(pageargs=pageargs)
         hash_id = context.get('hash_id', UNDEFINED)
         __M_writer = context.writer()
-        __M_writer('<html>\n<head><title>Url shortener</title></head>\n<body>\n        <div style="background-color:MediumSeaGreen;color:white;padding:20px;">\n        <h2 style="text-align:center;">Successfully</h2>\n        <p style="text-align:center; color:black"><strong>Shortener\n        <a href="http://localhost:8080/urls/')
+        __M_writer('<html>\n<head><title>Url shortener</title></head>\n<body>\n        <div style="background-color:MediumSeaGreen;color:white;padding:20px;">\n        <h2 style="text-align:center;">Successfully</h2>\n        <p style="text-align:center; color:black"><strong>Shortener url: http://localhost:8080/')
         __M_writer(str(hash_id))
-        __M_writer('">\n        http://localhost:8080/urls/')
-        __M_writer(str(hash_id))
-        __M_writer('</a>\n        </strong></p>\n        </div>\n        \n</body>\n</html>\n')
+        __M_writer('</strong></p>\n        </div>\n        \n</body>\n</html>\n')
         return ''
     finally:
         context.caller_stack._pop_frame()
 
 
 """
 __M_BEGIN_METADATA
-{"filename": "/home/mohammad/workspace/urlshortener/urlshortener/templates/successfully.mak", "uri": "successfully.mak", "source_encoding": "ascii", "line_map": {"16": 0, "22": 1, "23": 7, "24": 7, "25": 8, "26": 8, "32": 26}}
+{"filename": "/home/mohammad/workspace/urlshortener/templates/successfully.mak", "uri": "successfully.mak", "source_encoding": "ascii", "line_map": {"16": 0, "22": 1, "23": 6, "24": 6, "30": 24}}
 __M_END_METADATA
 """
diff --git a/setup.py b/setup.py
@@ -1,41 +1,47 @@
+
 import re
 from os.path import join, dirname
 from setuptools import setup, find_packages
 
 
 # reading package version (same way the sqlalchemy does)
-with open(join(dirname(__file__), 'urlshortener', '__init__.py')) as v_file:
-    package_version = re.compile('.*__version__ = \'(.*?)\'', re.S).match(v_file.read()).group(1)
+with open(join(dirname(__file__), 'urlShortener', '__init__.py')) as v_file:
+    package_version = re.compile(r".*__version__ = '(.*?)'", re.S).match(v_file.read()).group(1)
 
 
 dependencies = [
     'restfulpy >= 0.41.3',
-    'hashids',
+    'ujson',
+    'aiohttp',
+    'pymongo',
+    'mako',
     'nanohttp',
-    'oauth2client',
+    'bddrest',
 
     # Deployment
     'gunicorn',
 
     # testing
+    'requests',
     'webtest',
-    'nose',
-    'bddrest'
+    'nose'
 ]
 
 
 setup(
-    name='urlshortener',
+    name="urlShortener",
     version=package_version,
-    author='Mohammad',
-    author_email='mohammadsheikhian70@gmail.com',
+    author="Shayan",
+    author_email="shayn.rokrok@gmail.com",
     install_requires=dependencies,
     packages=find_packages(),
-    test_suite='urlshortener.tests',
+    test_suite="urlShortener.tests",
     entry_points={
         'console_scripts': [
-            'urlshortener = urlshortener:urlshortener.cli_main'
+            'urlShortener = urlShortener:urlShortener.cli_main'
         ]
-    }
+    },
+    message_extractors={'urlShortener': [
+        ('**.py', 'python', None),
+    ]},
 )
-
diff --git a/urlshortener/controllers/__init__.py → tags b/urlshortener/controllers/__init__.py → tags
diff --git a/templates/.successfully.mak.swp b/templates/.successfully.mak.swp
diff --git a/urlshortener/templates/index.mak → templates/index.mak b/urlshortener/templates/index.mak → templates/index.mak
@@ -2,14 +2,11 @@
 <head><title>Url shortener</title></head>
 <body>
         <div style="background-color:DodgerBlue;color:white;padding:20px;">
-        <form method="POST" action="/">
+        <form method="POST" action="/urlshortener">
         <strong>Iuput url:</strong>
             <input type="text" name="url" />
             <input type="submit" value="Submit" />
         </form>
-        <form method="POST" action="/auth">
-            <input type="submit" value="Login" />
-        </form>
         </div>
 </body>
 </html>
diff --git a/urlshortener/templates/successfully.mak → templates/successfully.mak b/urlshortener/templates/successfully.mak → templates/successfully.mak
@@ -3,10 +3,7 @@
 <body>
         <div style="background-color:MediumSeaGreen;color:white;padding:20px;">
         <h2 style="text-align:center;">Successfully</h2>
-        <p style="text-align:center; color:black"><strong>Shortener
-        <a href="http://localhost:8080/urls/${hash_id}">
-        http://localhost:8080/urls/${hash_id}</a>
-        </strong></p>
+        <p style="text-align:center; color:black"><strong>Shortener url: http://localhost:8080/${hash_id}</strong></p>
         </div>
 
 </body>

diff --git a/urlshortener.egg-info/PKG-INFO → urlShortener.egg-info/PKG-INFO b/urlshortener.egg-info/PKG-INFO → urlShortener.egg-info/PKG-INFO
@@ -1,10 +1,10 @@
 Metadata-Version: 1.0
-Name: urlshortener
-Version: 0.1.0-planning.0
+Name: urlShortener
+Version: 1.16.2
 Summary: UNKNOWN
 Home-page: UNKNOWN
-Author: Mohammad
-Author-email: mohammadsheikhian70@gmail.com
+Author: Shayan
+Author-email: shayn.rokrok@gmail.com
 License: UNKNOWN
 Description: UNKNOWN
 Platform: UNKNOWN
diff --git a/urlShortener.egg-info/SOURCES.txt b/urlShortener.egg-info/SOURCES.txt
@@ -0,0 +1,20 @@
+urlShortener/__init__.py
+urlShortener.egg-info/PKG-INFO
+urlShortener.egg-info/SOURCES.txt
+urlShortener.egg-info/dependency_links.txt
+urlShortener.egg-info/entry_points.txt
+urlShortener.egg-info/requires.txt
+urlShortener.egg-info/top_level.txt
+urlShortener/controllers/__init__.py
+urlShortener/controllers/helper.py
+urlShortener/controllers/root.py
+urlShortener/controllers/urls.py
+urlShortener/models/__init__.py
+urlShortener/models/speciality.py
+urlShortener/models/urls.py
+urlShortener/tests/__init__.py
+urlShortener/tests/helpers.py
+urlShortener/tests/sample.py
+urlShortener/tests/test_authentication.py
+urlShortener/tests/test_root.py
+urlShortener/tests/test_root2.py
diff --git a/urlshortener.egg-info/dependency_links.txt → urlShortener.egg-info/dependency_links.txt b/urlshortener.egg-info/dependency_links.txt → urlShortener.egg-info/dependency_links.txt
diff --git a/urlShortener.egg-info/entry_points.txt b/urlShortener.egg-info/entry_points.txt
@@ -0,0 +1,3 @@
+[console_scripts]
+urlShortener = urlShortener:urlShortener.cli_main
+
diff --git a/urlshortener.egg-info/requires.txt → urlShortener.egg-info/requires.txt b/urlshortener.egg-info/requires.txt → urlShortener.egg-info/requires.txt
@@ -1,8 +1,11 @@
 restfulpy>=0.41.3
-hashids
+ujson
+aiohttp
+pymongo
+mako
 nanohttp
-oauth2client
+bddrest
 gunicorn
+requests
 webtest
 nose
-bddrest
diff --git a/urlShortener.egg-info/top_level.txt b/urlShortener.egg-info/top_level.txt
@@ -0,0 +1 @@
+urlShortener
diff --git a/urlShortener/__init__.py b/urlShortener/__init__.py
@@ -0,0 +1,35 @@
+from os.path import dirname, join
+
+from restfulpy import Application as BaseApplication
+from restfulpy.orm import DBSession
+
+
+from urlShortener.controllers import Root
+from urlShortener import models
+from urlShortener.models.urls import Url
+
+__version__ = '1.16.2'
+
+
+class Application(BaseApplication):
+    def __init__(self):
+        super().__init__(
+            'urlShortener',
+            root=Root(),
+            root_path=join(dirname(__file__), '..'),
+            version=__version__,
+        )
+
+    # noinspection PyArgumentList
+    def insert_basedata(self):  # pragma: no cover
+        # basedata.insert()
+        DBSession.commit()
+
+    # noinspection PyArgumentList
+    def insert_mockup(self):
+        url = Url(url='www.google.com')
+        DBSession.add(url)
+        DBSession.commit
+
+
+urlShortener = Application()
diff --git a/urlShortener/__pycache__/__init__.cpython-36.pyc b/urlShortener/__pycache__/__init__.cpython-36.pyc
diff --git a/urlShortener/controllers/__init__.py b/urlShortener/controllers/__init__.py
@@ -0,0 +1 @@
+from urlShortener.controllers.root import Root
diff --git a/urlShortener/controllers/__pycache__/__init__.cpython-36.pyc b/urlShortener/controllers/__pycache__/__init__.cpython-36.pyc
diff --git a/urlShortener/controllers/__pycache__/chapters.cpython-36.pyc b/urlShortener/controllers/__pycache__/chapters.cpython-36.pyc
diff --git a/urlShortener/controllers/__pycache__/collections.cpython-36.pyc b/urlShortener/controllers/__pycache__/collections.cpython-36.pyc
diff --git a/urlShortener/controllers/__pycache__/feedbacks.cpython-36.pyc b/urlShortener/controllers/__pycache__/feedbacks.cpython-36.pyc
diff --git a/...ollers/__pycache__/helpers.cpython-36.pyc → ...rollers/__pycache__/helper.cpython-36.pyc b/...ollers/__pycache__/helpers.cpython-36.pyc → ...rollers/__pycache__/helper.cpython-36.pyc
diff --git a/urlShortener/controllers/__pycache__/icds.cpython-36.pyc b/urlShortener/controllers/__pycache__/icds.cpython-36.pyc
diff --git a/urlShortener/controllers/__pycache__/members.cpython-36.pyc b/urlShortener/controllers/__pycache__/members.cpython-36.pyc
diff --git a/urlShortener/controllers/__pycache__/root.cpython-36.pyc b/urlShortener/controllers/__pycache__/root.cpython-36.pyc
diff --git a/urlShortener/controllers/__pycache__/sections.cpython-36.pyc b/urlShortener/controllers/__pycache__/sections.cpython-36.pyc
diff --git a/urlShortener/controllers/__pycache__/sessions.cpython-36.pyc b/urlShortener/controllers/__pycache__/sessions.cpython-36.pyc
diff --git a/urlShortener/controllers/__pycache__/specialities.cpython-36.pyc b/urlShortener/controllers/__pycache__/specialities.cpython-36.pyc
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		[console_scripts]
		urlShortener = urlShortener:urlShortener.cli_main