Commit Graph

157 Commits

Author SHA1 Message Date
medmunds
8b0e475125 Bump master to 0.7dev 2013-06-15 15:51:11 -07:00
Jens Alm
807f38a240 Cleaned up .gitignor, PEP-8 issues and documentation 2013-06-02 11:11:37 +02:00
Jens Alm
a0da0ea713 Actually handling the correct headers 2013-05-30 13:10:58 +02:00
Jens Alm
4e81e5d5e8 Added byte/str compatibility for python 3 2013-05-30 11:21:05 +02:00
Jens Alm
bbfaf2c8d8 Fixed python 3.2 unicode issues 2013-05-30 10:57:34 +02:00
Jens Alm
e73c404427 Added support for signed webhooks
See
http://help.mandrill.com/entries/23704122-Authenticating-webhook-request
s
2013-05-30 10:52:13 +02:00
medmunds
be9b2b8e7c Bump master version 2013-04-17 16:13:23 -07:00
medmunds
33e1d17ac4 Webhook tests: verify signal handler definitely called, check data arg 2013-04-17 10:55:26 -07:00
José Padilla
2a661a6d8f Add: tests for webhook mixin and view 2013-04-14 20:36:33 -04:00
José Padilla
c63bbbd5cd Fix: webhook view post method
Gets the JSON data from the mandrill_events param.
Also returns a 400 error if there's any issues
loading the webhook request.
2013-04-14 20:35:52 -04:00
José Padilla
e2b36b1dde Raise exception if not using webhook secret 2013-04-14 19:32:28 -04:00
José Padilla
3496b206a0 Remove: Signal trigger on HEAD request 2013-04-14 19:31:29 -04:00
José Padilla
51d1ace9a4 Fix: Exception string whitespace and formatting 2013-04-14 19:25:48 -04:00
José Padilla
c60a7c666f Add webhook handler 2013-04-11 14:57:53 -04:00
medmunds
717e048365 Add Mandrill send options auto_html, tracking_domain, signing_domain 2013-03-27 11:08:04 -07:00
medmunds
ab1de7be2a (Don't use python builtin 'vars' as a parameter name) 2013-03-27 11:08:04 -07:00
medmunds
64f32fbc72 Use python's json rather than Django's
django.utils.simplejson is deprecated; Python 2.6+ includes json.
Fixes #32.
2013-03-13 09:52:51 -07:00
medmunds
7484a39108 v0.4 released to PyPI; bump master version 2013-03-06 11:38:54 -08:00
medmunds
9211c74144 Clean up version numbering and readme/description/docs sharing 2013-03-05 15:33:52 -08:00
medmunds
13c6125bda Support Mandrill inline_css sending option 2013-03-05 13:57:51 -08:00
medmunds
440e32529e Bump version (so readthedocs won't label updated docs as old "0.3.1") 2013-03-04 20:25:10 -08:00
medmunds
230011f818 Maintain version info in a single place.
http://stackoverflow.com/a/2073599/647002
2013-03-04 20:02:26 -08:00
medmunds
09de5faebe Support embedded images.
Treat image attachments with a Content-ID header as embedded, rather than ordinary attachments. (Rationale is that you must set the content-id to be able to refer to the image within your html, so that's a reasonable indicator to handle it as embedded.)
2013-03-01 13:58:07 -08:00
medmunds
92d413f5ae Don't filter attachment types
Mandrill dropped filtering on attachment mimetypes, so stop enforcing this in Djrill.
Fixes #26
2013-02-28 17:47:47 -08:00
medmunds
921baab602 Version 0.3.1 2013-01-13 08:17:41 -08:00
medmunds
ed3249cede Correct name/content lists for template_content, merge_vars, global_merge_vars.
Fixes #24.
2013-01-13 08:16:40 -08:00
medmunds
9380b1d8c9 Prep for 0.3.0 release
- Update version numbers
- Release notes
- Update authors
2013-01-12 14:20:40 -08:00
medmunds
860ebcdc44 Python 3.2 (but not 3.3) b64decode requires bytes not str 2013-01-12 14:00:34 -08:00
medmunds
ac0614a633 More Python 3.2 fixes - attachment encoding 2013-01-12 13:32:57 -08:00
medmunds
b4f2866f0f Python 3.2 fixes
- Absolute imports
- Unicode strings
2013-01-12 11:45:44 -08:00
medmunds
8de6b218b9 Handle bcc as Mandrill bcc_address, rather than additional to address 2013-01-12 10:26:42 -08:00
medmunds
8f9afdff7e Move MANDRILL_API_URL to package root (out of backend) 2013-01-11 17:34:17 -08:00
medmunds
ad4b9f38ff Raise NotSupportedByMandrillError for unsupported attachment mimetypes. 2013-01-11 17:26:09 -08:00
medmunds
18d27fdb21 Exception cleanup
Introduce djrill.NotSupportedByMandrillError for unsupported functionality (previously used generic ValueError).
Change to djrill.MandrillAPIError, derived from requests.HTTPError, for API error responses (previously used djrill.mail.backends.djrill.DjrillBackendHTTPError -- retained as equivalent for backwards compatibility).
2013-01-11 16:59:42 -08:00
medmunds
4be12952a3 Add send-template tests (and fixes).
Add test cases for send-template.
Expand template_content dict into Mandrill's name/value array.
Don't send template_content as "None" if missing.

Clean up some variable names in the backend.
2013-01-11 13:28:49 -08:00
medmunds
207e94e6d0 Tests: add ability to check which Mandrill API endpoint was used.
Add DjrillBackendMockAPITestCase.assert_mandrill_called; use it in representative backend test cases.

(Also make get_api_call_data work with various ways of calling requests.post.)
2013-01-11 12:44:06 -08:00
medmunds
3b237a59db Merge branch 'send-template' of git://github.com/peillis/Djrill into send_template 2013-01-09 12:39:18 -08:00
medmunds
5b4f4c12cb Support sending attachments 2013-01-03 13:52:41 -08:00
medmunds
d1b0e0a574 Tests: break apart tests.py into tests directory 2013-01-03 10:51:07 -08:00
peillis
046987a934 adding the send-template call 2012-12-24 13:36:37 +01:00
medmunds
bc9e6212a6 Version 0.2.0
* Release notes in readme
* Update example in readme
* Note deprecation of DjrillMessage class
* Longer long_description for PyPI
* Update authors
* Bump version number (setup.py and __init__.py)
2012-12-11 13:19:21 -08:00
medmunds
2a2ca6c137 Unclosed <dl> in admin status.html 2012-12-11 10:55:01 -08:00
medmunds
b0da1cf953 DjrillMessage class fixes
* Don't crash if no tags
* Allow `None` to omit options entirely from Mandrill send call
* Default `preserve_recipients` to None (= use setting from Mandrill account)
* ImproperlyConfigured --> ValueError for bad tags
2012-12-11 10:50:08 -08:00
medmunds
0a2595d731 Add test to ensure Mandrill account settings not overridden by default.
Default behavior should be to not pass any options to the Mandrill send API that haven't been specifically requested by the caller.
2012-12-10 11:36:19 -08:00
medmunds
8aab5e31b7 Expose most Mandrill send features on EmailMessage objects.
* Supports additional Mandrill send-API attributes on any ``EmailMessage``-derived object -- see details in readme
* Removes need for MANDRILL_API_URL in settings (since this is tightly tied to the code)
* Removes ``DjrillMessage`` from the readme (but not the code or tests) -- its functionality is now duplicated or exceeded by standard EmailMessage with additional attributes
* Ensures send(fail_silently=True) works as expected
2012-12-10 11:36:18 -08:00
medmunds
49238b28ae Fix django.conf.urls.defaults deprecation warning in admin
(Test on Django 1.3, 1.4, 1.5b)
2012-12-05 16:06:12 -08:00
medmunds
5f0ff0cba2 Remove unused adminmedia template tag
Fixes brack3t/Djrill#14
2012-12-05 16:04:55 -08:00
medmunds
2c539141f6 Merge commit '008b6cf' into test_admin_views
Conflicts:
	djrill/admin.py
2012-12-05 16:01:17 -08:00
medmunds
1b47ee93e4 Add simple tests for admin views.
Make sure the admin views load without error. (Not really trying to test content right now.)

This includes failing test cases for:
* brack3t/Djrill#8: admin.autodiscover() fails without django-adminplus or DjrillAdminSite
* brack3t/Djrill#14: Django 1.5 doesn't support adminmedia template tag
2012-12-05 15:52:02 -08:00
Kenneth Love
da37c4c750 Update djrill/mail/__init__.py
Defaulting `preserve_recipents` to False.
2012-12-04 17:29:20 -08:00