# HG changeset patch
# User Daniele Nicolodi <daniele@grinta.net>
# Date 1313431559 -7200
# Node ID 90c1fa07f6a7c25c623abbc0dc41177091bc1a2c
# Parent  543f68b3a8f08417f612385430cc4e913db3a247
Small tweaks to pagination API. Extend unit tests.

diff -r 543f68b3a8f0 -r 90c1fa07f6a7 src/ltpdarepo/pagination.py
--- a/src/ltpdarepo/pagination.py	Mon Aug 15 20:05:13 2011 +0200
+++ b/src/ltpdarepo/pagination.py	Mon Aug 15 20:05:59 2011 +0200
@@ -8,10 +8,6 @@
         self.items = items
 
     @property
-    def page(self):
-        return self.current
-
-    @property
     def pages(self):
         return int(ceil(self.count / float(self.size)))
 
@@ -24,9 +20,9 @@
         return self.current < self.pages
 
     @property
-    def slice(self):
+    def limits(self):
         start = (self.current - 1) * self.size
-        return slice(start, start + self.size)
+        return start, self.size
 
     def __iter__(self):
         # cache number of pages
diff -r 543f68b3a8f0 -r 90c1fa07f6a7 src/ltpdarepo/templates/pagination.html
--- a/src/ltpdarepo/templates/pagination.html	Mon Aug 15 20:05:13 2011 +0200
+++ b/src/ltpdarepo/templates/pagination.html	Mon Aug 15 20:05:59 2011 +0200
@@ -1,12 +1,12 @@
 {% macro render(pagination) %}
   <div class="pagination wrapper">
   {% if pagination.has_prev %}
-    <a class="prev" href="{{ url_for_other_page(pagination.page - 1) }}" alt="prev">&laquo;</a>
+    <a class="prev" href="{{ url_for_other_page(pagination.current - 1) }}" alt="prev">&laquo;</a>
   {% else %}
     <span class="prev discrete">&laquo;</span>
   {% endif %}
-  {%- for page in pagination %}
-    {% if page > 0%}
+  {% for page in pagination %}
+    {% if page > 0 %}
       {% if page != pagination.current %}
         <a href="{{ url_for_other_page(page) }}">{{ page }}</a>
       {% else %}
@@ -15,9 +15,9 @@
     {% else %}
       <span class="ellipsis">&hellip;</span>
     {% endif %}
-  {%- endfor %}
+  {% endfor %}
   {% if pagination.has_next %}
-    <a class="next" href="{{ url_for_other_page(pagination.page + 1) }}" alt="next">&raquo;</a>
+    <a class="next" href="{{ url_for_other_page(pagination.current + 1) }}" alt="next">&raquo;</a>
   {% else %}
     <span class="next discrete">&raquo;</span>
   {% endif %}
diff -r 543f68b3a8f0 -r 90c1fa07f6a7 src/ltpdarepo/tests/test_pagination.py
--- a/src/ltpdarepo/tests/test_pagination.py	Mon Aug 15 20:05:13 2011 +0200
+++ b/src/ltpdarepo/tests/test_pagination.py	Mon Aug 15 20:05:59 2011 +0200
@@ -9,71 +9,99 @@
 
     def test_zero_elements(self):
         p = Pagination(1, 0, size)
-        l = list(p)
-        self.assertEqual(l, [])
+        self.assertEqual(list(p), [])
+        self.assertFalse(p.has_prev)
+        self.assertFalse(p.has_next)
 
     def test_one_page(self):
         p = Pagination(1, 1, size)
-        l = list(p)
-        self.assertEqual(l, [1])
+        self.assertEqual(list(p), [1])
+        self.assertFalse(p.has_prev)
+        self.assertFalse(p.has_next)
 
         p = Pagination(1, 2, size)
-        l = list(p)
-        self.assertEqual(l, [1])
+        self.assertEqual(list(p), [1])
+        self.assertFalse(p.has_prev)
+        self.assertFalse(p.has_next)
 
     def test_two_pages(self):
         p = Pagination(1, 18, size)
-        l = list(p)
-        self.assertEqual(l, [1, 2])
+        self.assertEqual(list(p), [1, 2])
+        self.assertFalse(p.has_prev)
+        self.assertTrue(p.has_next)
+        self.assertEqual(p.limits, (0, size))
 
         p = Pagination(1, 20, size)
-        l = list(p)
-        self.assertEqual(l, [1, 2])
+        self.assertEqual(list(p), [1, 2])
+        self.assertFalse(p.has_prev)
+        self.assertTrue(p.has_next)
+        self.assertEqual(p.limits, (0, size))
+
+        p = Pagination(2, 20, size)
+        self.assertEqual(list(p), [1, 2])
+        self.assertTrue(p.has_prev)
+        self.assertFalse(p.has_next)
+        self.assertEqual(p.limits, (10, size))
 
     def test_pages_without_ellipsis(self):
+        # 7 elements pagination control should not use ellipsis up to 7 pages
         for i in range(1, 8):
             p = Pagination(1, size*i, size)
-            l = list(p)
-            self.assertEqual(l, range(1, i + 1))
+            self.assertEqual(list(p), range(1, i+1))
 
     def test_pages_with_ellipsis(self):
-
+        # test the 7 elements pagination control with 15 pages
         npages = 15
         nitems = size*npages
 
-        for i in range(1, 4):
-            p = Pagination(i, nitems, size)
-            l = list(p)
-            self.assertEqual(len(l), 7)
-            self.assertEqual(l, [1, 2, 3, 4, 5, -9, 15])
+        # ellipsis just at the end
+        p = Pagination(1, nitems, size)
+        l = list(p)
+        self.assertEqual(len(l), 7)
+        self.assertEqual(l, [1, 2, 3, 4, 5, -9, 15])
+        self.assertFalse(p.has_prev)
+        self.assertTrue(p.has_next)
 
-        p = Pagination(6, nitems, size)
+        p = Pagination(4, nitems, size)
         l = list(p)
         self.assertEqual(len(l), 7)
-        self.assertEqual(l, [1, -3, 5, 6, 7, -7, 15])
+        self.assertEqual(l, [1, 2, 3, 4, 5, -9, 15])
+        self.assertTrue(p.has_prev)
+        self.assertTrue(p.has_next)
 
-        p = Pagination(7, nitems, size)
+        # ellipsis on both sides
+        p = Pagination(5, nitems, size)
         l = list(p)
         self.assertEqual(len(l), 7)
-        self.assertEqual(l, [1, -4, 6, 7, 8, -6, 15])
+        self.assertEqual(l, [1, -2, 4, 5, 6, -8, 15])
+        self.assertTrue(p.has_prev)
+        self.assertTrue(p.has_next)
 
         p = Pagination(8, nitems, size)
         l = list(p)
         self.assertEqual(len(l), 7)
         self.assertEqual(l, [1, -5, 7, 8, 9, -5, 15])
+        self.assertTrue(p.has_prev)
+        self.assertTrue(p.has_next)
 
-        p = Pagination(9, nitems, size)
+        p = Pagination(11, nitems, size)
         l = list(p)
         self.assertEqual(len(l), 7)
-        self.assertEqual(l, [1, -6, 8, 9, 10, -4, 15])
+        self.assertEqual(l, [1, -8, 10, 11, 12, -2, 15])
+        self.assertTrue(p.has_prev)
+        self.assertTrue(p.has_next)
 
-        p = Pagination(10, nitems, size)
+        # ellipsis just at the beginning
+        p = Pagination(12, nitems, size)
         l = list(p)
         self.assertEqual(len(l), 7)
-        self.assertEqual(l, [1, -7, 9, 10, 11, -3, 15])
+        self.assertEqual(l, [1, -9, 11, 12, 13, 14, 15])
+        self.assertTrue(p.has_prev)
+        self.assertTrue(p.has_next)
 
-        for i in range(12, 15):
-            p = Pagination(i, nitems, size)
-            l = list(p)
-            self.assertEqual(len(l), 7)
-            self.assertEqual(l, [1, -9, 11, 12, 13, 14, 15])
+        p = Pagination(15, nitems, size)
+        l = list(p)
+        self.assertEqual(len(l), 7)
+        self.assertEqual(l, [1, -9, 11, 12, 13, 14, 15])
+        self.assertTrue(p.has_prev)
+        self.assertFalse(p.has_next)