X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/b9fa0c3d279f093b326ac1bc8dd431fa78f900b3..9c6f7a4f5ddd6758197a552bbc689868cf99054c:/contrib/penfield/utils.py

diff --git a/contrib/penfield/utils.py b/contrib/penfield/utils.py
index 3fe7e72..bfa08d0 100644
--- a/contrib/penfield/utils.py
+++ b/contrib/penfield/utils.py
@@ -1,7 +1,7 @@
 from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed
 from django.conf.urls.defaults import url, patterns
-from django.core.urlresolvers import reverse
 from django.http import HttpResponse
+from philo.utils import paginate
 
 
 class FeedMultiViewMixin(object):
@@ -14,27 +14,28 @@ class FeedMultiViewMixin(object):
 	feeds_enabled = True
 	atom_feed = Atom1Feed
 	rss_feed = Rss201rev2Feed
-	feed_description = ''
+	feed_title = None
+	feed_description = None
 	list_var = 'objects'
 	
 	def page_view(self, func, page):
 		"""
 		Wraps an object-fetching function and renders the results as a page.
 		"""
-		def inner(request, node=None, extra_context=None, **kwargs):
-			objects, extra_context = func(request=request, node=node, extra_context=extra_context, **kwargs)
+		def inner(request, extra_context=None, **kwargs):
+			objects, extra_context = func(request=request, extra_context=extra_context, **kwargs)
 
 			context = self.get_context()
 			context.update(extra_context or {})
 
-			if 'page' in kwargs or 'page' in request.GET:
+			if 'page' in kwargs or 'page' in request.GET or (hasattr(self, 'per_page') and self.per_page):
 				page_num = kwargs.get('page', request.GET.get('page', 1))
 				paginator, paginated_page, objects = paginate(objects, self.per_page, page_num)
 				context.update({'paginator': paginator, 'paginated_page': paginated_page, self.list_var: objects})
 			else:
 				context.update({self.list_var: objects})
 
-			return page.render_to_response(node, request, extra_context=context)
+			return page.render_to_response(request, extra_context=context)
 
 		return inner
 	
@@ -42,18 +43,24 @@ class FeedMultiViewMixin(object):
 		"""
 		Wraps an object-fetching function and renders the results as a rss or atom feed.
 		"""
-		def inner(request, node=None, extra_context=None, **kwargs):
-			objects, extra_context = func(request=request, node=node, extra_context=extra_context, **kwargs)
+		def inner(request, extra_context=None, **kwargs):
+			objects, extra_context = func(request=request, extra_context=extra_context, **kwargs)
 	
 			if 'HTTP_ACCEPT' in request.META and 'rss' in request.META['HTTP_ACCEPT'] and 'atom' not in request.META['HTTP_ACCEPT']:
 				feed_type = 'rss'
 			else:
 				feed_type = 'atom'
 			
-			feed = self.get_feed(feed_type, request, node, kwargs, reverse_name)
+			feed_kwargs = {
+				'link': request.node.construct_url(subpath=self.reverse(reverse_name, kwargs=kwargs), request=request, with_domain=True)
+			}
+			feed = self.get_feed(feed_type, extra_context, feed_kwargs)
 			
 			for obj in objects:
-				feed.add_item(obj.title, '/%s/%s/' % (node.get_absolute_url().strip('/'), self.get_subpath(obj).strip('/')), description=self.get_obj_description(obj))
+				kwargs = {
+					'link': request.node.construct_url(subpath=self.reverse(obj=obj), request=request, with_domain=True)
+				}
+				self.add_item(feed, obj, kwargs=kwargs)
 	
 			response = HttpResponse(mimetype=feed.mime_type)
 			feed.write(response, 'utf-8')
@@ -61,22 +68,31 @@ class FeedMultiViewMixin(object):
 
 		return inner
 	
-	def get_feed(self, feed_type, request, node, kwargs, reverse_name):
-		title = self.feed_title
-		link = '/%s/%s/' % (node.get_absolute_url().strip('/'), reverse(reverse_name, urlconf=self, kwargs=kwargs).strip('/'))
-		description = self.feed_description
+	def get_feed(self, feed_type, extra_context, kwargs=None):
+		defaults = {
+			'description': ''
+		}
+		defaults.update(kwargs or {})
+		
 		if feed_type == 'rss':
-			return self.rss_feed(title, link, description)
+			return self.rss_feed(**defaults)
+		
+		if 'description' in defaults and defaults['description'] and 'subtitle' not in defaults:
+			defaults['subtitle'] = defaults['description']
 		
-		return self.atom_feed(title, link, description, subtitle=description)
+		return self.atom_feed(**defaults)
 	
 	def feed_patterns(self, object_fetcher, page, base_name):
-		feed_name = '%s_feed' % base_name
 		urlpatterns = patterns('',
-			url(r'^%s/$' % self.feed_suffix, self.feed_view(object_fetcher, feed_name), name=feed_name),
 			url(r'^$', self.page_view(object_fetcher, page), name=base_name)
 		)
+		if self.feeds_enabled:
+			feed_name = '%s_feed' % base_name
+			urlpatterns = patterns('',
+				url(r'^%s$' % self.feed_suffix, self.feed_view(object_fetcher, feed_name), name=feed_name),
+			) + urlpatterns
 		return urlpatterns
 	
-	def get_obj_description(self, obj):
-		raise NotImplementedError
\ No newline at end of file
+	def add_item(self, feed, obj, kwargs=None):
+		defaults = kwargs or {}
+		feed.add_item(**defaults)
\ No newline at end of file