Comparing version 0.1.1 to 0.1.2
114
index.js
@@ -54,2 +54,35 @@ /*jslint browser: true, regexp: true */ | ||
function add_options(params, options) { | ||
'use strict'; | ||
var options_key; | ||
if (options) { | ||
for (options_key in options) { | ||
if (options.hasOwnProperty(options_key)) { | ||
params[options_key] = options[options_key]; | ||
} | ||
} | ||
} | ||
return params; | ||
} | ||
function get_smugmug_data(params, options) { | ||
'use strict'; | ||
var url = utils.generate_url(add_options(params, options)), | ||
deferred = Q.defer(); | ||
utils.get_json(url).then(function (data) { | ||
if (data.stat === 'fail') { | ||
deferred.reject(new Error(data.message)); | ||
} | ||
deferred.resolve(data); | ||
}).fail(function (error) { | ||
deferred.reject(error); | ||
}); | ||
return deferred.promise; | ||
} | ||
module.exports = { | ||
@@ -96,6 +129,3 @@ config: function (configuration) { | ||
'use strict'; | ||
var params, url, options_key, | ||
deferred = Q.defer(); | ||
params = { | ||
var params = { | ||
method: 'smugmug.albums.get', | ||
@@ -105,30 +135,7 @@ NickName: name | ||
if (options) { | ||
for (options_key in options) { | ||
if (options.hasOwnProperty(options_key)) { | ||
params[options_key] = options[options_key]; | ||
} | ||
} | ||
} | ||
url = utils.generate_url(params); | ||
utils.get_json(url).then(function (album_data) { | ||
if (album_data.stat === 'fail') { | ||
deferred.reject(new Error(album_data.message)); | ||
} | ||
deferred.resolve(album_data); | ||
}).fail(function (error) { | ||
deferred.reject(error); | ||
}); | ||
return deferred.promise; | ||
return get_smugmug_data(params, options); | ||
}, | ||
getInfo: function (id, key, options) { | ||
'use strict'; | ||
var params, url, options_key, | ||
deferred = Q.defer(); | ||
params = { | ||
var params = { | ||
method: 'smugmug.albums.getInfo', | ||
@@ -139,23 +146,3 @@ AlbumID: id, | ||
if (options) { | ||
for (options_key in options) { | ||
if (options.hasOwnProperty(options_key)) { | ||
params[options_key] = options[options_key]; | ||
} | ||
} | ||
} | ||
url = utils.generate_url(params); | ||
utils.get_json(url).then(function (album_data) { | ||
if (album_data.stat === 'fail') { | ||
deferred.reject(new Error(album_data.message)); | ||
} | ||
deferred.resolve(album_data); | ||
}).fail(function (error) { | ||
deferred.reject(error); | ||
}); | ||
return deferred.promise; | ||
return get_smugmug_data(params, options); | ||
} | ||
@@ -166,6 +153,3 @@ }, | ||
'use strict'; | ||
var params, url, options_key, | ||
deferred = Q.defer(); | ||
params = { | ||
var params = { | ||
method: 'smugmug.images.get', | ||
@@ -176,23 +160,3 @@ AlbumID: id, | ||
if (options) { | ||
for (options_key in options) { | ||
if (options.hasOwnProperty(options_key)) { | ||
params[options_key] = options[options_key]; | ||
} | ||
} | ||
} | ||
url = utils.generate_url(params); | ||
utils.get_json(url).then(function (image_data) { | ||
if (image_data.stat === 'fail') { | ||
deferred.reject(new Error(image_data.message)); | ||
} | ||
deferred.resolve(image_data); | ||
}).fail(function (error) { | ||
deferred.reject(error); | ||
}); | ||
return deferred.promise; | ||
return get_smugmug_data(params, options); | ||
} | ||
@@ -199,0 +163,0 @@ }, |
{ | ||
"name": "humblemug", | ||
"version": "0.1.1", | ||
"version": "0.1.2", | ||
"description": "A library for interacting with the SmugMug API", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -20,3 +20,3 @@ # A Node.js library for SmugMug | ||
# Documentation | ||
##config | ||
## config | ||
Config takes in an object of configuration information to store and use. | ||
@@ -26,4 +26,4 @@ ```javascript | ||
``` | ||
##login | ||
###anon | ||
## login | ||
### anon | ||
Most public information can be accessed with after loggining in anonymously | ||
@@ -35,4 +35,4 @@ ```javascript | ||
``` | ||
##albums | ||
###[get](http://api.smugmug.com/services/api/?version=1.3.0&method=smugmug.albums.get) | ||
## albums | ||
### [get](http://api.smugmug.com/services/api/?version=1.3.0&method=smugmug.albums.get) | ||
Lists all of the albums for a given user | ||
@@ -44,3 +44,3 @@ ```javascript | ||
``` | ||
###[getInfo](http://api.smugmug.com/services/api/?version=1.3.0&method=smugmug.albums.getInfo) | ||
### [getInfo](http://api.smugmug.com/services/api/?version=1.3.0&method=smugmug.albums.getInfo) | ||
Gets all the info for a given album | ||
@@ -52,4 +52,4 @@ ```javascript | ||
``` | ||
##images | ||
###[get](http://api.smugmug.com/services/api/?version=1.3.0&method=smugmug.images.get) | ||
## images | ||
### [get](http://api.smugmug.com/services/api/?version=1.3.0&method=smugmug.images.get) | ||
Lists all of the images in an album | ||
@@ -56,0 +56,0 @@ ```javascript |
24472
132