diff --git a/.meteor/packages b/.meteor/packages
index 3cdb18b5a..99641cf96 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -75,6 +75,6 @@ telescope-kadira
telescope-notifications
telescope-singleday
telescope-invites
-telescope-post-by-rss
+telescope-post-by-feed
# Custom Packages
diff --git a/packages/telescope-post-by-rss/.gitignore b/packages/telescope-post-by-feed/.gitignore
similarity index 100%
rename from packages/telescope-post-by-rss/.gitignore
rename to packages/telescope-post-by-feed/.gitignore
diff --git a/packages/telescope-post-by-rss/.npm/package/.gitignore b/packages/telescope-post-by-feed/.npm/package/.gitignore
similarity index 100%
rename from packages/telescope-post-by-rss/.npm/package/.gitignore
rename to packages/telescope-post-by-feed/.npm/package/.gitignore
diff --git a/packages/telescope-post-by-rss/.npm/package/README b/packages/telescope-post-by-feed/.npm/package/README
similarity index 100%
rename from packages/telescope-post-by-rss/.npm/package/README
rename to packages/telescope-post-by-feed/.npm/package/README
diff --git a/packages/telescope-post-by-rss/.npm/package/npm-shrinkwrap.json b/packages/telescope-post-by-feed/.npm/package/npm-shrinkwrap.json
similarity index 100%
rename from packages/telescope-post-by-rss/.npm/package/npm-shrinkwrap.json
rename to packages/telescope-post-by-feed/.npm/package/npm-shrinkwrap.json
diff --git a/packages/telescope-post-by-feed/i18n/en.i18n.json b/packages/telescope-post-by-feed/i18n/en.i18n.json
new file mode 100644
index 000000000..95fd435d1
--- /dev/null
+++ b/packages/telescope-post-by-feed/i18n/en.i18n.json
@@ -0,0 +1,4 @@
+{
+ "feed_already_exists": "A feed with the same URL already exists.",
+ "you_need_to_login_and_be_an_admin_to_add_a_new_feed": "You need to log in and be an admin to add a new feed."
+}
diff --git a/packages/telescope-post-by-rss/lib/client/routes.js b/packages/telescope-post-by-feed/lib/client/routes.js
similarity index 100%
rename from packages/telescope-post-by-rss/lib/client/routes.js
rename to packages/telescope-post-by-feed/lib/client/routes.js
diff --git a/packages/telescope-post-by-feed/lib/client/templates/feed_item.html b/packages/telescope-post-by-feed/lib/client/templates/feed_item.html
new file mode 100644
index 000000000..650727861
--- /dev/null
+++ b/packages/telescope-post-by-feed/lib/client/templates/feed_item.html
@@ -0,0 +1,6 @@
+
+
+ Url: {{url}}
+ Delete
+
+
diff --git a/packages/telescope-post-by-feed/lib/client/templates/feed_item.js b/packages/telescope-post-by-feed/lib/client/templates/feed_item.js
new file mode 100644
index 000000000..0d7cbf07c
--- /dev/null
+++ b/packages/telescope-post-by-feed/lib/client/templates/feed_item.js
@@ -0,0 +1,10 @@
+Meteor.startup(function () {
+ Template[getTemplate('feedItem')].events({
+ 'click .delete-feed': function(e, instance){
+ e.preventDefault();
+
+ if (confirm(i18n.t('are_you_sure')))
+ Feeds.remove(instance.data._id);
+ }
+ });
+});
diff --git a/packages/telescope-post-by-rss/lib/client/templates/rss_urls.html b/packages/telescope-post-by-feed/lib/client/templates/feeds.html
similarity index 78%
rename from packages/telescope-post-by-rss/lib/client/templates/rss_urls.html
rename to packages/telescope-post-by-feed/lib/client/templates/feeds.html
index 5c70d8059..079efce10 100644
--- a/packages/telescope-post-by-rss/lib/client/templates/rss_urls.html
+++ b/packages/telescope-post-by-feed/lib/client/templates/feeds.html
@@ -1,9 +1,9 @@
-
RSS Urls
+
Feeds
- {{#each rssUrls}}
- {{> UI.dynamic template=rssUrlItem}}
+ {{#each feeds}}
+ {{> UI.dynamic template=feedItem}}
{{/each}}
diff --git a/packages/telescope-post-by-rss/lib/client/templates/rss_urls.js b/packages/telescope-post-by-feed/lib/client/templates/feeds.js
similarity index 54%
rename from packages/telescope-post-by-rss/lib/client/templates/rss_urls.js
rename to packages/telescope-post-by-feed/lib/client/templates/feeds.js
index f23582edc..c22b8a70f 100644
--- a/packages/telescope-post-by-rss/lib/client/templates/rss_urls.js
+++ b/packages/telescope-post-by-feed/lib/client/templates/feeds.js
@@ -1,20 +1,20 @@
Meteor.startup(function () {
- Template[getTemplate('rssUrls')].helpers({
- rssUrls: function(){
- return RssUrls.find({}, {sort: {url: 1}});
+ Template[getTemplate('feeds')].helpers({
+ feeds: function(){
+ return Feeds.find({}, {sort: {url: 1}});
},
- rssUrlItem: function () {
- return getTemplate('rssUrlItem');
+ feedItem: function () {
+ return getTemplate('feedItem');
}
});
- Template[getTemplate('rssUrls')].events({
+ Template[getTemplate('feeds')].events({
'click input[type=submit]': function(e){
e.preventDefault();
var url = $('#url').val();
- Meteor.call('insertRssUrl', {url: url}, function(error, result) {
+ Meteor.call('insertFeed', {url: url}, function(error, result) {
if(error){
console.log(error);
flashMessage(error.reason, "error");
diff --git a/packages/telescope-post-by-feed/lib/feeds.js b/packages/telescope-post-by-feed/lib/feeds.js
new file mode 100644
index 000000000..0ea0c93c8
--- /dev/null
+++ b/packages/telescope-post-by-feed/lib/feeds.js
@@ -0,0 +1,35 @@
+// feedSchema schema
+feedSchema = new SimpleSchema({
+ _id: {
+ type: String,
+ optional: true
+ },
+ url: {
+ type: String,
+ regEx: SimpleSchema.RegEx.Url
+ }
+});
+
+Feeds = new Meteor.Collection("feeds", {
+ schema: feedSchema
+});
+
+Meteor.startup(function () {
+ Feeds.allow({
+ remove: isAdminById
+ });
+
+ Meteor.methods({
+ insertFeed: function(feedUrl){
+ check(feedUrl, feedSchema);
+
+ if (Feeds.findOne({url: feedSchema.url}))
+ throw new Meteor.Error('already-exists', i18n.t('feed_already_exists'));
+
+ if (!Meteor.user() || !isAdmin(Meteor.user()))
+ throw new Meteor.Error('login-required', i18n.t('you_need_to_login_and_be_an_admin_to_add_a_new_feed'));
+
+ return Feeds.insert(feedUrl);
+ }
+ });
+});
diff --git a/packages/telescope-post-by-rss/lib/server/cron.js b/packages/telescope-post-by-feed/lib/server/cron.js
similarity index 72%
rename from packages/telescope-post-by-rss/lib/server/cron.js
rename to packages/telescope-post-by-feed/lib/server/cron.js
index 13f4209d6..ca28458eb 100644
--- a/packages/telescope-post-by-rss/lib/server/cron.js
+++ b/packages/telescope-post-by-feed/lib/server/cron.js
@@ -1,9 +1,9 @@
SyncedCron.add({
- name: 'Post by RSS url',
+ name: 'Post by RSS feed',
schedule: function(parser) {
return parser.text('every 10 mins');
},
job: function() {
- fetchUrls();
+ fetchFeeds();
}
});
diff --git a/packages/telescope-post-by-rss/lib/server/publications.js b/packages/telescope-post-by-feed/lib/server/publications.js
similarity index 100%
rename from packages/telescope-post-by-rss/lib/server/publications.js
rename to packages/telescope-post-by-feed/lib/server/publications.js
diff --git a/packages/telescope-post-by-rss/lib/server/utils.js b/packages/telescope-post-by-feed/lib/server/utils.js
similarity index 97%
rename from packages/telescope-post-by-rss/lib/server/utils.js
rename to packages/telescope-post-by-feed/lib/server/utils.js
index ff7eeaa41..8c8bdf348 100644
--- a/packages/telescope-post-by-rss/lib/server/utils.js
+++ b/packages/telescope-post-by-feed/lib/server/utils.js
@@ -78,10 +78,10 @@ var handleFeed = function(error, feed) {
});
};
-fetchUrls = function() {
+fetchFeeds = function() {
var content;
- RssUrls.find().forEach(function(rssUrl) {
+ Feeds.find().forEach(function(rssUrl) {
try {
content = HTTP.get(rssUrl.url).content;
} catch (e) {
diff --git a/packages/telescope-post-by-rss/package-tap.i18n b/packages/telescope-post-by-feed/package-tap.i18n
similarity index 100%
rename from packages/telescope-post-by-rss/package-tap.i18n
rename to packages/telescope-post-by-feed/package-tap.i18n
diff --git a/packages/telescope-post-by-rss/package.js b/packages/telescope-post-by-feed/package.js
similarity index 96%
rename from packages/telescope-post-by-rss/package.js
rename to packages/telescope-post-by-feed/package.js
index 1b5c593aa..5ff77d285 100644
--- a/packages/telescope-post-by-rss/package.js
+++ b/packages/telescope-post-by-feed/package.js
@@ -1,7 +1,7 @@
Package.describe({
summary: 'Auto post via RSS to Telescope',
version: '0.0.1',
- name: 'telescope-post-by-rss'
+ name: 'telescope-post-by-feed'
});
Npm.depends({
diff --git a/packages/telescope-post-by-rss/versions.json b/packages/telescope-post-by-feed/versions.json
similarity index 100%
rename from packages/telescope-post-by-rss/versions.json
rename to packages/telescope-post-by-feed/versions.json
diff --git a/packages/telescope-post-by-rss/i18n/en.i18n.json b/packages/telescope-post-by-rss/i18n/en.i18n.json
deleted file mode 100644
index d4818cc3a..000000000
--- a/packages/telescope-post-by-rss/i18n/en.i18n.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "rss_url_is_already_exists": "Url is already exists."
-}
diff --git a/packages/telescope-post-by-rss/lib/client/templates/rss_url_item.html b/packages/telescope-post-by-rss/lib/client/templates/rss_url_item.html
deleted file mode 100644
index 163063bad..000000000
--- a/packages/telescope-post-by-rss/lib/client/templates/rss_url_item.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- Url: {{url}}
- Delete
-
-
diff --git a/packages/telescope-post-by-rss/lib/client/templates/rss_url_item.js b/packages/telescope-post-by-rss/lib/client/templates/rss_url_item.js
deleted file mode 100644
index f01a39c37..000000000
--- a/packages/telescope-post-by-rss/lib/client/templates/rss_url_item.js
+++ /dev/null
@@ -1,10 +0,0 @@
-Meteor.startup(function () {
- Template[getTemplate('rssUrlItem')].events({
- 'click .delete-url': function(e, instance){
- e.preventDefault();
-
- if (confirm(i18n.t('are_you_sure')))
- RssUrls.remove(instance.data._id);
- }
- });
-});
diff --git a/packages/telescope-post-by-rss/lib/rssUrls.js b/packages/telescope-post-by-rss/lib/rssUrls.js
deleted file mode 100644
index b8c775dc0..000000000
--- a/packages/telescope-post-by-rss/lib/rssUrls.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// rssUrl schema
-rssUrlSchema = new SimpleSchema({
- _id: {
- type: String,
- optional: true
- },
- url: {
- type: String,
- regEx: SimpleSchema.RegEx.Url
- },
-});
-
-RssUrls = new Meteor.Collection("rss_urls", {
- schema: rssUrlSchema
-});
-
-Meteor.startup(function () {
- RssUrls.allow({
- remove: isAdminById
- });
-
- Meteor.methods({
- insertRssUrl: function(rssUrl){
- check(rssUrl, rssUrlSchema);
-
- if (RssUrls.findOne({url: rssUrl.url}))
- throw new Meteor.Error('already-exists', i18n.t('rss_url_is_already_exists'));
-
- if (!Meteor.user() || !isAdmin(Meteor.user()))
- throw new Meteor.Error('login-required', i18n.t('you_need_to_login_and_be_an_admin_to_add_a_new_rss_url'));
-
- return RssUrls.insert(rssUrl);
- }
- });
-});