From fd7d9f64c9582863269b2660e0ef6f36cb7bcf49 Mon Sep 17 00:00:00 2001 From: Jonathan Hornung Date: Mon, 21 Dec 2015 23:51:42 +0100 Subject: [PATCH] impr: changed "undefined" as default value for unused attributes in models (close #5) --- dist/aping-plugin-github.min.js | 2 +- src/aping-github-helper.js | 60 ++++++++++++++++----------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dist/aping-plugin-github.min.js b/dist/aping-plugin-github.min.js index 69ef761..85c9ea3 100644 --- a/dist/aping-plugin-github.min.js +++ b/dist/aping-plugin-github.min.js @@ -1,3 +1,3 @@ /*! aping-plugin-github v0.1.3 (21-12-2015) by Jonathan Hornung */ -"use strict";var jjtApingGithub=angular.module("jtt_aping_github",["jtt_github"]).directive("apingGithub",["apingGithubHelper","apingUtilityHelper","githubFactory",function(a,b,c){return{require:"?aping",restrict:"A",replace:"false",link:function(d,e,f,g){var h=g.getAppSettings(),i=b.parseJsonFromAttributes(f.apingGithub,a.getThisPlattformString(),h);i.forEach(function(d){var e={model:h.model};"undefined"!=typeof h.getNativeData?e.getNativeData=h.getNativeData:e.getNativeData=!1;var f={access_token:b.getApiCredentials(a.getThisPlattformString(),"access_token")};if("undefined"!=typeof d.items?f.per_page=d.items:f.per_page=h.items,0==f.per_page)return!1;if((f.per_page<0||isNaN(f.per_page))&&(f.per_page=void 0),f.per_page>100&&(f.per_page=100),d.user)switch(f.user=d.user,h.model){case"repo":d.repo?(f.repo=d.repo,c.getRepoByUserAndName(f).success(function(b){g.concatToResults(a.getObjectByJsonData(b,e))}).error(function(a){})):c.getReposByUser(f).success(function(b){g.concatToResults(a.getObjectByJsonData(b,e))}).error(function(a){});break;case"activity":c.getEventsByUser(f).success(function(b){g.concatToResults(a.getObjectByJsonData(b,e))}).error(function(a){})}else if(d.search)switch(f.q=d.search,"undefined"!=typeof d.sort&&(f.sort=d.sort),"undefined"!=typeof d.order&&(f.order=d.order),h.model){case"repo":c.getReposByName(f).success(function(b){g.concatToResults(a.getObjectByJsonData(b,e))}).error(function(a){})}})}}}]);jjtApingGithub.service("apingGithubHelper",["apingModels","apingTimeHelper","apingUtilityHelper",function(a,b,c){this.getThisPlattformString=function(){return"github"},this.getThisPlattformLink=function(){return"https://github.com/"},this.getObjectByJsonData=function(a,b){var c=[];if(a){var d=this;if(a.constructor===Array)angular.forEach(a,function(a,e){var f;f=b.getNativeData===!0||"true"===b.getNativeData?a:d.getItemByJsonData(a,b.model),f&&c.push(f)});else{if(a.items)angular.forEach(a.items,function(a,e){var f;f=b.getNativeData===!0||"true"===b.getNativeData?a:d.getItemByJsonData(a,b.model),f&&c.push(f)});else{var e;e=b.getNativeData===!0||"true"===b.getNativeData?a:d.getItemByJsonData(a,b.model),e&&c.push(e)}}}return c},this.getItemByJsonData=function(a,b){var c={};if(a&&b)switch(b){case"repo":c=this.getRepoItemByJsonData(a);break;default:return!1}return c},this.getRepoItemByJsonData=function(c){var d=a.getNew("repo",this.getThisPlattformString());return $.extend(!0,d,{owner_name:c.owner?c.owner.login:!1,owner_id:c.owner?c.owner.id:!1,owner_link:c.owner?c.owner.html_url:!1,owner_img_url:c.owner?c.owner.avatar_url:!1,name:c.name,id:c.id,fullname:c.full_name,description:c.description||!1,url:c.html_url,homepage:c.homepage||!1,language:c.language||!1,clone_url:c.clone_url,git_url:c.git_url,ssh_url:c.ssh_url,svn_url:c.svn_url,isFork:c.fork,openIssues:c.open_issues_count,watchers:c.watchers_count,stargazers:c.stargazers_count,forks:c.forks_count,created_timestamp:b.getTimestampFromDateString(c.created_at,1e3,36e5),created_date_time:new Date(c.created_at),updated_timestamp:c.updated_at?b.getTimestampFromDateString(c.updated_at,1e3,36e5):!1,updated_date_time:c.updated_at?new Date(c.updated_at):!1,pushed_timestamp:c.pushed_at?b.getTimestampFromDateString(c.pushed_at,1e3,36e5):!1,pushed_date_time:c.pushed_at?new Date(c.pushed_at):!1}),d}}]),angular.module("jtt_github",[]).factory("githubFactory",["$http","githubSearchDataService",function(a,b){var c={};return c.getUser=function(c){var d=b.getNew("user",c);return a({method:"GET",url:d.url,params:d.object})},c.getReposByUser=function(c){var d=b.getNew("reposByUser",c);return a({method:"GET",url:d.url,params:d.object})},c.getReposByName=function(c){var d=b.getNew("reposByName",c);return a({method:"GET",url:d.url,params:d.object})},c.getRepoByUserAndName=function(c){var d=b.getNew("repoByUserAndName",c);return a({method:"GET",url:d.url,params:d.object})},c.getEventsByUser=function(c){var d=b.getNew("eventsByUser",c);return a({method:"GET",url:d.url,params:d.object})},c.getEventsFromRepoByUserAndName=function(c){var d=b.getNew("eventsFromRepoByUserAndName",c);return a({method:"GET",url:d.url,params:d.object})},c}]).service("githubSearchDataService",function(){this.getApiBaseUrl=function(a){return"https://api.github.com/"},this.fillDataInObjectByList=function(a,b,c){return angular.forEach(c,function(c,d){"undefined"!=typeof b[c]&&(a.object[c]=b[c])}),a},this.getNew=function(a,b){var c={object:{access_token:b.access_token},url:""};switch("undefined"!=typeof b.per_page&&(c.object.per_page=b.per_page),a){case"user":c.object.per_page=void 0,c=this.fillDataInObjectByList(c,b,[]),c.url=this.getApiBaseUrl()+"users/"+b.user;break;case"reposByUser":c=this.fillDataInObjectByList(c,b,["q","sort","order","page"]),c.url=this.getApiBaseUrl()+"users/"+b.user+"/repos";break;case"reposByName":c=this.fillDataInObjectByList(c,b,["sort","order","page"]),c.url=this.getApiBaseUrl()+"search/repositories?q="+b.q;break;case"repoByUserAndName":c.object={access_token:b.access_token},c=this.fillDataInObjectByList(c,b,[]),c.url=this.getApiBaseUrl()+"repos/"+b.user+"/"+b.repo;break;case"eventsByUser":c=this.fillDataInObjectByList(c,b,["q","sort","order","page"]),c.url=this.getApiBaseUrl()+"users/"+b.user+"/events";break;case"eventsFromRepoByUserAndName":c=this.fillDataInObjectByList(c,b,["q","sort","order","page"]),c.url=this.getApiBaseUrl()+"repos/"+b.user+"/"+b.repo+"/events"}return c}}); \ No newline at end of file +"use strict";var jjtApingGithub=angular.module("jtt_aping_github",["jtt_github"]).directive("apingGithub",["apingGithubHelper","apingUtilityHelper","githubFactory",function(a,b,c){return{require:"?aping",restrict:"A",replace:"false",link:function(d,e,f,g){var h=g.getAppSettings(),i=b.parseJsonFromAttributes(f.apingGithub,a.getThisPlattformString(),h);i.forEach(function(d){var e={model:h.model};"undefined"!=typeof h.getNativeData?e.getNativeData=h.getNativeData:e.getNativeData=!1;var f={access_token:b.getApiCredentials(a.getThisPlattformString(),"access_token")};if("undefined"!=typeof d.items?f.per_page=d.items:f.per_page=h.items,0==f.per_page)return!1;if((f.per_page<0||isNaN(f.per_page))&&(f.per_page=void 0),f.per_page>100&&(f.per_page=100),d.user)switch(f.user=d.user,h.model){case"repo":d.repo?(f.repo=d.repo,c.getRepoByUserAndName(f).success(function(b){g.concatToResults(a.getObjectByJsonData(b,e))}).error(function(a){})):c.getReposByUser(f).success(function(b){g.concatToResults(a.getObjectByJsonData(b,e))}).error(function(a){});break;case"activity":c.getEventsByUser(f).success(function(b){g.concatToResults(a.getObjectByJsonData(b,e))}).error(function(a){})}else if(d.search)switch(f.q=d.search,"undefined"!=typeof d.sort&&(f.sort=d.sort),"undefined"!=typeof d.order&&(f.order=d.order),h.model){case"repo":c.getReposByName(f).success(function(b){g.concatToResults(a.getObjectByJsonData(b,e))}).error(function(a){})}})}}}]);jjtApingGithub.service("apingGithubHelper",["apingModels","apingTimeHelper","apingUtilityHelper",function(a,b,c){this.getThisPlattformString=function(){return"github"},this.getThisPlattformLink=function(){return"https://github.com/"},this.getObjectByJsonData=function(a,b){var c=[];if(a){var d=this;if(a.constructor===Array)angular.forEach(a,function(a,e){var f;f=b.getNativeData===!0||"true"===b.getNativeData?a:d.getItemByJsonData(a,b.model),f&&c.push(f)});else{if(a.items)angular.forEach(a.items,function(a,e){var f;f=b.getNativeData===!0||"true"===b.getNativeData?a:d.getItemByJsonData(a,b.model),f&&c.push(f)});else{var e;e=b.getNativeData===!0||"true"===b.getNativeData?a:d.getItemByJsonData(a,b.model),e&&c.push(e)}}}return c},this.getItemByJsonData=function(a,b){var c={};if(a&&b)switch(b){case"repo":c=this.getRepoItemByJsonData(a);break;default:return!1}return c},this.getRepoItemByJsonData=function(c){var d=a.getNew("repo",this.getThisPlattformString());return $.extend(!0,d,{owner_name:c.owner?c.owner.login:void 0,owner_id:c.owner?c.owner.id:void 0,owner_link:c.owner?c.owner.html_url:void 0,owner_img_url:c.owner?c.owner.avatar_url:void 0,name:c.name,id:c.id,fullname:c.full_name,description:c.description||void 0,url:c.html_url,homepage:c.homepage||void 0,language:c.language||void 0,clone_url:c.clone_url,git_url:c.git_url,ssh_url:c.ssh_url,svn_url:c.svn_url,isFork:c.fork,openIssues:c.open_issues_count,watchers:c.watchers_count,stargazers:c.stargazers_count,forks:c.forks_count,created_timestamp:b.getTimestampFromDateString(c.created_at,1e3,36e5),created_date_time:new Date(c.created_at),updated_timestamp:c.updated_at?b.getTimestampFromDateString(c.updated_at,1e3,36e5):void 0,updated_date_time:c.updated_at?new Date(c.updated_at):void 0,pushed_timestamp:c.pushed_at?b.getTimestampFromDateString(c.pushed_at,1e3,36e5):void 0,pushed_date_time:c.pushed_at?new Date(c.pushed_at):void 0}),d}}]),angular.module("jtt_github",[]).factory("githubFactory",["$http","githubSearchDataService",function(a,b){var c={};return c.getUser=function(c){var d=b.getNew("user",c);return a({method:"GET",url:d.url,params:d.object})},c.getReposByUser=function(c){var d=b.getNew("reposByUser",c);return a({method:"GET",url:d.url,params:d.object})},c.getReposByName=function(c){var d=b.getNew("reposByName",c);return a({method:"GET",url:d.url,params:d.object})},c.getRepoByUserAndName=function(c){var d=b.getNew("repoByUserAndName",c);return a({method:"GET",url:d.url,params:d.object})},c.getEventsByUser=function(c){var d=b.getNew("eventsByUser",c);return a({method:"GET",url:d.url,params:d.object})},c.getEventsFromRepoByUserAndName=function(c){var d=b.getNew("eventsFromRepoByUserAndName",c);return a({method:"GET",url:d.url,params:d.object})},c}]).service("githubSearchDataService",function(){this.getApiBaseUrl=function(a){return"https://api.github.com/"},this.fillDataInObjectByList=function(a,b,c){return angular.forEach(c,function(c,d){"undefined"!=typeof b[c]&&(a.object[c]=b[c])}),a},this.getNew=function(a,b){var c={object:{access_token:b.access_token},url:""};switch("undefined"!=typeof b.per_page&&(c.object.per_page=b.per_page),a){case"user":c.object.per_page=void 0,c=this.fillDataInObjectByList(c,b,[]),c.url=this.getApiBaseUrl()+"users/"+b.user;break;case"reposByUser":c=this.fillDataInObjectByList(c,b,["q","sort","order","page"]),c.url=this.getApiBaseUrl()+"users/"+b.user+"/repos";break;case"reposByName":c=this.fillDataInObjectByList(c,b,["sort","order","page"]),c.url=this.getApiBaseUrl()+"search/repositories?q="+b.q;break;case"repoByUserAndName":c.object={access_token:b.access_token},c=this.fillDataInObjectByList(c,b,[]),c.url=this.getApiBaseUrl()+"repos/"+b.user+"/"+b.repo;break;case"eventsByUser":c=this.fillDataInObjectByList(c,b,["q","sort","order","page"]),c.url=this.getApiBaseUrl()+"users/"+b.user+"/events";break;case"eventsFromRepoByUserAndName":c=this.fillDataInObjectByList(c,b,["q","sort","order","page"]),c.url=this.getApiBaseUrl()+"repos/"+b.user+"/"+b.repo+"/events"}return c}}); \ No newline at end of file diff --git a/src/aping-github-helper.js b/src/aping-github-helper.js index 42ed363..6d5cbb4 100644 --- a/src/aping-github-helper.js +++ b/src/aping-github-helper.js @@ -91,17 +91,17 @@ jjtApingGithub.service('apingGithubHelper', ['apingModels', 'apingTimeHelper', ' var repoObject = apingModels.getNew("repo", this.getThisPlattformString()); $.extend(true, repoObject, { - owner_name : _item.owner ? _item.owner.login : false, - owner_id : _item.owner ? _item.owner.id : false, - owner_link : _item.owner ? _item.owner.html_url : false, - owner_img_url : _item.owner ? _item.owner.avatar_url : false, + owner_name : _item.owner ? _item.owner.login : undefined, + owner_id : _item.owner ? _item.owner.id : undefined, + owner_link : _item.owner ? _item.owner.html_url : undefined, + owner_img_url : _item.owner ? _item.owner.avatar_url : undefined, name : _item.name, id: _item.id, fullname: _item.full_name, - description : _item.description || false, + description : _item.description || undefined, url : _item.html_url, - homepage : _item.homepage || false, - language : _item.language || false, + homepage : _item.homepage || undefined, + language : _item.language || undefined, clone_url : _item.clone_url, git_url : _item.git_url, ssh_url : _item.ssh_url, @@ -113,10 +113,10 @@ jjtApingGithub.service('apingGithubHelper', ['apingModels', 'apingTimeHelper', ' forks : _item.forks_count, created_timestamp : apingTimeHelper.getTimestampFromDateString(_item.created_at, 1000, 3600*1000), created_date_time: new Date(_item.created_at), - updated_timestamp: _item.updated_at ? apingTimeHelper.getTimestampFromDateString(_item.updated_at, 1000, 3600*1000) : false, - updated_date_time: _item.updated_at ? new Date(_item.updated_at) : false, - pushed_timestamp: _item.pushed_at ? apingTimeHelper.getTimestampFromDateString(_item.pushed_at, 1000, 3600*1000) : false, - pushed_date_time: _item.pushed_at ? new Date(_item.pushed_at) : false, + updated_timestamp: _item.updated_at ? apingTimeHelper.getTimestampFromDateString(_item.updated_at, 1000, 3600*1000) : undefined, + updated_date_time: _item.updated_at ? new Date(_item.updated_at) : undefined, + pushed_timestamp: _item.pushed_at ? apingTimeHelper.getTimestampFromDateString(_item.pushed_at, 1000, 3600*1000) : undefined, + pushed_date_time: _item.pushed_at ? new Date(_item.pushed_at) : undefined, }); return repoObject; @@ -126,28 +126,28 @@ jjtApingGithub.service('apingGithubHelper', ['apingModels', 'apingTimeHelper', ' var activityObject = apingModels.getNew("activity", this.getThisPlattformString()); $.extend(true, activityObject, { - body : false, + body : undefined, - actor_name : _item.actor ? _item.actor.login : false, //who? - actor_id : _item.actor ? _item.actor.id : false, - actor_url : _item.actor ? this.getThisPlattformLink()+_item.actor.login : false, - actor_img_url : _item.actor ? _item.actor.avatar_url : false, - actor_type: false, + actor_name : _item.actor ? _item.actor.login : undefined, //who? + actor_id : _item.actor ? _item.actor.id : undefined, + actor_url : _item.actor ? this.getThisPlattformLink()+_item.actor.login : undefined, + actor_img_url : _item.actor ? _item.actor.avatar_url : undefined, + actor_type: undefined, - //action_name : false, - //action_message : false, + //action_name : undefined, + //action_message : undefined, action_id : _item.id, - //action_url : false, - //action_img : false, + //action_url : undefined, + //action_img : undefined, action_type: _item.type, - object_name : _item.repo ? _item.repo.name : false, - object_id : _item.repo ? _item.repo.id : false, - object_img : false, - object_url : _item.repo ? this.getThisPlattformLink()+_item.repo.name : false, - object_type: _item.repo ? "repository" : false, + object_name : _item.repo ? _item.repo.name : undefined, + object_id : _item.repo ? _item.repo.id : undefined, + object_img : undefined, + object_url : _item.repo ? this.getThisPlattformLink()+_item.repo.name : undefined, + object_type: _item.repo ? "repository" : undefined, - //context : false, + //context : undefined, timestamp : apingTimeHelper.getTimestampFromDateString(_item.created_at, 1000, 3600*1000), date_time: new Date(_item.created_at), @@ -165,9 +165,9 @@ jjtApingGithub.service('apingGithubHelper', ['apingModels', 'apingTimeHelper', ' this.getActionMessageByTypeAndPayload = function (_type, _payload) { var returnObject ={ - name : false, + name : undefined, message : "", - url : false, + url : undefined, }; switch(_type) { @@ -195,7 +195,7 @@ jjtApingGithub.service('apingGithubHelper', ['apingModels', 'apingTimeHelper', ' } if(returnObject.message === "") { - returnObject.message = false; + returnObject.message = undefined; } return returnObject;