test url params & view descriptions

wq · Nov 8, 2016 · 98f3939 · 98f3939
1 parent 61691e2
commit 98f3939
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 12 deletions.
diff --git a/rest_pandas/mustache/rest_pandas.html b/rest_pandas/mustache/rest_pandas.html
@@ -17,14 +17,14 @@ <h1>{{name}}</h1>
         {{/description}}
         <div data-role="controlgroup" data-type="horizontal" data-mini="true">
           {{#available_formats}}
-          <a href="{{url}}.{{.}}" rel="external" class="ui-btn ui-corner-all">
+          <a href="{{url}}.{{.}}{{url_params}}" rel="external" class="ui-btn ui-corner-all">
             {{.}}
           </a>
           {{/available_formats}}
         </div>
         {{#wq_chart_type}}
         <hr>
-        <svg data-wq-url="{{url}}.csv" data-wq-type="{{wq_chart_type}}"></svg>
+        <svg data-wq-url="{{url}}.csv{{url_params}}" data-wq-type="{{wq_chart_type}}"></svg>
         {{/wq_chart_type}}
         <hr>
         {{{table}}}

diff --git a/rest_pandas/renderers.py b/rest_pandas/renderers.py
@@ -94,6 +94,9 @@ def get_template_context(self, data, renderer_context):
         data['name'] = view.get_view_name()
         data['description'] = view.get_view_description(html=True)
         data['url'] = request.path.replace('.html', '')
+        full_path = request.get_full_path()
+        if '?' in full_path:
+            data['url_params'] = full_path[full_path.index('?'):]
         data['available_formats'] = [
             cls.format for cls in view.renderer_classes
             if cls.format != 'html'

diff --git a/tests/files/multitimeseries.html b/tests/files/multitimeseries.html
@@ -10,7 +10,7 @@ <h1>Multi Time Series</h1>
       </div>
       <div role="main" class="ui-content">
         <h1>Multi Time Series</h1>
-        <p></p>
+        <p>Multiple time series.</p>
         <div data-role="controlgroup" data-type="horizontal" data-mini="true">
           <a href="/multitimeseries.csv" rel="external" class="ui-btn ui-corner-all">
             csv

diff --git a/tests/files/timeseries.html b/tests/files/timeseries.html
@@ -10,27 +10,27 @@ <h1>Time Series</h1>
       </div>
       <div role="main" class="ui-content">
         <h1>Time Series</h1>
-        <p></p>
+        <p>A simple time series view.</p>
         <div data-role="controlgroup" data-type="horizontal" data-mini="true">
-          <a href="/timeseries.csv" rel="external" class="ui-btn ui-corner-all">
+          <a href="/timeseries.csv?test=1" rel="external" class="ui-btn ui-corner-all">
             csv
           </a>
-          <a href="/timeseries.txt" rel="external" class="ui-btn ui-corner-all">
+          <a href="/timeseries.txt?test=1" rel="external" class="ui-btn ui-corner-all">
             txt
           </a>
-          <a href="/timeseries.json" rel="external" class="ui-btn ui-corner-all">
+          <a href="/timeseries.json?test=1" rel="external" class="ui-btn ui-corner-all">
             json
           </a>
-          <a href="/timeseries.xlsx" rel="external" class="ui-btn ui-corner-all">
+          <a href="/timeseries.xlsx?test=1" rel="external" class="ui-btn ui-corner-all">
             xlsx
           </a>
-          <a href="/timeseries.xls" rel="external" class="ui-btn ui-corner-all">
+          <a href="/timeseries.xls?test=1" rel="external" class="ui-btn ui-corner-all">
             xls
           </a>
-          <a href="/timeseries.png" rel="external" class="ui-btn ui-corner-all">
+          <a href="/timeseries.png?test=1" rel="external" class="ui-btn ui-corner-all">
             png
           </a>
-          <a href="/timeseries.svg" rel="external" class="ui-btn ui-corner-all">
+          <a href="/timeseries.svg?test=1" rel="external" class="ui-btn ui-corner-all">
             svg
           </a>
         </div>

diff --git a/tests/test_views.py b/tests/test_views.py
@@ -42,7 +42,7 @@ def test_view_json_kwargs(self):
         self.assertEqual(date, datetime.datetime(2014, 1, 1))
 
     def test_view_html(self):
-        response = self.client.get("/timeseries")
+        response = self.client.get("/timeseries?test=1")
         expected = open(
             os.path.join(os.path.dirname(__file__), 'files', 'timeseries.html')
         ).read()

diff --git a/tests/testapp/views.py b/tests/testapp/views.py
@@ -27,6 +27,9 @@ def get_data(self, request, *args, **kwargs):
 
 
 class TimeSeriesView(PandasView):
+    """
+    A simple time series view.
+    """
     queryset = TimeSeries.objects.all()
     serializer_class = TimeSeriesSerializer
 
@@ -41,6 +44,9 @@ class TimeSeriesViewSet(PandasViewSet):
 
 
 class MultiTimeSeriesView(PandasView):
+    """
+    Multiple time series.
+    """
     queryset = MultiTimeSeries.objects.all()
     serializer_class = MultiTimeSeriesSerializer
     pandas_serializer_class = PandasUnstackedSerializer