impr: implemented correct "items" behaviour

Author: JohnnyTheTank

README.md

@@ -15,7 +15,7 @@ Author: Jonathan Hornung ([JohnnyTheTank](https://github.com/JohnnyTheTank))
     <script src="bower_components/angular-vimeo-api-factory/src/angular-vimeo-api-factory.js"></script>
     ```
 
-4. Use the factory `vimeoFactory`.
+4. Use the factory `vimeoFactory`
 
 
 ### factory methods
@@ -27,7 +27,7 @@ Author: Jonathan Hornung ([JohnnyTheTank](https://github.com/JohnnyTheTank))
 // parameters: https://developer.vimeo.com/api/endpoints/channels#/{channel_id}/videos
 vimeoFactory.getVideosFromChannel({
     channel:"<CHANNEL_NAME>",
-    per_page:"<ITEMS_PER_PAGE>", // (optional) default: 20
+    per_page:"<ITEMS_PER_PAGE>", // (optional) valid values: 1-50 | default: 25
     page:"<PAGE_NUMBER>", // (optional)
     query:"<QUERY>", // (optional)
     filter:"<FILTER>", // (optional)
@@ -47,7 +47,7 @@ vimeoFactory.getVideosFromChannel({
 // parameters: https://developer.vimeo.com/api/endpoints/users#/{user_id}/videos
 vimeoFactory.getVideosFromUser({
     user:"<USER_NAME>",
-    per_page:"<ITEMS_PER_PAGE>", // (optional) default: 20
+    per_page:"<ITEMS_PER_PAGE>", // (optional) valid values: 1-50 | default: 25
     page:"<PAGE_NUMBER>", // (optional)
     query:"<QUERY>", // (optional)
     filter:"<FILTER>", // (optional)
@@ -67,7 +67,7 @@ vimeoFactory.getVideosFromUser({
 // parameters: https://developer.vimeo.com/api/endpoints/categories#/{category}/videos
 vimeoFactory.getVideosFromCategory({
     category:"<CATEGORY_NAME>",
-    per_page:"<ITEMS_PER_PAGE>", // (optional) default: 20
+    per_page:"<ITEMS_PER_PAGE>", // (optional) valid values: 1-50 | default: 25
     page:"<PAGE_NUMBER>", // (optional)
     query:"<QUERY>", // (optional)
     filter:"<FILTER>", // (optional)
@@ -87,7 +87,7 @@ vimeoFactory.getVideosFromCategory({
 // parameters: https://developer.vimeo.com/api/endpoints/tags#/{word}/videos
 vimeoFactory.getVideosFromTag({
     tag:"<TAG_NAME>",
-    per_page:"<ITEMS_PER_PAGE>", // (optional) default: 20
+    per_page:"<ITEMS_PER_PAGE>", // (optional) valid values: 1-50 | default: 25
     page:"<PAGE_NUMBER>", // (optional)
     query:"<QUERY>", // (optional)
     sort:"<SORT>", // (optional)

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-vimeo-api-factory",
   "description": "angularjs factory for vimeo json rest api requests",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "Gruntfile.js",
   "authors": [
     "Jonathan Hornung"

demo/js/app.js

@@ -1,19 +1,18 @@
 var app = angular.module("app", ['jtt_vimeo']);
 app.controller('controller', ['$scope', 'vimeoFactory', function($scope, vimeoFactory) {
 
-    var _access_token = "<YOUR_VIMEO_ACCESS_TOKEN>";
+    var _access_token = '<YOUR_VIMEO_ACCESS_TOKEN>';
 
     vimeoFactory.getVideosFromChannel({
         channel:"nicetype",
-        per_page:2,
         access_token:_access_token
     }).success(function(_data){
         console.info("videos from channel", _data);
     });
 
     vimeoFactory.getVideosFromCategory({
         category:"cameratechniques",
-        per_page:2,
+        //per_page:2,
         access_token:_access_token
     }).success(function(_data){
         console.info("videos from category", _data);

dist/angular-vimeo-api-factory.min.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-vimeo-api-factory",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "angularjs factory for vimeo json rest api requests",
   "main": "Gruntfile.js",
   "scripts": {

package.json

@@ -95,61 +95,41 @@ angular.module("jtt_vimeo", [])
 
         this.getNew = function (_type, _params) {
 
-            var defaultLimit = 20;
-
             var vimeoSearchData = {
-                object: {},
+                object: {
+                    access_token: _params.access_token,
+                },
                 url: "",
             };
 
             switch (_type) {
                 case "videosFromChannel":
-                    vimeoSearchData.object = {
-                        access_token: _params.access_token,
-                        per_page: _params.per_page || defaultLimit
-                    };
-
                     vimeoSearchData = this.fillDataInObjectByList(vimeoSearchData, _params, [
-                        'page', 'query', 'filter', 'filter_embeddable', 'sort', 'direction'
+                        'page', 'query', 'filter', 'filter_embeddable', 'sort', 'direction', 'per_page'
                     ]);
 
                     vimeoSearchData.url = this.getApiBaseUrl() + "channels/" + _params.channel + "/videos";
                     break;
 
                 case "videosFromCategory":
-                    vimeoSearchData.object = {
-                        access_token: _params.access_token,
-                        per_page: _params.per_page || defaultLimit
-                    };
-
-                    vimeoSearchData = this.fillDataInObjectByList(vimeoSearchData, _params, [
-                        'page', 'query', 'filter', 'filter_embeddable', 'sort', 'direction'
+                     vimeoSearchData = this.fillDataInObjectByList(vimeoSearchData, _params, [
+                        'page', 'query', 'filter', 'filter_embeddable', 'sort', 'direction', 'per_page'
                     ]);
 
                     vimeoSearchData.url = this.getApiBaseUrl() + "categories/" + _params.category + "/videos";
                     break;
 
                 case "videosFromTag":
-                    vimeoSearchData.object = {
-                        access_token: _params.access_token,
-                        per_page: _params.per_page || defaultLimit
-                    };
-
                     vimeoSearchData = this.fillDataInObjectByList(vimeoSearchData, _params, [
-                        'page', 'query', 'sort', 'direction'
+                        'page', 'query', 'sort', 'direction', 'per_page'
                     ]);
 
                     vimeoSearchData.url = this.getApiBaseUrl() + "tags/" + _params.tag + "/videos";
                     break;
 
                 case "videosFromUser":
-                    vimeoSearchData.object = {
-                        access_token: _params.access_token,
-                        per_page: _params.per_page || defaultLimit
-                    };
-
                     vimeoSearchData = this.fillDataInObjectByList(vimeoSearchData, _params, [
-                        'page', 'query', 'filter', 'filter_embeddable', 'sort', 'direction'
+                        'page', 'query', 'filter', 'filter_embeddable', 'sort', 'direction', 'per_page'
                     ]);
 
                     vimeoSearchData.url = this.getApiBaseUrl() + "users/" + _params.user + "/videos";