Made some modifications.

README

@@ -8,8 +8,12 @@ Requirements
 
  * Django_ >= 1.1
  * `Django Taggit`_ >= 0.4.0
- * `Asgard Utilities`_ == trunk
+
+Optional Requirements
+---------------------
+
+ * `Django Markup`_ >= 0.3
 
 .. _Django: http://djangoproject.org/
 .. _Django Taggit: http://pypi.python.org/pypi/django-taggit
-.. _Asgard Utilities: http://github.com/asgardproject/asgard-utils
+.. _Django Markup: http://pypi.python.org/pypi/django-markup

bookmarks/feeds.py

@@ -1,7 +1,7 @@
 from django.contrib.sites.models import Site
 from django.core.urlresolvers import reverse
 from django.core.exceptions import ObjectDoesNotExist
-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.contrib.syndication.views import Feed, FeedDoesNotExist
 
 from bookmarks.models import Bookmark
 

bookmarks/fixtures/bookmarks.json

@@ -8,9 +8,8 @@
 			"url": "http://google.com/",
 
 			"body": "Google is a Search Engine.",
-			"body_markup_choices": "plain",
-			"body_html": "<p>Google is a Search Engine.</p>",
-
+			"markup": "linebreaks",
+
 			"author": 1,
 
 			"published": "2009-07-31",
@@ -27,8 +26,7 @@
 			"url": "http://yahoo.com/",
 
 			"body": "Yahoo! is a Search Engine.",
-			"body_markup_choices": "plain",
-			"body_html": "<p>Yahoo! is a Search Engine.</p>",
+			"markup": "linebreaks",
 
 			"author": 1,
 

bookmarks/managers.py

@@ -19,7 +19,7 @@ def search(self, search_terms):
 
 		for term in terms:
 			q_objects.append(Q(title__icontains=term))
-			q_objects.append(Q(body_html__icontains=term))
+			q_objects.append(Q(body__icontains=term))
 
 		qs = self.get_query_set().filter(published__lte=datetime.now())
 		return qs.filter(reduce(operator.or_, q_objects))

bookmarks/models.py

@@ -27,7 +27,6 @@ class Bookmark(models.Model):
 	title = models.CharField(_('title'), max_length=1000)
 	body = models.TextField(_('body'), null=True, blank=True)
 	url = models.URLField(_('URL'), max_length=1000)
-	tags = TaggableManager()
 
 	author = models.ForeignKey(User, verbose_name=_('author'))
 
@@ -37,6 +36,8 @@ class Bookmark(models.Model):
 
 	comments = generic.GenericRelation(Comment, object_id_field='object_pk')
 
+	tags = TaggableManager()
+
 	if MarkupField:
 		markup = MarkupField(default='none')
 

bookmarks/tests.py

@@ -58,11 +58,11 @@ def testTagDetail(self):
 		self.assertEquals(response.status_code, 200)
 
 	def testBookmarkFeed(self):
-		response = self.client.get(reverse('feeds', args=['bookmarks',]))
+		response = self.client.get(reverse('bookmarks_bookmark_feed'))
 		self.assertEquals(response.status_code, 200)
 
 	def testBookmarkTagFeed(self):
-		response = self.client.get(reverse('feeds', args=['bookmarks-tag/person']))
+		response = self.client.get(reverse('bookmarks_bookmark_tag_feed', args=['person']))
 		self.assertEquals(response.status_code, 200)
 
 	def testBookmarkSitemap(self):

bookmarks/testurls.py

@@ -6,11 +6,6 @@
 
 admin.autodiscover()
 
-feeds = {
-	'bookmarks': BookmarkFeed,
-	'bookmarks-tag': BookmarkTagFeed,
-}
-
 sitemaps = {
 	'bookmarks': BookmarkSitemap,
 	'bookmarks-tags': BookmarkTagSitemap,
@@ -22,12 +17,6 @@
 
 	(r'^bookmarks/', include('bookmarks.urls')),
 
-	url(r'^feeds/(?P<url>.*)/$',
-		'django.contrib.syndication.views.feed',
-		{ 'feed_dict': feeds },
-		name = 'feeds'
-	),
-
 	url(r'^sitemap.xml$',
 		'django.contrib.sitemaps.views.sitemap',
 		{ 'sitemaps': sitemaps },

bookmarks/urls.py

@@ -1,6 +1,19 @@
 from django.conf.urls.defaults import *
 
-urlpatterns = patterns('bookmarks.views',
+from bookmarks.feeds import BookmarkFeed, BookmarkTagFeed
+
+urlpatterns = patterns('',
+	url(r'feed/$',
+		view = BookmarkFeed(),
+		name = 'bookmarks_bookmark_feed',
+	),
+	url(r'tag/(?P<slug>(.*))/feed/$',
+		view = BookmarkTagFeed,
+		name = 'bookmarks_bookmark_tag_feed'
+	)
+)
+
+urlpatterns += patterns('bookmarks.views',
 	url(r'^url/$',
 		view = 'url_redirect',
 		name = 'bookmark_url_redirect',