Optimise dsl #3876
Optimise dsl #3876
Conversation
| "//foo/bar" in { | ||
| Path("//foo/bar") must_== Path("", "foo", "bar") | ||
| "~ extractor on Path without Root" in { | ||
| (Path(Vector(Segment("foo.json"))) match { |
There was a problem hiding this comment.
you can use path"foo.json" or Path.fromString
There was a problem hiding this comment.
@hamnis I am so sorry. I thought I had changed all to Path.fromString. Will change it and push
| "~ extractor on Path" in { | ||
| (Path("/foo.json") match { | ||
| "~ extractor on Path with Root" in { | ||
| (Path(Vector(Segment("foo.json")), absolute = true) match { |
There was a problem hiding this comment.
you can use path"/foo.json" or Path.fromString
| } | ||
|
|
||
| "/: should not crash without trailing slash" in { | ||
| // Bug reported on Gitter | ||
| Path("/cameras/1NJDOI") match { | ||
| Path(Vector(Segment("/cameras/1NJDOI"))) match { |
| case Root / "user" / IntVar(userId) => userId == 123 | ||
| case _ => false | ||
| }) must beTrue | ||
| } | ||
|
|
||
| "Int extractor, invalid int" in { | ||
| (Path("/user/invalid") match { | ||
| (Path(Vector(Segment("/user/invalid"))) match { |
There was a problem hiding this comment.
This cant be right?
Path.fromString should be used here?
| case Root / "user" / UUIDVar(userId @ _) => true | ||
| case _ => false | ||
| }) must beFalse | ||
| } | ||
| "a bad UUID" in { | ||
| (Path("/user/13251d88-7a73-4fcf-b935") match { | ||
| (Path(Vector(Segment("/user/13251d88-7a73-4fcf-b935"))) match { |
| @@ -302,55 +272,47 @@ class PathSpec extends Http4sSpec { | |||
|
|
|||
| "invalid" >> { | |||
| "empty with semi" in { | |||
| (Path("/board/square;") match { | |||
| (Path(Vector(Segment("/board/square;"))) match { | |||
| case Root / "board" / BoardExtractor(x @ _, y @ _) => true | ||
| case _ => false | ||
| }) must beFalse | ||
| } | ||
|
|
||
| "empty without semi" in { | ||
| (Path("/board/square") match { | ||
| (Path(Vector(Segment("/board/square"))) match { |
| case Root / "board" / BoardExtractor(x @ _, y @ _) => true | ||
| case _ => false | ||
| }) must beFalse | ||
| } | ||
|
|
||
| "empty with mismatched name" in { | ||
| (Path("/board/other") match { | ||
| (Path(Vector(Segment("/board/other"))) match { |
| case Root / "user" / UUIDVar(userId @ _) => true | ||
| case _ => false | ||
| }) must beFalse | ||
| } | ||
| "a word" in { | ||
| (Path("/user/invalid") match { | ||
| (Path(Vector(Segment("/user/invalid"))) match { |
|
@hamnis @rossabaker I had to make changes in |
There was a problem hiding this comment.
This is looking nice to me, but @hamnis is much more of an expert in this area of the code now, so I'll defer to him.
| @@ -361,7 +361,7 @@ object Uri { | |||
| val (start, end) = segments.splitAt(idx) | |||
| Path(start, absolute = absolute) -> Path(end, true, endsWithSlash = endsWithSlash) | |||
| } | |||
| private def copy( | |||
| def copy( | |||
There was a problem hiding this comment.
Are there any invariants we might be breaking because of making this public? Certain invalid combinations we don't want to allow? I think all states are legal.
There was a problem hiding this comment.
@rossabaker really sorry, I did not understand why/how does variance come into the picture here?
There was a problem hiding this comment.
Invariants (e.g., constraints), not invariance (e.g., subtypes and supertypes). Invariants are properties of a class that can't be violated. Silly example:
class Date(month: Int, day: Int, year: Int)Invariants of Date might be that month >= 1 and month <= 12 and if month == 4 then date <= 30. When we expose a copy constructor, we want to e sure that all parameters to it are legal, and all combinations are legal. And whenever a constructor is private, it's often the case that copy should be private.
There was a problem hiding this comment.
@rossabaker ah okay, got it. Makes sense. I used the copy method purely for convenience. Should I revert it?
There was a problem hiding this comment.
Let's see what @hamnis says. If it's dangerous, we can revert and add appropriate with* methods. If it's safe, we can keep the convenience. Either way, we should have a clear path forward.
| object / { | ||
| def unapply(path: Path): Option[(Path, String)] = | ||
| if (path.endsWithSlash) | ||
| Some(path.copy(endsWithSlash = false) -> "") |
| } | ||
| implicit val arbitraryPath: Gen[Path] = | ||
| arbitrary[List[String]] | ||
| .map(_.foldLeft(Path.Root)((acc, e) => acc.copy(segments = acc.segments :+ Segment(e)))) |
There was a problem hiding this comment.
acc.addSegment(e) or acc / e
that should eliminate both uses of copy
No description provided.