Merge branch 'release/0.3.8'

.travis.yml

@@ -15,4 +15,6 @@ install:
     - pip install -IM pylama
     - pip install -IM -r requirements.txt
 
-script: make test
+script:
+    - make audit
+    - make test

Changelog

@@ -1,3 +1,8 @@
+2012-08-24  klen
+
+	* Add 'before_new', 'before_delete' model methods support
+	* Add FlaskMail log handler for production
+
 2012-08-19  klen
 
 	* Update alembic, flask-cache, flask-principal

Makefile

@@ -31,7 +31,7 @@ audit:
 	pylama base -i E501
 
 .PHONY: test
-test: .env/ manage.py audit
+test: .env/ manage.py
 	$(PYTHON) manage.py test -c base.config.test
 
 .PHONY: clean

base/auth/manager.py

@@ -20,7 +20,7 @@ def register(self, app, *args, **kwargs):
         if not self._login_manager or self.app != app:
             self._login_manager = LoginManager()
             self._login_manager.user_callback = self.user_loader
-            self._login_manager.setup_app(app)
+            self._login_manager.init_app(app)
             self._login_manager.login_view = app.config.get('AUTH_LOGIN_VIEW', 'code.index')
             self._login_manager.login_message = u'You need to be signed in for this page.'
 

base/config/core.py

@@ -17,3 +17,11 @@
 # Auth
 AUTH_USER_MIXINS = []
 AUTH_LOGIN_VIEW = 'core.index'
+
+# Mail
+MAIL_SERVER = 'smtp.gmail.com'
+MAIL_PORT = 465
+MAIL_USE_SSL = True
+MAIL_USERNAME = 'username@gmail.com'
+MAIL_PASSWORD = 'password_here'
+DEFAULT_MAIL_SENDER = 'Admin <%s>' % MAIL_USERNAME

base/config/production.py

@@ -6,14 +6,6 @@
 
 SECRET_KEY = 'SecretKeyForSessionSigning'
 
-# Mail (gmail config)
-MAIL_SERVER = 'smtp.gmail.com'
-MAIL_PORT = 465
-MAIL_USE_SSL = True
-MAIL_USERNAME = 'username@gmail.com'
-MAIL_PASSWORD = '*********'
-DEFAULT_MAIL_SENDER = 'Admin < %s >' % MAIL_USERNAME
-
 ADMINS = frozenset([MAIL_USERNAME])
 COLLECT_STATIC_ROOT = op.join(op.dirname(ROOTDIR), 'static')
 
@@ -28,5 +20,5 @@
     consumer_secret='Pt1t2PjzKu8vsX5ixbFKu5gNEAekYrbpJrlsQMIwquc'
 )
 
+
 # pymode:lint_ignore=W0614,W404
-# flake8: noqa

base/core/__init__.py

@@ -1,4 +1,9 @@
 " base.core "
+from flask import request
+from flaskext.mail import Message
+from logging import Handler, ERROR
+
+from ..ext import mail
 
 
 def register_app(app):
@@ -17,4 +22,19 @@ def register_app(app):
     from flask import render_template
     app.errorhandler(404)(lambda e: (render_template('core/404.html'), 404))
 
+    if not app.debug:
+        mailhandler = FlaskMailHandler(ERROR)
+        app.logger.addHandler(mailhandler)
+
 register_app.priority = 100.0
+
+
+class FlaskMailHandler(Handler):
+
+    def emit(self, record):
+        sbj = "APP ERROR: %s%s" % (request.host_url.rstrip('/'), request.path)
+        msg = Message(sbj, body=self.format(record), recipients=mail.app.config.get('ADMINS', []))
+        mail.send(msg)
+
+
+# pymode:lint_ignore=F0401

base/core/models.py

@@ -1,8 +1,10 @@
 from datetime import datetime
 
+from sqlalchemy import event
 from sqlalchemy.ext.declarative import declared_attr
 from sqlalchemy.orm import object_mapper
 from sqlalchemy.orm.session import object_session
+
 from ..ext import db
 
 
@@ -105,3 +107,10 @@ def appstruct(self):
 class Alembic(db.Model):
     __tablename__ = 'alembic_version'
     version_num = db.Column(db.String(32), nullable=False, primary_key=True)
+
+
+def before_signal(session, *args):
+    map(lambda o: hasattr(o, 'before_new') and o.before_new(), session.new)
+    map(lambda o: hasattr(o, 'before_delete') and o.before_delete(), session.deleted)
+
+event.listen(db.session.__class__, 'before_flush', before_signal)

base/core/tests.py

@@ -34,3 +34,21 @@ def test_cache(self):
         cache.set('key', 'value')
         testkey = cache.get('key')
         self.assertEqual(testkey, 'value')
+
+    def test_after_change(self):
+        from .models import Alembic
+        from mock import Mock
+        Alembic.before_new = Mock()
+        a = Alembic()
+        a.version_num = '345'
+        db.session.add(a)
+        db.session.commit()
+        self.assertEqual(Alembic.before_new.call_count, 1)
+
+    def test_mail_handler(self):
+        from ..ext import mail
+        with mail.record_messages() as outbox:
+            self.app.logger.error('Attention!')
+            self.assertTrue(outbox)
+            msg = outbox[0]
+            self.assertEqual(msg.subject, 'APP ERROR: http://localhost/')

base/ext.py

@@ -13,7 +13,7 @@
 babel = Babel()
 cache = Cache()
 db = SQLAlchemy()
-main = Mail()
+mail = Mail()
 
 manager = Manager(create_app)
 manager.add_option("-c", "--config", dest="config", required=False)
@@ -27,7 +27,7 @@ def config_extensions(app):
 
     cache.init_app(app)
     db.init_app(app)
-    main.init_app(app)
+    mail.init_app(app)
     collect.init_app(app)
 
     DebugToolbarExtension(app)

requirements.txt

@@ -5,7 +5,7 @@ Flask-SQLAlchemy>=0.16
 Flask-Script>=0.3.3
 Flask-Admin>=1.0.1
 Flask-Babel>=0.8
-Flask-Bootstrap>=2.0.4-3
+Flask-Bootstrap>=2.1.0-1
 Flask-Login>=0.1.3
 Flask-Principal>=0.3.1
 Flask-Cache>=0.6.0