From 130928f16a15d8b918dc0a2af4113e8519e260b4 Mon Sep 17 00:00:00 2001
From: Gust <darksshades@hotmail.com>
Date: Fri, 23 Jan 2015 14:31:21 -0200
Subject: [PATCH] Add diazobase to proxy.utils

---
 colab/proxy/gitlab/diazo.xml        |  2 +-
 colab/proxy/gitlab/views.py         |  2 +-
 colab/proxy/jenkins/views.py        |  2 +-
 colab/proxy/noosfero/diazo.xml      |  2 +-
 colab/proxy/noosfero/views.py       |  2 +-
 colab/proxy/proxybase/__init__.py   |  0
 colab/proxy/proxybase/apps.py       |  4 ----
 colab/proxy/proxybase/diazobase.xml | 14 --------------
 colab/proxy/proxybase/views.py      | 36 ------------------------------------
 colab/proxy/redmine/apps.py         |  2 +-
 colab/proxy/redmine/diazo.xml       |  4 ++--
 colab/proxy/redmine/views.py        |  2 +-
 colab/proxy/trac/views.py           |  2 +-
 colab/proxy/utils/__.init__.py      |  0
 colab/proxy/utils/apps.py           |  4 ++++
 colab/proxy/utils/diazobase.xml     | 14 ++++++++++++++
 colab/proxy/utils/views.py          | 36 ++++++++++++++++++++++++++++++++++++
 17 files changed, 64 insertions(+), 64 deletions(-)
 delete mode 100644 colab/proxy/proxybase/__init__.py
 delete mode 100644 colab/proxy/proxybase/apps.py
 delete mode 100644 colab/proxy/proxybase/diazobase.xml
 delete mode 100644 colab/proxy/proxybase/views.py
 create mode 100644 colab/proxy/utils/__.init__.py
 create mode 100644 colab/proxy/utils/apps.py
 create mode 100644 colab/proxy/utils/diazobase.xml
 create mode 100644 colab/proxy/utils/views.py

diff --git a/colab/proxy/gitlab/diazo.xml b/colab/proxy/gitlab/diazo.xml
index 077eb0e..10d0b00 100644
--- a/colab/proxy/gitlab/diazo.xml
+++ b/colab/proxy/gitlab/diazo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no" ?>
 <!DOCTYPE rules [
-<!ENTITY proxybase SYSTEM "../proxybase/diazobase.xml">
+<!ENTITY proxybase SYSTEM "../utils/diazobase.xml">
 ]>
 
 <rules
diff --git a/colab/proxy/gitlab/views.py b/colab/proxy/gitlab/views.py
index f556e6d..b750ff2 100644
--- a/colab/proxy/gitlab/views.py
+++ b/colab/proxy/gitlab/views.py
@@ -1,7 +1,7 @@
 
-from ..utils.views import ColabProxyView
 from django.conf import settings
 
+from ..utils.views import ColabProxyView
 
 class GitlabProxyView(ColabProxyView):
     app_label = 'gitlab'
diff --git a/colab/proxy/jenkins/views.py b/colab/proxy/jenkins/views.py
index c08cacb..e7ab64e 100644
--- a/colab/proxy/jenkins/views.py
+++ b/colab/proxy/jenkins/views.py
@@ -1,7 +1,7 @@
 
 from django.conf import settings
 
-from ..proxybase.views import ColabProxyView
+from ..utils.views import ColabProxyView
 
 
 class JenkinsProxyView(ColabProxyView):
diff --git a/colab/proxy/noosfero/diazo.xml b/colab/proxy/noosfero/diazo.xml
index 14db62f..5de4993 100644
--- a/colab/proxy/noosfero/diazo.xml
+++ b/colab/proxy/noosfero/diazo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no" ?>
 <!DOCTYPE rules [
-<!ENTITY proxybase SYSTEM "../proxybase/diazobase.xml">
+<!ENTITY proxybase SYSTEM "../utils/diazobase.xml">
 ]>
 
 <rules
diff --git a/colab/proxy/noosfero/views.py b/colab/proxy/noosfero/views.py
index e6c1252..2df515c 100644
--- a/colab/proxy/noosfero/views.py
+++ b/colab/proxy/noosfero/views.py
@@ -1,7 +1,7 @@
 
 from django.conf import settings
 
-from ..proxybase.views import ColabProxyView
+from ..utils.views import ColabProxyView
 
 
 class NoosferoProxyView(ColabProxyView):
diff --git a/colab/proxy/proxybase/__init__.py b/colab/proxy/proxybase/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/colab/proxy/proxybase/__init__.py
+++ /dev/null
diff --git a/colab/proxy/proxybase/apps.py b/colab/proxy/proxybase/apps.py
deleted file mode 100644
index cc77887..0000000
--- a/colab/proxy/proxybase/apps.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from django.apps import AppConfig
-
-class ColabProxiedAppConfig(AppConfig):
-    colab_proxied_app = True
diff --git a/colab/proxy/proxybase/diazobase.xml b/colab/proxy/proxybase/diazobase.xml
deleted file mode 100644
index e90277f..0000000
--- a/colab/proxy/proxybase/diazobase.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--
-  This file will be included as a base rules for all diazo rules.
-  e.g.: The file proxy/noosfero/diazo.xml the first lines indicates this source file and this code will be replaced in &proxybase; 
--->
-<rules
-    xmlns="http://namespaces.plone.org/diazo"
-    xmlns:css="http://namespaces.plone.org/diazo/css"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <before theme-children="/html/head" content-children="/html/head" />
-    <before css:theme-children="#main-content" css:content-children="body" />
-
-    <merge attributes="class" css:theme="body" css:content="body" />
-</rules>
diff --git a/colab/proxy/proxybase/views.py b/colab/proxy/proxybase/views.py
deleted file mode 100644
index bfbc58a..0000000
--- a/colab/proxy/proxybase/views.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import json
-
-from django.conf import settings
-
-from revproxy.views import ProxyView
-
-
-class ColabProxyView(ProxyView):
-    add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
-    diazo_theme_template = 'base.html'
-    html5 = True
-
-    @property
-    def upstream(self):
-        proxy_config = settings.PROXIED_APPS.get(self.app_label, {})
-        return proxy_config.get('upstream')
-
-    @property
-    def app_label(self):
-        raise NotImplementedError('app_label attribute must be set')
-
-    def dispatch(self, request, *args, **kwargs):
-
-        if request.user.is_authenticated():
-
-            remote_user_data = {}
-
-            remote_user_data['email'] = request.user.email
-            remote_user_data['name'] = request.user.get_full_name()
-
-            request.META['HTTP_REMOTE_USER_DATA'] = json.dumps(
-                remote_user_data,
-                sort_keys=True,
-                )
-
-        return super(ColabProxyView, self).dispatch(request, *args, **kwargs)
diff --git a/colab/proxy/redmine/apps.py b/colab/proxy/redmine/apps.py
index 7b9a862..1076304 100644
--- a/colab/proxy/redmine/apps.py
+++ b/colab/proxy/redmine/apps.py
@@ -1,5 +1,5 @@
 
-from ..proxybase.apps import ColabProxiedAppConfig
+from ..utils.apps import ColabProxiedAppConfig
 
 
 class ProxyRedmineAppConfig(ColabProxiedAppConfig):
diff --git a/colab/proxy/redmine/diazo.xml b/colab/proxy/redmine/diazo.xml
index 1d2bf13..41e5e7e 100644
--- a/colab/proxy/redmine/diazo.xml
+++ b/colab/proxy/redmine/diazo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no" ?>
 <!DOCTYPE rules [
-<!ENTITY proxybase SYSTEM "../proxybase/diazobase.xml">
+<!ENTITY proxybase SYSTEM "../utils/diazobase.xml">
 ]>
 
 <rules
@@ -8,7 +8,7 @@
     xmlns:css="http://namespaces.plone.org/diazo/css"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-  <!-- Includes base proxybase/diazobase.xml rules -->
+  <!-- Includes base utils/diazobase.xml rules -->
   &proxybase;
 
   <!-- Redmine specific rules -->
diff --git a/colab/proxy/redmine/views.py b/colab/proxy/redmine/views.py
index b262b08..34f6f06 100644
--- a/colab/proxy/redmine/views.py
+++ b/colab/proxy/redmine/views.py
@@ -1,7 +1,7 @@
 
 from django.conf import settings
 
-from ..proxybase.views import ColabProxyView
+from ..utils.views import ColabProxyView
 
 
 class RedmineProxyView(ColabProxyView):
diff --git a/colab/proxy/trac/views.py b/colab/proxy/trac/views.py
index cf0975f..d7291e4 100644
--- a/colab/proxy/trac/views.py
+++ b/colab/proxy/trac/views.py
@@ -3,7 +3,7 @@ from django.conf import settings
 
 from hitcounter.views import HitCounterViewMixin
 
-from ..proxybase.views import ColabProxyView
+from ..utils.views import ColabProxyView
 from .models import Wiki, Ticket, Revision
 
 
diff --git a/colab/proxy/utils/__.init__.py b/colab/proxy/utils/__.init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/colab/proxy/utils/__.init__.py
diff --git a/colab/proxy/utils/apps.py b/colab/proxy/utils/apps.py
new file mode 100644
index 0000000..cc77887
--- /dev/null
+++ b/colab/proxy/utils/apps.py
@@ -0,0 +1,4 @@
+from django.apps import AppConfig
+
+class ColabProxiedAppConfig(AppConfig):
+    colab_proxied_app = True
diff --git a/colab/proxy/utils/diazobase.xml b/colab/proxy/utils/diazobase.xml
new file mode 100644
index 0000000..e90277f
--- /dev/null
+++ b/colab/proxy/utils/diazobase.xml
@@ -0,0 +1,14 @@
+<!--
+  This file will be included as a base rules for all diazo rules.
+  e.g.: The file proxy/noosfero/diazo.xml the first lines indicates this source file and this code will be replaced in &proxybase; 
+-->
+<rules
+    xmlns="http://namespaces.plone.org/diazo"
+    xmlns:css="http://namespaces.plone.org/diazo/css"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+    <before theme-children="/html/head" content-children="/html/head" />
+    <before css:theme-children="#main-content" css:content-children="body" />
+
+    <merge attributes="class" css:theme="body" css:content="body" />
+</rules>
diff --git a/colab/proxy/utils/views.py b/colab/proxy/utils/views.py
new file mode 100644
index 0000000..bfbc58a
--- /dev/null
+++ b/colab/proxy/utils/views.py
@@ -0,0 +1,36 @@
+import json
+
+from django.conf import settings
+
+from revproxy.views import ProxyView
+
+
+class ColabProxyView(ProxyView):
+    add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
+    diazo_theme_template = 'base.html'
+    html5 = True
+
+    @property
+    def upstream(self):
+        proxy_config = settings.PROXIED_APPS.get(self.app_label, {})
+        return proxy_config.get('upstream')
+
+    @property
+    def app_label(self):
+        raise NotImplementedError('app_label attribute must be set')
+
+    def dispatch(self, request, *args, **kwargs):
+
+        if request.user.is_authenticated():
+
+            remote_user_data = {}
+
+            remote_user_data['email'] = request.user.email
+            remote_user_data['name'] = request.user.get_full_name()
+
+            request.META['HTTP_REMOTE_USER_DATA'] = json.dumps(
+                remote_user_data,
+                sort_keys=True,
+                )
+
+        return super(ColabProxyView, self).dispatch(request, *args, **kwargs)
--
libgit2 0.21.2