- Added browser version (moviedb.js and moviedb.min.js)

- Request token now returns an error instead of throwing.

Makefile

@@ -1,11 +0,0 @@
-ALL_TESTS = $(shell find test/ -name '*.test.js')
-
-run-tests:
-	@./node_modules/.bin/mocha \
-		$(TESTFLAGS) \
-		$(TESTS)
-
-test:
-	@$(MAKE) NODE_PATH=lib TESTS="$(ALL_TESTS)" run-tests
-
-.PHONY: test

lib/moviedb.js

@@ -3,14 +3,14 @@
  * Module dependencies
  */
 
-var request = require('superagent')
-  , endpoints = require('./endpoints.json');
+var request = require('superagent');
+var endpoints = require('./endpoints.json');
 
 /*
  * Exports the constructor
  */
 
-module.exports = function(api_key, base_url){
+module.exports = function(api_key, base_url) {
   if(api_key) return new MovieDB(api_key, base_url);
   else throw new Error('Bad api key');
 };
@@ -37,11 +37,11 @@ MovieDB.prototype.requestToken = function(fn){
   .query({'api_key': self.api_key})
   .set('Accept', 'application/json')
   .end(function(res){
-    if(res.ok) self.token = res.body;
-    else throw res.error;
+    if(!res.ok) return fn(res.error);
+    self.token = res.body;
     fn();
   }).on('error', function(error){
-    throw error;
+    fn(error);
   });
 
   return this;
@@ -63,7 +63,8 @@ Object.keys(endpoints.methods).forEach(function(method){
       }
 
       if(!this.token || Date.now() > +new Date(this.token.expires_at)) {
-        this.requestToken(function(){
+        this.requestToken(function(err){
+          if(err) return fn(err);
           execMethod.call(self, met[m].method, params, met[m].resource, fn);
         });    
       } else {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "moviedb",
   "description": "Library for interacting with themoviedb.com API",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "keywords": [
     "themoviedb",
     "api"
@@ -12,9 +12,6 @@
   "main": "index.js",
   "author": "Dan Zajdband <dan.zajdband@gmail.com>",
   "dependencies": {
-    "superagent": "0.20.0"
-  },
-  "devDependencies": {
-    "mocha": "1.0.x"
+    "superagent": "0.21.0"
   }
 }