Prepare for tablier 0.2.+

Type-checked templates makes my life so much easier <3

Id: d55d646d8268d7ecfa49ec9caa7dff76f3c0a4a9
Author: Caio
Commit time: 2019-02-16T09:28:19-02:00

Modified pom.xml

@@ -39,7 +39,7
<resilience4j.version>0.13.2</resilience4j.version>
<chronicle.version>3.17.0</chronicle.version>
<jsoup.version>1.11.3</jsoup.version>
- <tablier.version>0.1.3</tablier.version>
+ <tablier.version>0.2.0-SNAPSHOT</tablier.version>
</properties>

<dependencyManagement>

Modified src/main/java/co/caio/cerberus/boot/ModelView.java

@@ -10,6 +10,7
import co.caio.tablier.model.RecipeInfo;
import co.caio.tablier.model.SearchFormInfo;
import co.caio.tablier.model.SearchResultsInfo;
+import co.caio.tablier.model.SidebarInfo;
import co.caio.tablier.model.SiteInfo;
import co.caio.tablier.view.Error;
import co.caio.tablier.view.Index;

@@ -31,20 +32,19
static final String ERROR_PAGE_TITLE = "An Error Has Occurred";

private static final SiteInfo defaultSite = new SiteInfo.Builder().build();
+ private static final SiteInfo unstableSite = new SiteInfo.Builder().isUnstable(true).build();
private static final PageInfo defaultIndexPage =
new PageInfo.Builder().title(INDEX_PAGE_TITLE).build();
private static final SearchFormInfo defaultSearchForm = new SearchFormInfo.Builder().build();
- private static final PageInfo unstableIndexPage =
- new PageInfo.Builder().from(defaultIndexPage).showUnstableWarning(true).build();
- private static final SearchFormInfo disabledSearchForm =
- new SearchFormInfo.Builder().isAutoFocus(false).isDisabled(true).build();
private static final SearchFormInfo.Builder defaultSearchSearchFormBuilder =
- new SearchFormInfo.Builder().isAutoFocus(false).isDisabled(false).buttonText("Search again");
+ new SearchFormInfo.Builder().isAutoFocus(false);
private static final PageInfo defaultSearchPage =
new PageInfo.Builder().title(SEARCH_PAGE_TITLE).build();
private static final PageInfo defaultErrorPage =
new PageInfo.Builder().title(ERROR_PAGE_TITLE).build();
private static final String DEFAULT_UNKNOWN_ERROR_SUBTITLE = "Unknown Error Cause";
+
+ private static final SidebarInfo emptySidebar = new SidebarInfo.Builder().build();

private final int pageSize;
private final RecipeMetadataDatabase db;

@@ -61,7 +61,7
}

RockerModel renderUnstableIndex() {
- return Index.template(defaultSite, unstableIndexPage, disabledSearchForm);
+ return Index.template(unstableSite, defaultIndexPage, defaultSearchForm);
}

RockerModel renderSearch(

@@ -79,6 +79,7

var searchBuilder =
new SearchResultsInfo.Builder()
+ .sidebar(emptySidebar)
.paginationStart(query.offset() + 1)
.paginationEnd(result.recipes().size() + query.offset())
.numMatching(result.totalHits());

@@ -143,6 +144,11
}

@Override
+ public String slug() {
+ return metadata.getSlug();
+ }
+
+ @Override
public int numIngredients() {
return metadata.getNumIngredients();
}

@@ -155,6 +161,16
@Override
public OptionalInt totalTime() {
return metadata.getTotalTime();
+ }
+
+ @Override
+ public List<String> ingredients() {
+ return metadata.getIngredients();
+ }
+
+ @Override
+ public List<String> instructions() {
+ return metadata.getInstructions();
}
}

Modified src/test/java/co/caio/cerberus/boot/ModelViewTest.java

@@ -164,7 +164,7

assertTrue(doc.title().startsWith(ModelView.SEARCH_PAGE_TITLE));

- var subtitle = doc.selectFirst("section#results h2.subtitle").text();
- assertEquals("Showing recipes 3 to 4 (Out of 4)", subtitle);
+ var subtitle = doc.selectFirst("section#results div.notification.content").text();
+ assertTrue(subtitle.contains("from 3 to 4."));
}
}