From d070aabe9a9e2fc525022fb1ab24bdb6d3d4b2c3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Sat, 8 Apr 2017 18:53:40 +0200 Subject: [PATCH] Replace edit image page with Kotlin version --- .../sone/web/pages/EditImagePage.java | 83 ---------------------- .../pterodactylus/sone/web/pages/EditImagePage.kt | 46 ++++++++++++ .../net/pterodactylus/sone/test/Mockotlin.kt | 2 + .../sone/web/pages/EditImagePageTest.kt | 7 +- 4 files changed, 53 insertions(+), 85 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/web/pages/EditImagePage.java create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt diff --git a/src/main/java/net/pterodactylus/sone/web/pages/EditImagePage.java b/src/main/java/net/pterodactylus/sone/web/pages/EditImagePage.java deleted file mode 100644 index 34f404e..0000000 --- a/src/main/java/net/pterodactylus/sone/web/pages/EditImagePage.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Sone - EditImagePage.java - Copyright © 2010–2016 David Roden - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.pterodactylus.sone.web.pages; - -import net.pterodactylus.sone.data.Image; -import net.pterodactylus.sone.text.TextFilter; -import net.pterodactylus.sone.web.WebInterface; -import net.pterodactylus.sone.web.page.FreenetRequest; -import net.pterodactylus.util.template.Template; -import net.pterodactylus.util.template.TemplateContext; -import net.pterodactylus.util.web.Method; - -/** - * Page that lets the user edit title and description of an {@link Image}. - * - * @author David ‘Bombe’ Roden - */ -public class EditImagePage extends SoneTemplatePage { - - /** - * Creates a new “edit image” page. - * - * @param template - * The template to render - * @param webInterface - * The Sone web interface - */ - public EditImagePage(Template template, WebInterface webInterface) { - super("editImage.html", template, "Page.EditImage.Title", webInterface, true); - } - - // - // SONETEMPLATEPAGE METHODS - // - - /** - * {@inheritDoc} - */ - @Override - protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException { - if (request.getMethod() == Method.POST) { - String imageId = request.getHttpRequest().getPartAsStringFailsafe("image", 36); - String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256); - Image image = webInterface.getCore().getImage(imageId, false); - if (image == null) { - throw new RedirectException("invalid.html"); - } - if (!image.getSone().isLocal()) { - throw new RedirectException("noPermission.html"); - } - if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveLeft", 4))) { - image.getAlbum().moveImageUp(image); - } else if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveRight", 4))) { - image.getAlbum().moveImageDown(image); - } else { - String title = request.getHttpRequest().getPartAsStringFailsafe("title", 100).trim(); - String description = request.getHttpRequest().getPartAsStringFailsafe("description", 1024).trim(); - if (title.length() == 0) { - throw new RedirectException("emptyImageTitle.html"); - } - image.modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update(); - } - webInterface.getCore().touchConfiguration(); - throw new RedirectException(returnPage); - } - } - -} diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt new file mode 100644 index 0000000..5ce1702 --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt @@ -0,0 +1,46 @@ +package net.pterodactylus.sone.web.pages + +import net.pterodactylus.sone.data.Image.Modifier.ImageTitleMustNotBeEmpty +import net.pterodactylus.sone.text.TextFilter +import net.pterodactylus.sone.utils.isPOST +import net.pterodactylus.sone.web.WebInterface +import net.pterodactylus.sone.web.page.FreenetRequest +import net.pterodactylus.util.template.Template +import net.pterodactylus.util.template.TemplateContext + +/** + * Page that lets the user edit title and description of an {@link Image}. + */ +class EditImagePage(template: Template, webInterface: WebInterface): + SoneTemplatePage("editImage.html", template, "Page.EditImage.Title", webInterface, true) { + + override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) { + if (request.isPOST) { + val image = webInterface.core.getImage(request.httpRequest.getPartAsStringFailsafe("image", 36)) ?: throw RedirectException("invalid.html") + if (!image.sone.isLocal) { + throw RedirectException("noPermission.html") + } + request.httpRequest.getPartAsStringFailsafe("returnPage", 256).let { returnPage -> + if (request.httpRequest.getPartAsStringFailsafe("moveLeft", 4) == "true") { + image.album.moveImageUp(image) + webInterface.core.touchConfiguration() + } else if (request.httpRequest.getPartAsStringFailsafe("moveRight", 4) == "true") { + image.album.moveImageDown(image) + webInterface.core.touchConfiguration() + } else { + try { + image.modify() + .setTitle(request.httpRequest.getPartAsStringFailsafe("title", 100)) + .setDescription(TextFilter.filter(request.httpRequest.getHeader("Host"), request.httpRequest.getPartAsStringFailsafe("description", 1024))) + .update() + webInterface.core.touchConfiguration() + } catch (e: ImageTitleMustNotBeEmpty) { + throw RedirectException("emptyImageTitle.html") + } + } + throw RedirectException(returnPage) + } + } + } + +} diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Mockotlin.kt b/src/test/kotlin/net/pterodactylus/sone/test/Mockotlin.kt index 4549641..dcd139b 100644 --- a/src/test/kotlin/net/pterodactylus/sone/test/Mockotlin.kt +++ b/src/test/kotlin/net/pterodactylus/sone/test/Mockotlin.kt @@ -11,6 +11,8 @@ inline fun deepMock(): T = Mockito.mock(T::class.java, Mock inline fun selfMock(): T = Mockito.mock(T::class.java, Mockito.RETURNS_SELF)!! inline fun capture(): ArgumentCaptor = ArgumentCaptor.forClass(T::class.java) +inline fun OngoingStubbing<*>.doThrow(): OngoingStubbing<*> = thenThrow(E::class.java) + inline fun bind(implementation: T): Module = Module { it!!.bind(T::class.java).toInstance(implementation) } diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt index 810e149..4a39cdf 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt @@ -3,7 +3,9 @@ package net.pterodactylus.sone.web.pages import net.pterodactylus.sone.data.Album import net.pterodactylus.sone.data.Image import net.pterodactylus.sone.data.Image.Modifier +import net.pterodactylus.sone.data.Image.Modifier.ImageTitleMustNotBeEmpty import net.pterodactylus.sone.data.Sone +import net.pterodactylus.sone.test.doThrow import net.pterodactylus.sone.test.mock import net.pterodactylus.sone.test.mockBuilder import net.pterodactylus.sone.test.whenever @@ -59,7 +61,7 @@ class EditImagePageTest : WebPageTest() { @Test fun `get request does not redirect`() { request("", GET) - page.handleRequest(freenetRequest, templateContext) + page.processTemplate(freenetRequest, templateContext) } @Test @@ -110,6 +112,7 @@ class EditImagePageTest : WebPageTest() { addHttpRequestParameter("image", "image-id") addHttpRequestParameter("returnPage", "return.html") addHttpRequestParameter("title", " ") + whenever(modifier.update()).doThrow() verifyRedirect("emptyImageTitle.html") { verify(core, never()).touchConfiguration() } @@ -132,7 +135,7 @@ class EditImagePageTest : WebPageTest() { } @Test - fun `post request with image title and description modifies image with filtered description and redirects to reutrn page`() { + fun `post request with image title and description modifies image with filtered description and redirects to return page`() { request("", POST) addImage("image-id", image) addHttpRequestParameter("image", "image-id") -- 2.7.4