add a request.matches(pattern) method fix jooby-project#219

jknack · jknack · commit 0fdec8cbcf04 · 2015-12-06T18:26:30.000-03:00
diff --git a/coverage-report/src/test/java/org/jooby/RequestPathMatcher.java b/coverage-report/src/test/java/org/jooby/RequestPathMatcher.java
@@ -0,0 +1,34 @@
+package org.jooby;
+
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+public class RequestPathMatcher extends ServerFeature {
+
+  {
+    get("/static/", req -> req.matches("/static"));
+
+    get("/static/f.js", req -> req.matches("/static/**"));
+
+    get("/admin/**", req -> req.matches("/admin/**"));
+  }
+
+  @Test
+  public void pathMatcher() throws Exception {
+    request()
+        .get("/static")
+        .expect("true");
+
+    request()
+        .get("/static/f.js")
+        .expect("true");
+
+    request()
+        .get("/admin")
+        .expect("true");
+
+    request()
+        .get("/admin/people")
+        .expect("true");
+  }
+}
diff --git a/jooby/src/main/java/org/jooby/Request.java b/jooby/src/main/java/org/jooby/Request.java
@@ -66,6 +66,11 @@ public String path() {
       return req.path();
     }
 
+    @Override
+    public boolean matches(final String pattern) {
+      return req.matches(pattern);
+    }
+
     @Override
     public String contextPath() {
       return req.contextPath();
@@ -365,6 +370,14 @@ default Optional<MediaType> accepts(final String... types) {
     return accepts(MediaType.valueOf(types));
   }
 
+  /**
+   * Test if the given request path matches the pattern.
+   *
+   * @param pattern A pattern to test for.
+   * @return True, if the request path matches the pattern.
+   */
+  boolean matches(String pattern);
+
   /**
    * True, if request accept any of the given types.
    *
diff --git a/jooby/src/main/java/org/jooby/internal/RequestImpl.java b/jooby/src/main/java/org/jooby/internal/RequestImpl.java
@@ -126,6 +126,12 @@ public <T> Optional<T> get(final String name) {
     return Optional.ofNullable((T) locals.get(name));
   }
 
+  @Override
+  public boolean matches(final String pattern) {
+    RoutePattern p = new RoutePattern("*", pattern);
+    return p.matcher(route.path()).matches();
+  }
+
   @Override
   public Map<String, Object> attributes() {
     return Collections.unmodifiableMap(locals);
diff --git a/jooby/src/test/java/org/jooby/RequestTest.java b/jooby/src/test/java/org/jooby/RequestTest.java
@@ -25,6 +25,11 @@ public MediaType type() {
       throw new UnsupportedOperationException();
     }
 
+    @Override
+    public boolean matches(final String pattern) {
+      throw new UnsupportedOperationException();
+    }
+
     @Override
     public List<MediaType> accept() {
       throw new UnsupportedOperationException();
