reated a couple of apps to clean up the view code better

* Added settings for who contact form emails go to/from
* Created an app for the code specific to retrieving meetups
* Created an app for the code to process contact form submissions and emails
* Commented out admin/admindoc apps for now

Author: estebistec

pythonkc_site/contact/docs/README.rst

@@ -0,0 +1,25 @@
+=====================================
+Contact App for the PythonKC.com Site
+=====================================
+
+Contact Form
+------------
+``pythonkc_site.contact.forms`` provides the contact form class.
+
+Sending Contact Email
+---------------------
+The ``pythonkc_site.contact.email`` module provides a function to send an email
+based on the data from a submitted contact form.
+
+This app also provides templates that used to compose the email, so these can
+be used to customize the email that is sent on contact form submission.
+
+Settings
+--------
+The following settings are expected to be provided by the Django site for the
+contact functionality to work.
+
+``CONTACT_EMAIL_FROM``
+    The email address to send contact form emails from.
+``CONTACT_EMAIL_TO``
+    The email addresses to send contact form email to.

pythonkc_site/contact/email.py

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+"""
+Provides a function for sending the email when the site's contact form is
+submitted by a visitor.
+
+"""
+
+
+from django.conf import settings
+from django.core.mail import BadHeaderError
+from django.core.mail import EmailMultiAlternatives
+from django.template.loader import render_to_string
+import logging
+
+
+logger = logging.getLogger(__name__)
+_SUBJECT_TEMPLATE = 'pythonkc_site/contact/email_subject.txt'
+_TEXT_TEMPLATE = 'pythonkc_site/contact/email_contents.txt'
+_HTML_TEMPLATE = 'pythonkc_site/contact/email_contents.html'
+
+
+def send_contact_form_email(first_name, last_name, email, message):
+    """
+    Send an email based on the submission of the site's contact form.
+
+    """
+    context = {
+        'first_name': first_name,
+        'last_name': last_name,
+        'email': email,
+        'message': message
+    }
+
+    subject = render_to_string(_SUBJECT_TEMPLATE, context)
+    text_content = render_to_string(_TEXT_TEMPLATE, context)
+    html_content = render_to_string(_HTML_TEMPLATE, context)
+    from_email = settings.CONTACT_EMAIL_FROM
+    to_emails = settings.CONTACT_EMAIL_TO
+
+    message = EmailMultiAlternatives(subject, text_content, from_email,
+                                     to_emails)
+    message.attach_alternative(html_content, "text/html")
+
+    try:
+        message.send()
+    except BadHeaderError:
+        logger.exception('Exception occurred while sending contact form email')

pythonkc_site/contact/templates/pythonkc_site/contact/email_contents.html

@@ -0,0 +1,2 @@
+<h1>From {{ first }} {{ last }} &lt;{{ email }}&gt;</h1>
+<p>{{ message }}</p>

pythonkc_site/contact/templates/pythonkc_site/contact/email_contents.txt

@@ -0,0 +1,3 @@
+From {{ first }} {{ last }} <{{ email }}>
+
+{{ message }}

pythonkc_site/contact/templates/pythonkc_site/contact/email_subject.txt

@@ -0,0 +1 @@
+New message from a PythonKC.com visitor

pythonkc_site/meetups/__init__.py

@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+"""
+Provides the Meetup.com events that will be used to populate the site homepage.
+
+"""
+
+
+from django.conf import settings
+from django.core.cache import cache
+from django.core.exceptions import ImproperlyConfigured
+from functools import wraps
+from pythonkc_meetups import PythonKCMeetups
+import logging
+
+
+logger = logging.getLogger(__name__)
+
+
+try:
+    api_key = settings.MEETUP_API_KEY
+except AttributeError:
+    raise ImproperlyConfigured('MEETUP_API_KEY is required in settings')
+
+
+meetups = PythonKCMeetups(api_key, http_timeout=6)
+num_past_events = getattr(settings, 'MEETUP_SHOW_PAST_EVENTS', 3)
+
+
+def memoize_in_cache(cache_key, cache_timeout_seconds=None):
+    """Cache the result of a no-args function."""
+    def decorator(func):
+        @wraps(func)
+        def decorated():
+            value = cache.get(cache_key)
+            if not value:
+                value = func()
+                cache.set(cache_key, value, cache_timeout_seconds)
+            return value
+        return decorated
+    return decorator
+
+
+@memoize_in_cache('next_event', 60 * 5)
+def get_next_event():
+    logging.info('Retrieving next event from Meetup.com')
+    upcoming_events = meetups.get_upcoming_events()
+    return upcoming_events[0] if upcoming_events else None
+
+
+@memoize_in_cache('past_events', 60 * 60)
+def get_past_events():
+    logging.info('Retrieving past events from Meetup.com')
+    return meetups.get_past_events()[:num_past_events]

pythonkc_site/meetups/events.py

@@ -114,10 +114,11 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     # Uncomment the next line to enable the admin:
-    'django.contrib.admin',
+    #'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
-    'django.contrib.admindocs',
+    #'django.contrib.admindocs',
     'south',
+    'pythonkc_site.contact',
 )
 
 # A sample logging configuration. The only tangible logging
@@ -144,6 +145,11 @@
 }
 
 
+CONTACT_EMAIL_FROM = 'noreply@pythonkc.com'
+# The following should become pythonkc@gmail.com, and eventually
+# contact@pythonkc.com
+CONTACT_EMAIL_TO = ['estebistec@gmail.com']
+
 try:
     from local_settings import *
 except ImportError:

pythonkc_site/settings.py

@@ -1,76 +1,32 @@
 # -*- coding: utf-8 -*-
 
 
-from django.conf import settings
-from django.core.cache import cache
-from django.core.exceptions import ImproperlyConfigured
 from django.core.urlresolvers import reverse
 from django.views.generic import FormView
 from django.views.generic.base import TemplateView
-from functools import wraps
-from pythonkc_meetups import PythonKCMeetups
-from pythonkc_site.forms import ContactForm
-import logging
-
-
-logger = logging.getLogger(__name__)
-
-
-try:
-    api_key = settings.MEETUP_API_KEY
-except AttributeError:
-    raise ImproperlyConfigured('MEETUP_API_KEY is required in settings')
-
-
-meetups = PythonKCMeetups(api_key, http_timeout=6)
-num_past_events = getattr(settings, 'MEETUP_SHOW_PAST_EVENTS', 3)
+from pythonkc_site.contact.email import send_contact_form_email
+from pythonkc_site.contact.forms import ContactForm
+from pythonkc_site.meetups import events
 
 
 class PythonKCHome(FormView):
     template_name = 'index.html'
     form_class = ContactForm
 
     def get_success_url(self):
-        return reverse('home')
+        return '{0}?contact_sent=yes'.format(reverse('home'))
 
     def form_valid(self, form):
-        # TODO send email
-        # TODO create success msg with msg framework
+        send_contact_form_email(**form.cleaned_data)
         return super(PythonKCHome, self).form_valid(form)
 
     def get_context_data(self, **kwargs):
-
-        @memoize_in_cache('next_event', 60 * 5)
-        def get_next_event():
-            logging.info('Retrieving next event from Meetup.com')
-            upcoming_events = meetups.get_upcoming_events()
-            return upcoming_events[0] if upcoming_events else None
-
-        @memoize_in_cache('past_events', 60 * 60)
-        def get_past_events():
-            logging.info('Retrieving past events from Meetup.com')
-            return meetups.get_past_events()[:num_past_events]
-
         return {
-            'next_event': get_next_event(),
-            'past_events': get_past_events(),
+            'next_event': events.get_next_event(),
+            'past_events': events.get_past_events(),
             'form': kwargs.get('form', None) or ContactForm()
         }
 
 
-def memoize_in_cache(cache_key, cache_timeout_seconds=None):
-    """Cache the result of a no-args function."""
-    def decorator(func):
-        @wraps(func)
-        def decorated():
-            value = cache.get(cache_key)
-            if not value:
-                value = func()
-                cache.set(cache_key, value, cache_timeout_seconds)
-            return value
-        return decorated
-    return decorator
-
-
 class PythonKCComingSoon(TemplateView):
     template_name = 'coming_soon.html'