From 52b1f57ad22dbce08748ba8460e9d7d57e573f13 Mon Sep 17 00:00:00 2001
From: James Socol <james@mozilla.com>
Date: Fri, 9 Nov 2012 16:37:09 -0500
Subject: [PATCH] Remove jingo.views and tests. Fix #2.

With the changes since #2 was filed, it's no longer necessary to have
jingo.views.direct_to_template at all. Django's direct_to_template view
works just fine with jingo.Loader.

I cleaned up some tests, but jingo.render_to_string is still a different
function than django.template.loader.render_to_string, so I wasn't able
to drop that.
---
 jingo/tests/test_views.py | 15 ++++++++-------
 jingo/views.py            |  5 -----
 2 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 jingo/views.py

diff --git a/jingo/tests/test_views.py b/jingo/tests/test_views.py
index 3b73528..cdf1316 100644
--- a/jingo/tests/test_views.py
+++ b/jingo/tests/test_views.py
@@ -1,17 +1,18 @@
 from django.utils import translation
-from mock import Mock, patch, sentinel
+from django.views.generic.simple import direct_to_template
 
+from mock import patch, sentinel
 from nose.tools import eq_
 
-import jingo.views
-from jingo import get_env
+from jingo import get_env, render_to_string
 
 
 @patch('jingo.render')
 def test_direct_to_template(mock_render):
-    request = sentinel.request
-    jingo.views.direct_to_template(request, 'base.html', x=1)
-    mock_render.assert_called_with(request, 'base.html', {'x': 1})
+    response = direct_to_template(sentinel.request,
+                                  'jinja_app/test_nonoverride.html',
+                                  {'x': 1})
+    eq_('HELLO', response.content)
 
 
 def test_template_substitution_crash():
@@ -22,5 +23,5 @@ def test_template_substitution_crash():
     # The localized string has the wrong variable name in it
     s = '{% trans string="heart" %}Broken {{ string }}{% endtrans %}'
     template = env.from_string(s)
-    rendered = jingo.render_to_string(Mock(), template, {})
+    rendered = render_to_string(sentinel.request, template, {})
     eq_(rendered, 'Broken heart')
diff --git a/jingo/views.py b/jingo/views.py
deleted file mode 100644
index 7556c76..0000000
--- a/jingo/views.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import jingo
-
-
-def direct_to_template(request, template, **kwargs):
-    return jingo.render(request, template, kwargs)