Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.8.6
06818e4113cbef6069997c12e21d3bd99ee04a8e
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.3"
version = "3.8.6"

runner.dialect = scala3

Expand Down
3 changes: 1 addition & 2 deletions src/main/scala/org/felher/laminirouter/Routes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,7 @@ object Routes:
.of[Codec]
.appliedTo(vd.tpt.tpe.asType match
case '[Option[t]] => TypeRepr.of[t]
case _ => vd.tpt.tpe
)
case _ => vd.tpt.tpe)
Implicits.search(codecType) match
case _: ImplicitSearchFailure =>
sys.error(s"Cannot find implicit codec: ${codecType.show}")
Expand Down
25 changes: 17 additions & 8 deletions src/test/scala/org/felher/laminirouter/LaminouterSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ object LaminouterSpec extends TestSuite:
test("URLs should encode and decode correctly") {
for t <- routesToTest do
val baseUrl = dom.URL("https://www.heise.de:8080")
val url = dom.URL(t.url)
val url = dom.URL(t.url)
assert(routes.encode(baseUrl, t.route).toString == t.url)
assert(routes.decode(url).exists(compareRoutes(_, t.route)))
}
Expand All @@ -39,16 +39,25 @@ object LaminouterSpec extends TestSuite:
a1 == b1 && a2 == b2 && a.page == b.page && a.filter == b.filter
case _ => false

private final case class Test(
route: Route,
url: String,
final private case class Test(
route: Route,
url: String
)

private final val routesToTest = List(
final private val routesToTest = List(
Test(Route.Home, "https://www.heise.de:8080/home"),
Test(Route.SingleParam(123), "https://www.heise.de:8080/singleParam/123"),
Test(Route.MultiParam("user-name", 999), "https://www.heise.de:8080/multiParam/user-name/999"),
Test(Route.MultiParamQuery("user-name", 999)(123, "red"), "https://www.heise.de:8080/multiParamQuery/user-name/999?page=123&filter=red"),
Test(Route.MultiParamQueryOptional("user-name", 999)(123, Some("red")), "https://www.heise.de:8080/multiParamQueryOptional/user-name/999?page=123&filter=red"),
Test(Route.MultiParamQueryOptional("user-name", 999)(123, None), "https://www.heise.de:8080/multiParamQueryOptional/user-name/999?page=123"),
Test(
Route.MultiParamQuery("user-name", 999)(123, "red"),
"https://www.heise.de:8080/multiParamQuery/user-name/999?page=123&filter=red"
),
Test(
Route.MultiParamQueryOptional("user-name", 999)(123, Some("red")),
"https://www.heise.de:8080/multiParamQueryOptional/user-name/999?page=123&filter=red"
),
Test(
Route.MultiParamQueryOptional("user-name", 999)(123, None),
"https://www.heise.de:8080/multiParamQueryOptional/user-name/999?page=123"
)
)