Merge pull request #110 from indera/fix-email-attribute-error

Fix email attribute error - closes #109

.travis.yml

@@ -12,6 +12,7 @@
 # http://docs.travis-ci.com/user/migrating-from-legacy/
 sudo: false
 language: python
+cache: pip
 python:
     - "2.7"
 

app/fabfile.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 The 'fabfile.py' is used by Fabric and must reside in the
 application root directory.
@@ -12,6 +13,9 @@
 from fabric.contrib.console import confirm
 from contextlib import contextmanager
 
+STATUS_PASS = '✔'
+STATUS_FAIL = '✗'
+
 
 @task
 def prep_deploy():
@@ -92,7 +96,9 @@ def coverage():
     # https://pytest.org/latest/example/pythoncollection.html
     local('python setup.py nosetests')
     """
-    local('py.test --tb=short -s --cov redidropper --cov-config tests/.coveragerc --cov-report term-missing --cov-report html tests/')
+    local(
+        'py.test --tb=short -s --cov redidropper --cov-config tests/.coveragerc --cov-report term-missing --cov-report html tests/')
+
 
 @task
 def lint():
@@ -108,6 +114,33 @@ def run():
     local('python run.py')
 
 
+@task
+def show_versions(url='https://localhost:5000'):
+    """ display latest tag and deployed tag at a specific url
+    Example: fab show_versions:url=https://stage.dropper.ctsi.ufl.edu
+    """
+    local('git fetch --tags')
+
+    cmd = """git tag \
+        | sort -t. -k 1,1n -k 2,2n -k 3,3n \
+        | tail -1"""
+    last_tag = local(cmd, capture=True)
+
+    cmd2 = 'curl -sk {}'.format(url) + """ \
+        | grep Version \
+        | grep -oE "[0-9.]{1,2}[0-9.]{1,2}[0-9a-z.]{1,4}" \
+        | tail -1"""
+    deployed_tag = local(cmd2, capture=True)
+
+    print("\nLast tag: {}".format(colors.yellow(last_tag)))
+    print("Deployed tag: {}".format(colors.yellow(deployed_tag)))
+
+    if last_tag != deployed_tag:
+        print("[{}] Tags do not match!".format(colors.red(STATUS_FAIL)))
+    else:
+        print("[{}] Tags do match.".format(colors.green(STATUS_PASS)))
+
+
 @contextmanager
 def virtualenv(venv_name):
     """ Activate a context """

app/redidropper/models/log_entity.py

@@ -55,12 +55,13 @@ def get_logs(per_page=25, page_num=1):
         def item_from_entity(entity):
             return {
                 'id': entity.id,
-                'user_email': entity.web_session.user.email,
+                'user_email': entity.web_session.user.email
+                if entity.web_session.user is not None else '',
                 'type': entity.log_type.type,
                 'details': entity.details,
                 'web_session_ip': entity.web_session.ip,
                 'date_time': utils.localize_est_datetime(entity.date_time),
-            }
+                }
 
         pagination = LogEntity.query.paginate(page_num, per_page, False)
         items = map(item_from_entity, pagination.items)

app/redidropper/routes/pages.py

@@ -336,18 +336,18 @@ def logout():
         https://shib.ncsu.edu/docs/logout.html
         https://wiki.shibboleth.net/confluence/display/CONCEPT/SLOIssues
     """
+    # Log the logout
+    if 'uuid' in session:
+        LogEntity.logout(session['uuid'])
+
     logout_user()
 
-    # Remove session keys set by Flask-Principal
-    for key in ('identity.name', 'identity.auth_type'):
+    # Remove session keys set by Flask-Principal, and `uuid` key set manually
+    for key in ('identity.name', 'identity.auth_type', 'uuid'):
         session.pop(key, None)
 
     # Tell Flask-Principal the user is anonymous
     identity_changed.send(current_app._get_current_object(),
                           identity=AnonymousIdentity())
 
-    # Log the logout
-    LogEntity.logout(session['uuid'])
-    # Also pop the session id
-    session.pop('uuid')
     return redirect('/')

app/redidropper/static/css/parallax.css

@@ -28,8 +28,10 @@ This stylesheet and the associated (x)html may be modified in any way to fit you
 }
 
 /* additional sections */
-#home {
-  background: url(/static/img/bottles.jpg) no-repeat center center fixed; 
+#home,
+#image2,
+#image3 {
+  background: no-repeat center center fixed;
   display: table;
   height: 45vh;
   position: relative;
@@ -40,28 +42,18 @@ This stylesheet and the associated (x)html may be modified in any way to fit you
   background-size: cover;
 }
 
+#home {
+    background-image: url(/static/img/bottles.jpg);
+}
+
 #image2 {
-  background: url(/static/img/oil.jpg) no-repeat center center fixed;
-  display: table;
-  height: 45vh;
-  position: relative;
-  width: 100%;
-  -webkit-background-size: cover;
-  -moz-background-size: cover;
-  -o-background-size: cover;
-  background-size: cover;
+    background-image: url(/static/img/oil.jpg);
 }
 
 #image3 {
-  background: url(/static/img/red-oil-flipped.jpg) no-repeat center center fixed;
-  display: table;
-  height: 45vh;
-  position: relative;
-  width: 100%;
-  -webkit-background-size: cover;
-  -moz-background-size: cover;
-  -o-background-size: cover;
-  background-size: cover;
+    background-image: url(/static/img/oil.jpg);
+    transform: scaleY(-1);
+    filter: FlipV;
 }
 
 #about {
@@ -99,15 +91,38 @@ This stylesheet and the associated (x)html may be modified in any way to fit you
   color: #FFFFFF;
 }
 
-#information .container {
-  background: url(/static/img/translucent-oil.jpg) no-repeat center center fixed; 
-  height: 100vh;
-  display: table;
-  position: relative;
-  width: 100%;
-  background-size: cover;
+
+#information {
+    height: 100vh;
+    background: #fff no-repeat center center fixed;
+    display: table;
+    position: relative;
+    width: 100%;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
+}
+
+#information:before {
+    background-image: url(/static/img/oil.jpg);
+    background-repeat: no-repeat;
+    content: ' ';
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 1;
+    opacity: 0.3;
+    background-position: 50% 0;
+    -webkit-background-size: cover;
+    -moz-background-size: cover;
+    -o-background-size: cover;
+    background-size: cover;
 }
 
+
 #stardiv {
   position: relative;
   top: 20vh;