Merge pull request #3 from mbehlendorf/master

Removed googles feed service

Author: sdorra

README.md

@@ -55,3 +55,10 @@ Define a dependency for the module:
 ```javascript
 angular.module('sample', ['adf', 'adf.widget.news']);
 ```
+
+Define the URL of the service which converts a rss feed into json:
+
+ ```javascript
+ .constant('newsServiceUrl', '<URL>')
+ ```
+ The expected response structure is based on the node module [rss-parser](https://www.npmjs.com/package/rss-parser)

dist/adf-widget-news.js

@@ -27,7 +27,7 @@
 
 
 angular.module('adf.widget.news', ['adf.provider'])
-  .value('newsServiceUrl', 'https://ajax.googleapis.com/ajax/services/feed/load?v=1.0&callback=JSON_CALLBACK&q=')
+  .constant('newsServiceUrl', '')
   .config(RegisterWidget);
 
 function RegisterWidget(dashboardProvider){
@@ -59,7 +59,7 @@ function RegisterWidget(dashboardProvider){
 RegisterWidget.$inject = ["dashboardProvider"];
 
 angular.module("adf.widget.news").run(["$templateCache", function($templateCache) {$templateCache.put("{widgetsPath}/news/src/edit.html","<form role=form><div class=form-group><label for=url>Feed url</label> <input type=url class=form-control id=url ng-model=config.url placeholder=\"Enter feed url\"></div><div class=form-group><label for=num>Number of Entries</label> <input type=number class=form-control id=num ng-model=config.num></div><div class=form-group><label for=showTitle>Show Feed Title</label> <input type=checkbox class=form-control id=showTitle ng-model=config.showTitle></div><div class=form-group><label for=showTitle>Show Feed Description</label> <input type=checkbox class=form-control id=showDescription ng-model=config.showDescription></div></form>");
-$templateCache.put("{widgetsPath}/news/src/view.html","<div class=news><div class=\"alert alert-info\" ng-if=!vm.feed>Please insert a feed url in the widget configuration</div><div ng-if=vm.feed><h3 ng-if=config.showTitle><a ng-href={{vm.feed.link}} target=_blank>{{vm.feed.title}}</a></h3><p ng-if=config.showDescription>{{vm.feed.description}}</p><div class=media ng-repeat=\"entry in vm.feed.entries\"><div class=media-body><h4 class=media-heading><a ng-href={{entry.link}} target=_blank>{{entry.title}}</a></h4><p>{{entry.contentSnippet}}</p><small>{{entry.author}}, {{entry.publishedDate | toDate | date: \'yyyy-MM-dd HH:mm\'}}</small></div></div></div></div>");}]);
+$templateCache.put("{widgetsPath}/news/src/view.html","<div class=news><div class=\"alert alert-info\" ng-if=!vm.feed>Please insert a feed url in the widget configuration</div><div ng-if=vm.feed><h3 ng-if=config.showTitle><a ng-href={{vm.feed.link}} target=_blank>{{vm.feed.title}}</a></h3><p ng-if=config.showDescription>{{vm.feed.description}}</p><div class=media ng-repeat=\"entry in vm.feed.entries\"><div class=media-body><h4 class=media-heading><a ng-href={{entry.link}} target=_blank>{{entry.title}}</a></h4><p>{{entry.contentSnippet}}</p><small>{{ (entry.author) ? entry.author + \',\' : \'\' }} {{entry.pubDate | toDate | date: \'yyyy-MM-dd HH:mm\'}}</small></div></div></div></div>");}]);
 /*
  * The MIT License
  *
@@ -102,10 +102,10 @@ function NewsService($q, $http, newsServiceUrl){
     var deferred = $q.defer();
     $http.jsonp(createUrl(config))
       .success(function(data){
-        if (data && data.responseData && data.responseData.feed){
-          deferred.resolve(data.responseData.feed);
+        if (data && data.feed){
+          deferred.resolve(data.feed);
         } else {
-          deferred.reject('feed does not contain responseData element');
+          deferred.reject('response does not contain feed element');
         }
       })
       .error(function(err){

dist/adf-widget-news.min.js

@@ -17,7 +17,7 @@
     "gulp-connect": "~2.2.0",
     "gulp-csslint": "^0.1.5",
     "gulp-headerfooter": "^1.0.3",
-    "gulp-if": "^1.2.5",
+    "gulp-if": "~2.0.2",
     "gulp-inject": "^1.2.0",
     "gulp-jshint": "^1.9.4",
     "gulp-less": "^3.0.2",

package.json

@@ -40,10 +40,10 @@ function NewsService($q, $http, newsServiceUrl){
     var deferred = $q.defer();
     $http.jsonp(createUrl(config))
       .success(function(data){
-        if (data && data.responseData && data.responseData.feed){
-          deferred.resolve(data.responseData.feed);
+        if (data && data.feed){
+          deferred.resolve(data.feed);
         } else {
-          deferred.reject('feed does not contain responseData element');
+          deferred.reject('response does not contain feed element');
         }
       })
       .error(function(err){

src/service.js

@@ -17,7 +17,7 @@ <h4 class="media-heading">
           </a>
         </h4>
         <p>{{entry.contentSnippet}}</p>
-        <small>{{entry.author}}, {{entry.publishedDate | toDate | date: 'yyyy-MM-dd HH:mm'}}</small>
+        <small>{{ (entry.author) ? entry.author + ',' : '' }} {{entry.pubDate | toDate | date: 'yyyy-MM-dd HH:mm'}}</small>
       </div>
     </div>
   </div>

src/view.html

@@ -26,7 +26,7 @@
 
 
 angular.module('adf.widget.news', ['adf.provider'])
-  .value('newsServiceUrl', 'https://ajax.googleapis.com/ajax/services/feed/load?v=1.0&callback=JSON_CALLBACK&q=')
+  .constant('newsServiceUrl', '')
   .config(RegisterWidget);
 
 function RegisterWidget(dashboardProvider){