Merge pull request #2372 from pmartin/api-get-entry-as-epub

API: ability to export entry in all available format (epub, pdf, etc...)
This commit is contained in:
Jeremy Benoist 2016-10-12 14:06:33 +02:00 committed by GitHub
commit b1b561da51
4 changed files with 89 additions and 54 deletions

View file

@ -130,6 +130,8 @@ fos_rest:
nelmio_api_doc: nelmio_api_doc:
sandbox: sandbox:
enabled: false enabled: false
cache:
enabled: true
name: wallabag API documentation name: wallabag API documentation
nelmio_cors: nelmio_cors:

View file

@ -3,7 +3,7 @@
namespace Wallabag\ApiBundle\Controller; namespace Wallabag\ApiBundle\Controller;
use FOS\RestBundle\Controller\FOSRestController; use FOS\RestBundle\Controller\FOSRestController;
use Hateoas\Configuration\Route; use Hateoas\Configuration\Route as HateoasRoute;
use Hateoas\Representation\Factory\PagerfantaFactory; use Hateoas\Representation\Factory\PagerfantaFactory;
use Nelmio\ApiDocBundle\Annotation\ApiDoc; use Nelmio\ApiDocBundle\Annotation\ApiDoc;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
@ -12,6 +12,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Wallabag\CoreBundle\Entity\Entry; use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag; use Wallabag\CoreBundle\Entity\Tag;
use FOS\RestBundle\Controller\Annotations\Route;
class WallabagRestController extends FOSRestController class WallabagRestController extends FOSRestController
{ {
@ -115,7 +116,7 @@ class WallabagRestController extends FOSRestController
$pagerfantaFactory = new PagerfantaFactory('page', 'perPage'); $pagerfantaFactory = new PagerfantaFactory('page', 'perPage');
$paginatedCollection = $pagerfantaFactory->createRepresentation( $paginatedCollection = $pagerfantaFactory->createRepresentation(
$pager, $pager,
new Route( new HateoasRoute(
'api_get_entries', 'api_get_entries',
[ [
'archive' => $isArchived, 'archive' => $isArchived,
@ -157,6 +158,30 @@ class WallabagRestController extends FOSRestController
return (new JsonResponse())->setJson($json); return (new JsonResponse())->setJson($json);
} }
/**
* Retrieve a single entry as a predefined format.
*
* @ApiDoc(
* requirements={
* {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
* }
* )
*
* @Route(requirements={"_format"="epub|mobi|pdf|txt|csv"})
*
* @return Response
*/
public function getEntryExportAction(Entry $entry, Request $request)
{
$this->validateAuthentication();
$this->validateUserAccess($entry->getUser()->getId());
return $this->get('wallabag_core.helper.entries_export')
->setEntries($entry)
->updateTitle('entry')
->exportAs($request->attributes->get('_format'));
}
/** /**
* Create an entry. * Create an entry.
* *

View file

@ -1,4 +1,4 @@
entries: api:
type: rest type: rest
resource: "WallabagApiBundle:WallabagRest" resource: "WallabagApiBundle:WallabagRest"
name_prefix: api_ name_prefix: api_

View file

@ -32,12 +32,55 @@ class WallabagRestControllerTest extends WallabagApiTestCase
$this->assertEquals($entry->getUserEmail(), $content['user_email']); $this->assertEquals($entry->getUserEmail(), $content['user_email']);
$this->assertEquals($entry->getUserId(), $content['user_id']); $this->assertEquals($entry->getUserId(), $content['user_id']);
$this->assertTrue( $this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
$this->client->getResponse()->headers->contains( }
'Content-Type',
'application/json' public function testExportEntry()
) {
); $entry = $this->client->getContainer()
->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Entry')
->findOneBy(['user' => 1, 'isArchived' => false]);
if (!$entry) {
$this->markTestSkipped('No content found in db.');
}
$this->client->request('GET', '/api/entries/'.$entry->getId().'/export.epub');
$this->assertEquals(200, $this->client->getResponse()->getStatusCode());
// epub format got the content type in the content
$this->assertContains('application/epub', $this->client->getResponse()->getContent());
$this->assertEquals('application/epub+zip', $this->client->getResponse()->headers->get('Content-Type'));
// re-auth client for mobi
$client = $this->createAuthorizedClient();
$client->request('GET', '/api/entries/'.$entry->getId().'/export.mobi');
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$this->assertEquals('application/x-mobipocket-ebook', $client->getResponse()->headers->get('Content-Type'));
// re-auth client for pdf
$client = $this->createAuthorizedClient();
$client->request('GET', '/api/entries/'.$entry->getId().'/export.pdf');
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$this->assertContains('PDF-', $client->getResponse()->getContent());
$this->assertEquals('application/pdf', $client->getResponse()->headers->get('Content-Type'));
// re-auth client for pdf
$client = $this->createAuthorizedClient();
$client->request('GET', '/api/entries/'.$entry->getId().'/export.txt');
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$this->assertContains('text/plain', $client->getResponse()->headers->get('Content-Type'));
// re-auth client for pdf
$client = $this->createAuthorizedClient();
$client->request('GET', '/api/entries/'.$entry->getId().'/export.csv');
$this->assertEquals(200, $client->getResponse()->getStatusCode());
$this->assertContains('application/csv', $client->getResponse()->headers->get('Content-Type'));
} }
public function testGetOneEntryWrongUser() public function testGetOneEntryWrongUser()
@ -70,12 +113,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
$this->assertEquals(1, $content['page']); $this->assertEquals(1, $content['page']);
$this->assertGreaterThanOrEqual(1, $content['pages']); $this->assertGreaterThanOrEqual(1, $content['pages']);
$this->assertTrue( $this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
$this->client->getResponse()->headers->contains(
'Content-Type',
'application/json'
)
);
} }
public function testGetEntriesWithFullOptions() public function testGetEntriesWithFullOptions()
@ -117,12 +155,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
$this->assertContains('since=1443274283', $content['_links'][$link]['href']); $this->assertContains('since=1443274283', $content['_links'][$link]['href']);
} }
$this->assertTrue( $this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
$this->client->getResponse()->headers->contains(
'Content-Type',
'application/json'
)
);
} }
public function testGetStarredEntries() public function testGetStarredEntries()
@ -150,12 +183,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
$this->assertContains('sort=updated', $content['_links'][$link]['href']); $this->assertContains('sort=updated', $content['_links'][$link]['href']);
} }
$this->assertTrue( $this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
$this->client->getResponse()->headers->contains(
'Content-Type',
'application/json'
)
);
} }
public function testGetArchiveEntries() public function testGetArchiveEntries()
@ -182,12 +210,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
$this->assertContains('archive=1', $content['_links'][$link]['href']); $this->assertContains('archive=1', $content['_links'][$link]['href']);
} }
$this->assertTrue( $this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
$this->client->getResponse()->headers->contains(
'Content-Type',
'application/json'
)
);
} }
public function testGetTaggedEntries() public function testGetTaggedEntries()
@ -214,12 +237,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
$this->assertContains('tags='.urlencode('foo,bar'), $content['_links'][$link]['href']); $this->assertContains('tags='.urlencode('foo,bar'), $content['_links'][$link]['href']);
} }
$this->assertTrue( $this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
$this->client->getResponse()->headers->contains(
'Content-Type',
'application/json'
)
);
} }
public function testGetDatedEntries() public function testGetDatedEntries()
@ -246,12 +264,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
$this->assertContains('since=1443274283', $content['_links'][$link]['href']); $this->assertContains('since=1443274283', $content['_links'][$link]['href']);
} }
$this->assertTrue( $this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
$this->client->getResponse()->headers->contains(
'Content-Type',
'application/json'
)
);
} }
public function testGetDatedSupEntries() public function testGetDatedSupEntries()
@ -279,12 +292,7 @@ class WallabagRestControllerTest extends WallabagApiTestCase
$this->assertContains('since='.($future->getTimestamp() + 1000), $content['_links'][$link]['href']); $this->assertContains('since='.($future->getTimestamp() + 1000), $content['_links'][$link]['href']);
} }
$this->assertTrue( $this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
$this->client->getResponse()->headers->contains(
'Content-Type',
'application/json'
)
);
} }
public function testDeleteEntry() public function testDeleteEntry()