From ec61902af19f9e3f5d54b58e07152c39a45e94a3 Mon Sep 17 00:00:00 2001
From: Dan Zajdband <dan.zajdband@gmail.com>
Date: Mon, 20 Aug 2012 13:06:11 -0300
Subject: [PATCH] reduced lib size and complexity

---
 lib/auth.js    | 25 ------------------
 lib/moviedb.js | 63 ++++++++++++++++++++++++++++++++++++++++---
 lib/request.js | 72 --------------------------------------------------
 3 files changed, 59 insertions(+), 101 deletions(-)
 delete mode 100644 lib/auth.js
 delete mode 100644 lib/request.js

diff --git a/lib/auth.js b/lib/auth.js
deleted file mode 100644
index cc75de2..0000000
--- a/lib/auth.js
+++ /dev/null
@@ -1,25 +0,0 @@
-
-/**
- * Module dependencies
- */
-
-var request = require('superagent')
-  , endpoints = require('./endpoints.json')
-  , MovieDB = module.parent.exports;
-
-
-MovieDB.prototype.requestToken = function(fn){
-  var that = this;
-
-  request
-  .get(endpoints.base_url  + endpoints.authentication.requestToken)
-  .send({api_key: that.api_key})
-  .set('Accept', 'application/json')
-  .end(function(res){
-    if(res.ok) that.token = res.body;
-    else throw new Error('Invalid authentication');
-
-    fn();
-  });
-};
-
diff --git a/lib/moviedb.js b/lib/moviedb.js
index 03bae62..9b2b361 100644
--- a/lib/moviedb.js
+++ b/lib/moviedb.js
@@ -1,9 +1,16 @@
 
+/*
+ * Module dependencies
+ */
+
+var request = require('superagent')
+  , endpoints = require('./endpoints.json');
+
 /*
  * Exports the constructor
  */
 
-module.exports = function MovieDB(api_key){
+var MovieDB = module.exports = function(api_key){
   if(api_key) this.api_key = api_key;
   else throw new Error('Bad api key');
 };
@@ -12,10 +19,58 @@ module.exports = function MovieDB(api_key){
  * API auth
  */
 
-require('./auth');
+MovieDB.prototype.requestToken = function(fn){
+  var self = this;
+
+  request
+  .get(endpoints.base_url  + endpoints.authentication.requestToken)
+  .send({'api_key': self.api_key})
+  .set('Accept', 'application/json')
+  .end(function(res){
+    if(res.ok) self.token = res.body;
+    else throw new Error('Invalid authentication');
+    fn();
+  });
+};
 
 /*
- * API request
+ * Generate API methods
  */
 
-require('./request');
+Object.keys(endpoints.methods).forEach(function(method){
+  var met = endpoints.methods[method];
+  Object.keys(met).forEach(function(m){
+    MovieDB.prototype[method + m] = function(params, fn){
+      var self = this;
+
+      if("function" == typeof params) {
+        fn = params;
+        params = {};
+      }
+
+      if(!this.token || Date.now() > +new Date(this.token.expires_at)) {
+        this.requestToken(function(){
+          execMethod.call(self, met[m].method, params, met[m].resource, fn);
+        });    
+      } else {
+        execMethod.call(this, met[m].method, params, met[m].resource, fn);
+      } 
+    };
+
+  });
+});
+
+var execMethod = function(type, params, endpoint, fn){
+  params = params || {};
+  endpoint = endpoint.replace(':id', params.id);
+  
+  request(type, endpoints.base_url + endpoint)
+  .query({api_key : this.api_key})
+  .send(params)
+  .set('Accept', 'application/json')
+  .end(function(res){
+    if(res.ok) fn(null, res.body);
+    else if(res.body && res.body.status_message) fn(new Error(res.body.status_message), null);
+    else fn(res.error, null);
+  });
+};
diff --git a/lib/request.js b/lib/request.js
deleted file mode 100644
index e0c603b..0000000
--- a/lib/request.js
+++ /dev/null
@@ -1,72 +0,0 @@
-
-/**
- * Module dependencies
- */
-
-var request = require('superagent')
-var endpoints = require('./endpoints.json')
-  , methods = endpoints.methods
-  , base_url = endpoints.base_url
-  , MovieDB = module.exports = module.parent.exports;
-
-/*
- * Generate API methods
- */
-
-Object.keys(methods).forEach(function(method){
-  Object.keys(methods[method]).forEach(function(m){
-    MovieDB.prototype[method + m] = function(params, fn){
-      var self = this;
-
-      if("function" == typeof params) {
-        fn = params;
-        params = {};
-      }
-
-      if(!this.token || Date.now() > +new Date(this.token.expires_at)) {
-        this.requestToken(function(){
-          execMethod.call(self, methods[method][m].method, params, methods[method][m].resource, fn);
-        });    
-      } else {
-        execMethod.call(this, methods[method][m].method, params, methods[method][m].resource, fn);
-      } 
-    };
-
-  });
-});
-
-var execMethod = function(type, params, endpoint, fn){
-  params = params || {};
-  endpoint = endpoint.replace(':id', params.id);
-  
-  var req;
-
-  if(type == "get") {
-    req = request.get(base_url + endpoint)
-  } else if(type == "post") { 
-    req = request.post(base_url + endpoint);
-  } else {
-    fn(new Error("Method is not well implemented, needs to be a get or post request"), null);
-  }
- 
-  req
-  .query({api_key : this.api_key})
-  .send(params)
-  .set('Accept', 'application/json')
-  .end(function(res){
-    if(res.ok){
-      try{
-        var body = JSON.parse(res.text);
-        fn(null, body);
-      } catch(e){
-        fn(e, null);
-      }
-    } else {
-      if(res.body && res.body.status_message){
-        fn(new Error(res.body.status_message), null);
-      } else {
-        fn(res.error, null);
-      }
-    }
-  });
-};