import net.pterodactylus.sone.web.ajax.UnlockSoneAjaxPage;
import net.pterodactylus.sone.web.ajax.UntrustAjaxPage;
import net.pterodactylus.sone.web.page.FreenetRequest;
+import net.pterodactylus.sone.web.page.TemplateRenderer;
import net.pterodactylus.sone.web.pages.AboutPage;
import net.pterodactylus.sone.web.pages.BookmarkPage;
import net.pterodactylus.sone.web.pages.BookmarksPage;
/** The template context factory. */
private final TemplateContextFactory templateContextFactory;
+ private final TemplateRenderer templateRenderer;
/** The Sone text parser. */
private final SoneTextParser soneTextParser;
public WebInterface(SonePlugin sonePlugin, Loaders loaders, ListNotificationFilter listNotificationFilter,
PostVisibilityFilter postVisibilityFilter, ReplyVisibilityFilter replyVisibilityFilter,
ElementLoader elementLoader, TemplateContextFactory templateContextFactory,
+ TemplateRenderer templateRenderer,
ParserFilter parserFilter, ShortenFilter shortenFilter,
RenderFilter renderFilter,
LinkedElementRenderFilter linkedElementRenderFilter,
this.postVisibilityFilter = postVisibilityFilter;
this.replyVisibilityFilter = replyVisibilityFilter;
this.elementLoader = elementLoader;
+ this.templateRenderer = templateRenderer;
this.parserFilter = parserFilter;
this.shortenFilter = shortenFilter;
this.renderFilter = renderFilter;
Template openSearchTemplate = loaders.loadTemplate("/templates/xml/OpenSearch.xml");
pageToadletRegistry.addPage(new RedirectPage<FreenetRequest>("", "index.html"));
- pageToadletRegistry.addPage(new IndexPage(indexTemplate, this, loaders, postVisibilityFilter));
- pageToadletRegistry.addPage(new NewPage(newTemplate, this, loaders));
- pageToadletRegistry.addPage(new CreateSonePage(createSoneTemplate, this, loaders));
- pageToadletRegistry.addPage(new KnownSonesPage(knownSonesTemplate, this, loaders));
- pageToadletRegistry.addPage(new EditProfilePage(editProfileTemplate, this, loaders));
- pageToadletRegistry.addPage(new EditProfileFieldPage(editProfileFieldTemplate, this, loaders));
- pageToadletRegistry.addPage(new DeleteProfileFieldPage(deleteProfileFieldTemplate, this, loaders));
- pageToadletRegistry.addPage(new CreatePostPage(createPostTemplate, this, loaders));
- pageToadletRegistry.addPage(new CreateReplyPage(createReplyTemplate, this, loaders));
- pageToadletRegistry.addPage(new ViewSonePage(viewSoneTemplate, this, loaders));
- pageToadletRegistry.addPage(new ViewPostPage(viewPostTemplate, this, loaders));
- pageToadletRegistry.addPage(new LikePage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new UnlikePage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new DeletePostPage(deletePostTemplate, this, loaders));
- pageToadletRegistry.addPage(new DeleteReplyPage(deleteReplyTemplate, this, loaders));
- pageToadletRegistry.addPage(new LockSonePage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new UnlockSonePage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new FollowSonePage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new UnfollowSonePage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new ImageBrowserPage(imageBrowserTemplate, this, loaders));
- pageToadletRegistry.addPage(new CreateAlbumPage(createAlbumTemplate, this, loaders));
- pageToadletRegistry.addPage(new EditAlbumPage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new DeleteAlbumPage(deleteAlbumTemplate, this, loaders));
- pageToadletRegistry.addPage(new UploadImagePage(invalidTemplate, this, loaders));
- pageToadletRegistry.addPage(new EditImagePage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new DeleteImagePage(deleteImageTemplate, this, loaders));
- pageToadletRegistry.addPage(new TrustPage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new DistrustPage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new UntrustPage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new MarkAsKnownPage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new BookmarkPage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new UnbookmarkPage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new BookmarksPage(bookmarksTemplate, this, loaders));
- pageToadletRegistry.addPage(new SearchPage(searchTemplate, this, loaders));
- pageToadletRegistry.addPage(new DeleteSonePage(deleteSoneTemplate, this, loaders));
- pageToadletRegistry.addPage(new LoginPage(loginTemplate, this, loaders));
- pageToadletRegistry.addPage(new LogoutPage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new OptionsPage(optionsTemplate, this, loaders));
- pageToadletRegistry.addPage(new RescuePage(rescueTemplate, this, loaders));
- pageToadletRegistry.addPage(new AboutPage(aboutTemplate, this, loaders, new PluginVersion(SonePlugin.getPluginVersion()), new PluginYear(sonePlugin.getYear()), new PluginHomepage(sonePlugin.getHomepage())));
- pageToadletRegistry.addPage(new SoneTemplatePage("noPermission.html", this, loaders, noPermissionTemplate, "Page.NoPermission.Title"));
- pageToadletRegistry.addPage(new SoneTemplatePage("emptyImageTitle.html", this, loaders, emptyImageTitleTemplate, "Page.EmptyImageTitle.Title"));
- pageToadletRegistry.addPage(new SoneTemplatePage("emptyAlbumTitle.html", this, loaders, emptyAlbumTitleTemplate, "Page.EmptyAlbumTitle.Title"));
- pageToadletRegistry.addPage(new DismissNotificationPage(emptyTemplate, this, loaders));
- pageToadletRegistry.addPage(new SoneTemplatePage("invalid.html", this, loaders, invalidTemplate, "Page.Invalid.Title"));
+ pageToadletRegistry.addPage(new IndexPage(indexTemplate, this, loaders, templateRenderer, postVisibilityFilter));
+ pageToadletRegistry.addPage(new NewPage(newTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new CreateSonePage(createSoneTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new KnownSonesPage(knownSonesTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new EditProfilePage(editProfileTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new EditProfileFieldPage(editProfileFieldTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DeleteProfileFieldPage(deleteProfileFieldTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new CreatePostPage(createPostTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new CreateReplyPage(createReplyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new ViewSonePage(viewSoneTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new ViewPostPage(viewPostTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new LikePage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new UnlikePage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DeletePostPage(deletePostTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DeleteReplyPage(deleteReplyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new LockSonePage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new UnlockSonePage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new FollowSonePage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new UnfollowSonePage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new ImageBrowserPage(imageBrowserTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new CreateAlbumPage(createAlbumTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new EditAlbumPage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DeleteAlbumPage(deleteAlbumTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new UploadImagePage(invalidTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new EditImagePage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DeleteImagePage(deleteImageTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new TrustPage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DistrustPage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new UntrustPage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new MarkAsKnownPage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new BookmarkPage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new UnbookmarkPage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new BookmarksPage(bookmarksTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new SearchPage(searchTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new DeleteSonePage(deleteSoneTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new LoginPage(loginTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new LogoutPage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new OptionsPage(optionsTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new RescuePage(rescueTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new AboutPage(aboutTemplate, this, loaders, templateRenderer, new PluginVersion(SonePlugin.getPluginVersion()), new PluginYear(sonePlugin.getYear()), new PluginHomepage(sonePlugin.getHomepage())));
+ pageToadletRegistry.addPage(new SoneTemplatePage("noPermission.html", this, loaders, noPermissionTemplate, templateRenderer, "Page.NoPermission.Title"));
+ pageToadletRegistry.addPage(new SoneTemplatePage("emptyImageTitle.html", this, loaders, emptyImageTitleTemplate, templateRenderer, "Page.EmptyImageTitle.Title"));
+ pageToadletRegistry.addPage(new SoneTemplatePage("emptyAlbumTitle.html", this, loaders, emptyAlbumTitleTemplate, templateRenderer, "Page.EmptyAlbumTitle.Title"));
+ pageToadletRegistry.addPage(new DismissNotificationPage(emptyTemplate, this, loaders, templateRenderer));
+ pageToadletRegistry.addPage(new SoneTemplatePage("invalid.html", this, loaders, invalidTemplate, templateRenderer, "Page.Invalid.Title"));
pageToadletRegistry.addPage(loaders.<FreenetRequest>loadStaticPage("css/", "/static/css/", "text/css"));
pageToadletRegistry.addPage(loaders.<FreenetRequest>loadStaticPage("javascript/", "/static/javascript/", "text/javascript"));
pageToadletRegistry.addPage(loaders.<FreenetRequest>loadStaticPage("images/", "/static/images/", "image/png"));
import net.pterodactylus.sone.main.*
import net.pterodactylus.util.template.*
import net.pterodactylus.util.web.*
-import java.io.*
import java.lang.String.*
import java.net.*
import java.util.logging.*
*/
open class FreenetTemplatePage(
private val path: String,
- private val templateContextFactory: TemplateContextFactory,
+ private val templateRenderer: TemplateRenderer,
loaders: Loaders,
template: Template,
private val invalidFormPasswordRedirectTarget: String
}
shortcutIcon?.let { pageNode.addForwardLink("icon", it) }
- val templateContext = templateContextFactory.createTemplateContext()
- templateContext.mergeContext(template.initialContext)
- try {
+ val output = try {
val start = System.nanoTime()
- processTemplate(request, templateContext)
- val finish = System.nanoTime()
- logger.log(Level.FINEST, format("Template was rendered in %.2fms.", (finish - start) / 1000000.0))
+ templateRenderer.render(template) { templateContext ->
+ processTemplate(request, templateContext)
+ }.also {
+ val finish = System.nanoTime()
+ logger.log(Level.FINEST, format("Template was rendered in %.2fms.", (finish - start) / 1000000.0))
+ }
} catch (re1: RedirectException) {
return RedirectResponse(re1.target ?: "")
}
- val stringWriter = StringWriter()
- template.render(templateContext, stringWriter)
- pageNode.content.addChild("%", stringWriter.toString())
+ pageNode.content.addChild("%", output)
return response.setStatusCode(200).setStatusText("OK").setContentType("text/html").write(pageNode.outer.generate())
}
* A [SoneTemplatePage] that stores information about Sone in the [TemplateContext].
*/
@MenuName("About")
-class AboutPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders,
+class AboutPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer,
private val pluginVersion: PluginVersion,
private val pluginYear: PluginYear,
- private val pluginHomepage: PluginHomepage): SoneTemplatePage("about.html", webInterface, loaders, template = template, pageTitleKey = "Page.About.Title") {
+ private val pluginHomepage: PluginHomepage): SoneTemplatePage("about.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.About.Title") {
override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
templateContext["version"] = pluginVersion.version
/**
* Page that lets the user bookmark a post.
*/
-class BookmarkPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders)
- : SoneTemplatePage("bookmark.html", webInterface, loaders, template = template, pageTitleKey = "Page.Bookmark.Title") {
+class BookmarkPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer)
+ : SoneTemplatePage("bookmark.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.Bookmark.Title") {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
* Page that lets the user browse all his bookmarked posts.
*/
@MenuName("Bookmarks")
-class BookmarksPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders) :
- SoneTemplatePage("bookmarks.html", webInterface, loaders, template = template, pageTitleKey = "Page.Bookmarks.Title") {
+class BookmarksPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+ SoneTemplatePage("bookmarks.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.Bookmarks.Title") {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
soneRequest.core.bookmarkedPosts.let { posts ->
/**
* Page that lets the user create a new album.
*/
-class CreateAlbumPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("createAlbum.html", template, "Page.CreateAlbum.Title", webInterface, loaders) {
+class CreateAlbumPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("createAlbum.html", template, "Page.CreateAlbum.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* This page lets the user create a new [Post].
*/
-class CreatePostPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("createPost.html", template, "Page.CreatePost.Title", webInterface, loaders) {
+class CreatePostPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("createPost.html", template, "Page.CreatePost.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
val returnPage = soneRequest.httpRequest.getPartAsStringFailsafe("returnPage", 256)
/**
* This page lets the user post a reply to a post.
*/
-class CreateReplyPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("createReply.html", template, "Page.CreateReply.Title", webInterface, loaders) {
+class CreateReplyPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("createReply.html", template, "Page.CreateReply.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
val postId = soneRequest.httpRequest.getPartAsStringFailsafe("post", 36).apply { templateContext["postId"] = this }
* The “create Sone” page lets the user create a new Sone.
*/
@MenuName("CreateSone")
-class CreateSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- SoneTemplatePage("createSone.html", webInterface, loaders, template = template, pageTitleKey = "Page.CreateSone.Title") {
+class CreateSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ SoneTemplatePage("createSone.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.CreateSone.Title") {
private val logger = Logger.getLogger(CreateSonePage::class.java.name)
/**
* Page that lets the user delete an {@link Album}.
*/
-class DeleteAlbumPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("deleteAlbum.html", template, "Page.DeleteAlbum.Title", webInterface, loaders) {
+class DeleteAlbumPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("deleteAlbum.html", template, "Page.DeleteAlbum.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* Page that lets the user delete an {@link Image}.
*/
-class DeleteImagePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("deleteImage.html", template, "Page.DeleteImage.Title", webInterface, loaders) {
+class DeleteImagePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("deleteImage.html", template, "Page.DeleteImage.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* Lets the user delete a post they made.
*/
-class DeletePostPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("deletePost.html", template, "Page.DeletePost.Title", webInterface, loaders) {
+class DeletePostPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("deletePost.html", template, "Page.DeletePost.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* Page that lets the user confirm the deletion of a profile field.
*/
-class DeleteProfileFieldPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("deleteProfileField.html", template, "Page.DeleteProfileField.Title", webInterface, loaders) {
+class DeleteProfileFieldPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("deleteProfileField.html", template, "Page.DeleteProfileField.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* This page lets the user delete a reply.
*/
-class DeleteReplyPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("deleteReply.html", template, "Page.DeleteReply.Title", webInterface, loaders) {
+class DeleteReplyPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("deleteReply.html", template, "Page.DeleteReply.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
* installation.
*/
@MenuName("DeleteSone")
-class DeleteSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("deleteSone.html", template, "Page.DeleteSone.Title", webInterface, loaders) {
+class DeleteSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("deleteSone.html", template, "Page.DeleteSone.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* Page that lets the user dismiss a notification.
*/
-class DismissNotificationPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- SoneTemplatePage("dismissNotification.html", webInterface, loaders, template = template, pageTitleKey = "Page.DismissNotification.Title") {
+class DismissNotificationPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ SoneTemplatePage("dismissNotification.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.DismissNotification.Title") {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
val returnPage = soneRequest.httpRequest.getPartAsStringFailsafe("returnPage", 256)
*
* @see net.pterodactylus.sone.core.Core#distrustSone(Sone, Sone)
*/
-class DistrustPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("distrust.html", template, "Page.Distrust.Title", webInterface, loaders) {
+class DistrustPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("distrust.html", template, "Page.Distrust.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* Page that lets the user edit the name and description of an album.
*/
-class EditAlbumPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("editAlbum.html", template, "Page.EditAlbum.Title", webInterface, loaders) {
+class EditAlbumPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("editAlbum.html", template, "Page.EditAlbum.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* Page that lets the user edit title and description of an {@link Image}.
*/
-class EditImagePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("editImage.html", template, "Page.EditImage.Title", webInterface, loaders) {
+class EditImagePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("editImage.html", template, "Page.EditImage.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* Page that lets the user edit the name of a profile field.
*/
-class EditProfileFieldPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders) :
- LoggedInPage("editProfileField.html", template, "Page.EditProfileField.Title", webInterface, loaders) {
+class EditProfileFieldPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+ LoggedInPage("editProfileField.html", template, "Page.EditProfileField.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
currentSone.profile.let { profile ->
* This page lets the user edit her profile.
*/
@MenuName("EditProfile")
-class EditProfilePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders) :
- LoggedInPage("editProfile.html", template, "Page.EditProfile.Title", webInterface, loaders) {
+class EditProfilePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+ LoggedInPage("editProfile.html", template, "Page.EditProfile.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
currentSone.profile.let { profile ->
/**
* This page lets the user follow another Sone.
*/
-class FollowSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("followSone.html", template, "Page.FollowSone.Title", webInterface, loaders) {
+class FollowSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("followSone.html", template, "Page.FollowSone.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
* The image browser page is the entry page for the image management.
*/
@MenuName("ImageBrowser")
-class ImageBrowserPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("imageBrowser.html", template, "Page.ImageBrowser.Title", webInterface, loaders) {
+class ImageBrowserPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("imageBrowser.html", template, "Page.ImageBrowser.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if ("album" in soneRequest.parameters) {
* of all friends of the current user.
*/
@MenuName("Index")
-class IndexPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, private val postVisibilityFilter: PostVisibilityFilter) :
- LoggedInPage("index.html", template, "Page.Index.Title", webInterface, loaders) {
+class IndexPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer, private val postVisibilityFilter: PostVisibilityFilter) :
+ LoggedInPage("index.html", template, "Page.Index.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
(currentSone.posts +
* This page shows all known Sones.
*/
@MenuName("KnownSones")
-class KnownSonesPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- SoneTemplatePage("knownSones.html", webInterface, loaders, template = template, pageTitleKey = "Page.KnownSones.Title") {
+class KnownSonesPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ SoneTemplatePage("knownSones.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.KnownSones.Title") {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
getCurrentSone(soneRequest.toadletContext).let { currentSone ->
/**
* Page that lets the user like [net.pterodactylus.sone.data.Post]s and [net.pterodactylus.sone.data.Reply]s.
*/
-class LikePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders) :
- LoggedInPage("like.html", template, "Page.Like.Title", webInterface, loaders) {
+class LikePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+ LoggedInPage("like.html", template, "Page.Like.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* This page lets the user lock a [net.pterodactylus.sone.data.Sone] to prevent it from being inserted.
*/
-class LockSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- SoneTemplatePage("lockSone.html", webInterface, loaders, template = template, pageTitleKey = "Page.LockSone.Title") {
+class LockSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ SoneTemplatePage("lockSone.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.LockSone.Title") {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
soneRequest.parameters["returnPage", 256]!!.let { returnPage ->
/**
* Base class for [SoneTemplatePage] implementations that require a logged in user.
*/
-abstract class LoggedInPage(path: String, template: Template, pageTitleKey: String, webInterface: WebInterface, loaders: Loaders) :
- SoneTemplatePage(path, webInterface, loaders, template = template, pageTitleKey = pageTitleKey, requiresLogin = true) {
+abstract class LoggedInPage(path: String, template: Template, pageTitleKey: String, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+ SoneTemplatePage(path, webInterface, loaders, template, templateRenderer, pageTitleKey = pageTitleKey, requiresLogin = true) {
final override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
handleRequest(soneRequest, getCurrentSone(soneRequest.toadletContext, false)!!, templateContext)
* The login page lets the user log in.
*/
@MenuName("Login")
-class LoginPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- SoneTemplatePage("login.html", webInterface, loaders, template = template, pageTitleKey = "Page.Login.Title") {
+class LoginPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ SoneTemplatePage("login.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.Login.Title") {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
* Logs a user out.
*/
@MenuName("Logout")
-class LogoutPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("logout.html", template, "Page.Logout.Title", webInterface, loaders) {
+class LogoutPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("logout.html", template, "Page.Logout.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
setCurrentSone(soneRequest.toadletContext, null)
* Page that lets the user mark a number of [net.pterodactylus.sone.data.Sone]s, [Post]s, or
* [Replie][net.pterodactylus.sone.data.Reply]s as known.
*/
-class MarkAsKnownPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- SoneTemplatePage("markAsKnown.html", webInterface, loaders, template = template, pageTitleKey = "Page.MarkAsKnown.Title") {
+class MarkAsKnownPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ SoneTemplatePage("markAsKnown.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.MarkAsKnown.Title") {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
val ids = soneRequest.parameters["id", 65536]!!.split(" ")
* [PostVisibilityFilter.isPostVisible(Sone, Post)] and sorted by time.
*/
@MenuName("New")
-class NewPage @Inject constructor( template: Template, webInterface: WebInterface, loaders: Loaders):
- SoneTemplatePage("new.html", webInterface, loaders, template = template, pageTitleKey = "Page.New.Title") {
+class NewPage @Inject constructor( template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ SoneTemplatePage("new.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.New.Title") {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) =
getCurrentSone(soneRequest.toadletContext).let { currentSone ->
* This page lets the user edit the options of the Sone plugin.
*/
@MenuName("Options")
-class OptionsPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- SoneTemplatePage("options.html", webInterface, loaders, template = template, pageTitleKey = "Page.Options.Title") {
+class OptionsPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ SoneTemplatePage("options.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.Options.Title") {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
* Page that lets the user control the rescue mode for a Sone.
*/
@MenuName("Rescue")
-class RescuePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("rescue.html", template, "Page.Rescue.Title", webInterface, loaders) {
+class RescuePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("rescue.html", template, "Page.Rescue.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
val soneRescuer = soneRequest.core.getSoneRescuer(currentSone)
* This page lets the user search for posts and replies that contain certain
* words.
*/
-class SearchPage(template: Template, webInterface: WebInterface, loaders: Loaders, ticker: Ticker = Ticker.systemTicker()) :
- SoneTemplatePage("search.html", webInterface, loaders, template = template, pageTitleKey = "Page.Search.Title") {
+class SearchPage(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer, ticker: Ticker = Ticker.systemTicker()) :
+ SoneTemplatePage("search.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.Search.Title") {
- @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders) :
- this(template, webInterface, loaders, Ticker.systemTicker())
+ @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+ this(template, webInterface, loaders, templateRenderer, Ticker.systemTicker())
private val cache: Cache<Iterable<Phrase>, Pagination<Post>> = CacheBuilder.newBuilder().ticker(ticker).expireAfterAccess(5, MINUTES).build()
private val webInterface: WebInterface,
loaders: Loaders,
template: Template,
+ templateRenderer: TemplateRenderer,
private val pageTitleKey: String? = null,
private val requiresLogin: Boolean = false,
private val pageTitle: (FreenetRequest) -> String = { pageTitleKey?.let(webInterface.l10n::getString) ?: "" }
-) : FreenetTemplatePage(path, webInterface.templateContextFactory, loaders, template, "noPermission.html") {
+) : FreenetTemplatePage(path, templateRenderer, loaders, template, "noPermission.html") {
private val core = webInterface.core
private val sessionProvider: SessionProvider = webInterface
* Page that lets the user trust another Sone. This will assign a configurable
* amount of trust to an identity.
*/
-class TrustPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders) :
- LoggedInPage("trust.html", template, "Page.Trust.Title", webInterface, loaders) {
+class TrustPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+ LoggedInPage("trust.html", template, "Page.Trust.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* Page that lets the user unbookmark a post.
*/
-class UnbookmarkPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- SoneTemplatePage("unbookmark.html", webInterface, loaders, template = template, pageTitleKey = "Page.Unbookmark.Title") {
+class UnbookmarkPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ SoneTemplatePage("unbookmark.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.Unbookmark.Title") {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
when {
/**
* This page lets the user unfollow another Sone.
*/
-class UnfollowSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders) :
- LoggedInPage("unfollowSone.html", template, "Page.UnfollowSone.Title", webInterface, loaders) {
+class UnfollowSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+ LoggedInPage("unfollowSone.html", template, "Page.UnfollowSone.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* Page that lets the user unlike a [net.pterodactylus.sone.data.Post] or [net.pterodactylus.sone.data.Reply].
*/
-class UnlikePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("unlike.html", template, "Page.Unlike.Title", webInterface, loaders) {
+class UnlikePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("unlike.html", template, "Page.Unlike.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* This page lets the user unlock a [net.pterodactylus.sone.data.Sone] to allow its insertion.
*/
-class UnlockSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- SoneTemplatePage("unlockSone.html", webInterface, loaders, template = template, pageTitleKey = "Page.UnlockSone.Title") {
+class UnlockSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ SoneTemplatePage("unlockSone.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.UnlockSone.Title") {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
* Page that lets the user untrust another Sone. This will remove all trust
* assignments for an identity.
*/
-class UntrustPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders) :
- LoggedInPage("untrust.html", template, "Page.Untrust.Title", webInterface, loaders) {
+class UntrustPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+ LoggedInPage("untrust.html", template, "Page.Untrust.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* Page implementation that lets the user upload an image.
*/
-class UploadImagePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- LoggedInPage("uploadImage.html", template, "Page.UploadImage.Title", webInterface, loaders) {
+class UploadImagePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ LoggedInPage("uploadImage.html", template, "Page.UploadImage.Title", webInterface, loaders, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
if (soneRequest.isPOST) {
/**
* This page lets the user view a post and all its replies.
*/
-class ViewPostPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- SoneTemplatePage("viewPost.html", webInterface, loaders, template = template, pageTitleKey = "Page.ViewPost.Title") {
+class ViewPostPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ SoneTemplatePage("viewPost.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.ViewPost.Title") {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
templateContext["post"] = soneRequest.parameters["post"]?.let(soneRequest.core::getPost)
/**
* Lets the user browser another Sone.
*/
-class ViewSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
- SoneTemplatePage("viewSone.html", webInterface, loaders, template = template) {
+class ViewSonePage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
+ SoneTemplatePage("viewSone.html", webInterface, loaders, template, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
templateContext["soneId"] = soneRequest.parameters["sone"]
import net.pterodactylus.sone.main.PluginVersion
import net.pterodactylus.sone.main.PluginYear
import net.pterodactylus.sone.test.*
+import net.pterodactylus.sone.web.page.*
import net.pterodactylus.sone.web.pages.*
import net.pterodactylus.util.template.Template
import org.hamcrest.Matcher
Core::class.isProvidedByMock(),
FreenetInterface::class.isProvidedByMock(),
Template::class.isProvidedByMock(),
- WebInterface::class.isProvidedByDeepMock()
+ WebInterface::class.isProvidedByDeepMock(),
+ TemplateRenderer::class.isProvidedByMock()
)!!
}
class FreenetTemplatePageTest {
private val templateContextFactory = deepMock<TemplateContextFactory>()
+ private val templateRenderer = deepMock<TemplateRenderer>()
private val loaders = mock<Loaders>()
private val template = mock<Template>()
- private val page = FreenetTemplatePage("/test/path", templateContextFactory, loaders, template, "invalid-form-password")
+ private val page = FreenetTemplatePage("/test/path", templateRenderer, loaders, template, "invalid-form-password")
@Test
fun `path is exposed correctly`() {
@Test
fun `isEnabled() returns false if full access only is true`() {
- val page = object : FreenetTemplatePage("/test/path", templateContextFactory, loaders, template, "invalid-form-password") {
+ val page = object : FreenetTemplatePage("/test/path", templateRenderer, loaders, template, "invalid-form-password") {
override val isFullAccessOnly = true
}
assertThat(page.isEnabled(mock()), equalTo(false))
@Test
fun `page with redirect target throws redirect exception on handleRequest`() {
- val page = object : FreenetTemplatePage("/test/path", templateContextFactory, loaders, template, "invalid-form-password") {
+ val page = object : FreenetTemplatePage("/test/path", templateRenderer, loaders, template, "invalid-form-password") {
override fun getRedirectTarget(request: FreenetRequest) = "foo"
}
val request = mock<FreenetRequest>()
@Test
fun `page with full access only returns unauthorized on handleRequest with non-full access request`() {
- val page = object : FreenetTemplatePage("/test/path", templateContextFactory, loaders, template, "invalid-form-password") {
+ val page = object : FreenetTemplatePage("/test/path", templateRenderer, loaders, template, "invalid-form-password") {
override val isFullAccessOnly = true
}
val request = deepMock<FreenetRequest>()
fun `template from annotation is loaded`() {
val template = deepMock<Template>()
whenever(loaders.loadTemplate("template-path")).thenReturn(template)
- TestPage(templateContextFactory, loaders)
+ TestPage(templateRenderer, loaders)
verify(loaders).loadTemplate("template-path")
}
@TemplatePath("template-path")
- private class TestPage(templateContextFactory: TemplateContextFactory, loaders: Loaders) : FreenetTemplatePage("/", templateContextFactory, loaders, Template(), "") {
+ private class TestPage(templateRenderer: TemplateRenderer, loaders: Loaders) : FreenetTemplatePage("/", templateRenderer, loaders, Template(), "") {
override fun getPath() = ""
override fun isPrefixPage() = false
override fun handleRequest(request: FreenetRequest, response: Response) = response
/**
* Unit test for [AboutPage].
*/
-class AboutPageTest : WebPageTest({ template, webInterface, loaders -> AboutPage(template, webInterface, loaders, PluginVersion(version), PluginYear(year), PluginHomepage(homepage)) }) {
+class AboutPageTest : WebPageTest({ template, webInterface, loaders, templateRenderer -> AboutPage(template, webInterface, loaders, templateRenderer, PluginVersion(version), PluginYear(year), PluginHomepage(homepage)) }) {
companion object {
private const val version = "0.1.2"
/**
* Unit test for [IndexPage].
*/
-class IndexPageTest: WebPageTest({ template, webInterface, loaders -> IndexPage(template, webInterface, loaders, postVisibilityFilter) }) {
+class IndexPageTest: WebPageTest({ template, webInterface, loaders, templateRenderer -> IndexPage(template, webInterface, loaders, templateRenderer, postVisibilityFilter) }) {
companion object {
private val postVisibilityFilter = mock<PostVisibilityFilter>()
/**
* Unit test for [SearchPage].
*/
-class SearchPageTest: WebPageTest({ template, webInterface, loaders -> SearchPage(template, webInterface, loaders, ticker) }) {
+class SearchPageTest: WebPageTest({ template, webInterface, loaders, templateRenderer -> SearchPage(template, webInterface, loaders, templateRenderer, ticker) }) {
companion object {
val ticker = mock<Ticker>()
/**
* Unit test for [SoneTemplatePage].
*/
-class SoneTemplatePageTest : WebPageTest({ template, webInterface, loaders -> object : SoneTemplatePage("path.html", webInterface, loaders, template = template, requiresLogin = true) {} }) {
+class SoneTemplatePageTest : WebPageTest({ template, webInterface, loaders, templateRenderer -> object : SoneTemplatePage("path.html", webInterface, loaders, template, templateRenderer, requiresLogin = true) {} }) {
init {
request("index.html")
@Test
fun `page title is empty string if no page title key was given`() {
- SoneTemplatePage("path.html", webInterface, loaders, template = template, requiresLogin = false).let { page ->
+ SoneTemplatePage("path.html", webInterface, loaders, template, templateRenderer, requiresLogin = false).let { page ->
assertThat(page.getPageTitle(soneRequest), equalTo(""))
}
}
@Test
fun `page title is retrieved from l10n if page title key is given`() {
- SoneTemplatePage("path.html", webInterface, loaders, template = template, pageTitleKey = "page.title", requiresLogin = false).let { page ->
+ SoneTemplatePage("path.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "page.title", requiresLogin = false).let { page ->
whenever(l10n.getString("page.title")).thenReturn("Page Title")
assertThat(page.getPageTitle(soneRequest), equalTo("Page Title"))
}
@Test
fun `handleRequest method is called`() {
var called = false
- val page = object : SoneTemplatePage("path.html", webInterface, loaders, template = template, requiresLogin = true) {
+ val page = object : SoneTemplatePage("path.html", webInterface, loaders, template, templateRenderer, requiresLogin = true) {
override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
called = true
}
@Test
fun `redirect does not happen if login is not required`() {
- val page = SoneTemplatePage("page.html", webInterface, loaders, template = template, requiresLogin = false)
+ val page = SoneTemplatePage("page.html", webInterface, loaders, template, templateRenderer, requiresLogin = false)
assertThat(page.getRedirectTarget(freenetRequest), nullValue())
}
@Test
fun `page is enabled if no full access is required and login is not required`() {
- SoneTemplatePage("path.html", webInterface, loaders, template = template, requiresLogin = false).let { page ->
+ SoneTemplatePage("path.html", webInterface, loaders, template, templateRenderer, requiresLogin = false).let { page ->
assertThat(page.isEnabled(toadletContext), equalTo(true))
}
}
@Test
fun `handle request with sone request is called`() {
var called = false
- val page = object : SoneTemplatePage("path.html", webInterface, loaders, template = template) {
+ val page = object : SoneTemplatePage("path.html", webInterface, loaders, template, templateRenderer) {
override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
called = true
}
/**
* Base class for web page tests.
*/
-open class WebPageTest(pageSupplier: (Template, WebInterface, Loaders) -> SoneTemplatePage = { _, _, _ -> mock() }) {
+open class WebPageTest(pageSupplier: (Template, WebInterface, Loaders, TemplateRenderer) -> SoneTemplatePage = { _, _, _, _ -> mock() }) {
val currentSone = mock<Sone>()
val loaders = mock<Loaders>()
val template = mock<Template>()
+ val templateRenderer = mock<TemplateRenderer>()
val webInterface = deepMock<WebInterface>()
val core = webInterface.core
val eventBus = mock<EventBus>()
val l10n = webInterface.l10n!!
val sessionManager = mock<SessionManager>()
- val page by lazy { pageSupplier(template, webInterface, loaders) }
+ val page by lazy { pageSupplier(template, webInterface, loaders, templateRenderer) }
val httpRequest = mock<HTTPRequest>()
val freenetRequest = mock<FreenetRequest>()
projects / Sone.git / commitdiff