updated readme to reflect api key:

CartoDB · Jun 1, 2012 · 9d2410f · 9d2410f
1 parent 22923e3
commit 9d2410f
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,10 @@
 SQL API for cartodb.com
 ========================
- 
+
 Provides a nodejs based API for running SQL queries against CartoDB.
 
-* Users are authenticated over OAuth. Also provides ability to make public
+* Users are authenticated over OAuth or via an API KEY.
-  "SELECT" only calls.
+* Authenticated requests to this API should always be made over SSL.
-* OAuth requests to this API should always be made over SSL.
 
 
 core requirements

diff --git a/test/README.md b/test/README.md
@@ -13,7 +13,6 @@ Acceptance tests (need ctrl-C to exit)
 > expresso test/acceptance/app.auth.test.js
 
 
-Unit tests
+Unit tests (need ctrl-C to exit)
-----------
+--------------------------------
-
+> expresso test/unit/*.js (or run the tests individually)
-> expresso test/unit/psql.tests.js
diff --git a/test/oauth/oauth_test.py → test/acceptance/oauth/oauth_test.py b/test/oauth/oauth_test.py → test/acceptance/oauth/oauth_test.py
diff --git a/spike/app.js → websocket_test/app.js b/spike/app.js → websocket_test/app.js
@@ -1,3 +1,4 @@
+// this is a test to understand accessing sql api via websockets
 var express = require('express')
   , app     = express.createServer(
     express.logger({

diff --git a/spike/public/gmaps_mercator.js → websocket_test/public/gmaps_mercator.js b/spike/public/gmaps_mercator.js → websocket_test/public/gmaps_mercator.js
diff --git a/spike/public/index.html → websocket_test/public/index.html b/spike/public/index.html → websocket_test/public/index.html
diff --git a/spike/public/map.js → websocket_test/public/map.js b/spike/public/map.js → websocket_test/public/map.js
diff --git a/spike/public/run_server.sh → websocket_test/public/run_server.sh b/spike/public/run_server.sh → websocket_test/public/run_server.sh
diff --git a/spike/public/test.html → websocket_test/public/test.html b/spike/public/test.html → websocket_test/public/test.html
diff --git a/spike/public/test/map.test.js → websocket_test/public/test/map.test.js b/spike/public/test/map.test.js → websocket_test/public/test/map.test.js
diff --git a/spike/public/test/suite.html → websocket_test/public/test/suite.html b/spike/public/test/suite.html → websocket_test/public/test/suite.html