Changeset 487 for Dev/trunk/src/server/util/couch.coffee

Timestamp:

03/05/14 22:44:48 (11 years ago)

Author:

hendrikvanantwerpen

Message:

Completed migration to API, without CouchDB proxy.

Move to API is now completed. The full API is password protected, a very
limited API is exposed for respondents, which works with secrets that
are passed in URLs.

Serverside the HTTPResult class was introduced, which is similar to
Promises, but specifically for HTTP. It carries a status code and
response and makes it easier to extract parts of async handling in
separate functions.

Fixed a bug in our schema (it seems optional attributes don't exist but
a required list does). Verification of our schema by grunt-tv4 didn't
work yet. Our schema is organized the wrong way (this is fixable),
but the json-schema schema has problems with simple types and $refs.

File:

• Dev/trunk/src/server/util/couch.coffee (modified) (2 diffs)

Dev/trunk/src/server/util/couch.coffee

@@ -6 +6 @@
  
 class CouchDB
-    constructor: (url) ->
-        @url = normalizeURL url
-    get: (id) ->
+    constructor: (url,db) ->
+        @serverURL = normalizeURL url
+        @db = db
+        if @db
+            @url = "#{@serverURL}/#{@db}"
+        else
+            @url = "#{@serverURL}"
+    get: (id, opts) ->
         url = "#{@url}/#{id}"
-        couchRequest 'GET', url
-    post: (doc) ->
-        url = "#{@url}"
-        couchRequest 'POST', url, doc
-    put: (id, doc) ->
+        couchRequest 'GET', url, null, opts
+    post: (doc, opts) ->
+        url = "#{@url}/"
+        couchRequest 'POST', url, doc, opts
+    put: (id, doc, opts) ->
         url = "#{@url}/#{id}"
-        couchRequest 'PUT', url, doc
-    delete: (id, rev) ->
-        url = "#{@url}/#{id}?rev=#{rev}"
-        couchRequest 'DELETE', url
+        couchRequest 'PUT', url, doc, opts
+    delete: (id, opts) ->
+        url = "#{@url}/#{id}"
+        couchRequest 'DELETE', url, null, opts
+    uuids: (opts) ->
+        url = "#{@serverURL}/_uuids"
+        couchRequest 'GET', url, null, opts
 
 normalizeURL = (url) ->
     url.replace /\/$/, ''
 
-couchRequest = (method, url, data) ->
+couchRequest = (method, url, body, opts) ->
     options =
         method: method,
         headers:
-            'content-type': 'application/json; charset=utf-8'
-            'accept': 'application/json'
-        body: JSON.stringify (stringifyFunctions (data || {}))
+            'Content-Type': 'application/json; charset=utf-8'
+            'Accept': 'application/json'
+        body: JSON.stringify (stringifyFunctions (body || {}))
+    if opts
+        options.qs = createQueryObj opts.query if opts.query
+        _.extend options.headers, opts.headers if opts.headers
     req = request(url, options)
-    req.response
-    .then (res) =>
+    res = req.response.then (res) =>
         req.then (res) =>
             JSON.parse res
@@ -40 +50 @@
     , (err) =>
         Q.reject err
+    res.response = req.response.then (res) =>
+        statusCode: res.statusCode
+        headers: res.headers
+        body: JSON.parse res.body
+    , (err) =>
+        Q.reject err
+    res
 
+createQueryObj = (obj) ->
+    newObj = {}
+    _.each obj, (val,key) ->
+        newObj[key] = JSON.stringify val
+    newObj
+        
 stringifyFunctions = (value) ->
     if value is null