Abstracting the pager and improving the pagination system

controllers/commitController.php

@@ -2,13 +2,8 @@
 
 $app->get('{repo}/commits/{branch}', function($repo, $branch) use($app) {
     $repository = $app['git']->getRepository($app['git.repos'] . $repo);
-    $pageNumber = $app['request']->get('page');
-    $pageNumber = (empty($pageNumber)) ? 0 : $pageNumber;
-    $totalCommits = $repository->getTotalCommits();
-    $lastPage = intval($totalCommits / 15);
-    // If total commits are integral multiple of 15, the lastPage will be commits/15 - 1.
-    $lastPage = ($lastPage * 15 == $totalCommits) ? $lastPage - 1 : $lastPage;
-    $commits = $repository->getCommits(null, $pageNumber);
+    $pager = $app['utils']->getPager($app['request']->get('page'), $repository->getTotalCommits());
+    $commits = $repository->getCommits(null, $pager['current']);
 
     foreach ($commits as $commit) {
         $date = $commit->getDate();
@@ -19,8 +14,7 @@ $app->get('{repo}/commits/{branch}', function($repo, $branch) use($app) {
     return $app['twig']->render('commits.twig', array(
         'baseurl'        => $app['baseurl'],
         'page'           => 'commits',
-        'pagenumber'     => $pageNumber,
-        'lastpage'       => $lastPage,
+        'pager'          => $pager,
         'repo'           => $repo,
         'branch'         => $branch,
         'branches'       => $repository->getBranches(),
@@ -33,10 +27,8 @@ $app->get('{repo}/commits/{branch}', function($repo, $branch) use($app) {
 
 $app->get('{repo}/commits/{branch}/{file}/', function($repo, $branch, $file) use($app) {
     $repository = $app['git']->getRepository($app['git.repos'] . $repo);
-    $pageNumber = $app['request']->get('page');
-    $pageNumber = (empty($pageNumber)) ? 0 : $pageNumber;
-    $lastPage = round($repository->getTotalCommits() / 15, 0, PHP_ROUND_HALF_UP);
-    $commits = $repository->getCommits($file, $pagenumber);
+    $pager = $app['utils']->getPager($app['request']->get('page'), $repository->getTotalCommits($file));
+    $commits = $repository->getCommits($file, $pager['current']);
 
     foreach ($commits as $commit) {
         $date = $commit->getDate();
@@ -47,8 +39,7 @@ $app->get('{repo}/commits/{branch}/{file}/', function($repo, $branch, $file) use
     return $app['twig']->render('commits.twig', array(
         'baseurl'        => $app['baseurl'],
         'page'           => 'commits',
-        'pagenumber'     => $pageNumber,
-        'lastpage'       => $lastPage,
+        'pager'          => $pager,
         'repo'           => $repo,
         'branch'         => $branch,
         'branches'       => $repository->getBranches(),

lib/Application/Utils.php

@@ -203,4 +203,21 @@ class Utils
                 return 'text';
         }
     }
+
+    public function getPager($pageNumber, $totalCommits)
+    {
+        $pageNumber = (empty($pageNumber)) ? 0 : $pageNumber;
+        $lastPage = intval($totalCommits / 15);
+        // If total commits are integral multiple of 15, the lastPage will be commits/15 - 1.
+        $lastPage = ($lastPage * 15 == $totalCommits) ? $lastPage - 1 : $lastPage;
+        $nextPage = $pageNumber + 1;
+        $previousPage = $pageNumber - 1;
+
+        return array('current' => $pageNumber,
+                     'next' => $nextPage,
+                     'previous' => $previousPage,
+                     'last' => $lastPage,
+                     'total' => $totalCommits,
+        );
+    }
 }

lib/Git/Repository.php

@@ -222,9 +222,15 @@ class Repository
      * @access public
      * @return integer Total number of commits
      */
-    public function getTotalCommits()
+    public function getTotalCommits($file = null)
     {
-        $commits = $this->getClient()->run($this, "rev-list --all --count");
+        $command = "rev-list --all --count";
+        
+        if ($file) {
+            $command .= " $file";
+        }
+
+        $commits = $this->getClient()->run($this, $command);
         return $commits;
     }
     

views/commits.twig

@@ -40,14 +40,14 @@
     {% endfor %}
 
     <ul class="pager">
-        {% if pagenumber != 0 %}
+        {% if pager.current != 0 %}
         <li class="previous">
-            <a href="?page={{ pagenumber - 1 }}">&larr; Older</a>
+            <a href="?page={{ pager.previous }}">&larr; Older</a>
         </li>
         {% endif %}
-        {% if pagenumber != lastpage %}
+        {% if pager.current != pager.last %}
         <li class="next">
-            <a href="?page={{ pagenumber + 1 }}">Newer &rarr;</a>
+            <a href="?page={{ pager.next }}">Newer &rarr;</a>
         </li>
         {% endif %}
     </ul>