WIP: refactoring

pygmy/app/link.py

@@ -11,7 +11,7 @@
 
 def shorten(long_url, short_code=None, expire_after=None, description=None,
             secret_key=None, owner=None, request=None):
-    """Helper class that has been delicated the task of inserting the
+    """Helper class that has been deligated the task of inserting the
     passed url in DB, base 62 encoding from db id and return the short
     url value.
 

pygmy/rest/shorturl.py

@@ -34,18 +34,20 @@ def get(self):
     def post(self):
         payload = request.get_json()
         data, errors = self.schema.load(payload)
+
+        if errors:
+            log.error('Error in the request payload %s', errors)
+            if errors.get('long_url'):
+                errors.update({'error': errors.get('long_url')})
+            return jsonify(errors), 400
+
         # if authenticated request check valid user
         user_email = APITokenAuth.get_jwt_identity()
         if user_email:
             user = UserManager().find(email=user_email)
             if not user:
                 return jsonify(dict(error='Invalid user')), 400
             data['owner'] = user.id
-        if errors:
-            log.error('Error in the request payload %s', errors)
-            if errors.get('long_url'):
-                errors.update({'error': errors.get('long_url')})
-            return jsonify(errors), 400
 
         long_url = data.pop('long_url')
         log.info('Shortening url %s', long_url)
@@ -90,8 +92,6 @@ def get(self):
 @APITokenAuth.token_optional
 def resolve(code):
     """Resolve the short url. code=301 PERMANENT REDIRECTION"""
-    # TODO not needed
-    user_email = APITokenAuth.get_jwt_identity()
     secret_key = request.headers.get('secret_key')
     try:
         # check if link is not a secret link

pygmy/validator/link.py

@@ -1,8 +1,7 @@
 import string
 
 from datetime import datetime
-from marshmallow import (
-    Schema, fields, post_dump, validate, ValidationError)
+from marshmallow import Schema, fields, post_dump, ValidationError
 
 from pygmy.model.clickmeta import ClickMetaManager
 from pygmy.utilities.urls import make_short_url, validate_url
@@ -50,7 +49,6 @@ class LinkSchema(Schema):
     created_at = fields.DateTime(format='%Y-%m-%d %H:%M:%S', dump_only=True)
     updated_at = fields.DateTime()
 
-
     def short_url_path(self, link):
         if link and link.short_code:
             return make_short_url(link.short_code)

pygmyui/pygmy/views.py

@@ -1,3 +1,4 @@
+import json
 import string
 import operator
 
@@ -8,7 +9,7 @@
 from utils import pygmy_client_object
 from restclient.errors import ObjectNotFound, UnAuthorized, LinkExpired, \
     InvalidInput
-from restclient.error_msg import *
+from restclient.error_msg import API_ERROR, INVALID_TOKEN
 from iso2full import iso2full
 
 # TODO: [IMP] middleware to return 500 page when internal error occurs.
@@ -112,15 +113,15 @@ def short_link_stats(request, code):
     pygmy_client = pygmy_client_object(settings, request)
     if request.method == 'GET':
         try:
-            clickmeta = pygmy_client.link_stats(code)   
+            clickmeta = pygmy_client.link_stats(code)
             clickmeta['country_stats'] = sorted(
                 clickmeta['country_stats'].items(),
                 key=operator.itemgetter(1),
                 reverse=True)
-         
-            stats =[(country,iso2full.get(country,"unknown"),hits) for (country,
-                                                hits) in clickmeta['country_stats']]
-            clickmeta['country_stats'] = stats
+
+            country_stats = [(country, iso2full.get(country, "unknown"), hits)
+                             for (country, hits) in clickmeta['country_stats']]
+            clickmeta['country_stats'] = country_stats
 
             clickmeta['referrer'] = sorted(
                 clickmeta['referrer'].items(),

pygmyui/restclient/error_msg.py

@@ -15,7 +15,7 @@ def API_ERROR(error_message):
                 pass
         elif isinstance(error_message, dict):
             error_message = error_message.get('error')
-    except Exception as e:
+    except Exception:
         import traceback
         traceback.print_exc()
         error_message = INTERNAL_SERVER_ERROR_API

pygmyui/static/css/styles.css

@@ -17,9 +17,6 @@ body {
     margin-right: .2px;
 }
 
-a {
-}
-
 ul.dropdown-lr {
     width: 300px;
 }