impr: implemented correct "items" behaviour

JohnnyTheTank · Dec 21, 2015 · 5cb88fe · 5cb88fe
1 parent a2d23a8
commit 5cb88fe
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Author: Jonathan Hornung ([JohnnyTheTank](https://github.com/JohnnyTheTank))
     <script src="bower_components/angular-github-api-factory/src/angular-github-api-factory.js"></script>
     ```
 
-4. Use the factory `githubFactory`.
+4. Use the factory `githubFactory`
 
 
 ### factory methods
@@ -52,7 +52,7 @@ githubFactory.getReposByName({
     q:"<SEARCH_STRING>",
     sort:"<SORT_STRING>", // (optional) 'stars', 'forks', or 'updated'
     order:"<SORT_ORDER>", // (optional) 'desc', 'asc'
-    per_page:"<ITEMS_PER_PAGE>", // (optional) default: 20
+    per_page:"<ITEMS_PER_PAGE>", // (optional) valid values: 1-100 | default: 30
     access_token:"<ACCESS_TOKEN>"
 }).success(function(_data){
     //on success
@@ -67,7 +67,7 @@ githubFactory.getReposByUser({
     q:"<SEARCH_STRING>", // (optional)
     sort:"<SORT_STRING>", // (optional) 'stars', 'forks', or 'updated'
     order:"<SORT_ORDER>", // (optional) 'desc', 'asc'
-    per_page:"<ITEMS_PER_PAGE>", // (optional) default: 20
+    per_page:"<ITEMS_PER_PAGE>", // (optional) valid values: 1-100 | default: 30
     access_token:"<ACCESS_TOKEN>"
 }).success(function(_data){
     //on success
@@ -84,7 +84,7 @@ githubFactory.getEventsFromRepoByUserAndName({
     q:"<SEARCH_STRING>",  // (optional)
     sort:"<SORT_STRING>", // (optional)
     order:"<SORT_ORDER>", // (optional) 'desc', 'asc'
-    per_page:"<ITEMS_PER_PAGE>", // (optional) default: 20
+    per_page:"<ITEMS_PER_PAGE>", // (optional) valid values: 1-100 | default: 30
     access_token:"<ACCESS_TOKEN>"
 }).success(function(_data){
     //on success
@@ -99,7 +99,7 @@ githubFactory.getEventsByUser({
     q:"<SEARCH_STRING>", // (optional)
     sort:"<SORT_STRING>", // (optional)
     order:"<SORT_ORDER>", // (optional) 'desc', 'asc'
-    per_page:"<ITEMS_PER_PAGE>", // (optional) default: 20
+    per_page:"<ITEMS_PER_PAGE>", // (optional) valid values: 1-100 | default: 30
     access_token:"<ACCESS_TOKEN>"
 }).success(function(_data){
     //on success

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "angular-github-api-factory",
   "description": "angularjs factory for github json rest api requests",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "Gruntfile.js",
   "authors": [
     "Jonathan Hornung"

diff --git a/demo/js/app.js b/demo/js/app.js
@@ -1,7 +1,7 @@
 var app = angular.module("app", ['jtt_github']);
 app.controller('controller', ['$scope', 'githubFactory', function($scope, githubFactory) {
 
-    var _access_token = "<YOUR_GITHUB_ACCESS_TOKEN>";
+    var _access_token = '<YOUR_GITHUB_ACCESS_TOKEN>';
 
     githubFactory.getUser({
         user:"xremix",
@@ -11,8 +11,8 @@ app.controller('controller', ['$scope', 'githubFactory', function($scope, github
     });
 
     githubFactory.getReposByUser({
-        user:"xremix",
-        per_page: 20,
+        user:"JohnnyTheTank",
+        per_page: 100,
         access_token:_access_token
     }).success(function(_data){
         console.info("repos by user", _data);
@@ -35,9 +35,9 @@ app.controller('controller', ['$scope', 'githubFactory', function($scope, github
     });
 
     githubFactory.getEventsFromRepoByUserAndName({
-        user:"xremix",
-        repo:"xGallerify",
-        per_page: 20,
+        user:"JohnnyTheTank",
+        repo:"apiNG",
+        per_page: 100,
         access_token:_access_token
     }).success(function(_data){
         console.info("events from repo by user and name", _data);

diff --git a/dist/angular-github-api-factory.min.js b/dist/angular-github-api-factory.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-github-api-factory",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "angularjs factory for github json rest api requests",
   "main": "Gruntfile.js",
   "scripts": {

diff --git a/src/angular-github-api-factory.js b/src/angular-github-api-factory.js
@@ -84,39 +84,32 @@ angular.module("jtt_github", [])
         };
 
         this.getNew = function (_type, _params) {
-
-            var default_per_page = 20;
-
             var githubSearchData = {
-                object: {},
+                object: {
+                    access_token: _params.access_token,
+                },
                 url: "",
             };
 
+            if (typeof _params.per_page !== "undefined") {
+                githubSearchData.object.per_page = _params.per_page;
+            }
+
             switch (_type) {
                 case "user":
-                    githubSearchData.object = {
-                        access_token: _params.access_token,
-                    };
+                    githubSearchData.object.per_page = undefined;
                     githubSearchData = this.fillDataInObjectByList(githubSearchData, _params, []);
                     githubSearchData.url = this.getApiBaseUrl() + "users/" + _params.user;
                     break;
 
                 case "reposByUser":
-                    githubSearchData.object = {
-                        access_token: _params.access_token,
-                        per_page: _params.per_page || default_per_page
-                    };
                     githubSearchData = this.fillDataInObjectByList(githubSearchData, _params, [
                         'q', 'sort', 'order', 'page'
                     ]);
                     githubSearchData.url = this.getApiBaseUrl() + "users/" + _params.user + "/repos";
                     break;
 
                 case "reposByName":
-                    githubSearchData.object = {
-                        access_token: _params.access_token,
-                        per_page: _params.per_page || default_per_page
-                    };
                     githubSearchData = this.fillDataInObjectByList(githubSearchData, _params, [
                         'sort', 'order', 'page'
                     ]);
@@ -134,28 +127,18 @@ angular.module("jtt_github", [])
                     break;
 
                 case "eventsByUser":
-                    githubSearchData.object = {
-                        access_token: _params.access_token,
-                        per_page: _params.per_page || default_per_page
-                    };
                     githubSearchData = this.fillDataInObjectByList(githubSearchData, _params, [
                         'q', 'sort', 'order', 'page'
                     ]);
                     githubSearchData.url = this.getApiBaseUrl() + "users/" + _params.user + "/events";
                     break;
 
                 case "eventsFromRepoByUserAndName":
-                    githubSearchData.object = {
-                        access_token: _params.access_token,
-                        per_page: _params.per_page || default_per_page
-                    };
                     githubSearchData = this.fillDataInObjectByList(githubSearchData, _params, [
                         'q', 'sort', 'order', 'page'
                     ]);
                     githubSearchData.url = this.getApiBaseUrl() + "repos/" + _params.user + "/" + _params.repo + "/events";
                     break;
-
-
             }
 
             return githubSearchData;