Changeset 966:79609d716c2c

Timestamp:

01/11/09 01:24:16 (3 years ago)

Author:

mitsuhiko

Branch:

default

Parents:

965:788f7d6bbbdc (diff), 961:3a38045dbdaf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automated merge with  file:///Users/mitsuhiko/Development/zine-0.1

Files:

• README (modified) (1 diff)
• zine/__init__.py (modified) (1 diff)
• zine/models.py (modified) (1 diff)
• zine/models.py (modified) (7 diffs)

README

@@ -3 +3 @@
 ===================================
 
-This is Zine 0.1.3, the third bugfix version of the first stable
-release of Zine.
+This is Zine 0.2 the second release of Zine.
 It already provides quite a few features:
 

zine/__init__.py

@@ -25 +25 @@
     :license: BSD, see LICENSE for more details.
 """
-__version__ = '0.1.3-dev'
+__version__ = '0.2-dev'
 __url__ = 'http://zine.pocoo.org/'
 

zine/models.py

@@ -568 +568 @@
         if prefix:
             prefix += '/'
-        full_slug = u'%s%04d/%02d/%02d/%s' % (
+        full_slug = u'%s%04d/%d/%d/%s' % (
             prefix,
             self.pub_date.year,

zine/models.py

@@ -9 +9 @@
     :license: BSD, see LICENSE for more details.
 """
-from math import ceil, log
+from math import log
 from datetime import date, datetime, timedelta
 from urlparse import urljoin
@@ -274 +274 @@
     """Add some extra methods to the post model."""
 
-    def lightweight(self, deferred=None, lazy=('comments',)):
+    def lightweight(self, deferred=None, lazy=None):
         """Send a lightweight query which deferes some more expensive
         things such as comment queries or even text and parser data.
         """
-        args = map(db.lazyload, lazy or ())
+        if lazy is None:
+            lazy = ('comments',)
+        args = map(db.lazyload, lazy)
+        undefer_comment_count = 'comments' in lazy
         if deferred:
+            deferred = set(deferred)
+            if 'comment_count' in deferred:
+                undefer_comment_count = False
+                deferred.remove('comment_count')
             args.extend(map(db.defer, deferred))
         # undefer the _comment_count query which is used by comment_count
         # for lightweight post objects.  See Post.comment_count for more
         # details.
-        if lazy and 'comments' in lazy:
+        if undefer_comment_count:
             args.append(db.undefer('_comment_count'))
         return self.options(*args)
+
+    def theme_lightweight(self, key):
+        """A query for lightweight settings based on the theme.  For example
+        to use the lightweight settings for the author overview page you can
+        use this query::
+
+            Post.query.theme_lightweight('author_overview')
+        """
+        theme_settings = get_application().theme.settings
+        deferred = theme_settings.get('sql.%s.deferred' % key)
+        lazy = theme_settings.get('sql.%s.lazy' % key)
+        return self.lightweight(deferred, lazy)
 
     def type(self, content_type):
@@ -769 +788 @@
         return self.filter(Comment.status == COMMENT_MODERATED)
 
-    def blocked(self):
-        """Filter all blocked comments.  Blocked comments are all comments but
-        unmoderated and moderated comments.
+    def all_blocked(self):
+        """Return all blocked comments, by user, by spam checker or by system.
         """
         return self.filter(Comment.status.in_([COMMENT_BLOCKED_USER,
                                                COMMENT_BLOCKED_SPAM,
                                                COMMENT_BLOCKED_SYSTEM]))
+
+    def blocked(self):
+        """Filter all comments blocked by user(s)
+        """
+        return self.filter(Comment.status == COMMENT_BLOCKED_USER)
+
     def unmoderated(self):
         """Filter all the unmoderated comments and comments blocked by a user
         or system.
         """
-        return self.filter(Comment.status.in_([COMMENT_UNMODERATED,
-                                               COMMENT_BLOCKED_USER,
-                                               COMMENT_BLOCKED_SYSTEM]))
+        return self.filter(Comment.status == COMMENT_UNMODERATED)
 
     def spam(self):
         """Filter all the spam comments."""
         return self.filter(Comment.status == COMMENT_BLOCKED_SPAM)
+
+    def system(self):
+        """Filter all the spam comments."""
+        return self.filter(Comment.status == COMMENT_BLOCKED_SYSTEM)
 
     def latest(self, limit=None, ignore_privileges=False, ignore_blocked=True):
@@ -1040 +1066 @@
     'posts':            db.dynamic_loader(Post,
                                           backref=db.backref('author', lazy=False),
+                                          query_class=PostQuery,
                                           cascade='all, delete, delete-orphan'),
     'comments':         db.dynamic_loader(Comment,
@@ -1052 +1079 @@
     'id':               groups.c.group_id,
     'users':            db.dynamic_loader(User, backref=db.backref('groups', lazy=True),
+                                          query_class=UserQuery,
                                           secondary=group_users),
     '_privileges':      db.relation(_Privilege, lazy=True,
@@ -1063 +1091 @@
 db.mapper(Category, categories, properties={
     'id':               categories.c.category_id,
-    'posts':            db.dynamic_loader(Post, secondary=post_categories)
+    'posts':            db.dynamic_loader(Post, secondary=post_categories,
+                                          query_class=PostQuery)
 }, order_by=categories.c.name)
 db.mapper(Comment, comments, properties={
@@ -1084 +1113 @@
 db.mapper(Tag, tags, properties={
     'id':           tags.c.tag_id,
-    'posts':        db.dynamic_loader(Post, secondary=post_tags)
+    'posts':        db.dynamic_loader(Post, secondary=post_tags,
+                                      query_class=PostQuery)
 }, order_by=tags.c.name)
 db.mapper(Post, posts, properties={