*Sob* I *STILL* do not understand git, missed some commits, and I'm too lazy to squish my commits!

Author: ciaranj

lib/flickrapi.js

@@ -3,7 +3,10 @@ var Request= require("./request").Request,
     Blogs= require("./blogs").Blogs,
     People= require("./people").People,
     Photos= require("./photos").Photos,
-    Photosets= require("./photosets").Photosets;
+    Photosets= require("./photosets").Photosets,
+    Contacts= require("./contacts").Contacts,
+    Feeds= require("./feeds").Feeds,
+    Urls= require("./urls").Urls;
 
 var FlickrAPI= function FlickrAPI(api_key, shared_secret, auth_token) {
     this._configure(api_key, shared_secret, auth_token);
@@ -17,10 +20,16 @@ FlickrAPI.prototype._configure= function(api_key, shared_secret, auth_token) {
     this.photosets= new Photosets(this._request);
     this.auth= new Auth(this._request);
     this.blogs= new Blogs(this._request);
+    this.contacts= new Contacts(this._request);
+    this.urls= new Urls(this._request);
+
+    this._feedRequest= new Request(api_key, shared_secret, auth_token, true);
+    this.feeds= new Feeds(this._feedRequest);
 };
 
 FlickrAPI.prototype.setAuthenticationToken= function(auth_token) {
    this._request.setAuthenticationToken(auth_token);
+   this._feedRequest.setAuthenticationToken(auth_token);
 };
 
 FlickrAPI.prototype.getLoginUrl= function(permissions, frob) {

lib/photos.js

@@ -1,5 +1,8 @@
+var PhotoComments= require("./photos_comments").PhotosComments;
+
 var Photos= function Photos(request) {
     this._request= request;
+    this.comments= new PhotoComments(this._request);
 };
 
 Photos.prototype.getInfo= function(photo_id, secret) {

lib/request.js

@@ -4,8 +4,17 @@ var sys = require("sys"),
 
 var flickr_request = http.createClient(80, "api.flickr.com");
 
-var Request= function Request(api_key, shared_secret, auth_token) {
+var Request= function Request(api_key, shared_secret, auth_token, isFeedRequest) {
     this._configure(api_key, shared_secret, auth_token);
+    this.isFeedRequest= false;
+    if( isFeedRequest !== undefined ) this.isFeedRequest= isFeedRequest;  
+
+    if( this.isFeedRequest ) {
+        this.baseUrl= "/services/feeds";  
+    }
+    else {
+        this.baseUrl= "/services/rest";  
+    }
 };
 
 Request.prototype._configure= function(api_key, shared_secret, auth_token) {
@@ -41,19 +50,26 @@ Request.prototype.getRequestPromise= function(method, arguments, sign_it, result
     var promise= new process.Promise()
     var argumentString = "";
     var api_sig= undefined;
+
     if( arguments === undefined )  arguments = {};
 
     // apply default arguments 
     arguments.format= "json";
     arguments.nojsoncallback= "1";
-    arguments["method"]= method;
-    arguments.api_key= this.api_key;
-    if( this.auth_token ) arguments.auth_token= this.auth_token;
+
+    if( this.isFeedRequest ) {
+        argumentString= "/"+ method;
+    }
+    else {
+        arguments.api_key= this.api_key;
+        arguments["method"]= method;
+        if( this.auth_token ) arguments.auth_token= this.auth_token;
 
-    if( this.shared_secret && (sign_it || this.auth_token) ) {
-        api_sig= this.generateSignature(this.shared_secret, arguments);
-        if( api_sig ) {
-            arguments.api_sig= api_sig;
+        if( this.shared_secret && (sign_it || this.auth_token) ) {
+            api_sig= this.generateSignature(this.shared_secret, arguments);
+            if( api_sig ) {
+                arguments.api_sig= api_sig;
+            }
         }
     }
     var operator= "?";
@@ -62,30 +78,49 @@ Request.prototype.getRequestPromise= function(method, arguments, sign_it, result
         if( operator == "?" ) operator= "&";
     }
     var request= flickr_request.request("GET", 
-                          "/services/rest"+ argumentString, 
+                          this.baseUrl+ argumentString, 
                           {"host": "api.flickr.com"});
+    var isFeedRequest= this.isFeedRequest;          
     request.finish(function (response) {
         var result= "";
         response.setBodyEncoding("utf8");
         response.addListener("body", function (chunk) {
           result+= chunk;
         });
         response.addListener("complete", function () {
-            var res= JSON.parse(result);
-            if( res.stat == "ok" ) {
-                // Munge the response to strip out the stat and just return the response value
-                for(var key in res) {
-                    if( key !== "stat" ) {
-                        res= res[key];
-                    }
+            if( isFeedRequest ) {
+                //Dear-god this is bound to fail horribly.
+                var m;
+                if(!result || (m= result.match(/[\S\s]+We were unable to generate the feed you requested, for the following reason:<\/p>\s*?<p[\S\s]+?>([\S\s]+?)<\/p>[\S\s]+/) ) ) {
+                    var  errorString= m[1].replace(/^\s+/,"");
+                    errorString= errorString.replace(/\s+$/, "");
+                    promise.emitError({code: -1, message: errorString});
                 }
-                if( result_mapper ) {
-                    res= result_mapper(res);
+                else {
+                    var res= JSON.parse(result);
+                    if( result_mapper ) {
+                        res= result_mapper(res);
+                    }
+                    promise.emitSuccess(res);
                 }
-                promise.emitSuccess(res);
             } 
             else {
-                promise.emitError({code: res.code, message: res.message});
+                var res= JSON.parse(result);
+                if( res.stat && res.stat == "ok" ) {
+                    // Munge the response to strip out the stat and just return the response value
+                    for(var key in res) {
+                        if( key !== "stat" ) {
+                            res= res[key];
+                        }
+                    }
+                    if( result_mapper ) {
+                        res= result_mapper(res);
+                    }
+                    promise.emitSuccess(res);
+                } 
+                else {
+                    promise.emitError({code: res.code, message: res.message});
+                }
             }
         });
     });