From: Jeremy Benoist Date: Wed, 2 Nov 2016 06:48:10 +0000 (+0100) Subject: Merge pull request #2519 from Jibec/master X-Git-Tag: 2.1.3~6 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=3be554c78f1d68c3969a85d163d9bb081ba525d0;hp=9c1547069178e8395ce4d43eac760d61e03aa2b0;p=github%2Fwallabag%2Fwallabag.git Merge pull request #2519 from Jibec/master Translation update - French --- diff --git a/Capfile b/Capfile index b80a5646..cc807112 100644 --- a/Capfile +++ b/Capfile @@ -7,6 +7,8 @@ require 'capistrano/setup' # Include default deployment tasks require 'capistrano/deploy' +require 'capistrano/composer' +require 'capistrano/file-permissions' require 'capistrano/symfony' # Load custom tasks from `lib/capistrano/tasks` if you have any defined diff --git a/Gemfile b/Gemfile index 31f887a9..233be899 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source "https://rubygems.org" gem 'capistrano', '~> 3.4' +gem 'capistrano-composer' gem 'capistrano-symfony', '~> 1.0.0.rc1' -gem 'capistrano-composer', '~> 0.0.3' +gem 'capistrano-file-permissions' diff --git a/Gemfile.lock b/Gemfile.lock index aebbeba2..7b13b399 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,8 +29,9 @@ PLATFORMS DEPENDENCIES capistrano (~> 3.4) - capistrano-composer (~> 0.0.3) + capistrano-composer + capistrano-file-permissions capistrano-symfony (~> 1.0.0.rc1) BUNDLED WITH - 1.11.2 + 1.13.5 diff --git a/app/config/capistrano/deploy.rb b/app/config/capistrano/deploy.rb index f15eef30..fee04620 100644 --- a/app/config/capistrano/deploy.rb +++ b/app/config/capistrano/deploy.rb @@ -1,9 +1,4 @@ # config valid only for current version of Capistrano -lock '3.4.0' - -set :log_path, "var/logs" -set :cache_path, "var/cache" -set :symfony_console_path, 'bin/console' set :application, 'wallabag' set :repo_url, 'git@github.com:wallabag/wallabag.git' @@ -11,8 +6,6 @@ set :repo_url, 'git@github.com:wallabag/wallabag.git' set :ssh_user, 'framasoft_bag' server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db} -set :scm, :git - set :format, :pretty set :log_level, :info # set :log_level, :debug @@ -23,4 +16,4 @@ set :linked_files, %w{app/config/parameters.yml} set :linked_dirs, [fetch(:log_path), "var/sessions", "web/uploads", "data"] set :keep_releases, 3 -after 'deploy:finishing', 'deploy:cleanup' +after 'deploy:updated', 'symfony:cache:clear' diff --git a/docs/de/developer/api.rst b/docs/de/developer/api.rst index f8911181..bb21154d 100644 --- a/docs/de/developer/api.rst +++ b/docs/de/developer/api.rst @@ -264,7 +264,8 @@ Drittanbieter Ressourcen Einige Applikationen oder Bibliotheken nutzen unsere API. Hier ist eine nicht abschließende Aufzählung von ihnen: -- `Java wrapper for the wallabag API `_ von Strubbl. +- `Java wrapper for the wallabag API `_ von Strubbl. - `.NET library for the wallabag v2 API `_ von Julian Oster. - `Python API for wallabag `_ von FoxMaSk, für sein Projekt `Trigger Happy `_. - `A plugin `_ entworfen für `Tiny Tiny RSS `_, das die wallabag v2 API nutzt. Von Josh Panter. +- `Golang wrapper for the wallabag API `_ von Strubbl, für sein Projekt `wallabag-stats Graph `_. diff --git a/docs/en/developer/api.rst b/docs/en/developer/api.rst index 4828cddd..b6c9ed3f 100644 --- a/docs/en/developer/api.rst +++ b/docs/en/developer/api.rst @@ -263,7 +263,8 @@ Third party resources Some applications or libraries use our API. Here is a non-exhaustive list of them: -- `Java wrapper for the wallabag API `_ by Strubbl. +- `Java wrapper for the wallabag API `_ by Strubbl. - `.NET library for the wallabag v2 API `_ by Julian Oster. - `Python API for wallabag `_ by FoxMaSk, for his project `Trigger Happy `_. - `A plugin `_ designed for `Tiny Tiny RSS `_ that makes use of the wallabag v2 API. By Josh Panter. +- `Golang wrapper for the wallabag API `_ by Strubbl, for his project `wallabag-stats graph `_. diff --git a/docs/fr/developer/api.rst b/docs/fr/developer/api.rst index a0710a96..8a6e2a13 100644 --- a/docs/fr/developer/api.rst +++ b/docs/fr/developer/api.rst @@ -263,7 +263,8 @@ Ressources tierces Certaines applications ou bibliothèques utilisent notre API. En voici une liste non exhaustive : -- `Java wrapper for the wallabag API `_ par Strubbl. +- `Java wrapper for the wallabag API `_ par Strubbl. - `.NET library for the wallabag v2 API `_ par Julian Oster. - `Python API for wallabag `_ par FoxMaSk, pour son projet `Trigger Happy `_. - `Un plugin `_ conçu pour `Tiny Tiny RSS `_ qui utilise l'API wallabag v2. Par Josh Panter. +- `Golang wrapper for the wallabag API `_ par Strubbl, pour son projet `wallabag-stats graphe `_. diff --git a/scripts/dev.sh b/scripts/dev.sh index fa3b2d5d..0703ced1 100644 --- a/scripts/dev.sh +++ b/scripts/dev.sh @@ -1,11 +1,11 @@ -#! /usr/bin/env bash +#!/usr/bin/env bash # You can execute this file to install wallabag dev environment # eg: `sh dev.sh` COMPOSER_COMMAND='composer' -DIR="${BASH_SOURCE%/*}" -if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi +DIR="${BASH_SOURCE}" +if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi . "$DIR/require.sh" $COMPOSER_COMMAND install diff --git a/scripts/install.sh b/scripts/install.sh index 7a1f02bd..62a46f4f 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,11 +1,11 @@ -#! /usr/bin/env bash +#!/usr/bin/env bash # You can execute this file to install wallabag # eg: `sh install.sh prod` COMPOSER_COMMAND='composer' -DIR="${BASH_SOURCE%/*}" -if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi +DIR="${BASH_SOURCE}" +if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi . "$DIR/require.sh" ENV=$1 diff --git a/scripts/update.sh b/scripts/update.sh index 45e93f36..f43c4f24 100644 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -1,11 +1,11 @@ -#! /usr/bin/env bash +#!/usr/bin/env bash # You can execute this file to update wallabag # eg: `sh update.sh prod` COMPOSER_COMMAND='composer' -DIR="${BASH_SOURCE%/*}" -if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi +DIR="${BASH_SOURCE}" +if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi . "$DIR/require.sh" ENV=$1 diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php new file mode 100644 index 00000000..24fa7b3b --- /dev/null +++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php @@ -0,0 +1,367 @@ +validateAuthentication(); + + $urls = $request->query->get('urls', []); + + // handle multiple urls first + if (!empty($urls)) { + $results = []; + foreach ($urls as $url) { + $res = $this->getDoctrine() + ->getRepository('WallabagCoreBundle:Entry') + ->findByUrlAndUserId($url, $this->getUser()->getId()); + + $results[$url] = false === $res ? false : true; + } + + $json = $this->get('serializer')->serialize($results, 'json'); + + return (new JsonResponse())->setJson($json); + } + + // let's see if it is a simple url? + $url = $request->query->get('url', ''); + + if (empty($url)) { + throw $this->createAccessDeniedException('URL is empty?, logged user id: '.$this->getUser()->getId()); + } + + $res = $this->getDoctrine() + ->getRepository('WallabagCoreBundle:Entry') + ->findByUrlAndUserId($url, $this->getUser()->getId()); + + $exists = false === $res ? false : true; + + $json = $this->get('serializer')->serialize(['exists' => $exists], 'json'); + + return (new JsonResponse())->setJson($json); + } + + /** + * Retrieve all entries. It could be filtered by many options. + * + * @ApiDoc( + * parameters={ + * {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0, all entries by default", "description"="filter by archived status."}, + * {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0, all entries by default", "description"="filter by starred status."}, + * {"name"="sort", "dataType"="string", "required"=false, "format"="'created' or 'updated', default 'created'", "description"="sort entries by date."}, + * {"name"="order", "dataType"="string", "required"=false, "format"="'asc' or 'desc', default 'desc'", "description"="order of sort."}, + * {"name"="page", "dataType"="integer", "required"=false, "format"="default '1'", "description"="what page you want."}, + * {"name"="perPage", "dataType"="integer", "required"=false, "format"="default'30'", "description"="results per page."}, + * {"name"="tags", "dataType"="string", "required"=false, "format"="api,rest", "description"="a list of tags url encoded. Will returns entries that matches ALL tags."}, + * {"name"="since", "dataType"="integer", "required"=false, "format"="default '0'", "description"="The timestamp since when you want entries updated."}, + * } + * ) + * + * @return JsonResponse + */ + public function getEntriesAction(Request $request) + { + $this->validateAuthentication(); + + $isArchived = (null === $request->query->get('archive')) ? null : (bool) $request->query->get('archive'); + $isStarred = (null === $request->query->get('starred')) ? null : (bool) $request->query->get('starred'); + $sort = $request->query->get('sort', 'created'); + $order = $request->query->get('order', 'desc'); + $page = (int) $request->query->get('page', 1); + $perPage = (int) $request->query->get('perPage', 30); + $tags = $request->query->get('tags', ''); + $since = $request->query->get('since', 0); + + $pager = $this->getDoctrine() + ->getRepository('WallabagCoreBundle:Entry') + ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order, $since, $tags); + + $pager->setCurrentPage($page); + $pager->setMaxPerPage($perPage); + + $pagerfantaFactory = new PagerfantaFactory('page', 'perPage'); + $paginatedCollection = $pagerfantaFactory->createRepresentation( + $pager, + new Route( + 'api_get_entries', + [ + 'archive' => $isArchived, + 'starred' => $isStarred, + 'sort' => $sort, + 'order' => $order, + 'page' => $page, + 'perPage' => $perPage, + 'tags' => $tags, + 'since' => $since, + ], + UrlGeneratorInterface::ABSOLUTE_URL + ) + ); + + $json = $this->get('serializer')->serialize($paginatedCollection, 'json'); + + return (new JsonResponse())->setJson($json); + } + + /** + * Retrieve a single entry. + * + * @ApiDoc( + * requirements={ + * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} + * } + * ) + * + * @return JsonResponse + */ + public function getEntryAction(Entry $entry) + { + $this->validateAuthentication(); + $this->validateUserAccess($entry->getUser()->getId()); + + $json = $this->get('serializer')->serialize($entry, 'json'); + + return (new JsonResponse())->setJson($json); + } + + /** + * Create an entry. + * + * @ApiDoc( + * parameters={ + * {"name"="url", "dataType"="string", "required"=true, "format"="http://www.test.com/article.html", "description"="Url for the entry."}, + * {"name"="title", "dataType"="string", "required"=false, "description"="Optional, we'll get the title from the page."}, + * {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."}, + * {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="entry already starred"}, + * {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="entry already archived"}, + * } + * ) + * + * @return JsonResponse + */ + public function postEntriesAction(Request $request) + { + $this->validateAuthentication(); + + $url = $request->request->get('url'); + $title = $request->request->get('title'); + $isArchived = $request->request->get('archive'); + $isStarred = $request->request->get('starred'); + + $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($url, $this->getUser()->getId()); + + if (false === $entry) { + $entry = $this->get('wallabag_core.content_proxy')->updateEntry( + new Entry($this->getUser()), + $url + ); + } + + if (!is_null($title)) { + $entry->setTitle($title); + } + + $tags = $request->request->get('tags', ''); + if (!empty($tags)) { + $this->get('wallabag_core.content_proxy')->assignTagsToEntry($entry, $tags); + } + + if (!is_null($isStarred)) { + $entry->setStarred((bool) $isStarred); + } + + if (!is_null($isArchived)) { + $entry->setArchived((bool) $isArchived); + } + + $em = $this->getDoctrine()->getManager(); + $em->persist($entry); + + $em->flush(); + + $json = $this->get('serializer')->serialize($entry, 'json'); + + return (new JsonResponse())->setJson($json); + } + + /** + * Change several properties of an entry. + * + * @ApiDoc( + * requirements={ + * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} + * }, + * parameters={ + * {"name"="title", "dataType"="string", "required"=false}, + * {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."}, + * {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="archived the entry."}, + * {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="starred the entry."}, + * } + * ) + * + * @return JsonResponse + */ + public function patchEntriesAction(Entry $entry, Request $request) + { + $this->validateAuthentication(); + $this->validateUserAccess($entry->getUser()->getId()); + + $title = $request->request->get('title'); + $isArchived = $request->request->get('archive'); + $isStarred = $request->request->get('starred'); + + if (!is_null($title)) { + $entry->setTitle($title); + } + + if (!is_null($isArchived)) { + $entry->setArchived((bool) $isArchived); + } + + if (!is_null($isStarred)) { + $entry->setStarred((bool) $isStarred); + } + + $tags = $request->request->get('tags', ''); + if (!empty($tags)) { + $this->get('wallabag_core.content_proxy')->assignTagsToEntry($entry, $tags); + } + + $em = $this->getDoctrine()->getManager(); + $em->flush(); + + $json = $this->get('serializer')->serialize($entry, 'json'); + + return (new JsonResponse())->setJson($json); + } + + /** + * Delete **permanently** an entry. + * + * @ApiDoc( + * requirements={ + * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} + * } + * ) + * + * @return JsonResponse + */ + public function deleteEntriesAction(Entry $entry) + { + $this->validateAuthentication(); + $this->validateUserAccess($entry->getUser()->getId()); + + $em = $this->getDoctrine()->getManager(); + $em->remove($entry); + $em->flush(); + + $json = $this->get('serializer')->serialize($entry, 'json'); + + return (new JsonResponse())->setJson($json); + } + + /** + * Retrieve all tags for an entry. + * + * @ApiDoc( + * requirements={ + * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} + * } + * ) + * + * @return JsonResponse + */ + public function getEntriesTagsAction(Entry $entry) + { + $this->validateAuthentication(); + $this->validateUserAccess($entry->getUser()->getId()); + + $json = $this->get('serializer')->serialize($entry->getTags(), 'json'); + + return (new JsonResponse())->setJson($json); + } + + /** + * Add one or more tags to an entry. + * + * @ApiDoc( + * requirements={ + * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} + * }, + * parameters={ + * {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."}, + * } + * ) + * + * @return JsonResponse + */ + public function postEntriesTagsAction(Request $request, Entry $entry) + { + $this->validateAuthentication(); + $this->validateUserAccess($entry->getUser()->getId()); + + $tags = $request->request->get('tags', ''); + if (!empty($tags)) { + $this->get('wallabag_core.content_proxy')->assignTagsToEntry($entry, $tags); + } + + $em = $this->getDoctrine()->getManager(); + $em->persist($entry); + $em->flush(); + + $json = $this->get('serializer')->serialize($entry, 'json'); + + return (new JsonResponse())->setJson($json); + } + + /** + * Permanently remove one tag for an entry. + * + * @ApiDoc( + * requirements={ + * {"name"="tag", "dataType"="integer", "requirement"="\w+", "description"="The tag ID"}, + * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} + * } + * ) + * + * @return JsonResponse + */ + public function deleteEntriesTagsAction(Entry $entry, Tag $tag) + { + $this->validateAuthentication(); + $this->validateUserAccess($entry->getUser()->getId()); + + $entry->removeTag($tag); + $em = $this->getDoctrine()->getManager(); + $em->persist($entry); + $em->flush(); + + $json = $this->get('serializer')->serialize($entry, 'json'); + + return (new JsonResponse())->setJson($json); + } +} diff --git a/src/Wallabag/ApiBundle/Controller/TagRestController.php b/src/Wallabag/ApiBundle/Controller/TagRestController.php new file mode 100644 index 00000000..4e7ddc66 --- /dev/null +++ b/src/Wallabag/ApiBundle/Controller/TagRestController.php @@ -0,0 +1,171 @@ +validateAuthentication(); + + $tags = $this->getDoctrine() + ->getRepository('WallabagCoreBundle:Tag') + ->findAllTags($this->getUser()->getId()); + + $json = $this->get('serializer')->serialize($tags, 'json'); + + return (new JsonResponse())->setJson($json); + } + + /** + * Permanently remove one tag from **every** entry. + * + * @ApiDoc( + * requirements={ + * {"name"="tag", "dataType"="string", "required"=true, "requirement"="\w+", "description"="Tag as a string"} + * } + * ) + * + * @return JsonResponse + */ + public function deleteTagLabelAction(Request $request) + { + $this->validateAuthentication(); + $label = $request->request->get('tag', ''); + + $tag = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findOneByLabel($label); + + if (empty($tag)) { + throw $this->createNotFoundException('Tag not found'); + } + + $this->getDoctrine() + ->getRepository('WallabagCoreBundle:Entry') + ->removeTag($this->getUser()->getId(), $tag); + + $this->cleanOrphanTag($tag); + + $json = $this->get('serializer')->serialize($tag, 'json'); + + return (new JsonResponse())->setJson($json); + } + + /** + * Permanently remove some tags from **every** entry. + * + * @ApiDoc( + * requirements={ + * {"name"="tags", "dataType"="string", "required"=true, "format"="tag1,tag2", "description"="Tags as strings (comma splitted)"} + * } + * ) + * + * @return JsonResponse + */ + public function deleteTagsLabelAction(Request $request) + { + $this->validateAuthentication(); + + $tagsLabels = $request->request->get('tags', ''); + + $tags = []; + + foreach (explode(',', $tagsLabels) as $tagLabel) { + $tagEntity = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findOneByLabel($tagLabel); + + if (!empty($tagEntity)) { + $tags[] = $tagEntity; + } + } + + if (empty($tags)) { + throw $this->createNotFoundException('Tags not found'); + } + + $this->getDoctrine() + ->getRepository('WallabagCoreBundle:Entry') + ->removeTags($this->getUser()->getId(), $tags); + + $this->cleanOrphanTag($tags); + + $json = $this->get('serializer')->serialize($tags, 'json'); + + return (new JsonResponse())->setJson($json); + } + + /** + * Permanently remove one tag from **every** entry. + * + * @ApiDoc( + * requirements={ + * {"name"="tag", "dataType"="integer", "requirement"="\w+", "description"="The tag"} + * } + * ) + * + * @return JsonResponse + */ + public function deleteTagAction(Tag $tag) + { + $this->validateAuthentication(); + + $this->getDoctrine() + ->getRepository('WallabagCoreBundle:Entry') + ->removeTag($this->getUser()->getId(), $tag); + + $this->cleanOrphanTag($tag); + + $json = $this->get('serializer')->serialize($tag, 'json'); + + return (new JsonResponse())->setJson($json); + } + + /** + * Retrieve version number. + * + * @ApiDoc() + * + * @return JsonResponse + */ + public function getVersionAction() + { + $version = $this->container->getParameter('wallabag_core.version'); + + $json = $this->get('serializer')->serialize($version, 'json'); + + return (new JsonResponse())->setJson($json); + } + + /** + * Remove orphan tag in case no entries are associated to it. + * + * @param Tag|array $tags + */ + private function cleanOrphanTag($tags) + { + if (!is_array($tags)) { + $tags = [$tags]; + } + + $em = $this->getDoctrine()->getManager(); + + foreach ($tags as $tag) { + if (count($tag->getEntries()) === 0) { + $em->remove($tag); + } + } + + $em->flush(); + } +} diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php index 9997913d..e927a890 100644 --- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php @@ -3,543 +3,25 @@ namespace Wallabag\ApiBundle\Controller; use FOS\RestBundle\Controller\FOSRestController; -use Hateoas\Configuration\Route; -use Hateoas\Representation\Factory\PagerfantaFactory; -use Nelmio\ApiDocBundle\Annotation\ApiDoc; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\JsonResponse; -use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Wallabag\CoreBundle\Entity\Entry; -use Wallabag\CoreBundle\Entity\Tag; class WallabagRestController extends FOSRestController { - private function validateAuthentication() + protected function validateAuthentication() { if (false === $this->get('security.authorization_checker')->isGranted('IS_AUTHENTICATED_FULLY')) { throw new AccessDeniedException(); } } - /** - * Check if an entry exist by url. - * - * @ApiDoc( - * parameters={ - * {"name"="url", "dataType"="string", "required"=true, "format"="An url", "description"="Url to check if it exists"}, - * {"name"="urls", "dataType"="string", "required"=false, "format"="An array of urls (?urls[]=http...&urls[]=http...)", "description"="Urls (as an array) to check if it exists"} - * } - * ) - * - * @return JsonResponse - */ - public function getEntriesExistsAction(Request $request) - { - $this->validateAuthentication(); - - $urls = $request->query->get('urls', []); - - // handle multiple urls first - if (!empty($urls)) { - $results = []; - foreach ($urls as $url) { - $res = $this->getDoctrine() - ->getRepository('WallabagCoreBundle:Entry') - ->findByUrlAndUserId($url, $this->getUser()->getId()); - - $results[$url] = false === $res ? false : true; - } - - $json = $this->get('serializer')->serialize($results, 'json'); - - return (new JsonResponse())->setJson($json); - } - - // let's see if it is a simple url? - $url = $request->query->get('url', ''); - - if (empty($url)) { - throw $this->createAccessDeniedException('URL is empty?, logged user id: '.$this->getUser()->getId()); - } - - $res = $this->getDoctrine() - ->getRepository('WallabagCoreBundle:Entry') - ->findByUrlAndUserId($url, $this->getUser()->getId()); - - $exists = false === $res ? false : true; - - $json = $this->get('serializer')->serialize(['exists' => $exists], 'json'); - - return (new JsonResponse())->setJson($json); - } - - /** - * Retrieve all entries. It could be filtered by many options. - * - * @ApiDoc( - * parameters={ - * {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0, all entries by default", "description"="filter by archived status."}, - * {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0, all entries by default", "description"="filter by starred status."}, - * {"name"="sort", "dataType"="string", "required"=false, "format"="'created' or 'updated', default 'created'", "description"="sort entries by date."}, - * {"name"="order", "dataType"="string", "required"=false, "format"="'asc' or 'desc', default 'desc'", "description"="order of sort."}, - * {"name"="page", "dataType"="integer", "required"=false, "format"="default '1'", "description"="what page you want."}, - * {"name"="perPage", "dataType"="integer", "required"=false, "format"="default'30'", "description"="results per page."}, - * {"name"="tags", "dataType"="string", "required"=false, "format"="api,rest", "description"="a list of tags url encoded. Will returns entries that matches ALL tags."}, - * {"name"="since", "dataType"="integer", "required"=false, "format"="default '0'", "description"="The timestamp since when you want entries updated."}, - * } - * ) - * - * @return JsonResponse - */ - public function getEntriesAction(Request $request) - { - $this->validateAuthentication(); - - $isArchived = (null === $request->query->get('archive')) ? null : (bool) $request->query->get('archive'); - $isStarred = (null === $request->query->get('starred')) ? null : (bool) $request->query->get('starred'); - $sort = $request->query->get('sort', 'created'); - $order = $request->query->get('order', 'desc'); - $page = (int) $request->query->get('page', 1); - $perPage = (int) $request->query->get('perPage', 30); - $tags = $request->query->get('tags', ''); - $since = $request->query->get('since', 0); - - $pager = $this->getDoctrine() - ->getRepository('WallabagCoreBundle:Entry') - ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order, $since, $tags); - - $pager->setCurrentPage($page); - $pager->setMaxPerPage($perPage); - - $pagerfantaFactory = new PagerfantaFactory('page', 'perPage'); - $paginatedCollection = $pagerfantaFactory->createRepresentation( - $pager, - new Route( - 'api_get_entries', - [ - 'archive' => $isArchived, - 'starred' => $isStarred, - 'sort' => $sort, - 'order' => $order, - 'page' => $page, - 'perPage' => $perPage, - 'tags' => $tags, - 'since' => $since, - ], - UrlGeneratorInterface::ABSOLUTE_URL - ) - ); - - $json = $this->get('serializer')->serialize($paginatedCollection, 'json'); - - return (new JsonResponse())->setJson($json); - } - - /** - * Retrieve a single entry. - * - * @ApiDoc( - * requirements={ - * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} - * } - * ) - * - * @return JsonResponse - */ - public function getEntryAction(Entry $entry) - { - $this->validateAuthentication(); - $this->validateUserAccess($entry->getUser()->getId()); - - $json = $this->get('serializer')->serialize($entry, 'json'); - - return (new JsonResponse())->setJson($json); - } - - /** - * Create an entry. - * - * @ApiDoc( - * parameters={ - * {"name"="url", "dataType"="string", "required"=true, "format"="http://www.test.com/article.html", "description"="Url for the entry."}, - * {"name"="title", "dataType"="string", "required"=false, "description"="Optional, we'll get the title from the page."}, - * {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."}, - * {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="entry already starred"}, - * {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="entry already archived"}, - * } - * ) - * - * @return JsonResponse - */ - public function postEntriesAction(Request $request) - { - $this->validateAuthentication(); - - $url = $request->request->get('url'); - $title = $request->request->get('title'); - $isArchived = $request->request->get('archive'); - $isStarred = $request->request->get('starred'); - - $entry = $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($url, $this->getUser()->getId()); - - if (false === $entry) { - $entry = $this->get('wallabag_core.content_proxy')->updateEntry( - new Entry($this->getUser()), - $url - ); - } - - if (!is_null($title)) { - $entry->setTitle($title); - } - - $tags = $request->request->get('tags', ''); - if (!empty($tags)) { - $this->get('wallabag_core.content_proxy')->assignTagsToEntry($entry, $tags); - } - - if (!is_null($isStarred)) { - $entry->setStarred((bool) $isStarred); - } - - if (!is_null($isArchived)) { - $entry->setArchived((bool) $isArchived); - } - - $em = $this->getDoctrine()->getManager(); - $em->persist($entry); - - $em->flush(); - - $json = $this->get('serializer')->serialize($entry, 'json'); - - return (new JsonResponse())->setJson($json); - } - - /** - * Change several properties of an entry. - * - * @ApiDoc( - * requirements={ - * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} - * }, - * parameters={ - * {"name"="title", "dataType"="string", "required"=false}, - * {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."}, - * {"name"="archive", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="archived the entry."}, - * {"name"="starred", "dataType"="integer", "required"=false, "format"="1 or 0", "description"="starred the entry."}, - * } - * ) - * - * @return JsonResponse - */ - public function patchEntriesAction(Entry $entry, Request $request) - { - $this->validateAuthentication(); - $this->validateUserAccess($entry->getUser()->getId()); - - $title = $request->request->get('title'); - $isArchived = $request->request->get('archive'); - $isStarred = $request->request->get('starred'); - - if (!is_null($title)) { - $entry->setTitle($title); - } - - if (!is_null($isArchived)) { - $entry->setArchived((bool) $isArchived); - } - - if (!is_null($isStarred)) { - $entry->setStarred((bool) $isStarred); - } - - $tags = $request->request->get('tags', ''); - if (!empty($tags)) { - $this->get('wallabag_core.content_proxy')->assignTagsToEntry($entry, $tags); - } - - $em = $this->getDoctrine()->getManager(); - $em->flush(); - - $json = $this->get('serializer')->serialize($entry, 'json'); - - return (new JsonResponse())->setJson($json); - } - - /** - * Delete **permanently** an entry. - * - * @ApiDoc( - * requirements={ - * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} - * } - * ) - * - * @return JsonResponse - */ - public function deleteEntriesAction(Entry $entry) - { - $this->validateAuthentication(); - $this->validateUserAccess($entry->getUser()->getId()); - - $em = $this->getDoctrine()->getManager(); - $em->remove($entry); - $em->flush(); - - $json = $this->get('serializer')->serialize($entry, 'json'); - - return (new JsonResponse())->setJson($json); - } - - /** - * Retrieve all tags for an entry. - * - * @ApiDoc( - * requirements={ - * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} - * } - * ) - * - * @return JsonResponse - */ - public function getEntriesTagsAction(Entry $entry) - { - $this->validateAuthentication(); - $this->validateUserAccess($entry->getUser()->getId()); - - $json = $this->get('serializer')->serialize($entry->getTags(), 'json'); - - return (new JsonResponse())->setJson($json); - } - - /** - * Add one or more tags to an entry. - * - * @ApiDoc( - * requirements={ - * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} - * }, - * parameters={ - * {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."}, - * } - * ) - * - * @return JsonResponse - */ - public function postEntriesTagsAction(Request $request, Entry $entry) - { - $this->validateAuthentication(); - $this->validateUserAccess($entry->getUser()->getId()); - - $tags = $request->request->get('tags', ''); - if (!empty($tags)) { - $this->get('wallabag_core.content_proxy')->assignTagsToEntry($entry, $tags); - } - - $em = $this->getDoctrine()->getManager(); - $em->persist($entry); - $em->flush(); - - $json = $this->get('serializer')->serialize($entry, 'json'); - - return (new JsonResponse())->setJson($json); - } - - /** - * Permanently remove one tag for an entry. - * - * @ApiDoc( - * requirements={ - * {"name"="tag", "dataType"="integer", "requirement"="\w+", "description"="The tag ID"}, - * {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"} - * } - * ) - * - * @return JsonResponse - */ - public function deleteEntriesTagsAction(Entry $entry, Tag $tag) - { - $this->validateAuthentication(); - $this->validateUserAccess($entry->getUser()->getId()); - - $entry->removeTag($tag); - $em = $this->getDoctrine()->getManager(); - $em->persist($entry); - $em->flush(); - - $json = $this->get('serializer')->serialize($entry, 'json'); - - return (new JsonResponse())->setJson($json); - } - - /** - * Retrieve all tags. - * - * @ApiDoc() - * - * @return JsonResponse - */ - public function getTagsAction() - { - $this->validateAuthentication(); - - $tags = $this->getDoctrine() - ->getRepository('WallabagCoreBundle:Tag') - ->findAllTags($this->getUser()->getId()); - - $json = $this->get('serializer')->serialize($tags, 'json'); - - return (new JsonResponse())->setJson($json); - } - - /** - * Permanently remove one tag from **every** entry. - * - * @ApiDoc( - * requirements={ - * {"name"="tag", "dataType"="string", "required"=true, "requirement"="\w+", "description"="Tag as a string"} - * } - * ) - * - * @return JsonResponse - */ - public function deleteTagLabelAction(Request $request) - { - $this->validateAuthentication(); - $label = $request->request->get('tag', ''); - - $tag = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findOneByLabel($label); - - if (empty($tag)) { - throw $this->createNotFoundException('Tag not found'); - } - - $this->getDoctrine() - ->getRepository('WallabagCoreBundle:Entry') - ->removeTag($this->getUser()->getId(), $tag); - - $this->cleanOrphanTag($tag); - - $json = $this->get('serializer')->serialize($tag, 'json'); - - return (new JsonResponse())->setJson($json); - } - - /** - * Permanently remove some tags from **every** entry. - * - * @ApiDoc( - * requirements={ - * {"name"="tags", "dataType"="string", "required"=true, "format"="tag1,tag2", "description"="Tags as strings (comma splitted)"} - * } - * ) - * - * @return JsonResponse - */ - public function deleteTagsLabelAction(Request $request) - { - $this->validateAuthentication(); - - $tagsLabels = $request->request->get('tags', ''); - - $tags = []; - - foreach (explode(',', $tagsLabels) as $tagLabel) { - $tagEntity = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findOneByLabel($tagLabel); - - if (!empty($tagEntity)) { - $tags[] = $tagEntity; - } - } - - if (empty($tags)) { - throw $this->createNotFoundException('Tags not found'); - } - - $this->getDoctrine() - ->getRepository('WallabagCoreBundle:Entry') - ->removeTags($this->getUser()->getId(), $tags); - - $this->cleanOrphanTag($tags); - - $json = $this->get('serializer')->serialize($tags, 'json'); - - return (new JsonResponse())->setJson($json); - } - - /** - * Permanently remove one tag from **every** entry. - * - * @ApiDoc( - * requirements={ - * {"name"="tag", "dataType"="integer", "requirement"="\w+", "description"="The tag"} - * } - * ) - * - * @return JsonResponse - */ - public function deleteTagAction(Tag $tag) - { - $this->validateAuthentication(); - - $this->getDoctrine() - ->getRepository('WallabagCoreBundle:Entry') - ->removeTag($this->getUser()->getId(), $tag); - - $this->cleanOrphanTag($tag); - - $json = $this->get('serializer')->serialize($tag, 'json'); - - return (new JsonResponse())->setJson($json); - } - - /** - * Retrieve version number. - * - * @ApiDoc() - * - * @return JsonResponse - */ - public function getVersionAction() - { - $version = $this->container->getParameter('wallabag_core.version'); - - $json = $this->get('serializer')->serialize($version, 'json'); - - return (new JsonResponse())->setJson($json); - } - - /** - * Remove orphan tag in case no entries are associated to it. - * - * @param Tag|array $tags - */ - private function cleanOrphanTag($tags) - { - if (!is_array($tags)) { - $tags = [$tags]; - } - - $em = $this->getDoctrine()->getManager(); - - foreach ($tags as $tag) { - if (count($tag->getEntries()) === 0) { - $em->remove($tag); - } - } - - $em->flush(); - } - /** * Validate that the first id is equal to the second one. * If not, throw exception. It means a user try to access information from an other user. * * @param int $requestUserId User id from the requested source */ - private function validateUserAccess($requestUserId) + protected function validateUserAccess($requestUserId) { $user = $this->get('security.token_storage')->getToken()->getUser(); if ($requestUserId != $user->getId()) { diff --git a/src/Wallabag/ApiBundle/Resources/config/routing_rest.yml b/src/Wallabag/ApiBundle/Resources/config/routing_rest.yml index 5f43f971..c1af9e02 100644 --- a/src/Wallabag/ApiBundle/Resources/config/routing_rest.yml +++ b/src/Wallabag/ApiBundle/Resources/config/routing_rest.yml @@ -1,4 +1,9 @@ entries: type: rest - resource: "WallabagApiBundle:WallabagRest" + resource: "WallabagApiBundle:EntryRest" + name_prefix: api_ + +tags: + type: rest + resource: "WallabagApiBundle:TagRest" name_prefix: api_ diff --git a/src/Wallabag/CoreBundle/Controller/ExportController.php b/src/Wallabag/CoreBundle/Controller/ExportController.php index 6191d5d7..79653cfe 100644 --- a/src/Wallabag/CoreBundle/Controller/ExportController.php +++ b/src/Wallabag/CoreBundle/Controller/ExportController.php @@ -4,8 +4,10 @@ namespace Wallabag\CoreBundle\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Wallabag\CoreBundle\Entity\Entry; +use Wallabag\CoreBundle\Entity\Tag; /** * The try/catch can be removed once all formats will be implemented. @@ -51,15 +53,24 @@ class ExportController extends Controller * * @return \Symfony\Component\HttpFoundation\Response */ - public function downloadEntriesAction($format, $category) + public function downloadEntriesAction(Request $request, $format, $category) { $method = ucfirst($category); $methodBuilder = 'getBuilderFor'.$method.'ByUser'; - $entries = $this->getDoctrine() - ->getRepository('WallabagCoreBundle:Entry') - ->$methodBuilder($this->getUser()->getId()) - ->getQuery() - ->getResult(); + + if ($category == 'tag_entries') { + $tag = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findOneBySlug($request->query->get('tag')); + + $entries = $this->getDoctrine() + ->getRepository('WallabagCoreBundle:Entry') + ->findAllByTagId($this->getUser()->getId(), $tag->getId()); + } else { + $entries = $this->getDoctrine() + ->getRepository('WallabagCoreBundle:Entry') + ->$methodBuilder($this->getUser()->getId()) + ->getQuery() + ->getResult(); + } try { return $this->get('wallabag_core.helper.entries_export') diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php index e50c68a6..4bf292a4 100644 --- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php +++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php @@ -8,7 +8,6 @@ use JMS\Serializer\SerializerBuilder; use PHPePub\Core\EPub; use PHPePub\Core\Structure\OPF\DublinCore; use Symfony\Component\HttpFoundation\Response; -use Craue\ConfigBundle\Util\Config; /** * This class doesn't have unit test BUT it's fully covered by a functional test with ExportControllerTest. @@ -27,12 +26,12 @@ class EntriesExport '; /** - * @param Config $craueConfig CraueConfig instance to get wallabag instance url from database + * @param string $wallabagUrl Wallabag instance url * @param string $logoPath Path to the logo FROM THE BUNDLE SCOPE */ - public function __construct(Config $craueConfig, $logoPath) + public function __construct($wallabagUrl, $logoPath) { - $this->wallabagUrl = $craueConfig->get('wallabag_url'); + $this->wallabagUrl = $wallabagUrl; $this->logoPath = $logoPath; } diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 614488a6..90a2419e 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -55,6 +55,7 @@ services: '.fok.nl': 'Googlebot/2.1' 'getpocket.com': 'PHP/5.2' 'iansommerville.com': 'PHP/5.2' + '.slashdot.org': 'PHP/5.2' calls: - [ setLogger, [ "@logger" ] ] tags: @@ -91,7 +92,7 @@ services: wallabag_core.helper.entries_export: class: Wallabag\CoreBundle\Helper\EntriesExport arguments: - - "@craue_config" + - '@=service(''craue_config'').get(''wallabag_url'')' - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png wallabag.operator.array.matches: diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index f19f2922..5d657c7e 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -53,19 +53,23 @@ diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 5c7cfd65..1225e680 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -99,18 +99,22 @@
{% set currentRoute = app.request.attributes.get('_route') %} + {% set currentTag = '' %} + {% if tag is defined %} + {% set currentTag = tag %} + {% endif %} {% if currentRoute == 'homepage' %} {% set currentRoute = 'unread' %} {% endif %}

{{ 'entry.list.export_title'|trans }}

    - {% if craue_setting('export_epub') %}
  • EPUB
    • {% endif %} - {% if craue_setting('export_mobi') %}
  • MOBI
    • {% endif %} - {% if craue_setting('export_pdf') %}
  • PDF
    • {% endif %} - {% if craue_setting('export_csv') %}
  • JSON
    • {% endif %} - {% if craue_setting('export_json') %}
  • CSV
    • {% endif %} - {% if craue_setting('export_txt') %}
  • TXT
    • {% endif %} - {% if craue_setting('export_xml') %}
  • XML
    • {% endif %} + {% if craue_setting('export_epub') %}
  • EPUB
    • {% endif %} + {% if craue_setting('export_mobi') %}
  • MOBI
    • {% endif %} + {% if craue_setting('export_pdf') %}
  • PDF
    • {% endif %} + {% if craue_setting('export_csv') %}
  • JSON
    • {% endif %} + {% if craue_setting('export_json') %}
  • CSV
    • {% endif %} + {% if craue_setting('export_txt') %}
  • TXT
    • {% endif %} + {% if craue_setting('export_xml') %}
  • XML
    • {% endif %}
diff --git a/src/Wallabag/ImportBundle/Command/ImportCommand.php b/src/Wallabag/ImportBundle/Command/ImportCommand.php index 1df38295..d1325338 100644 --- a/src/Wallabag/ImportBundle/Command/ImportCommand.php +++ b/src/Wallabag/ImportBundle/Command/ImportCommand.php @@ -50,6 +50,9 @@ class ImportCommand extends ContainerAwareCommand case 'chrome': $wallabag = $this->getContainer()->get('wallabag_import.chrome.import'); break; + case 'instapaper': + $wallabag = $this->getContainer()->get('wallabag_import.instapaper.import'); + break; case 'v1': default: $wallabag = $this->getContainer()->get('wallabag_import.wallabag_v1.import'); diff --git a/src/Wallabag/ImportBundle/Resources/config/services.yml b/src/Wallabag/ImportBundle/Resources/config/services.yml index 89adc71b..d600be0f 100644 --- a/src/Wallabag/ImportBundle/Resources/config/services.yml +++ b/src/Wallabag/ImportBundle/Resources/config/services.yml @@ -20,7 +20,6 @@ services: arguments: - "@doctrine.orm.entity_manager" - "@wallabag_core.content_proxy" - - "@craue_config" calls: - [ setClient, [ "@wallabag_import.pocket.client" ] ] - [ setLogger, [ "@logger" ]] diff --git a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php index ca9d18f1..961208f2 100644 --- a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php +++ b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php @@ -4,7 +4,6 @@ namespace Wallabag\UserBundle\Mailer; use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface; use Scheb\TwoFactorBundle\Mailer\AuthCodeMailerInterface; -use Craue\ConfigBundle\Util\Config; /** * Custom mailer for TwoFactorBundle email. @@ -61,16 +60,17 @@ class AuthCodeMailer implements AuthCodeMailerInterface * @param \Twig_Environment $twig * @param string $senderEmail * @param string $senderName - * @param Config $craueConfig Craue\Config instance to get wallabag support url from database + * @param string $supportUrl wallabag support url + * @param string $wallabagUrl wallabag instance url */ - public function __construct(\Swift_Mailer $mailer, \Twig_Environment $twig, $senderEmail, $senderName, Config $craueConfig) + public function __construct(\Swift_Mailer $mailer, \Twig_Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl) { $this->mailer = $mailer; $this->twig = $twig; $this->senderEmail = $senderEmail; $this->senderName = $senderName; - $this->supportUrl = $craueConfig->get('wallabag_support_url'); - $this->wallabagUrl = $craueConfig->get('wallabag_url'); + $this->supportUrl = $supportUrl; + $this->wallabagUrl = $wallabagUrl; } /** diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml index eb9c8e67..a8ee721b 100644 --- a/src/Wallabag/UserBundle/Resources/config/services.yml +++ b/src/Wallabag/UserBundle/Resources/config/services.yml @@ -6,7 +6,8 @@ services: - "@twig" - "%scheb_two_factor.email.sender_email%" - "%scheb_two_factor.email.sender_name%" - - "@craue_config" + - '@=service(''craue_config'').get(''wallabag_support_url'')' + - '@=service(''craue_config'').get(''wallabag_url'')' wallabag_user.password_resetting: class: Wallabag\UserBundle\EventListener\PasswordResettingListener diff --git a/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php new file mode 100644 index 00000000..825f8f7a --- /dev/null +++ b/tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php @@ -0,0 +1,673 @@ +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().'.json'); + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertEquals($entry->getTitle(), $content['title']); + $this->assertEquals($entry->getUrl(), $content['url']); + $this->assertCount(count($entry->getTags()), $content['tags']); + $this->assertEquals($entry->getUserName(), $content['user_name']); + $this->assertEquals($entry->getUserEmail(), $content['user_email']); + $this->assertEquals($entry->getUserId(), $content['user_id']); + + $this->assertTrue( + $this->client->getResponse()->headers->contains( + 'Content-Type', + 'application/json' + ) + ); + } + + public function testGetOneEntryWrongUser() + { + $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findOneBy(['user' => 2, 'isArchived' => false]); + + if (!$entry) { + $this->markTestSkipped('No content found in db.'); + } + + $this->client->request('GET', '/api/entries/'.$entry->getId().'.json'); + + $this->assertEquals(403, $this->client->getResponse()->getStatusCode()); + } + + public function testGetEntries() + { + $this->client->request('GET', '/api/entries'); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertGreaterThanOrEqual(1, count($content)); + $this->assertNotEmpty($content['_embedded']['items']); + $this->assertGreaterThanOrEqual(1, $content['total']); + $this->assertEquals(1, $content['page']); + $this->assertGreaterThanOrEqual(1, $content['pages']); + + $this->assertTrue( + $this->client->getResponse()->headers->contains( + 'Content-Type', + 'application/json' + ) + ); + } + + public function testGetEntriesWithFullOptions() + { + $this->client->request('GET', '/api/entries', [ + 'archive' => 1, + 'starred' => 1, + 'sort' => 'updated', + 'order' => 'asc', + 'page' => 1, + 'perPage' => 2, + 'tags' => 'foo', + 'since' => 1443274283, + ]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertGreaterThanOrEqual(1, count($content)); + $this->assertArrayHasKey('items', $content['_embedded']); + $this->assertGreaterThanOrEqual(0, $content['total']); + $this->assertEquals(1, $content['page']); + $this->assertEquals(2, $content['limit']); + $this->assertGreaterThanOrEqual(1, $content['pages']); + + $this->assertArrayHasKey('_links', $content); + $this->assertArrayHasKey('self', $content['_links']); + $this->assertArrayHasKey('first', $content['_links']); + $this->assertArrayHasKey('last', $content['_links']); + + foreach (['self', 'first', 'last'] as $link) { + $this->assertArrayHasKey('href', $content['_links'][$link]); + $this->assertContains('archive=1', $content['_links'][$link]['href']); + $this->assertContains('starred=1', $content['_links'][$link]['href']); + $this->assertContains('sort=updated', $content['_links'][$link]['href']); + $this->assertContains('order=asc', $content['_links'][$link]['href']); + $this->assertContains('tags=foo', $content['_links'][$link]['href']); + $this->assertContains('since=1443274283', $content['_links'][$link]['href']); + } + + $this->assertTrue( + $this->client->getResponse()->headers->contains( + 'Content-Type', + 'application/json' + ) + ); + } + + public function testGetStarredEntries() + { + $this->client->request('GET', '/api/entries', ['starred' => 1, 'sort' => 'updated']); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertGreaterThanOrEqual(1, count($content)); + $this->assertNotEmpty($content['_embedded']['items']); + $this->assertGreaterThanOrEqual(1, $content['total']); + $this->assertEquals(1, $content['page']); + $this->assertGreaterThanOrEqual(1, $content['pages']); + + $this->assertArrayHasKey('_links', $content); + $this->assertArrayHasKey('self', $content['_links']); + $this->assertArrayHasKey('first', $content['_links']); + $this->assertArrayHasKey('last', $content['_links']); + + foreach (['self', 'first', 'last'] as $link) { + $this->assertArrayHasKey('href', $content['_links'][$link]); + $this->assertContains('starred=1', $content['_links'][$link]['href']); + $this->assertContains('sort=updated', $content['_links'][$link]['href']); + } + + $this->assertTrue( + $this->client->getResponse()->headers->contains( + 'Content-Type', + 'application/json' + ) + ); + } + + public function testGetArchiveEntries() + { + $this->client->request('GET', '/api/entries', ['archive' => 1]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertGreaterThanOrEqual(1, count($content)); + $this->assertNotEmpty($content['_embedded']['items']); + $this->assertGreaterThanOrEqual(1, $content['total']); + $this->assertEquals(1, $content['page']); + $this->assertGreaterThanOrEqual(1, $content['pages']); + + $this->assertArrayHasKey('_links', $content); + $this->assertArrayHasKey('self', $content['_links']); + $this->assertArrayHasKey('first', $content['_links']); + $this->assertArrayHasKey('last', $content['_links']); + + foreach (['self', 'first', 'last'] as $link) { + $this->assertArrayHasKey('href', $content['_links'][$link]); + $this->assertContains('archive=1', $content['_links'][$link]['href']); + } + + $this->assertTrue( + $this->client->getResponse()->headers->contains( + 'Content-Type', + 'application/json' + ) + ); + } + + public function testGetTaggedEntries() + { + $this->client->request('GET', '/api/entries', ['tags' => 'foo,bar']); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertGreaterThanOrEqual(1, count($content)); + $this->assertNotEmpty($content['_embedded']['items']); + $this->assertGreaterThanOrEqual(1, $content['total']); + $this->assertEquals(1, $content['page']); + $this->assertGreaterThanOrEqual(1, $content['pages']); + + $this->assertArrayHasKey('_links', $content); + $this->assertArrayHasKey('self', $content['_links']); + $this->assertArrayHasKey('first', $content['_links']); + $this->assertArrayHasKey('last', $content['_links']); + + foreach (['self', 'first', 'last'] as $link) { + $this->assertArrayHasKey('href', $content['_links'][$link]); + $this->assertContains('tags='.urlencode('foo,bar'), $content['_links'][$link]['href']); + } + + $this->assertTrue( + $this->client->getResponse()->headers->contains( + 'Content-Type', + 'application/json' + ) + ); + } + + public function testGetDatedEntries() + { + $this->client->request('GET', '/api/entries', ['since' => 1443274283]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertGreaterThanOrEqual(1, count($content)); + $this->assertNotEmpty($content['_embedded']['items']); + $this->assertGreaterThanOrEqual(1, $content['total']); + $this->assertEquals(1, $content['page']); + $this->assertGreaterThanOrEqual(1, $content['pages']); + + $this->assertArrayHasKey('_links', $content); + $this->assertArrayHasKey('self', $content['_links']); + $this->assertArrayHasKey('first', $content['_links']); + $this->assertArrayHasKey('last', $content['_links']); + + foreach (['self', 'first', 'last'] as $link) { + $this->assertArrayHasKey('href', $content['_links'][$link]); + $this->assertContains('since=1443274283', $content['_links'][$link]['href']); + } + + $this->assertTrue( + $this->client->getResponse()->headers->contains( + 'Content-Type', + 'application/json' + ) + ); + } + + public function testGetDatedSupEntries() + { + $future = new \DateTime(date('Y-m-d H:i:s')); + $this->client->request('GET', '/api/entries', ['since' => $future->getTimestamp() + 1000]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertGreaterThanOrEqual(1, count($content)); + $this->assertEmpty($content['_embedded']['items']); + $this->assertEquals(0, $content['total']); + $this->assertEquals(1, $content['page']); + $this->assertEquals(1, $content['pages']); + + $this->assertArrayHasKey('_links', $content); + $this->assertArrayHasKey('self', $content['_links']); + $this->assertArrayHasKey('first', $content['_links']); + $this->assertArrayHasKey('last', $content['_links']); + + foreach (['self', 'first', 'last'] as $link) { + $this->assertArrayHasKey('href', $content['_links'][$link]); + $this->assertContains('since='.($future->getTimestamp() + 1000), $content['_links'][$link]['href']); + } + + $this->assertTrue( + $this->client->getResponse()->headers->contains( + 'Content-Type', + 'application/json' + ) + ); + } + + public function testDeleteEntry() + { + $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findOneByUser(1); + + if (!$entry) { + $this->markTestSkipped('No content found in db.'); + } + + $this->client->request('DELETE', '/api/entries/'.$entry->getId().'.json'); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertEquals($entry->getTitle(), $content['title']); + $this->assertEquals($entry->getUrl(), $content['url']); + + // We'll try to delete this entry again + $this->client->request('DELETE', '/api/entries/'.$entry->getId().'.json'); + + $this->assertEquals(404, $this->client->getResponse()->getStatusCode()); + } + + public function testPostEntry() + { + $this->client->request('POST', '/api/entries.json', [ + 'url' => 'http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', + 'tags' => 'google', + 'title' => 'New title for my article', + ]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertGreaterThan(0, $content['id']); + $this->assertEquals('http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', $content['url']); + $this->assertEquals(false, $content['is_archived']); + $this->assertEquals(false, $content['is_starred']); + $this->assertEquals('New title for my article', $content['title']); + $this->assertEquals(1, $content['user_id']); + $this->assertCount(1, $content['tags']); + } + + public function testPostSameEntry() + { + $this->client->request('POST', '/api/entries.json', [ + 'url' => 'http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', + 'archive' => '1', + 'tags' => 'google, apple', + ]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertGreaterThan(0, $content['id']); + $this->assertEquals('http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', $content['url']); + $this->assertEquals(true, $content['is_archived']); + $this->assertEquals(false, $content['is_starred']); + $this->assertCount(2, $content['tags']); + } + + public function testPostArchivedAndStarredEntry() + { + $this->client->request('POST', '/api/entries.json', [ + 'url' => 'http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html', + 'archive' => '1', + 'starred' => '1', + ]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertGreaterThan(0, $content['id']); + $this->assertEquals('http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html', $content['url']); + $this->assertEquals(true, $content['is_archived']); + $this->assertEquals(true, $content['is_starred']); + $this->assertEquals(1, $content['user_id']); + } + + public function testPostArchivedAndStarredEntryWithoutQuotes() + { + $this->client->request('POST', '/api/entries.json', [ + 'url' => 'http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html', + 'archive' => 0, + 'starred' => 1, + ]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertGreaterThan(0, $content['id']); + $this->assertEquals('http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html', $content['url']); + $this->assertEquals(false, $content['is_archived']); + $this->assertEquals(true, $content['is_starred']); + } + + public function testPatchEntry() + { + $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findOneByUser(1); + + if (!$entry) { + $this->markTestSkipped('No content found in db.'); + } + + // hydrate the tags relations + $nbTags = count($entry->getTags()); + + $this->client->request('PATCH', '/api/entries/'.$entry->getId().'.json', [ + 'title' => 'New awesome title', + 'tags' => 'new tag '.uniqid(), + 'starred' => '1', + 'archive' => '0', + ]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertEquals($entry->getId(), $content['id']); + $this->assertEquals($entry->getUrl(), $content['url']); + $this->assertEquals('New awesome title', $content['title']); + $this->assertGreaterThan($nbTags, count($content['tags'])); + $this->assertEquals(1, $content['user_id']); + } + + public function testPatchEntryWithoutQuotes() + { + $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findOneByUser(1); + + if (!$entry) { + $this->markTestSkipped('No content found in db.'); + } + + // hydrate the tags relations + $nbTags = count($entry->getTags()); + + $this->client->request('PATCH', '/api/entries/'.$entry->getId().'.json', [ + 'title' => 'New awesome title', + 'tags' => 'new tag '.uniqid(), + 'starred' => 1, + 'archive' => 0, + ]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertEquals($entry->getId(), $content['id']); + $this->assertEquals($entry->getUrl(), $content['url']); + $this->assertEquals('New awesome title', $content['title']); + $this->assertGreaterThan($nbTags, count($content['tags'])); + } + + public function testGetTagsEntry() + { + $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findOneWithTags($this->user->getId()); + + $entry = $entry[0]; + + if (!$entry) { + $this->markTestSkipped('No content found in db.'); + } + + $tags = []; + foreach ($entry->getTags() as $tag) { + $tags[] = ['id' => $tag->getId(), 'label' => $tag->getLabel(), 'slug' => $tag->getSlug()]; + } + + $this->client->request('GET', '/api/entries/'.$entry->getId().'/tags'); + + $this->assertEquals(json_encode($tags, JSON_HEX_QUOT), $this->client->getResponse()->getContent()); + } + + public function testPostTagsOnEntry() + { + $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findOneByUser(1); + + if (!$entry) { + $this->markTestSkipped('No content found in db.'); + } + + $nbTags = count($entry->getTags()); + + $newTags = 'tag1,tag2,tag3'; + + $this->client->request('POST', '/api/entries/'.$entry->getId().'/tags', ['tags' => $newTags]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertArrayHasKey('tags', $content); + $this->assertEquals($nbTags + 3, count($content['tags'])); + + $entryDB = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->find($entry->getId()); + + $tagsInDB = []; + foreach ($entryDB->getTags()->toArray() as $tag) { + $tagsInDB[$tag->getId()] = $tag->getLabel(); + } + + foreach (explode(',', $newTags) as $tag) { + $this->assertContains($tag, $tagsInDB); + } + } + + public function testDeleteOneTagEntry() + { + $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findOneWithTags($this->user->getId()); + $entry = $entry[0]; + + if (!$entry) { + $this->markTestSkipped('No content found in db.'); + } + + // hydrate the tags relations + $nbTags = count($entry->getTags()); + $tag = $entry->getTags()[0]; + + $this->client->request('DELETE', '/api/entries/'.$entry->getId().'/tags/'.$tag->getId().'.json'); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertArrayHasKey('tags', $content); + $this->assertEquals($nbTags - 1, count($content['tags'])); + } + + public function testSaveIsArchivedAfterPost() + { + $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findOneBy(['user' => 1, 'isArchived' => true]); + + if (!$entry) { + $this->markTestSkipped('No content found in db.'); + } + + $this->client->request('POST', '/api/entries.json', [ + 'url' => $entry->getUrl(), + ]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertEquals(true, $content['is_archived']); + } + + public function testSaveIsStarredAfterPost() + { + $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findOneBy(['user' => 1, 'isStarred' => true]); + + if (!$entry) { + $this->markTestSkipped('No content found in db.'); + } + + $this->client->request('POST', '/api/entries.json', [ + 'url' => $entry->getUrl(), + ]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertEquals(true, $content['is_starred']); + } + + public function testSaveIsArchivedAfterPatch() + { + $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findOneBy(['user' => 1, 'isArchived' => true]); + + if (!$entry) { + $this->markTestSkipped('No content found in db.'); + } + + $this->client->request('PATCH', '/api/entries/'.$entry->getId().'.json', [ + 'title' => $entry->getTitle().'++', + ]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertEquals(true, $content['is_archived']); + } + + public function testSaveIsStarredAfterPatch() + { + $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findOneBy(['user' => 1, 'isStarred' => true]); + + if (!$entry) { + $this->markTestSkipped('No content found in db.'); + } + $this->client->request('PATCH', '/api/entries/'.$entry->getId().'.json', [ + 'title' => $entry->getTitle().'++', + ]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertEquals(true, $content['is_starred']); + } + + public function testGetEntriesExists() + { + $this->client->request('GET', '/api/entries/exists?url=http://0.0.0.0/entry2'); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertEquals(true, $content['exists']); + } + + public function testGetEntriesExistsWithManyUrls() + { + $url1 = 'http://0.0.0.0/entry2'; + $url2 = 'http://0.0.0.0/entry10'; + $this->client->request('GET', '/api/entries/exists?urls[]='.$url1.'&urls[]='.$url2); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertArrayHasKey($url1, $content); + $this->assertArrayHasKey($url2, $content); + $this->assertEquals(true, $content[$url1]); + $this->assertEquals(false, $content[$url2]); + } + + public function testGetEntriesExistsWhichDoesNotExists() + { + $this->client->request('GET', '/api/entries/exists?url=http://google.com/entry2'); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertEquals(false, $content['exists']); + } + + public function testGetEntriesExistsWithNoUrl() + { + $this->client->request('GET', '/api/entries/exists?url='); + + $this->assertEquals(403, $this->client->getResponse()->getStatusCode()); + } +} diff --git a/tests/Wallabag/ApiBundle/Controller/TagRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/TagRestControllerTest.php new file mode 100644 index 00000000..bde5251f --- /dev/null +++ b/tests/Wallabag/ApiBundle/Controller/TagRestControllerTest.php @@ -0,0 +1,162 @@ +client->request('GET', '/api/tags.json'); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertGreaterThan(0, $content); + $this->assertArrayHasKey('id', $content[0]); + $this->assertArrayHasKey('label', $content[0]); + + return end($content); + } + + /** + * @depends testGetUserTags + */ + public function testDeleteUserTag($tag) + { + $tagName = $tag['label']; + + $this->client->request('DELETE', '/api/tags/'.$tag['id'].'.json'); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertArrayHasKey('label', $content); + $this->assertEquals($tag['label'], $content['label']); + $this->assertEquals($tag['slug'], $content['slug']); + + $entries = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findAllByTagId($this->user->getId(), $tag['id']); + + $this->assertCount(0, $entries); + + $tag = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Tag') + ->findOneByLabel($tagName); + + $this->assertNull($tag, $tagName.' was removed because it begun an orphan tag'); + } + + public function testDeleteTagByLabel() + { + $em = $this->client->getContainer()->get('doctrine.orm.entity_manager'); + $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findOneWithTags($this->user->getId()); + + $entry = $entry[0]; + + $tag = new Tag(); + $tag->setLabel('Awesome tag for test'); + $em->persist($tag); + + $entry->addTag($tag); + + $em->persist($entry); + $em->flush(); + + $this->client->request('DELETE', '/api/tag/label.json', ['tag' => $tag->getLabel()]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertArrayHasKey('label', $content); + $this->assertEquals($tag->getLabel(), $content['label']); + $this->assertEquals($tag->getSlug(), $content['slug']); + + $entries = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findAllByTagId($this->user->getId(), $tag->getId()); + + $this->assertCount(0, $entries); + } + + public function testDeleteTagByLabelNotFound() + { + $this->client->request('DELETE', '/api/tag/label.json', ['tag' => 'does not exist']); + + $this->assertEquals(404, $this->client->getResponse()->getStatusCode()); + } + + public function testDeleteTagsByLabel() + { + $em = $this->client->getContainer()->get('doctrine.orm.entity_manager'); + $entry = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findOneWithTags($this->user->getId()); + + $entry = $entry[0]; + + $tag = new Tag(); + $tag->setLabel('Awesome tag for tagsLabel'); + $em->persist($tag); + + $tag2 = new Tag(); + $tag2->setLabel('Awesome tag for tagsLabel 2'); + $em->persist($tag2); + + $entry->addTag($tag); + $entry->addTag($tag2); + + $em->persist($entry); + $em->flush(); + + $this->client->request('DELETE', '/api/tags/label.json', ['tags' => $tag->getLabel().','.$tag2->getLabel()]); + + $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); + + $content = json_decode($this->client->getResponse()->getContent(), true); + + $this->assertCount(2, $content); + + $this->assertArrayHasKey('label', $content[0]); + $this->assertEquals($tag->getLabel(), $content[0]['label']); + $this->assertEquals($tag->getSlug(), $content[0]['slug']); + + $this->assertArrayHasKey('label', $content[1]); + $this->assertEquals($tag2->getLabel(), $content[1]['label']); + $this->assertEquals($tag2->getSlug(), $content[1]['slug']); + + $entries = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findAllByTagId($this->user->getId(), $tag->getId()); + + $this->assertCount(0, $entries); + + $entries = $this->client->getContainer() + ->get('doctrine.orm.entity_manager') + ->getRepository('WallabagCoreBundle:Entry') + ->findAllByTagId($this->user->getId(), $tag2->getId()); + + $this->assertCount(0, $entries); + } + + public function testDeleteTagsByLabelNotFound() + { + $this->client->request('DELETE', '/api/tags/label.json', ['tags' => 'does not exist']); + + $this->assertEquals(404, $this->client->getResponse()->getStatusCode()); + } +} diff --git a/tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php b/tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php index 5dcb3e00..c87e58de 100644 --- a/tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php +++ b/tests/Wallabag/ApiBundle/Controller/WallabagRestControllerTest.php @@ -3,697 +3,9 @@ namespace Tests\Wallabag\ApiBundle\Controller; use Tests\Wallabag\ApiBundle\WallabagApiTestCase; -use Wallabag\CoreBundle\Entity\Tag; class WallabagRestControllerTest extends WallabagApiTestCase { - protected static $salt; - - public function testGetOneEntry() - { - $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().'.json'); - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertEquals($entry->getTitle(), $content['title']); - $this->assertEquals($entry->getUrl(), $content['url']); - $this->assertCount(count($entry->getTags()), $content['tags']); - $this->assertEquals($entry->getUserName(), $content['user_name']); - $this->assertEquals($entry->getUserEmail(), $content['user_email']); - $this->assertEquals($entry->getUserId(), $content['user_id']); - - $this->assertTrue( - $this->client->getResponse()->headers->contains( - 'Content-Type', - 'application/json' - ) - ); - } - - public function testGetOneEntryWrongUser() - { - $entry = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findOneBy(['user' => 2, 'isArchived' => false]); - - if (!$entry) { - $this->markTestSkipped('No content found in db.'); - } - - $this->client->request('GET', '/api/entries/'.$entry->getId().'.json'); - - $this->assertEquals(403, $this->client->getResponse()->getStatusCode()); - } - - public function testGetEntries() - { - $this->client->request('GET', '/api/entries'); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertGreaterThanOrEqual(1, count($content)); - $this->assertNotEmpty($content['_embedded']['items']); - $this->assertGreaterThanOrEqual(1, $content['total']); - $this->assertEquals(1, $content['page']); - $this->assertGreaterThanOrEqual(1, $content['pages']); - - $this->assertTrue( - $this->client->getResponse()->headers->contains( - 'Content-Type', - 'application/json' - ) - ); - } - - public function testGetEntriesWithFullOptions() - { - $this->client->request('GET', '/api/entries', [ - 'archive' => 1, - 'starred' => 1, - 'sort' => 'updated', - 'order' => 'asc', - 'page' => 1, - 'perPage' => 2, - 'tags' => 'foo', - 'since' => 1443274283, - ]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertGreaterThanOrEqual(1, count($content)); - $this->assertArrayHasKey('items', $content['_embedded']); - $this->assertGreaterThanOrEqual(0, $content['total']); - $this->assertEquals(1, $content['page']); - $this->assertEquals(2, $content['limit']); - $this->assertGreaterThanOrEqual(1, $content['pages']); - - $this->assertArrayHasKey('_links', $content); - $this->assertArrayHasKey('self', $content['_links']); - $this->assertArrayHasKey('first', $content['_links']); - $this->assertArrayHasKey('last', $content['_links']); - - foreach (['self', 'first', 'last'] as $link) { - $this->assertArrayHasKey('href', $content['_links'][$link]); - $this->assertContains('archive=1', $content['_links'][$link]['href']); - $this->assertContains('starred=1', $content['_links'][$link]['href']); - $this->assertContains('sort=updated', $content['_links'][$link]['href']); - $this->assertContains('order=asc', $content['_links'][$link]['href']); - $this->assertContains('tags=foo', $content['_links'][$link]['href']); - $this->assertContains('since=1443274283', $content['_links'][$link]['href']); - } - - $this->assertTrue( - $this->client->getResponse()->headers->contains( - 'Content-Type', - 'application/json' - ) - ); - } - - public function testGetStarredEntries() - { - $this->client->request('GET', '/api/entries', ['starred' => 1, 'sort' => 'updated']); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertGreaterThanOrEqual(1, count($content)); - $this->assertNotEmpty($content['_embedded']['items']); - $this->assertGreaterThanOrEqual(1, $content['total']); - $this->assertEquals(1, $content['page']); - $this->assertGreaterThanOrEqual(1, $content['pages']); - - $this->assertArrayHasKey('_links', $content); - $this->assertArrayHasKey('self', $content['_links']); - $this->assertArrayHasKey('first', $content['_links']); - $this->assertArrayHasKey('last', $content['_links']); - - foreach (['self', 'first', 'last'] as $link) { - $this->assertArrayHasKey('href', $content['_links'][$link]); - $this->assertContains('starred=1', $content['_links'][$link]['href']); - $this->assertContains('sort=updated', $content['_links'][$link]['href']); - } - - $this->assertTrue( - $this->client->getResponse()->headers->contains( - 'Content-Type', - 'application/json' - ) - ); - } - - public function testGetArchiveEntries() - { - $this->client->request('GET', '/api/entries', ['archive' => 1]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertGreaterThanOrEqual(1, count($content)); - $this->assertNotEmpty($content['_embedded']['items']); - $this->assertGreaterThanOrEqual(1, $content['total']); - $this->assertEquals(1, $content['page']); - $this->assertGreaterThanOrEqual(1, $content['pages']); - - $this->assertArrayHasKey('_links', $content); - $this->assertArrayHasKey('self', $content['_links']); - $this->assertArrayHasKey('first', $content['_links']); - $this->assertArrayHasKey('last', $content['_links']); - - foreach (['self', 'first', 'last'] as $link) { - $this->assertArrayHasKey('href', $content['_links'][$link]); - $this->assertContains('archive=1', $content['_links'][$link]['href']); - } - - $this->assertTrue( - $this->client->getResponse()->headers->contains( - 'Content-Type', - 'application/json' - ) - ); - } - - public function testGetTaggedEntries() - { - $this->client->request('GET', '/api/entries', ['tags' => 'foo,bar']); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertGreaterThanOrEqual(1, count($content)); - $this->assertNotEmpty($content['_embedded']['items']); - $this->assertGreaterThanOrEqual(1, $content['total']); - $this->assertEquals(1, $content['page']); - $this->assertGreaterThanOrEqual(1, $content['pages']); - - $this->assertArrayHasKey('_links', $content); - $this->assertArrayHasKey('self', $content['_links']); - $this->assertArrayHasKey('first', $content['_links']); - $this->assertArrayHasKey('last', $content['_links']); - - foreach (['self', 'first', 'last'] as $link) { - $this->assertArrayHasKey('href', $content['_links'][$link]); - $this->assertContains('tags='.urlencode('foo,bar'), $content['_links'][$link]['href']); - } - - $this->assertTrue( - $this->client->getResponse()->headers->contains( - 'Content-Type', - 'application/json' - ) - ); - } - - public function testGetDatedEntries() - { - $this->client->request('GET', '/api/entries', ['since' => 1443274283]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertGreaterThanOrEqual(1, count($content)); - $this->assertNotEmpty($content['_embedded']['items']); - $this->assertGreaterThanOrEqual(1, $content['total']); - $this->assertEquals(1, $content['page']); - $this->assertGreaterThanOrEqual(1, $content['pages']); - - $this->assertArrayHasKey('_links', $content); - $this->assertArrayHasKey('self', $content['_links']); - $this->assertArrayHasKey('first', $content['_links']); - $this->assertArrayHasKey('last', $content['_links']); - - foreach (['self', 'first', 'last'] as $link) { - $this->assertArrayHasKey('href', $content['_links'][$link]); - $this->assertContains('since=1443274283', $content['_links'][$link]['href']); - } - - $this->assertTrue( - $this->client->getResponse()->headers->contains( - 'Content-Type', - 'application/json' - ) - ); - } - - public function testGetDatedSupEntries() - { - $future = new \DateTime(date('Y-m-d H:i:s')); - $this->client->request('GET', '/api/entries', ['since' => $future->getTimestamp() + 1000]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertGreaterThanOrEqual(1, count($content)); - $this->assertEmpty($content['_embedded']['items']); - $this->assertEquals(0, $content['total']); - $this->assertEquals(1, $content['page']); - $this->assertEquals(1, $content['pages']); - - $this->assertArrayHasKey('_links', $content); - $this->assertArrayHasKey('self', $content['_links']); - $this->assertArrayHasKey('first', $content['_links']); - $this->assertArrayHasKey('last', $content['_links']); - - foreach (['self', 'first', 'last'] as $link) { - $this->assertArrayHasKey('href', $content['_links'][$link]); - $this->assertContains('since='.($future->getTimestamp() + 1000), $content['_links'][$link]['href']); - } - - $this->assertTrue( - $this->client->getResponse()->headers->contains( - 'Content-Type', - 'application/json' - ) - ); - } - - public function testDeleteEntry() - { - $entry = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findOneByUser(1); - - if (!$entry) { - $this->markTestSkipped('No content found in db.'); - } - - $this->client->request('DELETE', '/api/entries/'.$entry->getId().'.json'); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertEquals($entry->getTitle(), $content['title']); - $this->assertEquals($entry->getUrl(), $content['url']); - - // We'll try to delete this entry again - $this->client->request('DELETE', '/api/entries/'.$entry->getId().'.json'); - - $this->assertEquals(404, $this->client->getResponse()->getStatusCode()); - } - - public function testPostEntry() - { - $this->client->request('POST', '/api/entries.json', [ - 'url' => 'http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', - 'tags' => 'google', - 'title' => 'New title for my article', - ]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertGreaterThan(0, $content['id']); - $this->assertEquals('http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', $content['url']); - $this->assertEquals(false, $content['is_archived']); - $this->assertEquals(false, $content['is_starred']); - $this->assertEquals('New title for my article', $content['title']); - $this->assertEquals(1, $content['user_id']); - $this->assertCount(1, $content['tags']); - } - - public function testPostSameEntry() - { - $this->client->request('POST', '/api/entries.json', [ - 'url' => 'http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', - 'archive' => '1', - 'tags' => 'google, apple', - ]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertGreaterThan(0, $content['id']); - $this->assertEquals('http://www.lemonde.fr/pixels/article/2015/03/28/plongee-dans-l-univers-d-ingress-le-jeu-de-google-aux-frontieres-du-reel_4601155_4408996.html', $content['url']); - $this->assertEquals(true, $content['is_archived']); - $this->assertEquals(false, $content['is_starred']); - $this->assertCount(2, $content['tags']); - } - - public function testPostArchivedAndStarredEntry() - { - $this->client->request('POST', '/api/entries.json', [ - 'url' => 'http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html', - 'archive' => '1', - 'starred' => '1', - ]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertGreaterThan(0, $content['id']); - $this->assertEquals('http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html', $content['url']); - $this->assertEquals(true, $content['is_archived']); - $this->assertEquals(true, $content['is_starred']); - $this->assertEquals(1, $content['user_id']); - } - - public function testPostArchivedAndStarredEntryWithoutQuotes() - { - $this->client->request('POST', '/api/entries.json', [ - 'url' => 'http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html', - 'archive' => 0, - 'starred' => 1, - ]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertGreaterThan(0, $content['id']); - $this->assertEquals('http://www.lemonde.fr/idees/article/2016/02/08/preserver-la-liberte-d-expression-sur-les-reseaux-sociaux_4861503_3232.html', $content['url']); - $this->assertEquals(false, $content['is_archived']); - $this->assertEquals(true, $content['is_starred']); - } - - public function testPatchEntry() - { - $entry = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findOneByUser(1); - - if (!$entry) { - $this->markTestSkipped('No content found in db.'); - } - - // hydrate the tags relations - $nbTags = count($entry->getTags()); - - $this->client->request('PATCH', '/api/entries/'.$entry->getId().'.json', [ - 'title' => 'New awesome title', - 'tags' => 'new tag '.uniqid(), - 'starred' => '1', - 'archive' => '0', - ]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertEquals($entry->getId(), $content['id']); - $this->assertEquals($entry->getUrl(), $content['url']); - $this->assertEquals('New awesome title', $content['title']); - $this->assertGreaterThan($nbTags, count($content['tags'])); - $this->assertEquals(1, $content['user_id']); - } - - public function testPatchEntryWithoutQuotes() - { - $entry = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findOneByUser(1); - - if (!$entry) { - $this->markTestSkipped('No content found in db.'); - } - - // hydrate the tags relations - $nbTags = count($entry->getTags()); - - $this->client->request('PATCH', '/api/entries/'.$entry->getId().'.json', [ - 'title' => 'New awesome title', - 'tags' => 'new tag '.uniqid(), - 'starred' => 1, - 'archive' => 0, - ]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertEquals($entry->getId(), $content['id']); - $this->assertEquals($entry->getUrl(), $content['url']); - $this->assertEquals('New awesome title', $content['title']); - $this->assertGreaterThan($nbTags, count($content['tags'])); - } - - public function testGetTagsEntry() - { - $entry = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findOneWithTags($this->user->getId()); - - $entry = $entry[0]; - - if (!$entry) { - $this->markTestSkipped('No content found in db.'); - } - - $tags = []; - foreach ($entry->getTags() as $tag) { - $tags[] = ['id' => $tag->getId(), 'label' => $tag->getLabel(), 'slug' => $tag->getSlug()]; - } - - $this->client->request('GET', '/api/entries/'.$entry->getId().'/tags'); - - $this->assertEquals(json_encode($tags, JSON_HEX_QUOT), $this->client->getResponse()->getContent()); - } - - public function testPostTagsOnEntry() - { - $entry = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findOneByUser(1); - - if (!$entry) { - $this->markTestSkipped('No content found in db.'); - } - - $nbTags = count($entry->getTags()); - - $newTags = 'tag1,tag2,tag3'; - - $this->client->request('POST', '/api/entries/'.$entry->getId().'/tags', ['tags' => $newTags]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertArrayHasKey('tags', $content); - $this->assertEquals($nbTags + 3, count($content['tags'])); - - $entryDB = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->find($entry->getId()); - - $tagsInDB = []; - foreach ($entryDB->getTags()->toArray() as $tag) { - $tagsInDB[$tag->getId()] = $tag->getLabel(); - } - - foreach (explode(',', $newTags) as $tag) { - $this->assertContains($tag, $tagsInDB); - } - } - - public function testDeleteOneTagEntry() - { - $entry = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findOneWithTags($this->user->getId()); - $entry = $entry[0]; - - if (!$entry) { - $this->markTestSkipped('No content found in db.'); - } - - // hydrate the tags relations - $nbTags = count($entry->getTags()); - $tag = $entry->getTags()[0]; - - $this->client->request('DELETE', '/api/entries/'.$entry->getId().'/tags/'.$tag->getId().'.json'); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertArrayHasKey('tags', $content); - $this->assertEquals($nbTags - 1, count($content['tags'])); - } - - public function testGetUserTags() - { - $this->client->request('GET', '/api/tags.json'); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertGreaterThan(0, $content); - $this->assertArrayHasKey('id', $content[0]); - $this->assertArrayHasKey('label', $content[0]); - - return end($content); - } - - /** - * @depends testGetUserTags - */ - public function testDeleteUserTag($tag) - { - $tagName = $tag['label']; - - $this->client->request('DELETE', '/api/tags/'.$tag['id'].'.json'); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertArrayHasKey('label', $content); - $this->assertEquals($tag['label'], $content['label']); - $this->assertEquals($tag['slug'], $content['slug']); - - $entries = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findAllByTagId($this->user->getId(), $tag['id']); - - $this->assertCount(0, $entries); - - $tag = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Tag') - ->findOneByLabel($tagName); - - $this->assertNull($tag, $tagName.' was removed because it begun an orphan tag'); - } - - public function testDeleteTagByLabel() - { - $em = $this->client->getContainer()->get('doctrine.orm.entity_manager'); - $entry = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findOneWithTags($this->user->getId()); - - $entry = $entry[0]; - - $tag = new Tag(); - $tag->setLabel('Awesome tag for test'); - $em->persist($tag); - - $entry->addTag($tag); - - $em->persist($entry); - $em->flush(); - - $this->client->request('DELETE', '/api/tag/label.json', ['tag' => $tag->getLabel()]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertArrayHasKey('label', $content); - $this->assertEquals($tag->getLabel(), $content['label']); - $this->assertEquals($tag->getSlug(), $content['slug']); - - $entries = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findAllByTagId($this->user->getId(), $tag->getId()); - - $this->assertCount(0, $entries); - } - - public function testDeleteTagByLabelNotFound() - { - $this->client->request('DELETE', '/api/tag/label.json', ['tag' => 'does not exist']); - - $this->assertEquals(404, $this->client->getResponse()->getStatusCode()); - } - - public function testDeleteTagsByLabel() - { - $em = $this->client->getContainer()->get('doctrine.orm.entity_manager'); - $entry = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findOneWithTags($this->user->getId()); - - $entry = $entry[0]; - - $tag = new Tag(); - $tag->setLabel('Awesome tag for tagsLabel'); - $em->persist($tag); - - $tag2 = new Tag(); - $tag2->setLabel('Awesome tag for tagsLabel 2'); - $em->persist($tag2); - - $entry->addTag($tag); - $entry->addTag($tag2); - - $em->persist($entry); - $em->flush(); - - $this->client->request('DELETE', '/api/tags/label.json', ['tags' => $tag->getLabel().','.$tag2->getLabel()]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertCount(2, $content); - - $this->assertArrayHasKey('label', $content[0]); - $this->assertEquals($tag->getLabel(), $content[0]['label']); - $this->assertEquals($tag->getSlug(), $content[0]['slug']); - - $this->assertArrayHasKey('label', $content[1]); - $this->assertEquals($tag2->getLabel(), $content[1]['label']); - $this->assertEquals($tag2->getSlug(), $content[1]['slug']); - - $entries = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findAllByTagId($this->user->getId(), $tag->getId()); - - $this->assertCount(0, $entries); - - $entries = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findAllByTagId($this->user->getId(), $tag2->getId()); - - $this->assertCount(0, $entries); - } - - public function testDeleteTagsByLabelNotFound() - { - $this->client->request('DELETE', '/api/tags/label.json', ['tags' => 'does not exist']); - - $this->assertEquals(404, $this->client->getResponse()->getStatusCode()); - } - public function testGetVersion() { $this->client->request('GET', '/api/version'); @@ -704,136 +16,4 @@ class WallabagRestControllerTest extends WallabagApiTestCase $this->assertEquals($this->client->getContainer()->getParameter('wallabag_core.version'), $content); } - - public function testSaveIsArchivedAfterPost() - { - $entry = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findOneBy(['user' => 1, 'isArchived' => true]); - - if (!$entry) { - $this->markTestSkipped('No content found in db.'); - } - - $this->client->request('POST', '/api/entries.json', [ - 'url' => $entry->getUrl(), - ]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertEquals(true, $content['is_archived']); - } - - public function testSaveIsStarredAfterPost() - { - $entry = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findOneBy(['user' => 1, 'isStarred' => true]); - - if (!$entry) { - $this->markTestSkipped('No content found in db.'); - } - - $this->client->request('POST', '/api/entries.json', [ - 'url' => $entry->getUrl(), - ]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertEquals(true, $content['is_starred']); - } - - public function testSaveIsArchivedAfterPatch() - { - $entry = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findOneBy(['user' => 1, 'isArchived' => true]); - - if (!$entry) { - $this->markTestSkipped('No content found in db.'); - } - - $this->client->request('PATCH', '/api/entries/'.$entry->getId().'.json', [ - 'title' => $entry->getTitle().'++', - ]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertEquals(true, $content['is_archived']); - } - - public function testSaveIsStarredAfterPatch() - { - $entry = $this->client->getContainer() - ->get('doctrine.orm.entity_manager') - ->getRepository('WallabagCoreBundle:Entry') - ->findOneBy(['user' => 1, 'isStarred' => true]); - - if (!$entry) { - $this->markTestSkipped('No content found in db.'); - } - $this->client->request('PATCH', '/api/entries/'.$entry->getId().'.json', [ - 'title' => $entry->getTitle().'++', - ]); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertEquals(true, $content['is_starred']); - } - - public function testGetEntriesExists() - { - $this->client->request('GET', '/api/entries/exists?url=http://0.0.0.0/entry2'); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertEquals(true, $content['exists']); - } - - public function testGetEntriesExistsWithManyUrls() - { - $url1 = 'http://0.0.0.0/entry2'; - $url2 = 'http://0.0.0.0/entry10'; - $this->client->request('GET', '/api/entries/exists?urls[]='.$url1.'&urls[]='.$url2); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertArrayHasKey($url1, $content); - $this->assertArrayHasKey($url2, $content); - $this->assertEquals(true, $content[$url1]); - $this->assertEquals(false, $content[$url2]); - } - - public function testGetEntriesExistsWhichDoesNotExists() - { - $this->client->request('GET', '/api/entries/exists?url=http://google.com/entry2'); - - $this->assertEquals(200, $this->client->getResponse()->getStatusCode()); - - $content = json_decode($this->client->getResponse()->getContent(), true); - - $this->assertEquals(false, $content['exists']); - } - - public function testGetEntriesExistsWithNoUrl() - { - $this->client->request('GET', '/api/entries/exists?url='); - - $this->assertEquals(403, $this->client->getResponse()->getStatusCode()); - } } diff --git a/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php index 9ecd8bc4..5ca886bd 100644 --- a/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php @@ -117,6 +117,17 @@ class ExportControllerTest extends WallabagCoreTestCase $this->assertEquals('application/pdf', $headers->get('content-type')); $this->assertEquals('attachment; filename="All articles.pdf"', $headers->get('content-disposition')); $this->assertEquals('binary', $headers->get('content-transfer-encoding')); + + ob_start(); + $crawler = $client->request('GET', '/export/tag_entries.pdf?tag=foo'); + ob_end_clean(); + + $this->assertEquals(200, $client->getResponse()->getStatusCode()); + + $headers = $client->getResponse()->headers; + $this->assertEquals('application/pdf', $headers->get('content-type')); + $this->assertEquals('attachment; filename="Tag_entries articles.pdf"', $headers->get('content-disposition')); + $this->assertEquals('binary', $headers->get('content-transfer-encoding')); } public function testTxtExport() diff --git a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php index 441d6519..21412da6 100644 --- a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php +++ b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php @@ -26,7 +26,6 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase protected $mailer; protected $spool; protected $twig; - protected $config; protected function setUp() { @@ -44,14 +43,6 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase TWIG; $this->twig = new \Twig_Environment(new \Twig_Loader_Array(['WallabagUserBundle:TwoFactor:email_auth_code.html.twig' => $twigTemplate])); - - $this->config = $this->getMockBuilder('Craue\ConfigBundle\Util\Config') - ->disableOriginalConstructor() - ->getMock(); - - $this->config->expects($this->any()) - ->method('get') - ->willReturn('http://0.0.0.0/support'); } public function testSendEmail() @@ -67,7 +58,8 @@ TWIG; $this->twig, 'nobody@test.io', 'wallabag test', - $this->config + 'http://0.0.0.0/support', + 'http://0.0.0.0/' ); $authCodeMailer->sendAuthCode($user);