fix things

Author: tburch

application.properties

@@ -1,5 +1,5 @@
 #Grails Metadata file
-#Tue Dec 04 14:14:33 MST 2012
+#Tue Dec 04 20:56:40 MST 2012
 app.grails.version=2.1.1
 app.name=jsonblob
 app.version=0.1

grails-app/conf/BuildConfig.groovy

@@ -1,4 +1,4 @@
-grails.servlet.version = "2.5" // Change depending on target container compliance (2.5 or 3.0)
+grails.servlet.version = "3.0" // Change depending on target container compliance (2.5 or 3.0)
 grails.project.class.dir = "target/classes"
 grails.project.test.class.dir = "target/test-classes"
 grails.project.test.reports.dir = "target/test-reports"
@@ -24,12 +24,6 @@ grails.project.dependency.resolution = {
 
         mavenLocal()
         mavenCentral()
-
-        // uncomment these (or add new ones) to enable remote dependency resolution from public Maven repositories
-        //mavenRepo "http://snapshots.repository.codehaus.org"
-        //mavenRepo "http://repository.codehaus.org"
-        //mavenRepo "http://download.java.net/maven/2/"
-        //mavenRepo "http://repository.jboss.com/maven2/"
     }
     dependencies {
         runtime "org.mongodb:mongo-java-driver:2.9.1"
@@ -39,10 +33,6 @@ grails.project.dependency.resolution = {
     }
 
     plugins {
-        runtime ":hibernate:$grailsVersion"
-
-        runtime ":jquery:1.8.3"
-        compile ":twitter-bootstrap:2.2.1"
         runtime ":resources:1.2.RC2"
         runtime ":zipped-resources:1.0"
         runtime ":cached-resources:1.0"
@@ -53,14 +43,8 @@ grails.project.dependency.resolution = {
             excludes 'mongo-java-driver', 'gmongo'
         }
 
-        compile ':shiro:1.1.4'
-
         compile ":jaxrs:0.6"
 
         build ":tomcat:$grailsVersion"
-
-        runtime ":database-migration:1.1"
-
-        compile ':cache:1.0.0'
     }
 }

grails-app/conf/Config.groovy

@@ -1,3 +1,5 @@
+import grails.util.Environment
+
 // locations to search for config files that get merged into the main config;
 // config files can be ConfigSlurper scripts, Java properties files, or classes
 // in the classpath in ConfigSlurper format
@@ -77,6 +79,10 @@ log4j = {
     //    console name:'stdout', layout:pattern(conversionPattern: '%c{2} %m%n')
     //}
 
+    root {
+        info()
+    }
+
     error  'org.codehaus.groovy.grails.web.servlet',        // controllers
            'org.codehaus.groovy.grails.web.pages',          // GSP
            'org.codehaus.groovy.grails.web.sitemesh',       // layouts
@@ -89,3 +95,7 @@ log4j = {
            'org.hibernate',
            'net.sf.ehcache.hibernate'
 }
+
+grails.app.context = "/"
+
+org.grails.jaxrs.url.mappings=['/api']

grails-app/domain/jsonblob/JsonBlob.groovy

@@ -35,24 +35,15 @@ class JsonBlobCollectionResource implements InitializingBean {
         }
     }
 
-    @GET
-    Response readAll() {
-        def allBlobs = jsonBlobResourceService.readAll()
-        def jsonBlobs = allBlobs.collect {
-            objectMapper.writeValueAsString(it)
-        }
-        Response.ok(jsonBlobs).build()
-    }
-    
     @Path('/{id}')
-    JsonBlobResource getResource(@PathParam('id') Long id) {
+    JsonBlobResource getResource(@PathParam('id') String id) {
         new JsonBlobResource(jsonBlobResourceService: jsonBlobResourceService, objectMapper: objectMapper, id:id)
     }
 
     void afterPropertiesSet() throws Exception {
         def om = new ObjectMapper()
 
-        Module jacksonMongoModule = new SimpleModule("MongoModule", new Version(1, 0, 0, null))
+        def jacksonMongoModule = new SimpleModule("MongoModule", new Version(1, 0, 0, null))
         jacksonMongoModule.addSerializer(ObjectId, new JsonSerializer<ObjectId>() {
             @Override
             void serialize(ObjectId t, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {

grails-app/resources/jsonblob/JsonBlobCollectionResource.groovy

@@ -16,13 +16,13 @@ class JsonBlobResource {
         def blob = jsonBlobResourceService.read(id)
         Response.ok(objectMapper.writeValueAsString(blob)).build()
     }
-    
+
     @PUT
     Response update(String json) {
-        def updatedBlob = jsonBlobResourceService.update(id, dto)
+        def updatedBlob = jsonBlobResourceService.update(id, json)
         Response.ok(objectMapper.writeValueAsString(updatedBlob)).build()
     }
-    
+
     @DELETE
     void delete() {
         jsonBlobResourceService.delete(id)

grails-app/resources/jsonblob/JsonBlobResource.groovy

@@ -1,7 +1,9 @@
 package jsonblob
 
 import com.gmongo.GMongo
+import com.mongodb.BasicDBObject
 import com.mongodb.util.JSON
+import org.bson.types.ObjectId
 import org.grails.jaxrs.provider.DomainObjectNotFoundException
 
 class JsonBlobResourceService {
@@ -12,38 +14,38 @@ class JsonBlobResourceService {
         mongo.getDB("jsonblob").getCollection("blob")
     }
 
+    private def getDBObject(String objectId) {
+        new BasicDBObject("_id", new ObjectId(objectId))
+    }
+
     def create(String json) {
         def parsed = JSON.parse(json)
         blobCollection().insert(parsed)
         parsed
     }
 
     def read(String id) {
-        def obj = blobCollection().findOne(_id: id)
+        def obj = blobCollection().findOne(getDBObject(id))
         if (!obj) {
-            throw new DomainObjectNotFoundException(String.class, id)
+            throw new DomainObjectNotFoundException(ObjectId.class, id)
         }
         obj
     }
 
-    def readAll() {
-        blobCollection().find()
-    }
-    
     def update(String id, String json) {
-        def obj = blobCollection().findOne(_id: id)
+        def obj = blobCollection().findOne(getDBObject(id))
         if (!obj) {
-            throw new DomainObjectNotFoundException(String.class, id)
+            throw new DomainObjectNotFoundException(ObjectId.class, id)
         }
         def parsed = com.mongodb.util.JSON.parse(json)
-        db.doctor.update([_id:id],parsed)
-        obj
+        blobCollection().update(getDBObject(id), parsed)
+        parsed
     }
 
     void delete(String id) {
-        def obj = blobCollection().findOne(_id: id)
+        def obj = blobCollection().findOne(getDBObject(id))
         if (obj) {
-            blobCollection().remove(_id: id)
+            blobCollection().remove(getDBObject(id))
         }
     }
 

grails-app/services/jsonblob/JsonBlobResourceService.groovy

@@ -10,22 +10,61 @@ class JsonBlobApiTest extends IntegrationTestCase {
     @Test
     void testPostAndGet() {
         def headers = ['Content-Type':'application/json', 'Accept':'application/json']
-        def content = '{"class":"jsonblob.JsonBlob","blob":{"data": "hi"}}'
 
-        // create new person
-        sendRequest('/api/jsonBlob', 'POST', headers, content.bytes)
+        def jsonBuilder = new groovy.json.JsonBuilder()
+        jsonBuilder.dogs {
+            bella {
+                breed 'bernese mountain dog'
+                age '5'
+                address(city: 'Denver', country: 'USA', zip: 80210)
+            }
+        }
+
+        def apiBase = '/api/jsonBlob'
+
+        // create new blob
+        sendRequest(apiBase, 'POST', headers, jsonBuilder.toString().bytes)
+
+        def locationHeader = response.getHeader('Location')
+        def relativePath = locationHeader.substring(locationHeader.indexOf(apiBase))
 
         assertEquals(201, response.status)
         assertTrue(response.contentAsString.length() > 0)
         assertTrue(response.getHeader('Content-Type').startsWith('application/json'))
-        assertTrue(response.getHeader('Location') ==~ /.*\/api\/jsonBlob\/.*/)
+        assertTrue(relativePath.startsWith("$apiBase/"))
 
-        // get list of persons
-        sendRequest('/api/jsonBlob', 'GET', headers)
+        // get the newly created blob
+        sendRequest(relativePath, 'GET', headers)
 
         assertEquals(200, response.status)
         assertTrue(response.getHeader('Content-Type').startsWith('application/json'))
         assertTrue(response.contentAsString.length() > 0)
+
+        jsonBuilder.pigs {
+            wilbur {
+                breed 'rambunctious pig'
+                age '2'
+            }
+        }
+
+        // update blob
+        sendRequest(relativePath, 'PUT', headers, jsonBuilder.toString().bytes)
+
+        assertEquals(200, response.status)
+        assertTrue(response.getHeader('Content-Type').startsWith('application/json'))
+        assertTrue(response.contentAsString.contains("pigs"))
+
+        // delete blob
+        sendRequest(relativePath, 'DELETE', headers)
+
+        assertEquals(204, response.status)
+        assertTrue(response.getHeader('Content-Type').startsWith('application/json'))
+        assertTrue(response.contentAsString == null || response.contentAsString == "")
+
+        // get deleted blob
+        sendRequest(relativePath, 'GET', headers)
+
+        assertEquals(404, response.status)
     }
 
 }