raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

=htp: fix match headers by symbol name

Browse source
This commit is contained in:
kulikov 2015-07-29 19:15:53 +03:00
parent 00e92caa5e
commit fd290b2a66
2 changed files with 64 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

62
akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/HeaderDirectivesSpec.scala
View file

@ -53,6 +53,68 @@ class HeaderDirectivesSpec extends RoutingSpec with Inside {
}
}
"The headerValueByName directive" should {
lazy val route =
headerValueByName("Referer") { referer ⇒
complete(s"The referer was $referer")
}
"extract a header if the name is matching" in {
Get("abc") ~> RawHeader("Referer", "http://example.com") ~> route ~> check {
responseAs[String] shouldEqual "The referer was http://example.com"
}
}
"extract a header with Symbol name" in {
lazy val symbolRoute =
headerValueByName('Referer) { referer ⇒
complete(s"The symbol referer was $referer")
}
Get("abc") ~> RawHeader("Referer", "http://example.com/symbol") ~> symbolRoute ~> check {
responseAs[String] shouldEqual "The symbol referer was http://example.com/symbol"
}
}
"reject a request if no header of the given type is present" in {
Get("abc") ~> route ~> check {
inside(rejection) {
case MissingHeaderRejection("Referer") ⇒
}
}
}
}
"The optionalHeaderValueByName directive" should {
lazy val route =
optionalHeaderValueByName("Referer") { referer ⇒
complete(s"The referer was $referer")
}
"extract a header if the name is matching" in {
Get("abc") ~> RawHeader("Referer", "http://example.com") ~> route ~> check {
responseAs[String] shouldEqual "The referer was Some(http://example.com)"
}
}
"extract a header with Symbol name" in {
lazy val symbolRoute =
optionalHeaderValueByName('Referer) { referer ⇒
complete(s"The symbol referer was $referer")
}
Get("abc") ~> RawHeader("Referer", "http://example.com/symbol") ~> symbolRoute ~> check {
responseAs[String] shouldEqual "The symbol referer was Some(http://example.com/symbol)"
}
}
"extract None if no header of the given name is present" in {
Get("abc") ~> route ~> check {
responseAs[String] shouldEqual "The referer was None"
}
}
}
"The optionalHeaderValue directive" should {
lazy val myHeaderValue = optionalHeaderValue {
case Connection(tokens) ⇒ Some(tokens.head)

4
akka-http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala
View file

@ -43,7 +43,7 @@ trait HeaderDirectives {
* Extracts the value of the first HTTP request header with the given name.
* If no header with a matching name is found the request is rejected with a [[spray.routing.MissingHeaderRejection]].
*/
def headerValueByName(headerName: Symbol): Directive1[String] = headerValueByName(headerName.toString)
def headerValueByName(headerName: Symbol): Directive1[String] = headerValueByName(headerName.name)
/**
* Extracts the value of the HTTP request header with the given name.
@ -81,7 +81,7 @@ trait HeaderDirectives {
* Extracts the value of the optional HTTP request header with the given name.
*/
def optionalHeaderValueByName(headerName: Symbol): Directive1[Option[String]] =
optionalHeaderValueByName(headerName.toString)
optionalHeaderValueByName(headerName.name)
/**
* Extracts the value of the optional HTTP request header with the given name.