MicroPyramid · ashwin31 · Sep 1, 2016 · Aug 31, 2016 · Aug 31, 2016 · Aug 31, 2016
diff --git a/.gitignore b/.gitignore
@@ -81,3 +81,5 @@ celerybeat-schedule
 # virtualenv
 venv/
 ENV/
+.coverage
+*.pyc
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,2 @@
+include README.rst
+recursive-include django_simple_forum/templates *
diff --git a/README.rst b/README.rst
@@ -1,6 +1,5 @@
 django-simple-forum:
 =====================================
-
 .. image:: https://readthedocs.org/projects/django-simple-forum/badge/?version=latest
    :target: http://django-simple-forum.readthedocs.io/en/latest/
    :alt: Documentation Status
@@ -17,7 +16,8 @@ django-simple-forum:
 
 .. image:: https://img.shields.io/github/license/micropyramid/django-simple-forum.svg
     :target: https://pypi.python.org/pypi/django-simple-forum/
-
+
+
 Introduction:
 =============
 
@@ -31,11 +31,10 @@ Modules used:
     * Python  >= 2.6 (or Python 3.4)
     * Django  = 1.9.6
     * JQuery  >= 1.7
-    * Django-compressor == 2.0
     * Microurl >=3.6.1
     * Boto == 2.40.0
     * Sendgrid == 2.2.1
-
+    * django-ses-gateway
 
 Installation Procedure
 ======================

diff --git a/__init__.py b/__init__.py
diff --git a/django_simple_forum/__init__.pyc b/django_simple_forum/__init__.pyc
diff --git a/django_simple_forum/__pycache__/__init__.cpython-34.pyc b/django_simple_forum/__pycache__/__init__.cpython-34.pyc
diff --git a/django_simple_forum/__pycache__/admin.cpython-34.pyc b/django_simple_forum/__pycache__/admin.cpython-34.pyc
diff --git a/django_simple_forum/__pycache__/forms.cpython-34.pyc b/django_simple_forum/__pycache__/forms.cpython-34.pyc
diff --git a/django_simple_forum/__pycache__/mixins.cpython-34.pyc b/django_simple_forum/__pycache__/mixins.cpython-34.pyc
diff --git a/django_simple_forum/__pycache__/models.cpython-34.pyc b/django_simple_forum/__pycache__/models.cpython-34.pyc
diff --git a/django_simple_forum/__pycache__/sending_mail.cpython-34.pyc b/django_simple_forum/__pycache__/sending_mail.cpython-34.pyc
diff --git a/django_simple_forum/__pycache__/tests.cpython-34.pyc b/django_simple_forum/__pycache__/tests.cpython-34.pyc
diff --git a/django_simple_forum/__pycache__/urls.cpython-34.pyc b/django_simple_forum/__pycache__/urls.cpython-34.pyc
diff --git a/django_simple_forum/__pycache__/views.cpython-34.pyc b/django_simple_forum/__pycache__/views.cpython-34.pyc
diff --git a/django_simple_forum/migrations/__pycache__/0001_initial.cpython-34.pyc b/django_simple_forum/migrations/__pycache__/0001_initial.cpython-34.pyc
diff --git a/django_simple_forum/migrations/__pycache__/0002_auto_20160628_1211.cpython-34.pyc b/django_simple_forum/migrations/__pycache__/0002_auto_20160628_1211.cpython-34.pyc
diff --git a/django_simple_forum/migrations/__pycache__/0003_topic_tags.cpython-34.pyc b/django_simple_forum/migrations/__pycache__/0003_topic_tags.cpython-34.pyc
diff --git a/django_simple_forum/migrations/__pycache__/0004_topic_no_of_likes.cpython-34.pyc b/django_simple_forum/migrations/__pycache__/0004_topic_no_of_likes.cpython-34.pyc
diff --git a/django_simple_forum/migrations/__pycache__/0005_attachment.cpython-34.pyc b/django_simple_forum/migrations/__pycache__/0005_attachment.cpython-34.pyc
diff --git a/django_simple_forum/migrations/__pycache__/0006_forumcategory_description.cpython-34.pyc b/django_simple_forum/migrations/__pycache__/0006_forumcategory_description.cpython-34.pyc
diff --git a/django_simple_forum/migrations/__pycache__/0007_topic_no_of_votes.cpython-34.pyc b/django_simple_forum/migrations/__pycache__/0007_topic_no_of_votes.cpython-34.pyc
diff --git a/django_simple_forum/migrations/__pycache__/0008_auto_20160707_1311.cpython-34.pyc b/django_simple_forum/migrations/__pycache__/0008_auto_20160707_1311.cpython-34.pyc
diff --git a/django_simple_forum/migrations/__pycache__/0009_userprofile_profile_pic.cpython-34.pyc b/django_simple_forum/migrations/__pycache__/0009_userprofile_profile_pic.cpython-34.pyc
diff --git a/django_simple_forum/migrations/__pycache__/0010_forumcategory_parent.cpython-34.pyc b/django_simple_forum/migrations/__pycache__/0010_forumcategory_parent.cpython-34.pyc
diff --git a/...go_simple_forum/migrations/__pycache__/0011_facebook_github_google_twitter.cpython-34.pyc b/...go_simple_forum/migrations/__pycache__/0011_facebook_github_google_twitter.cpython-34.pyc
diff --git a/django_simple_forum/migrations/__pycache__/0012_comment_mentioned.cpython-34.pyc b/django_simple_forum/migrations/__pycache__/0012_comment_mentioned.cpython-34.pyc
diff --git a/...imple_forum/migrations/__pycache__/0013_userprofile_send_mailnotifications.cpython-34.pyc b/...imple_forum/migrations/__pycache__/0013_userprofile_send_mailnotifications.cpython-34.pyc
diff --git a/django_simple_forum/migrations/__pycache__/__init__.cpython-34.pyc b/django_simple_forum/migrations/__pycache__/__init__.cpython-34.pyc
diff --git a/django_simple_forum/sending_mail.py b/django_simple_forum/sending_mail.py
@@ -3,19 +3,12 @@
 import sendgrid
 import requests
 from django.core.mail import EmailMultiAlternatives
+from django_ses_gateway.sending_mail import sending_mail
 
 
-def Memail(mto, mfrom, msubject, mbody):
-    print (settings.MAIL_SENDER)
+def Memail(mto, mfrom, msubject, mbody, email_template_name, context):
     if settings.MAIL_SENDER == 'AMAZON':
-        # conn=SESConnection(settings.AM_ACCESS_KEY, settings.AM_PASS_KEY)
-        conn = boto.ses.connect_to_region(
-            'eu-west-1',
-            aws_access_key_id=settings.AM_ACCESS_KEY,
-            aws_secret_access_key=settings.AM_PASS_KEY
-        )
-        conn.send_email(mfrom, msubject, mbody, mto, format='html')
-
+        sending_mail(msubject, email_template_name, context, mfrom, mto)
     elif settings.MAIL_SENDER == 'MAILGUN':
         requests.post(
             settings.MGUN_API_URL,
@@ -37,7 +30,6 @@ def Memail(mto, mfrom, msubject, mbody):
         reposne = sg.send(sending_msg)
         print (reposne)
     else:
-        print (mto)
         text_content = msubject
         msg = EmailMultiAlternatives(msubject, mbody, mfrom, mto)
         msg.attach_alternative(mbody, "text/html")

diff --git a/django_simple_forum/templatetags/__pycache__/__init__.cpython-34.pyc b/django_simple_forum/templatetags/__pycache__/__init__.cpython-34.pyc
diff --git a/django_simple_forum/templatetags/__pycache__/forum_tags.cpython-34.pyc b/django_simple_forum/templatetags/__pycache__/forum_tags.cpython-34.pyc
diff --git a/django_simple_forum/views.py b/django_simple_forum/views.py
@@ -556,7 +556,7 @@ def form_valid(self, form):
             subject = "New Comment For The Topic " + (comment.topic.title)
             rendered = t.render(c)
             mfrom = settings.DEFAULT_FROM_EMAIL
-            Memail(mto, mfrom, subject, rendered)
+            Memail(mto, mfrom, subject, rendered, 'emails/comment_add.html', c)
 
         for user in comment.mentioned.all():
             mto = [user.user.email]
@@ -565,7 +565,7 @@ def form_valid(self, form):
             subject = "New Comment For The Topic " + (comment.topic.title)
             rendered = t.render(c)
             mfrom = settings.DEFAULT_FROM_EMAIL
-            Memail(mto, mfrom, subject, rendered)
+            Memail(mto, mfrom, subject, rendered, 'emails/comment_mentioned.html', c)
 
         timeline_activity(user=self.request.user, content_object=comment,
                           namespace='commented for the', event_type="comment-create")
@@ -1260,7 +1260,7 @@ def form_valid(self, form):
             message = '<p>Your Password for the forum account is <strong>'+password+'</strong></p><br/><p>Use this credentials to login into <a href="' + settings.HOST_URL + '/forum/">forum</a></p>'
             to = user.email
             from_email = settings.DEFAULT_FROM_EMAIL
-            Memail(to, from_email, subject, message)
+            Memail(to, from_email, subject, message, '', '')
             user.set_password(password)
             user.save()
             data = {"error": False, "response": "An Email is sent to the entered email id"}

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -18,6 +18,7 @@ Modules used:
     * Microurl >=3.6.1
     * Boto == 2.40.0
     * Sendgrid == 2.2.1
+    * django-ses-gateway
 
 
 Installation Procedure

diff --git a/setup.py b/setup.py
@@ -0,0 +1,57 @@
+import os
+from setuptools import setup
+
+with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as readme:
+    README = readme.read()
+
+# allow setup.py to be run from any path
+os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
+PROJECT_NAME = 'django-simple-forum'
+
+data_files = []
+for dirpath, dirnames, filenames in os.walk(PROJECT_NAME):
+    for i, dirname in enumerate(dirnames):
+        if dirname.startswith('.'):
+            del dirnames[i]
+    if '__init__.py' in filenames:
+        continue
+    elif filenames:
+        for f in filenames:
+            data_files.append(os.path.join(
+                dirpath[len(PROJECT_NAME) + 1:], f))
+
+setup(
+    name='django-simple-forum',
+    version='0.0.1',
+    packages=['django_simple_forum', 'django_simple_forum.templatetags', 'django_simple_forum.migrations'],
+    include_package_data=True,
+    description='A Full featured forum, easy to integrate and use.',
+    long_description=README,
+    url='https://github.com/MicroPyramid/django-simple-forum',
+    author='Micropyramid',
+    author_email='hello@micropyramid.com',
+    classifiers=[
+        'Environment :: Web Environment',
+        'Framework :: Django',
+        'Intended Audience :: Developers',
+        'Operating System :: OS Independent',
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Topic :: Internet :: WWW/HTTP',
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
+    ],
+    install_requires=[
+        "Django>=1.6.0,<1.10",
+        'django-simple-pagination',
+        'django-storages',
+        'microurl',
+        'boto',
+        'sendgrid',
+        'sorl-thumbnail==12.4a1',
+        'django-ses-gateway'
+    ],
+)
diff --git a/test_runner.py b/test_runner.py
@@ -20,7 +20,7 @@
                         'django.contrib.sessions',
                         'django.contrib.staticfiles',
                         'sorl.thumbnail',
-                        'simple_pagination',
+                        #'simple_pagination',
                         'django_simple_forum',
                         ),
         MIDDLEWARE_CLASSES=(
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,3 +81,5 @@ celerybeat-schedule @@
     # virtualenv
     venv/
     ENV/
+    .coverage
+    *.pyc
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		include README.rst
		recursive-include django_simple_forum/templates *