new version (v0.2.2)

JohnnyTheTank · Dec 23, 2016 · 87bbf58 · 87bbf58
1 parent 3b1ccf9
commit 87bbf58
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 55 deletions.
diff --git a/README.md b/README.md
@@ -36,6 +36,7 @@ Author: Jonathan Hornung ([JohnnyTheTank](https://github.com/JohnnyTheTank))
 //Show one Season
 footballdataFactory.getSeason({
     id: '<SEASON_ID>',
+    protocol: '<PROTOCOL>', // (optional) 'http', 'https', 'auto'
     apiKey: '<YOUR_API_KEY>', // Register for a free api key: http://api.football-data.org/register
 }).then(function (_data) {
     //on success
@@ -50,6 +51,7 @@ footballdataFactory.getSeason({
 //List all available soccer seasons
 footballdataFactory.getSeasons({
     season: '<SEASON>',       // (optional) Default is the current year (4 digit), e.g: '2015'
+    protocol: '<PROTOCOL>', // (optional) 'http', 'https', 'auto'
     apiKey: '<YOUR_API_KEY>', // Register for a free api key: http://api.football-data.org/register
 }).then(function (_data) {
     //on success
@@ -64,6 +66,7 @@ footballdataFactory.getSeasons({
 //Show one team.
 footballdataFactory.getTeam({
     id: '<TEAM_ID>',
+    protocol: '<PROTOCOL>', // (optional) 'http', 'https', 'auto'
     apiKey: '<YOUR_API_KEY>', // Register for a free api key: http://api.football-data.org/register
 }).then(function (_data) {
     //on success
@@ -78,6 +81,7 @@ footballdataFactory.getTeam({
 //List all teams for a certain soccerseason
 footballdataFactory.getTeamsBySeason({
     id: '<SEASON_ID>',
+    protocol: '<PROTOCOL>', // (optional) 'http', 'https', 'auto'
     apiKey: '<YOUR_API_KEY>', // Register for a free api key: http://api.football-data.org/register
 }).then(function (_data) {
     //on success
@@ -92,6 +96,7 @@ footballdataFactory.getTeamsBySeason({
 //Show all players for a certain team.
 footballdataFactory.getPlayersByTeam({
     id: '<TEAM_ID>',
+    protocol: '<PROTOCOL>', // (optional) 'http', 'https', 'auto'
     apiKey: '<YOUR_API_KEY>', // Register for a free api key: http://api.football-data.org/register
 }).then(function (_data) {
     //on success
@@ -107,6 +112,7 @@ footballdataFactory.getPlayersByTeam({
 footballdataFactory.getLeagueTableBySeason({
     id: '<SEASON_ID>',
     matchday: '<MATCHDAY>',   // (optional) The current/last matchday is taken per default
+    protocol: '<PROTOCOL>', // (optional) 'http', 'https', 'auto'
     apiKey: '<YOUR_API_KEY>', // Register for a free api key: http://api.football-data.org/register
 }).then(function (_data) {
     //on success
@@ -137,6 +143,7 @@ footballdataFactory.getFixture({
 footballdataFactory.getFixtures({
     timeFrame: '<TIMEFRAME>', // (optional) The value of the timeFrame argument must start with either 'p' for past or 'n' for next. It is followed by a number in the range 1-99.
     league: '<LEAGUE_CODE>',  // (optional) A (list of, comma separated) league-code(s). Default is unset. Get all league codes at http://api.football-data.org/docs/latest/index.html
+    protocol: '<PROTOCOL>', // (optional) 'http', 'https', 'auto'
     apiKey: '<YOUR_API_KEY>', // Register for a free api key: http://api.football-data.org/register
 }).then(function (_data) {
     //on success
@@ -151,6 +158,7 @@ footballdataFactory.getFixturesBySeason({
     id: '<SEASON_ID>',
     timeFrame: '<TIMEFRAME>', // (optional) The value of the timeFrame argument must start with either 'p' for past or 'n' for next. It is followed by a number in the range 1-99.
     matchday: '<MATCHDAY>',   // (optional) The current/last matchday is taken per default
+    protocol: '<PROTOCOL>', // (optional) 'http', 'https', 'auto'
     apiKey: '<YOUR_API_KEY>', // Register for a free api key: http://api.football-data.org/register
 }).then(function (_data) {
     //on success
@@ -166,6 +174,7 @@ footballdataFactory.getFixturesByTeam({
     season: '<SEASON>',       // (optional) Defaults to the current year, given as 4 digit like '2015'
     timeFrame: '<TIMEFRAME>', // (optional) The value of the timeFrame argument must start with either 'p' for past or 'n' for next. It is followed by a number in the range 1-99.
     venue: '<VENUE>',         // (optional) Valid values: `home` and `away`. Default is unset.
+    protocol: '<PROTOCOL>', // (optional) 'http', 'https', 'auto'
     apiKey: '<YOUR_API_KEY>', // Register for a free api key: http://api.football-data.org/register
 }).then(function (_data) {
     //on success

diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Jonathan Hornung <[email protected]>"
   ],
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "angular factory for the football-data.org rest api",
   "main": "dist/angular-footballdata-api-factory.min.js",
   "moduleType": [],

diff --git a/demo/js/app.js b/demo/js/app.js
@@ -4,14 +4,14 @@ app.controller('controller', ['$scope', 'footballdataFactory', function($scope,
     var apiKey = 'e42cb6a6ecc949c8897e06d284a55e05';
 
     footballdataFactory.getSeasons({
-        season: '2014',
+        season: '2015',
         apiKey: apiKey,
     }).then(function(_data){
         console.info("getSeasons", _data);
     });
 
     footballdataFactory.getSeason({
-        id: '424',
+        id: '426',
         apiKey: apiKey,
     }).then(function(_data){
         console.info("getSeason", _data);
@@ -24,7 +24,7 @@ app.controller('controller', ['$scope', 'footballdataFactory', function($scope,
     });
 
     footballdataFactory.getFixture({
-        id: 149461,
+        id: 155048,
         apiKey: apiKey,
     }).then(function(_data){
         console.info("getFixture", _data);
@@ -52,22 +52,22 @@ app.controller('controller', ['$scope', 'footballdataFactory', function($scope,
     });
 
     footballdataFactory.getTeamsBySeason({
-        id: 351,
+        id: 424,
         apiKey: apiKey,
     }).then(function(_data){
         console.info("getTeamsBySeason", _data);
     });
 
     footballdataFactory.getLeagueTableBySeason({
-        id: 351,
+        id: 426,
         matchday: 10,
         apiKey: apiKey,
     }).then(function(_data){
         console.info("getLeagueTableBySeason", _data);
     });
 
     footballdataFactory.getFixturesBySeason({
-        id: 351,
+        id: 426,
         matchday: 10,
         apiKey: apiKey,
     }).then(function(_data){

diff --git a/dist/angular-footballdata-api-factory.js b/dist/angular-footballdata-api-factory.js
@@ -1,6 +1,6 @@
 /**
     @name: angular-footballdata-api-factory 
-    @version: 0.2.1 (20-12-2016) 
+    @version: 0.2.2 (23-12-2016) 
     @author: Jonathan Hornung 
     @url: https://github.com/JohnnyTheTank/angular-footballdata-api-factory#readme 
     @license: MIT
@@ -155,8 +155,19 @@ angular.module("jtt_footballdata", [])
         return footballdataFactory;
     }])
     .service('footballdataSearchDataService', function () {
-        this.getApiBaseUrl = function () {
-            return 'https://api.football-data.org/v1/';
+        this.getApiBaseUrl = function (protocol) {
+
+            switch (protocol) {
+                case 'http':
+                case 'https':
+                    protocol += ':';
+                    break;
+
+                default:
+                    protocol = '';
+            }
+
+            return protocol + '//api.football-data.org/v1/';
         };
 
         this.fillDataInObjectByList = function (_object, _params, _list) {
@@ -180,72 +191,72 @@ angular.module("jtt_footballdata", [])
             switch (_type) {
                 case "getSeasons":
                     footballdataSearchData = this.fillDataInObjectByList(footballdataSearchData, _params, [
-                        'apiKey', 'season',
+                        'protocol', 'apiKey', 'season',
                     ]);
-                    footballdataSearchData.url = this.getApiBaseUrl() + 'soccerseasons/';
+                    footballdataSearchData.url = this.getApiBaseUrl(footballdataSearchData.object.protocol) + 'soccerseasons/';
                     break;
 
                 case "getSeason":
                     footballdataSearchData = this.fillDataInObjectByList(footballdataSearchData, _params, [
-                        'apiKey',
+                        'protocol', 'apiKey',
                     ]);
-                    footballdataSearchData.url = this.getApiBaseUrl() + 'soccerseasons/' + _params.id;
+                    footballdataSearchData.url = this.getApiBaseUrl(footballdataSearchData.object.protocol) + 'soccerseasons/' + _params.id;
                     break;
 
                 case "getTeam":
                     footballdataSearchData = this.fillDataInObjectByList(footballdataSearchData, _params, [
-                        'apiKey'
+                        'protocol', 'apiKey'
                     ]);
-                    footballdataSearchData.url = this.getApiBaseUrl() + 'teams/' + _params.id;
+                    footballdataSearchData.url = this.getApiBaseUrl(footballdataSearchData.object.protocol) + 'teams/' + _params.id;
                     break;
 
                 case "getPlayersByTeam":
                     footballdataSearchData = this.fillDataInObjectByList(footballdataSearchData, _params, [
-                        'apiKey'
+                        'protocol', 'apiKey'
                     ]);
-                    footballdataSearchData.url = this.getApiBaseUrl() + 'teams/' + _params.id + '/players';
+                    footballdataSearchData.url = this.getApiBaseUrl(footballdataSearchData.object.protocol) + 'teams/' + _params.id + '/players';
                     break;
 
                 case "getFixtures":
                     footballdataSearchData = this.fillDataInObjectByList(footballdataSearchData, _params, [
-                        'apiKey', 'league', 'timeFrame'
+                        'protocol', 'apiKey', 'league', 'timeFrame'
                     ]);
-                    footballdataSearchData.url = this.getApiBaseUrl() + '/fixtures';
+                    footballdataSearchData.url = this.getApiBaseUrl(footballdataSearchData.object.protocol) + 'fixtures';
                     break;
 
                 case "getFixture":
                     footballdataSearchData = this.fillDataInObjectByList(footballdataSearchData, _params, [
-                        'apiKey', 'head2head'
+                        'protocol', 'apiKey', 'head2head'
                     ]);
-                    footballdataSearchData.url = this.getApiBaseUrl() + '/fixtures/' + _params.id;
+                    footballdataSearchData.url = this.getApiBaseUrl(footballdataSearchData.object.protocol) + 'fixtures/' + _params.id;
                     break;
 
                 case "getTeamsBySeason":
                     footballdataSearchData = this.fillDataInObjectByList(footballdataSearchData, _params, [
-
+                        'protocol', 'apiKey',
                     ]);
-                    footballdataSearchData.url = this.getApiBaseUrl() + 'soccerseasons/' + _params.id + '/teams';
+                    footballdataSearchData.url = this.getApiBaseUrl(footballdataSearchData.object.protocol) + 'soccerseasons/' + _params.id + '/teams';
                     break;
 
                 case "getLeagueTableBySeason":
                     footballdataSearchData = this.fillDataInObjectByList(footballdataSearchData, _params, [
-                        'apiKey', 'matchday'
+                        'protocol', 'apiKey', 'matchday'
                     ]);
-                    footballdataSearchData.url = this.getApiBaseUrl() + 'soccerseasons/' + _params.id + '/leagueTable';
+                    footballdataSearchData.url = this.getApiBaseUrl(footballdataSearchData.object.protocol) + 'soccerseasons/' + _params.id + '/leagueTable';
                     break;
 
                 case "getFixturesBySeason":
                     footballdataSearchData = this.fillDataInObjectByList(footballdataSearchData, _params, [
-                        'apiKey', 'matchday', 'timeFrame'
+                        'protocol', 'apiKey', 'matchday', 'timeFrame'
                     ]);
-                    footballdataSearchData.url = this.getApiBaseUrl() + 'soccerseasons/' + _params.id + '/fixtures';
+                    footballdataSearchData.url = this.getApiBaseUrl(footballdataSearchData.object.protocol) + 'soccerseasons/' + _params.id + '/fixtures';
                     break;
 
                 case "getFixturesByTeam":
                     footballdataSearchData = this.fillDataInObjectByList(footballdataSearchData, _params, [
-                        'apiKey', 'season', 'timeFrame', 'venue'
+                        'protocol', 'apiKey', 'season', 'timeFrame', 'venue'
                     ]);
-                    footballdataSearchData.url = this.getApiBaseUrl() + '/teams/' + _params.id + '/fixtures';
+                    footballdataSearchData.url = this.getApiBaseUrl(footballdataSearchData.object.protocol) + 'teams/' + _params.id + '/fixtures';
                     break;
 
             }

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