From a42ace4473606b80a394412032720fb0d3b7b06c Mon Sep 17 00:00:00 2001 From: skoczen Date: Fri, 9 May 2014 11:01:37 -0700 Subject: [PATCH] Proper response returns, v1.0 cleanup --- README.md | 2 +- django_seo_js/helpers.py | 1 - django_seo_js/middleware/hashbang.py | 5 +++-- django_seo_js/middleware/useragent.py | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3b3fd4e..967f3c9 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ MIDDLEWARE_CLASSES = ( 'django_seo_js.middleware.UserAgentMiddleware', # If you want to detect by user agent ) + MIDDLEWARE_CLASSES -INSTALLED_APPS += ('django_ses_js',) +INSTALLED_APPS += ('django_seo_js',) # If you're using prerender.io (the default backend): SEO_JS_PRERENDER_TOKEN = "123456789abcdefghijkl" diff --git a/django_seo_js/helpers.py b/django_seo_js/helpers.py index 5e99c34..9ea2bd4 100644 --- a/django_seo_js/helpers.py +++ b/django_seo_js/helpers.py @@ -1,4 +1,3 @@ - from django_seo_js.backends import SelectedBackend def update_cache_for_url(url): diff --git a/django_seo_js/middleware/hashbang.py b/django_seo_js/middleware/hashbang.py index 5547662..b62e31b 100644 --- a/django_seo_js/middleware/hashbang.py +++ b/django_seo_js/middleware/hashbang.py @@ -1,8 +1,9 @@ from django_seo_js.backends import SelectedBackend +from django.http import HttpResponse class HashBangMiddleware(SelectedBackend): def process_request(self, request): if "_escaped_fragment_" in request.GET: - url = "%s://%s%s" % (request.protocol, request.host, request.uri) - return self.backend.get_rendered_page(url) + url = request.build_absolute_uri() + return HttpResponse(self.backend.get_rendered_page(url)) diff --git a/django_seo_js/middleware/useragent.py b/django_seo_js/middleware/useragent.py index 4a8554a..42d932e 100644 --- a/django_seo_js/middleware/useragent.py +++ b/django_seo_js/middleware/useragent.py @@ -1,6 +1,7 @@ import re from django.conf import settings from django_seo_js.backends import SelectedBackend +from django.http import HttpResponse DEFAULT_SEO_JS_USER_AGENTS = [ "Googlebot", @@ -23,5 +24,5 @@ def __init__(self, *args, **kwargs): def process_request(self, request): if self.USER_AGENT_REGEX.match(request.META["HTTP_USER_AGENT"]): - url = "%s://%s%s" % (request.protocol, request.host, request.uri) - return self.backend.get_rendered_page(url) + url = request.build_absolute_uri() + return HttpResponse(self.backend.get_rendered_page(url))