Changeset 4855

Timestamp:

03/29/07 17:13:04 (2 years ago)

Author:

bouldersprinters

Message:

boulder-oracle-sprint: Merged to [4853].

Files:

• django/branches/boulder-oracle-sprint/django/contrib/flatpages/models.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/django/template/defaulttags.py (modified) (2 diffs)
• django/branches/boulder-oracle-sprint/django/test/simple.py (modified) (1 diff)
• django/branches/boulder-oracle-sprint/docs/templates.txt (modified) (1 diff)
• django/branches/boulder-oracle-sprint/docs/testing.txt (modified) (2 diffs)
• django/branches/boulder-oracle-sprint/docs/tutorial01.txt (modified) (5 diffs)
• django/branches/boulder-oracle-sprint/tests/regressiontests/templates/tests.py (modified) (1 diff)

django/branches/boulder-oracle-sprint/django/contrib/flatpages/models.py

@@ -5 +5 @@
-
-class FlatPage(models.Model):
-
+ db_index=True,
-        help_text=_("Example: '/about/contact/'. Make sure to have leading and trailing slashes."))
-    title = models.CharField(_('title'), maxlength=200)

django/branches/boulder-oracle-sprint/django/template/defaulttags.py

@@ -281 +281 @@
-        return ''
-
+class LoremNode(Node):
+    def __init__(self, count, method, common):
+        self.count, self.method, self.common = count, method, common
+
+    def render(self, context):
+        from django.utils.lorem_ipsum import words, paragraphs
+        try:
+            count = int(self.count.resolve(context))
+        except (ValueError, TypeError):
+            count = 1
+        if self.method == 'w':
+            return words(count, common=self.common)
+        else:
+            paras = paragraphs(count, common=self.common)
+        if self.method == 'p':
+            paras = ['<p>%s</p>' % p for p in paras]
+        return '\n\n'.join(paras)
+
-class NowNode(Node):
-    def __init__(self, format_string):
@@ -770 +788 @@
-
-#@register.tag
+def lorem(parser, token):
+    """
+    Creates random latin text useful for providing test data in templates.
+
+    Usage format::
+
+        {% lorem [count] [method] [random] %}
+
+    ``count`` is a number (or variable) containing the number of paragraphs or
+    words to generate (default is 1).
+
+    ``method`` is either ``w`` for words, ``p`` for HTML paragraphs, ``b`` for
+    plain-text paragraph blocks (default is ``b``).
+
+    ``random`` is the word ``random``, which if given, does not use the common
+    paragraph (starting "Lorem ipsum dolor sit amet, consectetuer...").
+
+    Examples:
+        * ``{% lorem %}`` will output the common "lorem ipsum" paragraph
+        * ``{% lorem 3 p %}`` will output the common "lorem ipsum" paragraph
+          and two random paragraphs each wrapped in HTML ``<p>`` tags
+        * ``{% lorem 2 w random %}`` will output two random latin words
+    """
+    bits = list(token.split_contents())
+    tagname = bits[0]
+    # Random bit
+    common = bits[-1] != 'random'
+    if not common:
+        bits.pop()
+    # Method bit
+    if bits[-1] in ('w', 'p', 'b'):
+        method = bits.pop()
+    else:
+        method = 'b'
+    # Count bit
+    if len(bits) > 1:
+        count = bits.pop()
+    else:
+        count = '1'
+    count = parser.compile_filter(count)
+    if len(bits) != 1:
+        raise TemplateSyntaxError, "Incorrect format for %r tag" % tagname
+    return LoremNode(count, method, common)
+lorem = register.tag(lorem)    
+
+#@register.tag
-def now(parser, token):
-    """

django/branches/boulder-oracle-sprint/django/test/simple.py

@@ -85 +85 @@
-    teardown_test_environment()
-    
-
+ + len(result.errors)
-    

django/branches/boulder-oracle-sprint/docs/templates.txt

@@ -625 +625 @@
-
-See `Custom tag and filter libraries`_ for more information.
+
+lorem
+~~~~~
+
+Display random latin text useful for providing sample data in templates.
+
+Usage format: ``{% lorem [count] [method] [random] %}``
+
+    ===========  =============================================================
+    Argument     Description
+    ===========  =============================================================
+    ``count``    A number (or variable) containing the number of paragraphs or
+                 words to generate (default is 1).
+    ``method``   Either ``w`` for words, ``p`` for HTML paragraphs or ``b``
+                 for plain-text paragraph blocks (default is ``b``).
+    ``random``   The word ``random``, which if given, does not use the common
+                 paragraph ("Lorem ipsum dolor sit amet...") when generating
+                 text.
+
+Examples:
+
+    * ``{% lorem %}`` will output the common "lorem ipsum" paragraph.
+    * ``{% lorem 3 p %}`` will output the common "lorem ipsum" paragraph
+      and two random paragraphs each wrapped in HTML ``<p>`` tags.
+    * ``{% lorem 2 w random %}`` will output two random latin words.
-
-now

django/branches/boulder-oracle-sprint/docs/testing.txt

@@ -277 +277 @@
-                     full list of HTTP status codes.
-
-e
+is
-                     content as rendered by the view, or any error message
-                     (such as the URL for a 302 redirect).
@@ -469 +469 @@
-    FAILED (failures=1)
-
-
+
+
-
-Regardless of whether the tests pass or fail, the test database is destroyed when

django/branches/boulder-oracle-sprint/docs/tutorial01.txt

@@ -134 +134 @@
-database's connection parameters:
-
-
-More coming soon
+_psycopg2
+Other backends are `also available`_
-    * ``DATABASE_NAME`` -- The name of your database, or the full (absolute)
-      path to the database file if you're using SQLite.
@@ -144 +144 @@
-      (not used for SQLite).
-
+.. _also available: ../settings/
+
-.. admonition:: Note
-
@@ -320 +322 @@
-    python manage.py sql polls
-
-
+
+
-
-    BEGIN;
@@ -338 +341 @@
-Note the following:
-
+    * The exact output will vary depending on the database you are using.
+    
-    * Table names are automatically generated by combining the name of the app
-      (``polls``) and the lowercase name of the model -- ``poll`` and
@@ -366 +371 @@
-      construction of your models.
-
-
-
+
+
+
-
-    * ``python manage.py sqlclear polls`` -- Outputs the necessary ``DROP

django/branches/boulder-oracle-sprint/tests/regressiontests/templates/tests.py

@@ -655 +655 @@
-            'with02': ('{{ key }}{% with dict.key as key %}{{ key }}-{{ dict.key }}-{{ key }}{% endwith %}{{ key }}', {'dict': {'key':50}}, ('50-50-50', 'INVALID50-50-50INVALID')),
-
+            ### LOREM TAG ######################################################
+            'lorem01': ('{% lorem %}', {}, 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'),
+            'lorem02': ('{% lorem p %}', {}, '<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>'),
+            'lorem03': ('{% lorem 6 w %}', {}, 'lorem ipsum dolor sit amet consectetur'),
+
-            ### NOW TAG ########################################################
-            # Simple case