Update all dependencies to most recent versions, with minimal compati…

…bility fixes.

README.md

@@ -13,7 +13,7 @@ The included test application currently allows you to
 * query a list of available configuration options
 * query the values of specific configuration options
 
-The test suite can be run using `npm test`. There's also a small test application in `test/test-server.coffee` which runs on `http://localhost:1337` and allows to change camera settings and to take pictures.
+The test suite can be run using `npm test`. There's also a small test application (`npx coffee examples/server.coffee`) which runs on `http://localhost:1337` and allows to change camera settings and to take pictures.
 
 ## Prerequisites
 

examples/public/index.html

@@ -26,7 +26,7 @@
       stopPreview: ()->
         $('#img').unbind('load')
       loadSettings: (cb)=>
-        request.get '/settings', (settings)=>
+        request.get('/settings').then (settings)=>
           cb JSON.parse(settings.text) if cb
           
       enumSettings: (settings, gui)=>
@@ -40,14 +40,14 @@
             foo[val.label] = val.value
             changeFn = (newValue)->
                 console.log val.label, "changed to", newValue
-                request.put "/settings/#{key}", newValue:newValue, (response)->
+                request.put("/settings/#{key}", newValue:newValue).then (response)->
                   console.log response
             if val.type is 'string'
               gui.add(foo, val.label).onChange changeFn
             else if val.type is 'toggle'
               foo[val.label] = val.value != 0
               gui.add(foo, val.label).onChange (newValue)->
-                request.put "/settings/#{key}", newValue: (if newValue then 1 else 0), (response)->
+                request.put("/settings/#{key}", newValue: (if newValue then 1 else 0)).then (response)->
                   console.log response
             else if val.type is 'choice'
               gui.add(foo, val.label, val.choices).onChange(changeFn)
@@ -61,7 +61,7 @@
           'Start live preview' : ()=>
             @startPreview()
           'Take picture': ()=>
-            request.get 'takePicture', download:false, (res)=>
+            request.get('takePicture', download:false).then (res)=>
               console.log res
               if res.text
                 $('<a>').attr('href', res.text).text(res.text).appendTo($('#downloads')).css('display':'block')
@@ -75,7 +75,7 @@
     window.gphoto.displaySettings()
   </script>
   </script>
-  <script type="text/javascript" src="/js/coffee-script.js"></script>
+  <script type="text/javascript" src="/js/coffeescript.js"></script>
 
 </body>
 </html>

examples/server.coffee

@@ -1,8 +1,9 @@
 process.title = 'node-gphoto2 test program'
 global[id] ?= require name for id, name of {
   "fs"
-  "GPhoto":"../"
+  "GPhoto": "../"
   "express"
+  "bodyParser": "body-parser"
   _: "underscore"
 }
 
@@ -30,9 +31,9 @@ gphoto.list (cameras)->
 app = express()
 
 app.use express.static __dirname + '/public'
-app.use express.bodyParser()
+app.use bodyParser.json()
 
-app.engine '.html', require('jade').__express
+app.engine '.html', require('pug').__express
 app.get '/', (req, res)->
   res.render 'index.html'
 
@@ -49,42 +50,42 @@ logRequests = ()->
 # save configuration
 app.put '/settings/:name', (req, res)->
   unless camera
-    res.send 404, 'Camera not connected'
+    res.status(404).send 'Camera not connected'
   else
     camera.setConfigValue req.params.name, req.body.newValue, (er)->
       if er
-        res.send 404, JSON.stringify(er)
+        res.status(404).send JSON.stringify(er)
       else
-        res.send 200
+        res.sendStatus 200
 
 # get configuration
 app.get '/settings', (req, res)->
   unless camera
-    res.send 404, 'Camera not connected'
+    res.status(404).send 'Camera not connected'
   else
     camera.getConfig (er, settings)->
       res.send JSON.stringify(settings)
 
 app.get '/download/*', (req, res)->
   unless camera
-    res.send 404, 'Camera not connected'
+    res.status(404).send 'Camera not connected'
   else
     if (match = req.url.match /download(.*)$/) and (path = match[1])
       console.log "trying to DL #{path}"
       camera.downloadPicture {cameraPath: path}, (er, data)->
         if er
-          res.send 404, er
+          res.status(404).send er
         else
           res.header 'Content-Type', 'image/jpeg'
           res.send data
 
 app.get '/takePicture', (req, res)->
   unless camera
-    res.send 404, 'Camera not connected'
+    res.status(404).send 'Camera not connected'
   else
     camera.takePicture download:(if req.query.download is 'false' then false else true), (er, data)->
       if er
-        res.send 404, er
+        res.status(404).send er
       else
         if req.query.download is 'false'
           console.log data
@@ -95,7 +96,7 @@ app.get '/takePicture', (req, res)->
 
 app.get '/preview*', (req, res)->
   unless camera
-    res.send 404, 'Camera not connected'
+    res.status(404).send 'Camera not connected'
   else
     preview_listeners.push res
     if preview_listeners.length is 1