Added $page->itemsCount. Move set of $page->hasPrev to separate pipe.

makedo · makedo · commit 91cf00a376b2 · 2019-08-19T23:03:23.000+03:00
diff --git a/examples/count.php b/examples/count.php
@@ -37,6 +37,7 @@
 var_dump($page->hasNext);
 var_dump($page->hasPrev);
 var_dump($page->items->count());
+var_dump($page->itemsCount);
 foreach ($page->items as $user) {
     var_dump($user);
 }
diff --git a/examples/id.php b/examples/id.php
@@ -32,6 +32,7 @@
 var_dump($page->hasNext);
 var_dump($page->hasPrev);
 var_dump($page->items->count());
+var_dump($page->itemsCount);
 foreach ($page->items as $user) {
     var_dump($user);
 }
diff --git a/examples/offset.php b/examples/offset.php
@@ -28,6 +28,8 @@
 var_dump($page->hasNext);
 var_dump($page->hasPrev);
 var_dump($page->items->count());
+var_dump($page->itemsCount);
+
 foreach ($page->items as $user) {
     var_dump($user);
 }
diff --git a/spec/Paginator/Page/Builder/CountItemsSpec.php b/spec/Paginator/Page/Builder/CountItemsSpec.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace spec\Makedo\Paginator\Page\Builder;
+
+use Makedo\Paginator\Loader\Result;
+use Makedo\Paginator\Page\Builder\CountItems;
+use Makedo\Paginator\Page\Builder\Pipe;
+use Makedo\Paginator\Page\Page;
+use PhpSpec\ObjectBehavior;
+
+class CountItemsSpec extends ObjectBehavior
+{
+    const PER_PAGE = 3;
+
+    function it_is_initializable()
+    {
+        $this->shouldHaveType(CountItems::class);
+        $this->shouldImplement(Pipe::class);
+    }
+
+    function it_sets_items_count(Page $page)
+    {
+        $page = $page->getWrappedObject();
+        $page->items = Result::fromIterable([1,2,3]);
+        $page->perPage = 10;
+
+        $page = $this->build($page);
+
+        $page->itemsCount->shouldBe(self::PER_PAGE);
+    }
+
+    function it_sets_items_count_as_per_page(Page $page)
+    {
+        $page = $page->getWrappedObject();
+
+        $page->items = Result::fromIterable([1,2,3,4]);
+        $page->perPage = self::PER_PAGE;
+
+        $page = $this->build($page);
+
+        $page->itemsCount->shouldBe(self::PER_PAGE);
+    }
+}
diff --git a/spec/Paginator/Page/Builder/HasPrevSpec.php b/spec/Paginator/Page/Builder/HasPrevSpec.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace spec\Makedo\Paginator\Page\Builder;
+
+use Makedo\Paginator\Page\Builder\HasPrev;
+use Makedo\Paginator\Page\Builder\Pipe;
+use Makedo\Paginator\Page\Page;
+use Makedo\Paginator\Strategy\Skip\Skip;
+use PhpSpec\ObjectBehavior;
+
+class HasPrevSpec extends ObjectBehavior
+{
+    function let(Skip $skip)
+    {
+        $this->beConstructedWith($skip);
+    }
+
+    function it_is_initializable()
+    {
+        $this->shouldHaveType(HasPrev::class);
+        $this->shouldImplement(Pipe::class);
+    }
+
+    function it_sets_has_prev_as_has_skip(Skip $skip, Page $page)
+    {
+        $skip->hasSkip()->willReturn(true);
+
+        $page = $page->getWrappedObject();
+
+        $page = $this->build($page);
+
+        $page->hasPrev->shouldBe(true);
+    }
+
+}
diff --git a/spec/Paginator/Page/Builder/LoadItemsSpec.php b/spec/Paginator/Page/Builder/LoadItemsSpec.php
@@ -42,12 +42,6 @@ public function it_fills_page_with_items(
             ->shouldBeCalled()
         ;
 
-        $hasSkip = false;
-        $skipStrategy->hasSkip()
-            ->willReturn($hasSkip)
-            ->shouldBeCalled()
-        ;
-
         $items = [1,2,3,4,5];
         $loader->load($limit, $skip)
             ->willReturn($items)
@@ -57,6 +51,5 @@ public function it_fills_page_with_items(
         $page = $this->build($page);
 
         $page->items->shouldBeLike(Result::fromIterable($items));
-        $page->hasPrev->shouldBe($hasSkip);
     }
 }
diff --git a/spec/Paginator/PaginatorBuilderSpec.php b/spec/Paginator/PaginatorBuilderSpec.php
@@ -46,6 +46,8 @@ function it_builds_paginator_with_offset_skip_strategy(Loader $loader)
         $page->currentPage->shouldBe($currentPage);
         $page->perPage->shouldBe(self::PER_PAGE);
         $page->items->shouldBe($result);
+        $page->itemsCount->shouldBe(self::PER_PAGE);
+        $page->items->count()->shouldBe($result->count());
         $page->hasPrev->shouldBe(true);
         $page->hasNext->shouldBe(true);
     }
@@ -105,6 +107,8 @@ function it_builds_paginator_with_offset_skip_strategy_and_count(
         $page->currentPage->shouldBe($currentPage);
         $page->perPage->shouldBe(self::PER_PAGE);
         $page->items->shouldBe($result);
+        $page->itemsCount->shouldBe(self::PER_PAGE);
+        $page->items->count()->shouldBe($result->count());
         $page->hasPrev->shouldBe(true);
         $page->hasNext->shouldBe(true);
 
@@ -140,6 +144,8 @@ function it_builds_paginator_with_skip_by_id_and_count(
 
         $page->currentPage->shouldBe(null);
         $page->perPage->shouldBe(self::PER_PAGE);
+        $page->itemsCount->shouldBe(self::PER_PAGE);
+        $page->items->count()->shouldBe($result->count());
         $page->items->shouldBe($result);
         $page->hasPrev->shouldBe(true);
         $page->hasNext->shouldBe(true);
@@ -156,7 +162,7 @@ function it_builds_paginator_with_skip_by_id_and_count_and_current_page(
         $id = 55;
         $limit = self::PER_PAGE;
 
-        $result = Result::fromArray([1,2,3,4], self::PER_PAGE);
+        $result = Result::fromArray([1,2,3,4,5], self::PER_PAGE);
         $loader->load($limit, $id)
             ->willReturn($result)
             ->shouldBeCalled()
@@ -179,6 +185,8 @@ function it_builds_paginator_with_skip_by_id_and_count_and_current_page(
         $page->currentPage->shouldBe($currentPage);
         $page->perPage->shouldBe(self::PER_PAGE);
         $page->items->shouldBe($result);
+        $page->itemsCount->shouldBe(self::PER_PAGE);
+        $page->items->count()->shouldBe($result->count());
         $page->hasPrev->shouldBe(true);
         $page->hasNext->shouldBe(true);
 
diff --git a/src/Paginator/Loader/Result.php b/src/Paginator/Loader/Result.php
@@ -14,16 +14,22 @@ final class Result implements IteratorAggregate, Countable
     /**
      * @var Iterator
      */
-    private $iterator;
+    private $items;
+
+    /**
+     * @var int|null
+     */
+    private $limit;
 
     /**
      * @var int
      */
     private $count;
 
-    public function __construct(Iterator $items, ?int $count = null, ?int $limit = null)
+    public function __construct(Iterator $items, ?int $limit = null, ?int $count = null)
     {
-        $this->iterator = $limit ? new LimitIterator($items, 0, $limit) : $items;
+        $this->items = $items;
+        $this->limit = $limit;
         $this->count = $count;
     }
 
@@ -42,26 +48,28 @@ public static function fromIterable(iterable $items, ?int $limit = null): self
 
     public static function fromArray(array $items, ?int $limit = null): self
     {
-        return new self(
-            new ArrayIterator($items),
-            count($items),
-            $limit
-        );
+        return new self(new ArrayIterator($items), $limit);
     }
 
     public static function fromIterator(Iterator $items, ?int $limit = null): self
     {
-        $count = self::countItems($items);
-        return new self($items, $count, $limit);
+        return new self($items, $limit);
     }
 
     public function getIterator(): Iterator
     {
-        return $this->iterator;
+        return $this->limit
+            ? new LimitIterator($this->items, 0, $this->limit)
+            : $this->items
+         ;
     }
 
     public function count(): int
     {
+        if (null === $this->count) {
+            $this->count = self::countItems($this->items);
+        }
+
         return $this->count;
     }
 
diff --git a/src/Paginator/Page/Builder/CountItems.php b/src/Paginator/Page/Builder/CountItems.php
@@ -0,0 +1,17 @@
+<?php
+
+
+namespace Makedo\Paginator\Page\Builder;
+
+use Makedo\Paginator\Page\Page;
+
+class CountItems implements Pipe
+{
+    public function build(Page $page): Page
+    {
+        $count = $page->items->count();
+        $page->itemsCount = $count > $page->perPage ? $count - 1 : $count;
+
+        return $page;
+    }
+}
diff --git a/src/Paginator/Page/Builder/HasNextByItemsCount.php b/src/Paginator/Page/Builder/HasNextByItemsCount.php
@@ -11,5 +11,4 @@ public function build(Page $page): Page
         $page->hasNext = $page->items->count() > $page->perPage;
         return $page;
     }
-
 }
diff --git a/src/Paginator/Page/Builder/HasPrev.php b/src/Paginator/Page/Builder/HasPrev.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Makedo\Paginator\Page\Builder;
+
+use Makedo\Paginator\Page\Page;
+use Makedo\Paginator\Strategy\Skip\Skip;
+
+class HasPrev implements Pipe
+{
+    /**
+     * @var Skip
+     */
+    private $skipStrategy;
+
+    public function __construct(Skip $skipStrategy)
+    {
+        $this->skipStrategy = $skipStrategy;
+    }
+
+    public function build(Page $page): Page
+    {
+        $page->hasPrev = $this->skipStrategy->hasSkip();
+        return $page;
+    }
+
+}
diff --git a/src/Paginator/Page/Builder/LoadItems.php b/src/Paginator/Page/Builder/LoadItems.php
@@ -39,8 +39,6 @@ public function build(Page $page): Page
 
         $items = $this->loader->load($limit, $skip);
 
-        $page->hasPrev = $this->skipStrategy->hasSkip();
-
         $page->items = $items instanceof Result
             ? $items
             : Result::fromIterable($items, $page->perPage)
diff --git a/src/Paginator/Page/Page.php b/src/Paginator/Page/Page.php
@@ -21,6 +21,11 @@ class Page
      */
     public $items;
 
+    /**
+     * @var int
+     */
+    public $itemsCount;
+
     /**
      * @var bool
      */
diff --git a/src/Paginator/PaginatorBuilder.php b/src/Paginator/PaginatorBuilder.php
@@ -5,6 +5,8 @@
 use Makedo\Paginator\Counter\Counter;
 use Makedo\Paginator\Loader\Loader;
 
+use Makedo\Paginator\Page\Builder\CountItems;
+use Makedo\Paginator\Page\Builder\HasPrev;
 use Makedo\Paginator\Page\Builder\Init;
 use Makedo\Paginator\Page\Builder\LoadItems;
 use Makedo\Paginator\Page\Builder\HasNextByItemsCount;
@@ -101,12 +103,13 @@ public function build(Loader $loader, ?Counter $counter = null): Paginator
         $paginator = new Paginator();
         $paginator
             ->addPipe(new Init($this->perPage, $this->currentPage))
-            ->addPipe(new LoadItems($loader, $limitStrategy, $skipStrategy));
-
+            ->addPipe(new HasPrev($skipStrategy))
+            ->addPipe(new LoadItems($loader, $limitStrategy, $skipStrategy))
+            ->addPipe(new CountItems())
+        ;
         if ($counter) {
             $paginator->addPipe(new CountTotal($counter));
         }
-
         $paginator->addPipe($next);
 
         return $paginator;

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`	`var_dump($page->hasNext);`
`38`	`38`	`var_dump($page->hasPrev);`
`39`	`39`	`var_dump($page->items->count());`
	`40`	`+var_dump($page->itemsCount);`
`40`	`41`	`foreach ($page->items as $user) {`
`41`	`42`	`var_dump($user);`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`var_dump($page->hasNext);`
`33`	`33`	`var_dump($page->hasPrev);`
`34`	`34`	`var_dump($page->items->count());`
	`35`	`+var_dump($page->itemsCount);`
`35`	`36`	`foreach ($page->items as $user) {`
`36`	`37`	`var_dump($user);`
`37`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@`
`28`	`28`	`var_dump($page->hasNext);`
`29`	`29`	`var_dump($page->hasPrev);`
`30`	`30`	`var_dump($page->items->count());`
	`31`	`+var_dump($page->itemsCount);`
	`32`	`+`
`31`	`33`	`foreach ($page->items as $user) {`
`32`	`34`	`var_dump($user);`
`33`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,6 @@ public function it_fills_page_with_items(`
`42`	`42`	`->shouldBeCalled()`
`43`	`43`	`;`
`44`	`44`
`45`		`- $hasSkip = false;`
`46`		`- $skipStrategy->hasSkip()`
`47`		`- ->willReturn($hasSkip)`
`48`		`- ->shouldBeCalled()`
`49`		`- ;`
`50`		`-`
`51`	`45`	`$items = [1,2,3,4,5];`
`52`	`46`	`$loader->load($limit, $skip)`
`53`	`47`	`->willReturn($items)`
`@@ -57,6 +51,5 @@ public function it_fills_page_with_items(`
`57`	`51`	`$page = $this->build($page);`
`58`	`52`
`59`	`53`	`$page->items->shouldBeLike(Result::fromIterable($items));`
`60`		`- $page->hasPrev->shouldBe($hasSkip);`
`61`	`54`	`}`
`62`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,16 +14,22 @@ final class Result implements IteratorAggregate, Countable`
`14`	`14`	`/**`
`15`	`15`	`* @var Iterator`
`16`	`16`	`*/`
`17`		`- private $iterator;`
	`17`	`+ private $items;`
	`18`	`+`
	`19`	`+ /**`
	`20`	`+ * @var int\|null`
	`21`	`+ */`
	`22`	`+ private $limit;`
`18`	`23`
`19`	`24`	`/**`
`20`	`25`	`* @var int`
`21`	`26`	`*/`
`22`	`27`	`private $count;`
`23`	`28`
`24`		`- public function __construct(Iterator $items, ?int $count = null, ?int $limit = null)`
	`29`	`+ public function __construct(Iterator $items, ?int $limit = null, ?int $count = null)`
`25`	`30`	`{`
`26`		`- $this->iterator = $limit ? new LimitIterator($items, 0, $limit) : $items;`
	`31`	`+ $this->items = $items;`
	`32`	`+ $this->limit = $limit;`
`27`	`33`	`$this->count = $count;`
`28`	`34`	`}`
`29`	`35`
`@@ -42,26 +48,28 @@ public static function fromIterable(iterable $items, ?int $limit = null): self`
`42`	`48`
`43`	`49`	`public static function fromArray(array $items, ?int $limit = null): self`
`44`	`50`	`{`
`45`		`- return new self(`
`46`		`- new ArrayIterator($items),`
`47`		`- count($items),`
`48`		`- $limit`
`49`		`- );`
	`51`	`+ return new self(new ArrayIterator($items), $limit);`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`public static function fromIterator(Iterator $items, ?int $limit = null): self`
`53`	`55`	`{`
`54`		`- $count = self::countItems($items);`
`55`		`- return new self($items, $count, $limit);`
	`56`	`+ return new self($items, $limit);`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`public function getIterator(): Iterator`
`59`	`60`	`{`
`60`		`- return $this->iterator;`
	`61`	`+ return $this->limit`
	`62`	`+ ? new LimitIterator($this->items, 0, $this->limit)`
	`63`	`+ : $this->items`
	`64`	`+ ;`
`61`	`65`	`}`
`62`	`66`
`63`	`67`	`public function count(): int`
`64`	`68`	`{`
	`69`	`+ if (null === $this->count) {`
	`70`	`+ $this->count = self::countItems($this->items);`
	`71`	`+ }`
	`72`	`+`
`65`	`73`	`return $this->count;`
`66`	`74`	`}`
`67`	`75`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,4 @@ public function build(Page $page): Page`
`11`	`11`	`$page->hasNext = $page->items->count() > $page->perPage;`
`12`	`12`	`return $page;`
`13`	`13`	`}`
`14`		`-`
`15`	`14`	`}`