add constraints to url mappings and complete the 500 and 404 pages

tburch · tburch · commit 701d31309b51 · 2013-01-03T12:01:21.000-07:00
diff --git a/grails-app/conf/UrlMappings.groovy b/grails-app/conf/UrlMappings.groovy
@@ -12,7 +12,15 @@ class UrlMappings {
         "/robots.txt" (view: "/robots")
         "/about"(view: "/about")
         "/api"(controller: 'api', action: 'index')
-        "/$id?"(controller: 'blob', action: 'load')
+        "/$id?" {
+            controller = 'blob'
+            action = 'load'
+            constraints {
+                id(matches: /[0-9a-f]{24}/)
+
+            }
+        }
 		"500"(view:'/error')
+        "404"(view:'/notfound')
 	}
 }
diff --git a/grails-app/controllers/jsonblob/BlobController.groovy b/grails-app/controllers/jsonblob/BlobController.groovy
@@ -3,19 +3,20 @@ package jsonblob
 class BlobController {
 
     def jsonBlobResourceService
-    def jsonService
 
     def load() {
         def jsonBlobId = params.get("id")
         try {
-           def blob = jsonBlobResourceService.read(jsonBlobId);
-           def id = blob["_id"]
-           blob.remove("_id")
-           def json = jsonService.objectMapper.writeValueAsString(blob)
-           render(view: '../editor', model: [blob: json, blobId: id])
-        } catch (Exception exception) {
-            log.error("Couldn't load object with id $jsonBlobId", exception)
-            redirect(uri: "/")
+            def blob = jsonBlobResourceService.read(jsonBlobId);
+            if (blob) {
+                def id = blob["_id"]
+                render(view: '../editor', model: [blobId: id])
+            } else {
+                response.status = 404
+            }
+        } catch (Exception e) {
+            log.error("Couldn't load blob with id=$jsonBlobId")
+            response.status = 404
         }
     }
 
diff --git a/grails-app/views/error.gsp b/grails-app/views/error.gsp
@@ -2,16 +2,14 @@
 <html>
 <head>
     <meta name="layout" content="bootstrap"/>
-    <title>About JSON Blob</title>
+    <title>Something Broke</title>
 </head>
 
 <body>
 <div class="row-fluid">
-    <div class="span3 well">
-        side nav
-    </div>
-    <div class="span9">
-        infos
+    <div class="hero-unit">
+        <h1>Something broke</h1>
+        <p>Feel free to file a <g:link url="https://github.com/tburch/jsonblob/issues">bug report</g:link> or open a <g:link url="https://github.com/tburch/jsonblob/pulls">pull request</g:link> with the fix.</p>
     </div>
 </div>
 </body>
diff --git a/grails-app/views/notfound.gsp b/grails-app/views/notfound.gsp
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta name="layout" content="bootstrap"/>
+    <title>It's gone</title>
+</head>
+
+<body>
+<div class="row-fluid">
+    <div class="hero-unit">
+        <h1>This page doesn't exist</h1>
+        <p>This probably means you've probably reached the end of the internet...</p>
+        <p><g:link url="/" class="btn btn-primary btn-large">Home &raquo;</g:link></p>
+    </div>
+</div>
+</body>
+</html>
