zine / files

     1.1 --- a/INSTALL	Wed Dec 24 15:36:38 2008 +0100
     1.2 +++ b/INSTALL	Wed Dec 24 16:19:52 2008 +0100
     1.3 @@ -8,7 +8,7 @@
     1.4  - Werkzeug*
     1.5  - Jinja2*
     1.6  - A database (MySQL, SQLite or PostgreSQL and others are supported)
     1.7 -- SQLAlchemy 0.5 [revision>=5491] or higher*
     1.8 +- SQLAlchemy 0.5
     1.9  - simplejson* [included in Python 2.6 and higher]
    1.10  - html5lib*
    1.11  - pytz*

     2.1 --- a/zine/__init__.py	Wed Dec 24 15:36:38 2008 +0100
     2.2 +++ b/zine/__init__.py	Wed Dec 24 16:19:52 2008 +0100
     2.3 @@ -24,7 +24,7 @@
     2.4      :copyright: 2007-2008 by Armin Ronacher.
     2.5      :license: BSD, see LICENSE for more details.
     2.6  """
     2.7 -__version__ = '0.1-dev'
     2.8 +__version__ = '0.1'
     2.9  __url__ = 'http://zine.pocoo.org/'
    2.10  
    2.11  

     3.1 --- a/zine/models.py	Wed Dec 24 15:36:38 2008 +0100
     3.2 +++ b/zine/models.py	Wed Dec 24 16:19:52 2008 +0100
     3.3 @@ -954,7 +954,6 @@
     3.4      'id':               users.c.user_id,
     3.5      'display_name':     db.synonym('_display_name', map_column=True),
     3.6      'posts':            db.dynamic_loader(Post, backref='author',
     3.7 -                                          query_class=PostQuery,
     3.8                                            cascade='all, delete, delete-orphan'),
     3.9      'comments':         db.dynamic_loader(Comment, backref='user',
    3.10                                            cascade='all, delete, delete-orphan'),
    3.11 @@ -966,7 +965,6 @@
    3.12  db.mapper(Group, groups, properties={
    3.13      'id':               groups.c.group_id,
    3.14      'users':            db.dynamic_loader(User, backref='groups',
    3.15 -                                          query_class=UserQuery,
    3.16                                            secondary=group_users),
    3.17      '_privileges':      db.relation(_Privilege, lazy=True,
    3.18                                      secondary=group_privileges,
    3.19 @@ -978,8 +976,7 @@
    3.20  })
    3.21  db.mapper(Category, categories, properties={
    3.22      'id':               categories.c.category_id,
    3.23 -    'posts':            db.dynamic_loader(Post, secondary=post_categories,
    3.24 -                                          query_class=PostQuery)
    3.25 +    'posts':            db.dynamic_loader(Post, secondary=post_categories)
    3.26  }, order_by=categories.c.name)
    3.27  db.mapper(Comment, comments, properties={
    3.28      'id':           comments.c.comment_id,
    3.29 @@ -1000,8 +997,7 @@
    3.30  })
    3.31  db.mapper(Tag, tags, properties={
    3.32      'id':           tags.c.tag_id,
    3.33 -    'posts':        db.dynamic_loader(Post, secondary=post_tags,
    3.34 -                                      query_class=PostQuery)
    3.35 +    'posts':        db.dynamic_loader(Post, secondary=post_tags)
    3.36  }, order_by=tags.c.name)
    3.37  db.mapper(Post, posts, properties={
    3.38      'id':               posts.c.post_id,

     4.1 --- a/zine/views/blog.py	Wed Dec 24 15:36:38 2008 +0100
     4.2 +++ b/zine/views/blog.py	Wed Dec 24 16:19:52 2008 +0100
     4.3 @@ -106,9 +106,9 @@
     4.4      :URL endpoint: ``blog/show_category``
     4.5      """
     4.6      category = Category.query.filter_by(slug=slug).first(True)
     4.7 -    data = category.posts.published().get_list(page=page,
     4.8 -                                               endpoint='blog/show_category',
     4.9 -                                               url_args=dict(slug=slug))
    4.10 +    data = Post.query.filter(Post.categories.contains(category)) \
    4.11 +               .published().get_list(page=page, endpoint='blog/show_category',
    4.12 +                                     url_args=dict(slug=slug))
    4.13  
    4.14      add_link('alternate', url_for('blog/atom_feed', category=slug),
    4.15               'application/atom+xml', _(u'All posts in category %s') % category.name)
    4.16 @@ -133,8 +133,9 @@
    4.17      :URL endpoint: ``blog/show_tag``
    4.18      """
    4.19      tag = Tag.query.filter_by(slug=slug).first(True)
    4.20 -    data = tag.posts.published().get_list(page=page, endpoint='blog/show_tag',
    4.21 -                                          url_args=dict(slug=slug))
    4.22 +    data = Post.query.filter(Post.tags.contains(tag)) \
    4.23 +               .published().get_list(page=page, endpoint='blog/show_tag',
    4.24 +                                     url_args=dict(slug=slug))
    4.25  
    4.26      add_link('alternate', url_for('blog/atom_feed', tag=slug),
    4.27               'application/atom+xml', _(u'All posts tagged %s') % tag.name)