v1.4.0 prep - DO NOT MERGE

.gitignore

@@ -1,11 +1,11 @@
 *.pyc
 *~
 *.swp
-coverage/*
-build/*
+*.egg-info
+.tox/
+coverage*/
+build/
 docs/_build
 MANIFEST
 dist/
-audio/*
 mydatabase
-

.travis.yml

@@ -1,11 +1,14 @@
 language: python
 python:
- - 2.7
+  - 2.6
+  - 2.7
 install:
-  - ./.travis_setup
+  - pip install -r requirements/dev.txt
+  - pip install .
+  - pip install Django==$DJANGO_VERSION
 env:
-  - SKIP_COVERAGE=1 SKIP_INSTALL=1 DJANGO_VERSION=1.4.5
-  - SKIP_COVERAGE=1 SKIP_INSTALL=1 DJANGO_VERSION=1.3.1
+  - SKIP_COVERAGE=1 SKIP_INSTALL=1 DJANGO_VERSION=1.4.10
+  - SKIP_COVERAGE=1 SKIP_INSTALL=1 DJANGO_VERSION=1.3.7
 script: fab test
 notifications:
   email: false

README.rst

@@ -11,53 +11,60 @@ foundation that the rest of the Armstrong content types are built off of.
 For more information, please see the `full documentation`_.
 
 .. change this link to point to docs inside docs.armstrongcms.org once its done
-.. _full documentation: http://armstrong.github.com/armstrong.core.arm_content/
+.. _full documentation: http://armstrong.github.io/armstrong.core.arm_content/
+
 
 Installation & Configuration
 ----------------------------
-You can install the latest release of ``armstrong.core.arm_content`` using
-`pip`_:
+#. ``pip install armstrong.core.arm_content``
+
+#. Add ``taggit`` to your ``INSTALLED_APPS``
+
+*Note:* You do not need to run ``syncdb`` or ``migrate`` after installing
+because this component does not have any concrete models. For the same reason,
+you do not need to add this to INSTALLED_APPS.
 
-::
+Optional Settings & Requirements:
+"""""""""""""""""""""""""""""""""
 
-    pip install armstrong.core.arm_content
+To use the Sorl features, like ``SorlThumbnailMixin``, you'll need two things:
+  #. Add ``sorl.thumbnail`` to your ``INSTALLED_APPS``
 
-You don't need to add ``armstrong.core.arm_content`` to your installed apps
-unless you want to use the include template tags.  You can add it like this:
+  #. Install an imaging library. Sorl supports several and you'll need one
+     mentioned in their `docs`_.
 
-::
+To use the included template tags:
+  #. Add ``armstrong.core.arm_content`` to your ``INSTALLED_APPS``
 
-	INSTALLED_APPS += ["armstrong.core.arm_content", ]
+  #. Follow the above directions to install Sorl.
 
-Note that you do not need to run ``syncdb`` or ``migrate`` after installing
-``armstrong.core.arm_content`` as it does not have any models.
 
-.. _pip: http://www.pip-installer.org/
+.. _docs: http://sorl-thumbnail.readthedocs.org/en/latest/requirements.html#image-library
 
 
 State of Project
 ----------------
 Armstrong is an open-source news platform that is freely available to any
-organization.  It is the result of a collaboration between the `Texas Tribune`_
-and `Bay Citizen`_, and a grant from the `John S. and James L. Knight
-Foundation`_.
+organization. It is the result of a collaboration between the `Texas Tribune`_
+and `The Center for Investigative Reporting`_ and a grant from the
+`John S. and James L. Knight Foundation`_.
 
 To follow development, be sure to join the `Google Group`_.
 
-``armstrong.core.arm_content`` is part of the `Armstrong`_ project.  You're
+``armstrong.core.arm_content`` is part of the `Armstrong`_ project. You're
 probably looking for that.
 
 
 .. _Armstrong: http://www.armstrongcms.org/
-.. _Bay Citizen: http://www.baycitizen.org/
+.. _The Center for Investigative Reporting: http://cironline.org/
 .. _John S. and James L. Knight Foundation: http://www.knightfoundation.org/
 .. _Texas Tribune: http://www.texastribune.org/
 .. _Google Group: http://groups.google.com/group/armstrongcms
 
 
 License
 -------
-Copyright 2011-2012 Bay Citizen and Texas Tribune
+Copyright 2011-2014 Texas Tribune and The Center for Investigative Reporting
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

armstrong/core/arm_content/fields/authors.py

@@ -1,9 +1,7 @@
-from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 from django.db.models.fields.related import create_many_related_manager
-from django.db.models.fields.related import ManyRelatedObjectsDescriptor
 
 
 # TODO: find permanent home for this code

armstrong/core/arm_content/models.py

@@ -1,6 +1,5 @@
 from django.conf import settings
 from django.db import models
-from django.db.models.query import QuerySet
 from model_utils.managers import InheritanceManager
 from taggit.managers import TaggableManager
 
@@ -16,18 +15,16 @@ class ContentBase(AuthorsMixin, PublicationMixin, AccessMixin, models.Model):
     """
     The base class providing the basic "armstrong" behavior for a model.
 
-    This is provided as a way to handle cross-model querying.  For example, you
+    This is provided as a way to handle cross-model querying. For example, you
     can use this to query across Article and Video models assuming they both
     extend from a concrete implementation of this class.
 
-    This is *not* a concrete implementation.  This is to avoid having any
-    tables created that are not needed.  `armstrong.apps.content`_ provides a
+    This is *not* a concrete implementation. This is to avoid having any
+    tables created that are not needed. `armstrong.apps.content` provides a
     concrete implementation of this if you want to use it without defining your
     own base Content model.
 
-    .. _armstrong.apps.content: http://github.com/armstrongcms/armstrong.apps.content
     """
-
     title = models.CharField(max_length=255)
     summary = models.TextField()
     # TODO: Increase max length for SlugField (see Issue #43)

armstrong/core/arm_content/tests/_utils.py

@@ -1,23 +1,11 @@
-from datetime import datetime
-from django.core.files import File
-from django.conf import settings
-
 from armstrong.dev.tests.utils import ArmstrongTestCase
-from armstrong.dev.tests.utils.concrete import *
-from armstrong.dev.tests.utils.users import *
-
-import fudge
+from armstrong.dev.tests.utils.users import generate_random_staff_users
 
 
 class ArmContentTestCase(ArmstrongTestCase):
     pass
 
 
-def add_n_users_to_authors(authors, *users):
-    for user in users:
-        authors.users.add(user)
-
-
 def add_profile_to(profile_class, *users):
     for user in users:
         profile = profile_class.objects.create(user=user)