cleanup #48

abcd/server/__init__.py

@@ -1,7 +1,12 @@
+import logging
 from abcd.server.app import create_app
 
+logging.basicConfig(level=logging.DEBUG)
 app = create_app()
 
 if __name__ == '__main__':
-    print('hello')
-    app.run(host='0.0.0.0')
+    # app.logger.setLevel(logging.DEBUG)
+    # handler = logging.StreamHandler()
+    # app.logger.addHandler(handler)
+
+    app.run(host='0.0.0.0', debug=True)

abcd/server/app/__init__.py

@@ -1,180 +1,46 @@
 import os
-import sys
-import logging
 
 from flask import Flask, render_template
 from flask_nav import register_renderer
 
 from abcd.server.app.db import db
 from abcd.server.app.nav import nav, BootstrapRenderer, DatabaseNav
-from abcd.server.app.views import database, api, index
-
-logger = logging.getLogger(__name__)
-
-
-def page_not_found(e):
-    return render_template('404.html'), 404
+from abcd.server.app.views import index  # database, api, index
 
 
 def create_app():
+    # Define the WSGI application object
     app = Flask(__name__)
+    app.logger.info('Creating application')
 
     app.config['SECRET_KEY'] = os.getenv('SECRET_KEY', os.urandom(12).hex())
+    app.config['ABCD_URL'] = os.getenv('ABCD_URL', 'localhost:27017/abcd')
 
-    app.config['MONGODB_SETTINGS'] = {
-        # 'db': os.getenv('MONGODB_DB', 'abcd'),
-        'name': os.getenv('MONGODB_DB', 'abcd'),
-        'host': os.getenv('MONGODB_HOST', '127.0.0.1'),
-        'port': int(os.getenv('MONGODB_PORT', 27017)),
-        'username': os.getenv('MONGODB_USERNAME', None),
-        'password': os.getenv('MONGODB_PASSWORD', None),
-        'authentication_source': 'admin'
-    }
-
-    db.init_app(app)
 
+    # Initialize extensions/add-ons/plugins.
+    nav.init_app(app)
     register_renderer(app, 'BootstrapRenderer', BootstrapRenderer)
     register_renderer(app, 'DatabaseNav', DatabaseNav)
-    nav.init_app(app)
 
-    app.register_error_handler(404, page_not_found)
+    db.init_app(app)
 
+    # Setup redirects and register blueprints.
     app.register_blueprint(index.bp)
-    app.register_blueprint(api.bp, url_prefix='/api')
-    app.register_blueprint(database.bp, url_prefix='/db')
 
-    print(app.config, file=sys.stderr)
+    # app.register_blueprint(api.bp, url_prefix='/api')
+    # app.register_blueprint(database.bp, url_prefix='/db')
+
+    @app.errorhandler(404)
+    def not_found(error):
+        return render_template('404.html'), 404
 
     return app
 
 
 if __name__ == '__main__':
-    logging.basicConfig(level=logging.INFO)
+    import logging
 
-    app = create_app()
+    logging.basicConfig(level=logging.DEBUG)
 
-    app.run()
-
-# # Using Extensions:
-
-# from flask_foo import Foo
-#
-# foo = Foo()
-#
-# app_old = Flask(__name__)
-# app_old.config.update(
-#     FOO_BAR='baz',
-#     FOO_SPAM='eggs',
-# )
-#
-# foo.init_app(app_old)
-
-
-# from flask import Flask, render_template
-#
-# # Import extensions
-# # from flask_appconfig import AppConfig
-# # from flask_bootstrap import Bootstrap
-# # from flask_debug import Debug
-# # from flask_markdown import Markdown
-# # from flaskext.markdown import Markdown
-#
-#
-# # from app_old.db import db
-# # from app_old.nav import nav
-# # from app_old.auth import basic_auth
-#
-# # Import database models
-# # from app_old.models.category import Category
-# # from app_old.models.material import Material
-# # from app_old.models.experiment import Experiment
-# # from app_old.models.measurement import Measurement, Experiment
-# # from models.measurement import SpectralData, AngularData
-#
-# # Import a module / component using its blueprint handler variable (mod_auth)
-# from .views.index import frontend
-# # from app_old.views.measurements import measurements
-# # from app_old.views.materials import materials
-# # from app_old.views.api import api
-# # from app_old.views.search import search
-#
-# # ============================================================================
-# # Initialize app_old. Flatten config_obj to dictionary (resolve properties).
-# # ============================================================================
-#
-# # Define the WSGI application object
-# app_old = Flask(__name__)
-#
-#
-# # ============================================================================
-# # Initialize extensions/add-ons/plugins.
-# # ============================================================================
-#
-# # from app_old.admin import admin
-#
-# # Configurations: The usage of Flask-Appconfig could be useful, but not a requirement.
-# # app_old.config.from_object('config')
-#
-# # AppConfig(app_old, 'config.py')
-# # Bootstrap(app_old)              # Install our Bootstrap extension
-# # Markdown(app_old)
-#
-# # app_old.debug and Debug(app_old)    # Enable debug interface
-#
-#
-# # db.init_app(app_old)            # Define the database object
-# # nav.init_app(app_old)           # We initialize the navigation as well
-# # admin.init_app(app_old)
-# # basic_auth.init_app(app_old)
-#
-#
-# # ============================================================================
-# # Build the database
-# # ============================================================================
-#
-#
-# # with app_old.app_context():
-#     # # This will create the database file using SQLAlchemy
-#     # db.create_all()
-#
-#
-# # ============================================================================
-# # Setup redirects and register blueprints.
-# # ============================================================================
-#
-#
-# # app_old.add_url_rule('/favicon.ico', 'favicon', lambda: app_old.send_static_file('favicon.ico'))
-#
-#
-# # Our application uses blueprints as well; these go well with the
-# # application factory. We already imported the blueprint, now we just need
-# # to register it:
-# app_old.register_blueprint(frontend)
-# # app_old.register_blueprint(materials)
-# # app_old.register_blueprint(measurements)
-# # app_old.register_blueprint(api)
-# # app_old.register_blueprint(search)
-#
-# # Because we're security-conscious developers, we also hard-code disabling
-# # the CDN support (this might become a default in later versions):
-# # app_old.config['BOOTSTRAP_SERVE_LOCAL'] = True
-#
-#
-# # Sample HTTP error handling
-# @app_old.errorhandler(404)
-# def not_found(error):
-#     return render_template('404.html'), 404
-#
-#
-# # from app_old.forms.search import SearchForm
-# # from flask import g
-#
-# # @app_old.before_request
-# # def before_request():
-# #     g.search_form = SearchForm()
-#
-# # __all__ = [Category, Measurement, Material, db]
-#
-#
-#
-# # Migration: https://danidee10.github.io/2016/10/05/flask-by-example-5.html
+    app = create_app()
+    app.run(host='0.0.0.0', debug=True)

abcd/server/app/db.py

@@ -1,11 +1,14 @@
-from abcd.backends import MongoDatabase
-from flask_mongoengine import MongoEngine
+from abcd import ABCD
+from flask_paginate import Pagination, get_page_args
 
-db = MongoEngine()
 
+class Database(ABCD):
+    """Wrapper for the ABCD factory method for registering a the database for the Flask application."""
+    def __init__(self):
+        super().__init__()
 
-class Databases(db.Document):
-    meta = {'collection': 'databases'}
-    name = db.StringField(required=True)
-    description = db.StringField(max_length=300)
-    tags = db.ListField(db.StringField(max_length=30))
+    def init_app(self, app):
+        pass
+
+
+db = Database()

abcd/server/app/nav.py

@@ -27,9 +27,9 @@ def main_navbar():
 
         Subgroup(
             'Links',
-            Link('Docs', 'https://fekad.github.io/abcd/'),
+            Link('Docs', 'https://libatoms.github.io/abcd/'),
             Separator(),
-            Link('Github', 'https://github.com/fekad/abcd'),
+            Link('Github', 'https://github.com/libatoms/abcd'),
         ),
     )
 

setup.py

@@ -19,7 +19,7 @@
         'mongo': ['pymongo'],
         'http': ['requests'],
         'server-api': ['flask'],
-        'server-app': ['flask', 'Flask-Nav', 'Flask-MongoEngine', 'gunicorn'],
+        'server-app': ['flask', 'Flask-Nav', 'Flask-MongoEngine', 'gunicorn', 'flask-paginate'],
     },
     test_require=['mongomock'],
     entry_points={