feat: added new parameter: protocol (close #6)

JohnnyTheTank · Jan 20, 2016 · e0bb9c7 · e0bb9c7
1 parent 02326ea
commit e0bb9c7
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -86,6 +86,7 @@ Every **apiNG plugin** expects an array of **requests** as html attribute.
 | **`path`** | `http://blog.hackerearth.com/feed` | |  RSS feed url | no |
 | **`items`**  | `15` | | Items per request (`0`-`n`) |  yes  |
 | **`parseImage`**  | `false` | `true` | Use `true` for try to parse image from content. This parameter only works for `social` model |  yes  |
+| **`protocol`**  | `https` |  | Use `https` or `http` to force the protocol. Leave it blank to for dynamic choose |  yes  |
 
 Sample requests:
 * `[{'path':'http://blog.hackerearth.com/feed'}, {'path':'http://www.magazin.dtv.de/index.php/feed/'}]`

diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Jonathan Hornung <jonathan.hornung@gmail.com>"
   ],
-  "version": "0.7.6",
+  "version": "0.7.7",
   "description": "RSS plugin for apiNG",
   "main": "dist/aping-plugin-rss.min.js",
   "moduleType": [],

diff --git a/demo/index.html b/demo/index.html
@@ -15,7 +15,7 @@
     <aping
             template-url="template.html"
             model="social"
-            aping-rss="[{'path':'https://github.com/JohnnyTheTank.atom'}]">
+            aping-rss="[{'path':'https://github.com/JohnnyTheTank.atom', 'protocol':'https'}]">
     </aping>
     <hr>
     <aping

diff --git a/dist/aping-plugin-rss.js b/dist/aping-plugin-rss.js
@@ -1,6 +1,6 @@
 /**
     @name: aping-plugin-rss 
-    @version: 0.7.6 (11-01-2016) 
+    @version: 0.7.7 (20-01-2016) 
     @author: Jonathan Hornung 
     @url: https://github.com/JohnnyTheTank/apiNG-plugin-rss#readme 
     @license: MIT
@@ -57,6 +57,12 @@ var jjtApingRss = angular.module("jtt_aping_rss", [])
                         requestObject.q = request.path;
                     }
 
+                    if(request.protocol === "http" || request.protocol === "https") {
+                        requestObject.protocol = request.protocol+"://";
+                    } else {
+                        requestObject.protocol = "//";
+                    }
+
                     // -1 is "no explicit limit". same for NaN value
                     if(requestObject.num < 0 || isNaN(requestObject.num)) {
                         requestObject.num = undefined;
@@ -77,8 +83,12 @@ var jjtApingRss = angular.module("jtt_aping_rss", [])
 jjtApingRss.factory('rssFactory', ['$http', function ($http) {
     var rssFactory = {};
     rssFactory.getData = function (_requestObject) {
+
+        var url = _requestObject.protocol + 'ajax.googleapis.com/ajax/services/feed/load';
+        _requestObject.protocol = undefined;
+
         return $http.jsonp(
-            '//ajax.googleapis.com/ajax/services/feed/load',
+            url,
             {
                 method: 'GET',
                 params: _requestObject

diff --git a/dist/aping-plugin-rss.min.js b/dist/aping-plugin-rss.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aping-plugin-rss",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "description": "RSS plugin for apiNG",
   "main": "dist/aping-plugin-rss.min.js",
   "scripts": {

diff --git a/src/aping-rss-directive.js b/src/aping-rss-directive.js
@@ -50,6 +50,12 @@ var jjtApingRss = angular.module("jtt_aping_rss", [])
                         requestObject.q = request.path;
                     }
 
+                    if(request.protocol === "http" || request.protocol === "https") {
+                        requestObject.protocol = request.protocol+"://";
+                    } else {
+                        requestObject.protocol = "//";
+                    }
+
                     // -1 is "no explicit limit". same for NaN value
                     if(requestObject.num < 0 || isNaN(requestObject.num)) {
                         requestObject.num = undefined;

diff --git a/src/aping-rss-factory.js b/src/aping-rss-factory.js
@@ -3,8 +3,12 @@
 jjtApingRss.factory('rssFactory', ['$http', function ($http) {
     var rssFactory = {};
     rssFactory.getData = function (_requestObject) {
+
+        var url = _requestObject.protocol + 'ajax.googleapis.com/ajax/services/feed/load';
+        _requestObject.protocol = undefined;
+
         return $http.jsonp(
-            '//ajax.googleapis.com/ajax/services/feed/load',
+            url,
             {
                 method: 'GET',
                 params: _requestObject