Merge branch 'develop'

package.json

@@ -62,7 +62,6 @@
     "redis": "~0.8.3",
     "request": "~2.33.0",
     "restify": "~2.5.1",
-    "restify-oauth2-oauthd": "~2.2.0",
     "rewire": "^2.1.0",
     "rimraf": "^2.2.8",
     "sugar": "^1.4.1",

providers/23andme/settings.json

@@ -11,7 +11,8 @@
 		"install": {
 			"href": {
 				"provider": "https://23andme.com/",
-				"docs": "https://api.23andme.com/docs"
+				"docs": "https://api.23andme.com/docs",
+				"apps": "https://api.23andme.com/dev"
 			}
 		},
         "sample": {

providers/500px/settings.json

@@ -11,7 +11,8 @@
 		"install": {
 			"href": {
 				"provider": "http://500px.com/",
-				"docs": "https://github.com/500px/api-documentation"
+				"docs": "https://github.com/500px/api-documentation",
+				"apps": "http://500px.com/settings/applications"
 			}
 		},
         "sample": {

providers/angel_list/conf.json

@@ -0,0 +1,53 @@
+{
+	"name": "AngelList",
+	"desc": "AngelList is a US website for startups, angel investors, and job-seekers looking to work at startups.",
+	"url": "https://api.angel.co/",
+	"oauth2": {
+		"authorize": {
+			"url": "https://angel.co/api/oauth/authorize",
+			"query": {
+				"response_type": "code",
+				"client_id": "{client_id}",
+				"state": "{{state}}",
+				"scope": "{scope}"
+			},
+			"format": "url"
+		},
+		"access_token": {
+			"url": "https://angel.co/api/oauth/token",
+			"query": {
+				"client_id": "{client_id}",
+				"client_secret": "{client_secret}",
+				"grant_type": "authorization_code",
+				"code": "{{code}}"
+			},
+			"format": "json"
+		},
+		"request": {
+			"url": "https://api.angel.co/"
+		},
+		"refresh": {
+			"url": "https://angel.co/api/oauth/token",
+			"method": "post",
+			"query": {
+				"client_id": "{client_id}",
+				"client_secret": "{client_secret}",
+				"grant_type": "refresh_token",
+				"refresh_token": "{{refresh_token}}"
+			}
+		},
+		"parameters": {
+			"client_id": "string",
+			"client_secret": "string",
+			"scope": {
+				"values": {
+					"comment": "gives your application permission to create and destroy likes and comments.",
+					"email": "gives your application access to the user's email address.",
+					"message": "gives your application access to the user's private messages, for reading and writing.",
+					"talent": "gives your application access to the user's presence on AngelList Talent."
+				},
+				"separator": " "
+			}
+		}
+	}
+}

providers/angel_list/me.js

@@ -0,0 +1,20 @@
+var me = {
+    fetch: [
+
+        function(fetched_elts) {
+            return '/1/me';
+        }
+
+    ],
+    params: {},
+    fields: {
+        id: "=",
+        email: "=",
+        location: "country",
+        name: "=",
+        avatar: function(me) {
+            return me.image;
+        }
+    }
+};
+module.exports = me;

providers/angel_list/settings.json

@@ -0,0 +1,23 @@
+{
+	"settings": {
+		"createApp": {
+			"url": "https://angel.co/api/oauth/clients",
+			"image": "config.png"
+		},
+		"copyingKey": {
+			"url": "https://angel.co/api/oauth/clients",
+			"image": "keys.png"
+		},
+		"install": {
+			"href": {
+				"provider": "https://angel.co/",
+				"docs": "https://angel.co/api",
+				"apps": "https://angel.co/api/oauth/clients"
+			}
+		},
+		"sample": {
+            "method": "get",
+            "url": "/1/me"
+        }
+	}
+}

providers/app_net/me.js

@@ -0,0 +1,28 @@
+var me = {
+    fetch: [
+
+        function(fetched_elts) {
+            return '/users/me';
+        }
+
+    ],
+    params: {},
+    fields: {
+        id: function(me) {
+            return me.data.id;
+        },
+        location: function(me) {
+            return me.data.locale;
+        },
+        name: function(me) {
+            return me.data.username;
+        },
+        avatar: function(me) {
+            return me.data.avatar_image.url;
+        },
+        alias: function(me) {
+            return me.data.username;
+        }
+    }
+};
+module.exports = me;

providers/app_net/settings.json

@@ -0,0 +1,23 @@
+{
+	"settings": {
+		"createApp": {
+			"url": "https://developers.app.net/docs/guides/create-an-app/",
+            "image": "config.png"
+		},
+		"copyingKey": {
+			"url": "https://account.app.net/developer/apps/",
+            "image": "keys.png"
+		},
+		"install": {
+			"href": {
+				"provider": "https://app.net/",
+				"docs": "https://developers.app.net/reference/resources/",
+				"apps": "https://account.app.net/developer/apps/"
+			}
+		},
+        "sample": {
+            "method": "get",
+            "url": "/users/me"
+        }
+	}
+}

providers/asana/settings.json

@@ -11,7 +11,8 @@
 		"install": {
 			"href": {
 				"provider": "https://asana.com",
-				"docs": "http://developer.asana.com/documentation"
+				"docs": "http://developer.asana.com/documentation",
+				"apps": "http://app.asana.com/-/account_api"
 			}
 		},
         "sample": {

providers/bitbucket/settings.json

@@ -1,17 +1,17 @@
 {
 	"settings": {
 		"createApp": {
-			"url": "https://bitbucket.org/account",
+			"url": "https://confluence.atlassian.com/display/BITBUCKET/OAuth+on+Bitbucket#OAuthonBitbucket-Step1.CreateanOAuthkeyandsecret",
 			"image": "config.png"
 		},
 		"copyingKey": {
-			"url": "https://bitbucket.org/account",
+			"url": "https://confluence.atlassian.com/display/BITBUCKET/OAuth+on+Bitbucket#OAuthonBitbucket-Step1.CreateanOAuthkeyandsecret",
 			"image": "keys.png"
 		},
 		"install": {
 			"href": {
 				"provider": "https://bitbucket.org/",
-				"docs": "http://confluence.atlassian.com/display/BITBUCKET/Using+the+Bitbucket+REST+APIs"
+				"docs": "https://confluence.atlassian.com/display/BITBUCKET/Use+the+Bitbucket+REST+APIs"
 			}
 		},
         "sample": {

providers/github/me.js

@@ -3,6 +3,9 @@ var me = {
     url: '/user',
     params: {},
     fields: {
+        id: function(me) {
+            return "" + me.id;
+        },
         name: '=',
         company: '=',
         alias: 'login',

providers/spotify/conf.json

@@ -56,7 +56,7 @@
 					"user-read-private": "Access your profile name, image and subscription details",
 					"user-read-email": "Get your real email address"
 				},
-				"separator": ","
+				"separator": " "
 			}
 		}
 	},

providers/spotify/settings.json

@@ -11,7 +11,8 @@
 		"install": {
 			"href": {
 				"provider": "https://www.spotify.com/",
-				"docs": "https://developer.spotify.com/web-api/"
+				"docs": "https://developer.spotify.com/web-api/",
+				"apps": "https://developer.spotify.com/my-applications"
 			}
 		},
         "sample": {

providers/uber/settings.json

@@ -2,14 +2,17 @@
     "settings": {
         "createApp": {
             "url": "https://login.uber.com/applications/new",
+            "image": "config.png"
         },
         "copyingKey": {
             "url": "https://login.uber.com/applications",
+            "image": "keys.png"
         },
         "install": {
             "href": {
                 "provider": "https://uber.com/",
-                "docs": "https://developer.uber.com/v1/api-reference/"
+                "docs": "https://developer.uber.com/v1/api-reference/",
+                "apps": "https://login.uber.com/applications"
             }
         },
         "sample": {
@@ -21,7 +24,6 @@
                 "method": "get",
                 "url": "/v1/me"
             }
-        },
-        "jsfiddle": "http://jsfiddle.net/willjcksn/2hb6B/embedded/"
+        }
     }
 }

src/core/pluginsEngine/plugins.coffee

@@ -82,6 +82,7 @@ module.exports = (env) ->
 
 	pluginsEngine.init = (cwd, callback) ->
 		env.pluginsEngine.cwd = cwd
+
 		env.scaffolding.plugins.info.getPluginsJson({ activeOnly: true })
 			.then (obj) ->
 				if not obj?
@@ -94,6 +95,7 @@ module.exports = (env) ->
 					loadPlugin(global_interface)
 				return callback null
 			.fail (e) ->
+				console.log e
 				return callback e
 
 	pluginsEngine.list = (callback) ->

src/data/base-entity.coffee

@@ -107,26 +107,45 @@ module.exports = (env) ->
 
 			defer.promise
 
-		save: () ->
+		save: (overwrite, delete_unknown_keys) ->
+			overwrite ?= true 
+			delete_unknown_keys ?= false 
 			defer = Q.defer()
 
 			# hat function that actually saves
 			_save = (done) =>
 				multi = env.data.redis.multi()
-				for key, value of @props
-					if typeof value == 'string'
-						multi.set @prefix() + key, value
-					if typeof value == 'object' and not value?.length?
-						multi.hmset @prefix() + key, value
-					if typeof value == 'object' and value?.length?
-						multi.del @prefix() + key
-						for k, v of value
-							multi.sadd @prefix() + key, v
-
-				# actual save
-				multi.exec (e, res) =>
-					return done e if e
-					done()
+
+				@keys()
+					.then (keys) =>
+						if delete_unknown_keys
+							prefixedProps = []
+							for key in Object.keys(@props)
+								prefixedProps.push @prefix() + key
+							for key in keys
+								if key not in prefixedProps
+									multi.del key
+						for key, value of @props
+							if typeof value == 'string' or typeof value == 'number'
+								multi.set @prefix() + key, value
+							else if typeof value == 'object' and Array.isArray(value)
+								multi.del @prefix() + key
+								for k, v of value
+									multi.sadd @prefix() + key, v
+							else if	value? and typeof value == 'object'
+								if overwrite
+									multi.del @prefix() + key
+								multi.hmset @prefix() + key, value
+							else
+								# TODO (value instanceof Boolean || typeof value == 'boolean')
+								console.log "not saved: type not found"
+
+						# actual save
+						multi.exec (e, res) =>
+							return done e if e
+							done()
+					.fail (e) =>
+						return done e if e
 
 			# checks if new entity or not. If no id found, increments ids
 			if not @id?

src/scaffolding/plugins/git.coffee

@@ -27,7 +27,6 @@ module.exports = (env, plugin_name, fetch, cwd) ->
 	git =
 		getCurrentVersion: () ->
 			defer = Q.defer()
-
 			execGit ['branch -v'], (error, stdout, stderr) ->
 				return defer.reject error if error
 

src/scaffolding/plugins/info.coffee

@@ -13,6 +13,7 @@ module.exports = (env) ->
 		getPluginsJson: (opts) ->
 			defer = Q.defer()
 			opts ?= {}
+
 			fs.readFile process.cwd() + '/plugins.json', {encoding: 'UTF-8'}, (err, data) ->
 				return defer.reject err if err
 				try
@@ -50,6 +51,7 @@ module.exports = (env) ->
 									plugins_json[plugin_name] = value
 									next()
 								.fail (e) ->
+
 									plugins_json[plugin_name] = {
 										name: plugin_name,
 										active: true
@@ -133,6 +135,8 @@ module.exports = (env) ->
 						.then (v) ->
 							plugin_data.version = v.version
 							defer.resolve plugin_data
+						.fail () ->
+							defer.resolve plugin_data
 				catch err
 					defer.reject err