issue-77: Fix absolute request url in HttpStubAdmin with regex(#77)

http_stubs/admin.py

@@ -43,6 +43,7 @@ def has_add_permission(self, *args, **kwargs) -> bool:
 class HTTPStubAdmin(admin.ModelAdmin):
     """HTTP stub admin."""
 
+    change_form_template = 'admin/http_stubs/httpstub/change_form.html'
     extra_buttons_style = 'background-color:#00b0ff;color:white'
 
     actions = ['enable_action', 'disable_action']

http_stubs/templatetags/stub_tags.py

@@ -1,18 +1,52 @@
-from typing import Dict
+import json
+from html import unescape
+from json import JSONDecodeError
+from typing import AnyStr, Dict, List
+from urllib import parse
 
 from django import template
+from django.contrib.admin.helpers import Fieldset
+from django.template.defaultfilters import stringfilter
 
 Url = str
 
 register = template.Library()
 
 
 @register.simple_tag(takes_context=True, name='absolute')
-def get_absolute_url_tag(context: Dict, url: Url) -> Url:
+def get_absolute_url_tag(context: Dict, url: Url, fieldset: Fieldset) -> Url:
     """Tag that returns an absolute url.
 
     :param context: context of request
     :param url: relative url
+    :param fieldset: Fieldset of Django
     :returns: absolute url
     """
-    return context.get('request').build_absolute_uri(url)
+    request = context['request']
+    form = fieldset.form
+    if form.initial.get('regex_path'):
+        return parse.urlunparse(
+            [request.scheme, request.get_host(), '', '', '', ''])
+    if not url.startswith('/'):
+        url = f'/{url}'
+    return request.build_absolute_uri(url)
+
+
+@register.filter()
+@stringfilter
+def headers_to_list(headers: AnyStr) -> List:
+    """Filter that creates a list from a string of headers(dict).
+
+    Return a list of the lines in the string representation of the request
+    headers.
+    :param headers: string representation of the request headers
+    :returns: list of individual headers string representation
+    """
+    try:
+        headers = json.loads(unescape(headers).replace("'", '"'))
+    except (TypeError, JSONDecodeError):
+        return []
+    return [
+        f'{header}: {header_value}'
+        for header, header_value in headers.items()
+    ]

http_stubs/tests/test_tags.py

@@ -1,11 +1,30 @@
+from django.contrib.admin.helpers import Fieldset
+from django.contrib.admin.sites import AdminSite
 from django.http.request import HttpRequest
 
-from http_stubs.templatetags.stub_tags import get_absolute_url_tag
+from http_stubs.admin import HTTPStubAdmin
+from http_stubs.models import HTTPStub
+from http_stubs.templatetags import stub_tags
 
 
 class TestStubTags:
     """Tests for custom tags and filters for Django templates."""
 
+    def test_absolute_url_tag_with_regex(self):
+        """Check that the absolute url is correct if regex_path is true."""
+        req = HttpRequest()
+        req.META = {
+            'SERVER_NAME': '127.0.0.1',
+            'SERVER_PORT': '80',
+        }
+        relative_url = '/check/'
+        form = HTTPStubAdmin(
+            HTTPStub, AdminSite).get_form(req)(initial={'regex_path': True})
+        fieldset = Fieldset(form)
+        url = stub_tags.get_absolute_url_tag(
+            {'request': req}, relative_url, fieldset)
+        assert url == 'http://127.0.0.1'
+
     def test_absolute_url_tag(self):
         """Check that the absolute url is returned."""
         req = HttpRequest()
@@ -14,5 +33,38 @@ def test_absolute_url_tag(self):
             'SERVER_PORT': '80',
         }
         relative_url = '/check/'
-        url = get_absolute_url_tag({'request': req}, relative_url)
+        form = HTTPStubAdmin(
+            HTTPStub, AdminSite).get_form(req)(initial={'regex_path': False})
+        fieldset = Fieldset(form)
+        url = stub_tags.get_absolute_url_tag(
+            {'request': req}, relative_url, fieldset)
         assert url == 'http://127.0.0.1/check/'
+
+    def test_absolute_url_tag_without_slash(self):
+        """Check that the absolute url is correct when relative url doesn`t
+        start with a slash.
+        """
+        req = HttpRequest()
+        req.META = {
+            'SERVER_NAME': '127.0.0.1',
+            'SERVER_PORT': '80',
+        }
+        relative_url = 'check'
+        form = HTTPStubAdmin(
+            HTTPStub, AdminSite).get_form(req)(initial={'regex_path': False})
+        fieldset = Fieldset(form)
+        url = stub_tags.get_absolute_url_tag(
+            {'request': req}, relative_url, fieldset)
+        assert url == 'http://127.0.0.1/check'
+
+    def test_headers_to_list_filter(self):
+        """Check that the list of headers is returned."""
+        headers = '{"Content-Length": "2", "Accept": "text/html"}'
+        headers_list = stub_tags.headers_to_list(headers)
+        assert headers_list == ['Content-Length: 2', 'Accept: text/html']
+
+    def test_headers_to_list_filter_invalid(self):
+        """Check that the list of headers is empty."""
+        headers = 'invalid headers format'
+        headers_list = stub_tags.headers_to_list(headers)
+        assert not headers_list

templates/admin/http_stubs/change_form.html → templates/admin/http_stubs/httpstub/change_form.html

@@ -1,6 +1,6 @@
 {% extends "admin/change_form.html" %}
 {% block field_sets %}
 {% for fieldset in adminform %}
-    {% include "admin/http_stubs/includes/fieldset.html" %}
+    {% include "admin/http_stubs/includes/fieldset_http_stub.html" %}
 {% endfor %}
 {% endblock %}

templates/admin/http_stubs/includes/fieldset.html

@@ -1,6 +1,6 @@
 {% load stub_tags %}
 <fieldset class="module aligned {{ fieldset.classes }}">
-<legend></legend>
+    <legend></legend>
     {% if fieldset.name %}<h2>{{ fieldset.name }}</h2>{% endif %}
     {% if fieldset.description %}
         <div class="description">{{ fieldset.description|safe }}</div>
@@ -16,11 +16,13 @@
                     {% else %}
                         {{ field.label_tag }}
                         {% if field.is_readonly %}
-                            <div class="readonly">{{ field.contents }}</div>
+                            {% block readonly_field %}
+                                <div class="readonly">{{ field.contents }}</div>
+                            {% endblock %}
                         {% else %}
-                            {{ field.field }}
-                            {# added request url for path field(issue #35) #}
-                            {% if field.field.name == 'path' %}<div class="readonly"><div id="full-path">{% absolute field.field.value %}</div><div id="path-copied-alert">Copied!</div></div>{% endif %}
+                            {% block writable_field %}
+                                {{ field.field }}
+                            {% endblock %}
                         {% endif %}
                     {% endif %}
                     {% if field.field.help_text %}
@@ -193,32 +195,14 @@
         }
     }
     ImagePreview.init({id:$("#imgBox img")});
-
-
-      // copy content to clipboard
-    function copyToClipboard(element) {
-        var $temp = $("<input>");
-        $("body").append($temp);
-        $temp.val($(element).text()).select();
-        document.execCommand("copy");
-        $temp.remove();
-    }
-
-    // copy full request path to clipboard
-    $("#full-path").on("click", function() {
-        copyToClipboard("#full-path");
-        $("#path-copied-alert").fadeIn("slow");
-    });
 </script>
-
+{% block javascripts %}
+{% endblock %}
 
 <style type="text/css">
     #imgs img {
         width: 24%;
     }
-    #path-copied-alert {
-        display: none;
-        color: green;
-        padding-left: 170px;
-    }
 </style>
+{% block css %}
+{% endblock %}

templates/admin/http_stubs/includes/fieldset_http_stub.html

@@ -0,0 +1,40 @@
+{% extends 'admin/http_stubs/includes/fieldset.html' %}
+{% load stub_tags %}
+{% block writable_field %}
+    {{ field.field }}
+    {# added request url for path field(issue #35) #}
+    {% if field.field.name == 'path' %}
+        <div class="readonly">
+            <div id="full-path">{% absolute field.field.value fieldset %}</div>
+            <div id="path-copied-alert">Copied!</div>
+        </div>
+    {% endif %}
+{% endblock %}
+{% block javascripts %}
+    <script type="text/javascript">
+    // copy content to clipboard
+    function copyToClipboard(element) {
+        var $temp = $("<input>");
+        $("body").append($temp);
+        $temp.val($(element).text()).select();
+        document.execCommand("copy");
+        $temp.remove();
+    }
+
+    // copy full request path to clipboard
+    $("#full-path").on("click", function() {
+        copyToClipboard("#full-path");
+        $("#path-copied-alert").fadeIn("slow");
+    });
+
+</script>
+{% endblock %}
+{% block css %}
+<style type="text/css">
+    #path-copied-alert {
+        display: none;
+        color: green;
+        padding-left: 170px;
+    }
+</style>
+{% endblock %}

templates/admin/http_stubs/includes/fieldset_log_entry.html

@@ -0,0 +1,11 @@
+{% extends 'admin/http_stubs/includes/fieldset.html' %}
+{% load stub_tags %}
+{% block readonly_field %}
+    {% if field.field.name == 'headers' %}
+        <ul class="readonly">
+            {% for header in field.contents|headers_to_list %}
+                <li>{{ header }}</li>
+            {% endfor %}</ul>
+    {% else %}
+        <div class="readonly">{{ field.contents }}</div>{% endif %}
+{% endblock %}

templates/admin/http_stubs/logentry/change_form.html

@@ -0,0 +1,6 @@
+{% extends "admin/change_form.html" %}
+{% block field_sets %}
+{% for fieldset in adminform %}
+    {% include "admin/http_stubs/includes/fieldset_log_entry.html" %}
+{% endfor %}
+{% endblock %}