martin/Rinser
martin/Rinser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updated plugins and removed a couple of broken feeds

Browse Source
This commit is contained in:
Martin Donnelly 2016-04-18 13:49:38 +01:00
parent ff82df0d38
commit 99b58e36f8
20 changed files with 737 additions and 12209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

416
.idea/workspace.xml
View File

@ -1,9 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c2fd5632-2143-4c7e-8b0d-96d7692b700b" name="Default" comment="">
<list default="true" id="c2fd5632-2143-4c7e-8b0d-96d7692b700b" name="Default" comment="needed the bower file">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/feeds/news.json" />
<change type="DELETED" beforePath="$PROJECT_DIR$/html/news.html" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/html/news.json" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/html/news.xml" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/bower.json" afterPath="$PROJECT_DIR$/bower.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/lifestyle.js" afterPath="$PROJECT_DIR$/lifestyle.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/news.js" afterPath="$PROJECT_DIR$/news.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/LICENSE" afterPath="$PROJECT_DIR$/node_modules/lodash/LICENSE" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/README.md" afterPath="$PROJECT_DIR$/node_modules/lodash/README.md" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/array.js" afterPath="$PROJECT_DIR$/node_modules/lodash/array.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/chain.js" afterPath="$PROJECT_DIR$/node_modules/lodash/chain.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/collection.js" afterPath="$PROJECT_DIR$/node_modules/lodash/collection.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/math.js" afterPath="$PROJECT_DIR$/node_modules/lodash/math.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/object.js" afterPath="$PROJECT_DIR$/node_modules/lodash/object.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/node_modules/lodash/package.json" afterPath="$PROJECT_DIR$/node_modules/lodash/package.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/plugins/fix_images.js" afterPath="$PROJECT_DIR$/plugins/fix_images.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/plugins/fix_scripts.js" afterPath="$PROJECT_DIR$/plugins/fix_scripts.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tech.js" afterPath="$PROJECT_DIR$/tech.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/test.js" afterPath="$PROJECT_DIR$/test.js" />
</list>
<ignored path="rinser.iws" />
<ignored path=".idea/workspace.xml" />
@ -26,60 +44,88 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/index.html">
<file leaf-file-name="tech.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tech.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
<state relative-caret-position="1729">
<caret line="91" column="46" selection-start-line="91" selection-start-column="46" selection-end-line="91" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="gulpfile.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gulpfile.js">
<file leaf-file-name="RssBraider.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/node_modules/rss-braider/lib/RssBraider.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="632">
<caret line="86" column="0" selection-start-line="86" selection-start-column="0" selection-end-line="86" selection-end-column="0" />
<state relative-caret-position="317">
<caret line="95" column="40" selection-start-line="95" selection-start-column="40" selection-end-line="95" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="app.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dist/css/app.css">
<file leaf-file-name="news.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/news.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#20769#20976#2" expanded="true" />
</folding>
<state relative-caret-position="95">
<caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="6" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
<file leaf-file-name="fix_images.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/plugins/fix_images.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="4" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="fix_scripts.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/plugins/fix_scripts.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="9" column="3" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="lifestyle.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lifestyle.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<state relative-caret-position="586">
<caret line="75" column="11" selection-start-line="75" selection-start-column="11" selection-end-line="75" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="bower.json" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/bower.json">
<file leaf-file-name="test.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
<caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
<state relative-caret-position="572">
<caret line="69" column="23" selection-start-line="42" selection-start-column="6" selection-end-line="69" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="remote.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dist/js/remote.js">
<file leaf-file-name="news.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dist/news.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@ -88,6 +134,16 @@
</provider>
</entry>
</file>
<file leaf-file-name="news.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/feeds/news.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="77">
<caret line="64" column="5" selection-start-line="64" selection-start-column="5" selection-end-line="64" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@ -118,7 +174,6 @@
<option value="$PROJECT_DIR$/jobs-local.js" />
<option value="$PROJECT_DIR$/html/paleo.json" />
<option value="$PROJECT_DIR$/html/lifestyle.json" />
<option value="$PROJECT_DIR$/node_modules/rss-braider/lib/RssBraider.js" />
<option value="$PROJECT_DIR$/html/ejs/testcards.ejs" />
<option value="$PROJECT_DIR$/jobs.js" />
<option value="$PROJECT_DIR$/html/js/appv2.js" />
@ -134,11 +189,8 @@
<option value="$PROJECT_DIR$/dist/index.html" />
<option value="$PROJECT_DIR$/html/js/shell.js" />
<option value="$PROJECT_DIR$/paleo.js" />
<option value="$PROJECT_DIR$/tech.js" />
<option value="$PROJECT_DIR$/news.js" />
<option value="$PROJECT_DIR$/dist/js/vendor.js" />
<option value="$PROJECT_DIR$/dist/js/app.js" />
<option value="$PROJECT_DIR$/lifestyle.js" />
<option value="$PROJECT_DIR$/html/js/app.v3.js" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/html/css/app.css" />
@ -149,6 +201,14 @@
<option value="$PROJECT_DIR$/gulpfile.js" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/bower.json" />
<option value="$PROJECT_DIR$/feeds/news.json" />
<option value="$PROJECT_DIR$/test.js" />
<option value="$PROJECT_DIR$/news.js" />
<option value="$PROJECT_DIR$/node_modules/rss-braider/lib/RssBraider.js" />
<option value="$PROJECT_DIR$/tech.js" />
<option value="$PROJECT_DIR$/lifestyle.js" />
<option value="$PROJECT_DIR$/plugins/fix_images.js" />
<option value="$PROJECT_DIR$/plugins/fix_scripts.js" />
</list>
</option>
</component>
@ -194,7 +254,6 @@
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@ -223,7 +282,21 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="dist" />
<option name="myItemId" value="plugins" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="rinser" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Rinser" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="feeds" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@ -240,13 +313,10 @@
<option name="myItemId" value="dist" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -255,7 +325,7 @@
<property name="recentsLimit" value="5" />
<property name="settings.editor.selected.configurable" value="reference.settings.ics" />
<property name="settings.editor.splitter.proportion" value="0.2" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../usefulfiles" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="157" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="186" />
@ -276,6 +346,7 @@
<property name="editor.config.accepted" value="true" />
<property name="js.buildTools.gulp.node_interpreter" value="C:\Program Files\nodejs\node.exe" />
<property name="js.buildTools.gulp.gulp_package_dir" value="C:\Users\Martin\AppData\Roaming\npm\node_modules\gulp" />
<property name="nodejs_interpreter_path" value="$USER_HOME$/.nvm/versions/node/v5.7.0/bin/node" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
@ -290,7 +361,7 @@
<recent name="C:\mddev\Rinser\html" />
</key>
</component>
<component name="RunManager" selected="Gulp.js.Gulp">
<component name="RunManager" selected="Node.js.Lifestyle">
<configuration default="false" name="paleo.js" type="NodeJSConfigurationType" factoryName="Node.js" temporary="true" path-to-node="C:/Program Files/nodejs/node" path-to-js-file="paleo.js" working-dir="$PROJECT_DIR$">
<method />
</configuration>
@ -368,21 +439,25 @@
<envs />
<method />
</configuration>
<configuration default="false" name="Unnamed" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="C:/Program Files/nodejs/node" path-to-js-file="pipes-server.js" working-dir="$PROJECT_DIR$">
<configuration default="false" name="News" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" path-to-js-file="news.js" working-dir="$PROJECT_DIR$">
<method />
</configuration>
<configuration default="false" name="News" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="C:/Program Files/nodejs/node" path-to-js-file="news.js" working-dir="$PROJECT_DIR$">
<configuration default="false" name="Lifestyle" type="NodeJSConfigurationType" factoryName="Node.js" singleton="false" path-to-node="project" path-to-js-file="lifestyle.js" working-dir="$PROJECT_DIR$">
<method />
</configuration>
<configuration default="false" name="Tech" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="C:/Program Files/nodejs/node" path-to-js-file="tech.js" working-dir="$PROJECT_DIR$">
<configuration default="false" name="Tech" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" path-to-js-file="tech.js" working-dir="$PROJECT_DIR$">
<method />
</configuration>
<list size="5">
<configuration default="false" name="Test" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" path-to-js-file="test.js" working-dir="$PROJECT_DIR$">
<method />
</configuration>
<list size="6">
<item index="0" class="java.lang.String" itemvalue="Gulp.js.Gulp" />
<item index="1" class="java.lang.String" itemvalue="Node.js.Unnamed" />
<item index="2" class="java.lang.String" itemvalue="Node.js.News" />
<item index="1" class="java.lang.String" itemvalue="Node.js.News" />
<item index="2" class="java.lang.String" itemvalue="Node.js.Lifestyle" />
<item index="3" class="java.lang.String" itemvalue="Node.js.Tech" />
<item index="4" class="java.lang.String" itemvalue="Node.js.paleo.js" />
<item index="5" class="java.lang.String" itemvalue="Node.js.Test" />
</list>
<recent_temporary>
<list size="1">
@ -405,7 +480,11 @@
<updated>1437394742450</updated>
<workItem from="1460106859590" duration="1784000" />
<workItem from="1460109270348" duration="705000" />
<workItem from="1460111499918" duration="1546000" />
<workItem from="1460111499918" duration="3532000" />
<workItem from="1460364159750" duration="2875000" />
<workItem from="1460538212218" duration="14000" />
<workItem from="1460548625556" duration="2535000" />
<workItem from="1460978110601" duration="5105000" />
</task>
<task id="LOCAL-00001" summary="debugging braider">
<created>1438335954140</created>
@ -694,11 +773,18 @@
<option name="project" value="LOCAL" />
<updated>1460113538814</updated>
</task>
<option name="localTasksCounter" value="42" />
<task id="LOCAL-00042" summary="needed the bower file">
<created>1460113653057</created>
<option name="number" value="00042" />
<option name="presentableId" value="LOCAL-00042" />
<option name="project" value="LOCAL" />
<updated>1460113653057</updated>
</task>
<option name="localTasksCounter" value="43" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="4035000" />
<option name="totallyTimeSpent" value="16550000" />
</component>
<component name="ToolWindowManager">
<frame x="4" y="23" width="1825" height="1177" extended-state="0" />
@ -709,22 +795,22 @@
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33551913" sideWeight="0.34785393" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20645161" sideWeight="0.48606148" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3345622" sideWeight="0.65214604" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32896176" sideWeight="0.4838976" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3997773" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32987553" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33506224" sideWeight="0.65214604" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="SonarLint" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32850778" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="SonarQube" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32962137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3997773" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@ -776,7 +862,8 @@
<MESSAGE value="appcache and something else" />
<MESSAGE value="added newer icons and updated mui and jquery" />
<MESSAGE value="added bower for mui, jquery and strings. Then gulp bakes them in, shoudl reduce server read now that gzip is turned on." />
<option name="LAST_COMMIT_MESSAGE" value="added bower for mui, jquery and strings. Then gulp bakes them in, shoudl reduce server read now that gzip is turned on." />
<MESSAGE value="needed the bower file" />
<option name="LAST_COMMIT_MESSAGE" value="needed the bower file" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@ -785,48 +872,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/html/partials/list.ejs.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/js/app.prod.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="10" selection-start-line="0" selection-start-column="10" selection-end-line="133" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/ejs/test.ejs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="3" column="48" selection-start-line="3" selection-start-column="48" selection-end-line="3" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/ejs/testcards.ejs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/css/nprogress.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/css/cards.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/tech.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@ -906,7 +951,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1558">
<caret line="82" column="35" selection-start-line="82" selection-start-column="35" selection-end-line="82" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
@ -914,7 +958,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
@ -928,27 +971,10 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/plugins/fix_images.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="3" column="17" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/css/app.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3534">
<caret line="186" column="29" selection-start-line="186" selection-start-column="23" selection-end-line="186" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
@ -957,7 +983,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="12" column="42" selection-start-line="12" selection-start-column="42" selection-end-line="12" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
@ -965,7 +990,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2014">
<caret line="106" column="31" selection-start-line="106" selection-start-column="31" selection-end-line="106" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
@ -973,7 +997,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@ -981,9 +1004,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1235">
<caret line="67" column="36" selection-start-line="67" selection-start-column="36" selection-end-line="67" selection-end-column="36" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@ -991,7 +1011,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="760">
<caret line="40" column="1" selection-start-line="40" selection-start-column="1" selection-end-line="40" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
@ -999,9 +1018,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="24" column="23" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" />
<folding>
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
</entry>
@ -1024,7 +1040,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="16" column="55" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
@ -1032,31 +1047,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="532">
<caret line="28" column="51" selection-start-line="28" selection-start-column="51" selection-end-line="28" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tech.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2432">
<caret line="128" column="7" selection-start-line="128" selection-start-column="7" selection-end-line="128" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/news.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2679">
<caret line="141" column="5" selection-start-line="130" selection-start-column="0" selection-end-line="141" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lifestyle.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="81">
<caret line="250" column="53" selection-start-line="250" selection-start-column="53" selection-end-line="250" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
@ -1064,26 +1054,23 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bower_components/string/README.md">
<provider editor-type-id="MarkdownPreviewEditor">
<state />
</provider>
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
<provider editor-type-id="MarkdownPreviewEditor">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bower_components/string/dist/string.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@ -1091,7 +1078,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
@ -1103,17 +1089,9 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gulpfile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="632">
<state relative-caret-position="1634">
<caret line="86" column="0" selection-start-line="86" selection-start-column="0" selection-end-line="86" selection-end-column="0" />
<folding />
</state>
@ -1124,19 +1102,11 @@
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#20769#20976#2" expanded="true" />
<element signature="e#20769#20976#2" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="75" column="11" selection-start-line="75" selection-start-column="11" selection-end-line="75" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bower.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
@ -1145,5 +1115,109 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2071">
<caret line="109" column="26" selection-start-line="109" selection-start-column="26" selection-end-line="109" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/news.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="23" column="5" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/news.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/feeds/news.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="77">
<caret line="64" column="5" selection-start-line="64" selection-start-column="5" selection-end-line="64" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572">
<caret line="69" column="23" selection-start-line="42" selection-start-column="6" selection-end-line="69" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/news.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="6" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/rss-braider/lib/RssBraider.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="317">
<caret line="95" column="40" selection-start-line="95" selection-start-column="40" selection-end-line="95" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tech.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1729">
<caret line="91" column="46" selection-start-line="91" selection-start-column="46" selection-end-line="91" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lifestyle.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/plugins/fix_images.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="4" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/plugins/fix_scripts.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="9" column="3" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="586">
<caret line="75" column="11" selection-start-line="75" selection-start-column="11" selection-end-line="75" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
</component>
</project>

89
feeds/news.json Normal file
View File

@ -0,0 +1,89 @@
{
"feed_name": "feed",
"default_count": 1,
"no_cdata_fields": [],
// Don't wrap these fields in CDATA tags
"meta": {
"title": "News",
"description": "Combined News Feed",
'site_url': 'http://pipes.silvrtree.co.uk/news.xml'
},
"plugins": [
'filter_3_days',
'fix_images',
'fix_scripts'
],
"sources": [
{
"count": 100,
"feed_url": "http://qz.com/feed/"
},
{
"count": 100,
"feed_url": "http://feeds2.feedburner.com/businessinsider"
},
{
"count": 100,
"feed_url": "http://mf.feeds.reuters.com/reuters/UKTopNews"
},
{
"count": 100,
"feed_url": "http://mf.feeds.reuters.com/reuters/UKdomesticNews"
},
{
"count": 100,
"feed_url": "http://hosted2.ap.org/atom/APDEFAULT/cae69a7523db45408eeb2b3a98c0c9c5"
},
{
"count": 100,
"feed_url": "http://www.cityam.com/feeds/main.xml"
},
{
"count": 100,
"feed_url": "http://www.londonlovesbusiness.com/navrss?navsectioncode=121"
},
{
"count": 100,
"feed_url": "http://www.ibtimes.co.uk/rss/uk"
},
{
"count": 100,
"feed_url": "http://feeds.bbci.co.uk/news/rss.xml?edition=uk"
},
{
"count": 100,
"feed_url": "http://feeds.bbci.co.uk/news/scotland/rss.xml?edition=uk"
},
{
"count": 100,
"feed_url": "http://news.google.com/?output=rss"
},
{
"count": 100,
"feed_url": "http://feeds.feedburner.com/TheAtlantic"
},
{
"count": 100,
"feed_url": "http://www.telegraph.co.uk/newsfeed/rss/news-uk_news.xml"
},
{
"count": 100,
"feed_url": "http://www.telegraph.co.uk/news/worldnews/rss"
},
{
"count": 100,
"feed_url": "http://www.guardian.co.uk/rssfeed/0,,1,00.xml"
},
{
"count": 100,
"feed_url": "http://www.marketwatch.com/rss/topstories"
},
{
"count": 100,
"feed_url": "http://feeds.feedburner.com/wingsoverscotland/FgKv"
}
]
}

5607
html/news.html
View File

File diff suppressed because one or more lines are too long

1
html/news.json
View File

File diff suppressed because one or more lines are too long

6155
html/news.xml
View File

File diff suppressed because one or more lines are too long

7
lifestyle.js
View File

@ -18,12 +18,7 @@ feeds.simple_test_feed = {
"count": 100,
"feed_url": "http://feeds2.feedburner.com/acquire"
},
{
"count": 100,
"feed_url": "http://www.fhm.com/category/style/feed"
},
{
"count": 100,

256
news.js
View File

@ -1,101 +1,135 @@
var outputFile = 'news',
RssBraider = require('rss-braider'),
fs = require('fs'),
ejs = require('ejs'),
read = require('fs').readFileSync,
join = require('path').join,
str = read(join(__dirname, '/templates/rss.ejs'), 'utf8'),
feeds = {};
var outputFile = 'news', RssBraider = require('rss-braider'), fs = require('fs'), ejs = require(
'ejs'), read = require('fs').readFileSync, join = require('path').join, str = read(
join(__dirname, '/templates/rss.ejs'),
'utf8'), feeds = {};
var log4js = require('log4js');
var logger = log4js.getLogger();
// Pull feeds from config files: ,
// feeds.simple_test_feed = require("./config/feed").feed;
// Or define in-line
feeds.simple_test_feed = {
"feed_name": "feed",
"default_count": 1,
"no_cdata_fields": [], // Don't wrap these fields in CDATA tags
"meta": {
"title": "News",
"description": "Combined News Feed",
'site_url': 'http://pipes.silvrtree.co.uk/news.xml'
"feed_name": "feed",
"default_count": 1,
"no_cdata_fields": [], // Don't wrap these fields in CDATA tags
"meta": {
"title": "News",
"description": "Combined News Feed",
'site_url': 'http://pipes.silvrtree.co.uk/news.xml'
},
"plugins": [
'filter_3_days', 'fix_images', 'fix_scripts'
],
"sources": [
{
"count": 100,
"feed_url": "http://qz.com/feed/"
},
"plugins": ['filter_3_days', 'fix_images', 'fix_scripts'],
"sources": [{
"count": 100,
"feed_url": "http://qz.com/feed/"
{
"count": 100,
"feed_url": "http://feeds2.feedburner.com/businessinsider"
},
{
"count": 100,
"feed_url": "http://feeds2.feedburner.com/businessinsider"
{
"count": 100,
"feed_url": "http://feeds.reuters.com/reuters/UKTopNews"
},
{
"count": 100,
"feed_url": "http://mf.feeds.reuters.com/reuters/UKTopNews"
}
,
{
"count": 100,
"feed_url": "http://mf.feeds.reuters.com/reuters/UKdomesticNews"
{
"count": 100,
"feed_url": "http://feeds.reuters.com/reuters/UKdomesticNews"
},
{
"count": 100,
"feed_url": "http://hosted2.ap.org/atom/APDEFAULT/cae69a7523db45408eeb2b3a98c0c9c5"
{
"count": 100,
"feed_url": "http://feeds.reuters.com/reuters/UKWorldNews"
},
{
"count": 100,
"feed_url": "http://www.cityam.com/feeds/main.xml"
{
"count": 100,
"feed_url": "http://feeds.reuters.com/reuters/topNews"
},
{
"count": 100,
"feed_url": "http://www.londonlovesbusiness.com/navrss?navsectioncode=121"
},
{
"count": 100,
"feed_url": "http://www.ibtimes.co.uk/rss/uk"
},
{
"count": 100,
"feed_url": "http://feeds.bbci.co.uk/news/rss.xml?edition=uk"
},
{
"count": 100,
"feed_url": "http://feeds.bbci.co.uk/news/scotland/rss.xml?edition=uk"
},
{
"count": 100,
"feed_url": "http://news.google.com/?output=rss"
},
{
"count": 100,
"feed_url": "http://feeds.feedburner.com/TheAtlantic"
},
{
"count": 100,
"feed_url": "http://www.telegraph.co.uk/newsfeed/rss/news-uk_news.xml"
},
{
"count": 100,
"feed_url": "http://www.telegraph.co.uk/news/worldnews/rss"
},
{
"count": 100,
"feed_url": "http://www.guardian.co.uk/rssfeed/0,,1,00.xml"
},
{
"count": 100,
"feed_url": "http://www.marketwatch.com/rss/topstories"
{
"count": 100,
"feed_url": "http://feeds.reuters.com/Reuters/worldNews"
}
]
};
,
{
"count": 100,
"feed_url": "http://feeds.reuters.com/reuters/globalmarketsNews"
},
{
"count": 100,
"feed_url": "http://hosted2.ap.org/atom/APDEFAULT/cae69a7523db45408eeb2b3a98c0c9c5"
},
{
"count": 100,
"feed_url": "http://www.cityam.com/feeds/main.xml"
},
{
"count": 100,
"feed_url": "http://www.londonlovesbusiness.com/navrss?navsectioncode=121"
},
{
"count": 100,
"feed_url": "http://www.ibtimes.co.uk/rss/uk"
},
{
"count": 100,
"feed_url": "http://feeds.bbci.co.uk/news/rss.xml?edition=uk"
},
{
"count": 100,
"feed_url": "http://feeds.bbci.co.uk/news/scotland/rss.xml?edition=uk"
},
{
"count": 100,
"feed_url": "http://news.google.com/?output=rss"
},
{
"count": 100,
"feed_url": "http://feeds.feedburner.com/TheAtlantic"
},
{
"count": 100,
"feed_url": "http://www.telegraph.co.uk/newsfeed/rss/news-uk_news.xml"
},
{
"count": 100,
"feed_url": "http://www.telegraph.co.uk/news/worldnews/rss"
},
{
"count": 100,
"feed_url": "http://www.guardian.co.uk/rssfeed/0,,1,00.xml"
},
{
"count": 100,
"feed_url": "http://www.marketwatch.com/rss/topstories"
},
{
"count": 100,
"feed_url": "http://feeds.feedburner.com/wingsoverscotland/FgKv"
},
{
"count": 100,
"feed_url": "http://bellacaledonia.org.uk/feed/"
}
,
{
"count": 100,
"feed_url": "http://www.theweek.co.uk/feeds/all"
}
]
}
;
var braider_options = {
feeds: feeds,
indent: " ",
date_sort_order: "desc", // Newest first
log_level: "warn",
dedupe_fields: ['link', 'guid'],
plugins_directories: [__dirname + "/plugins/"]
feeds: feeds,
indent: " ",
date_sort_order: "desc", // Newest first
log_level: "warn",
dedupe_fields: ['link', 'guid'],
plugins_directories: [__dirname + "/plugins/"]
};
var rss_braider = RssBraider.createClient(braider_options);
@ -103,40 +137,40 @@ var rss_braider = RssBraider.createClient(braider_options);
//rss_braider.logger.level('off');
rss_braider.processFeed('simple_test_feed', 'json', function(err, data) {
if (err) {
return console.log(err);
}
console.log('A');
if (err) {
logger.error(err);
return err;
}
var j = JSON.parse(data);
var ejsOutput = ejs.compile(str)(j);
console.log('B');
fs.writeFile(__dirname + "/dist/" + outputFile + ".html", ejsOutput, function(err) {
var j = JSON.parse(data);
if (err) {
return console.log(err);
}
console.log('C');
var ejsOutput = ejs.compile(str)(j);
console.log("The file was saved!");
console.log('D');
fs.writeFile(__dirname + "/dist/" + outputFile + ".html",
ejsOutput,
function(err) {
if (err) {
logger.error(err);
return console.error(err);
}
console.log("The file was saved!");
});
fs.writeFile(__dirname + "/dist/" + outputFile + ".json", data, function(err) {
if (err) {
return console.log(err);
}
fs.writeFile(__dirname + "/dist/" + outputFile + ".json",
data,
function(err) {
if (err) {
logger.error(err);
return console.error(err);
}
console.log("The file was saved!");
console.log("The file was saved!");
});
});
/*rss_braider.processFeed('simple_test_feed', 'rss', function(err, data) {
if (err) {
return console.log(err);
}
fs.writeFile(__dirname + "/html/" + outputFile + ".xml", data, function(err) {
if (err) {
return console.log(err);
}
console.log("The file was saved!");
});
});*/

60
node_modules/lodash/LICENSE generated vendored
View File

@ -1,23 +1,47 @@
The MIT License (MIT)
Copyright jQuery Foundation and other contributors <https://jquery.org/>
Copyright 2012-2016 The Dojo Foundation <http://dojofoundation.org/>
Based on Underscore.js, copyright 2009-2016 Jeremy Ashkenas,
Based on Underscore.js, copyright Jeremy Ashkenas,
DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
This software consists of voluntary contributions made by many
individuals. For exact contribution history, see the revision history
available at https://github.com/lodash/lodash
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
The following license applies to all parts of this software except as
documented below:
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
====
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
====
Copyright and related rights for sample code are waived via CC0. Sample
code is defined as all source code displayed within the prose of the
documentation.
CC0: http://creativecommons.org/publicdomain/zero/1.0/
====
Files located in the node_modules and vendor directories are externally
maintained libraries used by this software which have their own
licenses; we recommend you read them, as their terms may differ from the
terms above.

12
node_modules/lodash/README.md generated vendored
View File

@ -1,6 +1,6 @@
# lodash v4.6.1
# lodash v4.11.1
The [lodash](https://lodash.com/) library exported as [Node.js](https://nodejs.org/) modules.
The [Lodash](https://lodash.com/) library exported as [Node.js](https://nodejs.org/) modules.
## Installation
@ -17,7 +17,7 @@ var _ = require('lodash');
// Load the core build.
var _ = require('lodash/core');
// Load the fp build for immutable auto-curried iteratee-first data-last methods.
var _ = require('lodash/fp');
var fp = require('lodash/fp');
// Load a method category.
var array = require('lodash/array');
@ -28,13 +28,13 @@ var chunk = require('lodash/chunk');
var extend = require('lodash/fp/extend');
```
See the [package source](https://github.com/lodash/lodash/tree/4.6.1-npm) for more details.
See the [package source](https://github.com/lodash/lodash/tree/4.11.1-npm) for more details.
**Note:**<br>
Don’t assign values to the [special variable](http://nodejs.org/api/repl.html#repl_repl_features) `_` when in the REPL.<br>
Install [n_](https://www.npmjs.com/package/n_) for a REPL that includes lodash by default.
Install [n_](https://www.npmjs.com/package/n_) for a REPL that includes `lodash` by default.
## Support
Tested in Chrome 47-48, Firefox 43-44, IE 9-11, Edge 13, Safari 8-9, Node.js 0.10, 0.12, 4, & 5, & PhantomJS 1.9.8.<br>
Tested in Chrome 48-49, Firefox 44-45, IE 9-11, Edge 13, Safari 8-9, Node.js 0.10, 0.12, 4, & 5, & PhantomJS 1.9.8.<br>
Automated [browser](https://saucelabs.com/u/lodash) & [CI](https://travis-ci.org/lodash/lodash/) test runs are available.

1
node_modules/lodash/array.js generated vendored
View File

@ -25,6 +25,7 @@ module.exports = {
'join': require('./join'),
'last': require('./last'),
'lastIndexOf': require('./lastIndexOf'),
'nth': require('./nth'),
'pull': require('./pull'),
'pullAll': require('./pullAll'),
'pullAllBy': require('./pullAllBy'),

6
node_modules/lodash/chain.js generated vendored
View File

@ -1,11 +1,13 @@
var lodash = require('./wrapperLodash');
/**
* Creates a `lodash` object that wraps `value` with explicit method chaining enabled.
* The result of such method chaining must be unwrapped with `_#value`.
* Creates a `lodash` wrapper instance that wraps `value` with explicit method
* chain sequences enabled. The result of such sequences must be unwrapped
* with `_#value`.
*
* @static
* @memberOf _
* @since 1.3.0
* @category Seq
* @param {*} value The value to wrap.
* @returns {Object} Returns the new `lodash` wrapper instance.

2
node_modules/lodash/collection.js generated vendored
View File

@ -8,6 +8,8 @@ module.exports = {
'find': require('./find'),
'findLast': require('./findLast'),
'flatMap': require('./flatMap'),
'flatMapDeep': require('./flatMapDeep'),
'flatMapDepth': require('./flatMapDepth'),
'forEach': require('./forEach'),
'forEachRight': require('./forEachRight'),
'groupBy': require('./groupBy'),

3
node_modules/lodash/math.js generated vendored
View File

@ -1,12 +1,15 @@
module.exports = {
'add': require('./add'),
'ceil': require('./ceil'),
'divide': require('./divide'),
'floor': require('./floor'),
'max': require('./max'),
'maxBy': require('./maxBy'),
'mean': require('./mean'),
'meanBy': require('./meanBy'),
'min': require('./min'),
'minBy': require('./minBy'),
'multiply': require('./multiply'),
'round': require('./round'),
'subtract': require('./subtract'),
'sum': require('./sum'),

2
node_modules/lodash/object.js generated vendored
View File

@ -6,6 +6,8 @@ module.exports = {
'create': require('./create'),
'defaults': require('./defaults'),
'defaultsDeep': require('./defaultsDeep'),
'entries': require('./entries'),
'entriesIn': require('./entriesIn'),
'extend': require('./extend'),
'extendWith': require('./extendWith'),
'findKey': require('./findKey'),

25
node_modules/lodash/package.json generated vendored
View File

@ -2,24 +2,24 @@
"_args": [
[
"lodash@^4.6.1",
"C:\\mddev\\rinser"
"/Users/martin/newdev/Rinser"
]
],
"_from": "lodash@>=4.6.1 <5.0.0",
"_id": "lodash@4.6.1",
"_id": "lodash@4.11.1",
"_inCache": true,
"_installable": true,
"_location": "/lodash",
"_nodeVersion": "5.5.0",
"_npmOperationalInternal": {
"host": "packages-12-west.internal.npmjs.com",
"tmp": "tmp/lodash-4.6.1.tgz_1456942179866_0.5565699376165867"
"host": "packages-16-east.internal.npmjs.com",
"tmp": "tmp/lodash-4.11.1.tgz_1460618480099_0.40750555554404855"
},
"_npmUser": {
"email": "john.david.dalton@gmail.com",
"name": "jdalton"
},
"_npmVersion": "2.14.17",
"_npmVersion": "2.15.3",
"_phantomChildren": {},
"_requested": {
"name": "lodash",
@ -30,13 +30,14 @@
"type": "range"
},
"_requiredBy": [
"#DEV:/"
"#DEV:/",
"/cheerio"
],
"_resolved": "https://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz",
"_shasum": "df00c1164ad236b183cfc3887a5e8d38cc63cbbc",
"_resolved": "http://registry.npmjs.org/lodash/-/lodash-4.11.1.tgz",
"_shasum": "a32106eb8e2ec8e82c241611414773c9df15f8bc",
"_shrinkwrap": null,
"_spec": "lodash@^4.6.1",
"_where": "C:\\mddev\\rinser",
"_where": "/Users/martin/newdev/Rinser",
"author": {
"email": "john.david.dalton@gmail.com",
"name": "John-David Dalton",
@ -67,8 +68,8 @@
"devDependencies": {},
"directories": {},
"dist": {
"shasum": "df00c1164ad236b183cfc3887a5e8d38cc63cbbc",
"tarball": "http://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz"
"shasum": "a32106eb8e2ec8e82c241611414773c9df15f8bc",
"tarball": "https://registry.npmjs.org/lodash/-/lodash-4.11.1.tgz"
},
"homepage": "https://lodash.com/",
"icon": "https://lodash.com/icon.svg",
@ -107,5 +108,5 @@
"scripts": {
"test": "echo \"See https://travis-ci.org/lodash/lodash-cli for testing details.\""
},
"version": "4.6.1"
"version": "4.11.1"
}

3
package.json
View File

@ -19,7 +19,8 @@
"gulp-rename": "^1.2.2",
"gulp-uglify": "^1.5.3",
"jshint": "^2.9.1",
"lodash": "^4.6.1",
"lodash": "^4.11.1",
"log4js": "^0.6.35",
"rss-braider": "^1.0.0"
},
"dependencies": {

11
plugins/fix_images.js
View File

@ -1,7 +1,10 @@
module.exports = function (item, itemOptions, source) {
var match = itemOptions.description.replace(/\ssrc=/gi,' src="assets/fm.png" data-src=');
//console.log(itemOptions);
// console.log((typeof itemOptions.descriptions !== 'undefined') && (itemOptions.description !== null));
if ((typeof itemOptions.descriptions !== 'undefined') && (itemOptions.description !== null)) {
var match = itemOptions.description.replace(/\ssrc=/gi,
' src="assets/fm.png" data-src=');
itemOptions.description = match;
return itemOptions;
}
return itemOptions;
};

9
plugins/fix_scripts.js
View File

@ -1,8 +1,13 @@
module.exports = function (item, itemOptions, source) {
if ((typeof itemOptions.descriptions !== 'undefined') && (itemOptions.description !== null)) {
var match = itemOptions.description.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,'');
match = match.replace(/<iframe\b[^<]*(?:(?!<\/iframe>)<[^<]*)*<\/iframe>/gi,'');
var match = itemOptions.description.replace(
/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
'');
match = match.replace(/<iframe\b[^<]*(?:(?!<\/iframe>)<[^<]*)*<\/iframe>/gi,
'');
itemOptions.description = match;
}
return itemOptions;
};

10
tech.js
View File

@ -7,6 +7,9 @@ var outputFile = 'tech',
str = read(join(__dirname, '/templates/rss.ejs'), 'utf8'),
feeds = {};
var log4js = require('log4js');
var logger = log4js.getLogger();
// Pull feeds from config files: ,
// feeds.simple_test_feed = require("./config/feed").feed;
// Or define in-line
@ -80,10 +83,10 @@ feeds.simple_test_feed = {
"count": 100,
"feed_url": "http://techcrunch.com/feed/"
},
{
/*{
"count": 100,
"feed_url": "http://feeds.venturebeat.com/VentureBeat"
},
},*/
{
"count": 100,
"feed_url": "http://feeds2.feedburner.com/thenextweb"
@ -105,6 +108,7 @@ var rss_braider = RssBraider.createClient(braider_options);
rss_braider.processFeed('simple_test_feed', 'json', function (err, data) {
if (err) {
logger.error(err);
return console.log(err);
}
@ -114,6 +118,7 @@ rss_braider.processFeed('simple_test_feed', 'json', function (err, data) {
fs.writeFile(__dirname + "/dist/" + outputFile + ".html", ejsOutput, function (err) {
if (err) {
logger.error(err);
return console.log(err);
}
@ -122,6 +127,7 @@ rss_braider.processFeed('simple_test_feed', 'json', function (err, data) {
fs.writeFile(__dirname + "/dist/" + outputFile + ".json", data, function (err) {
if (err) {
logger.error(err);
return console.log(err);
}

271
test.js
View File

@ -1,133 +1,182 @@
var outputFile = 'tech',
RssBraider = require('rss-braider'),
fs = require('fs'),
ejs = require('ejs'),
read = require('fs').readFileSync,
join = require('path').join,
str = read(join(__dirname, '/templates/rss.ejs'), 'utf8'),
feeds = {};
var outputFile = 'news',
RssBraider = require('rss-braider'),
fs = require('fs'),
ejs = require('ejs'),
read = require('fs').readFileSync,
join = require('path').join,
str = read(join(__dirname, '/templates/rss.ejs'), 'utf8'),
feeds = {};
var log4js = require('log4js');
var logger = log4js.getLogger();
// Pull feeds from config files: ,
// feeds.simple_test_feed = require("./config/feed").feed;
// Or define in-line
feeds.simple_test_feed = {
"feed_name" : "test",
"default_count" : 1,
"no_cdata_fields" : [], // Don't wrap these fields in CDATA tags
"meta" : {
"title": "test",
"description": "test",
'site_url':'http://pipes.silvrtree.co.uk/test.xml'
},
"plugins" : ['kill_unwanted_images'],
"sources" : [
"feed_name": "feed",
"default_count": 1,
"no_cdata_fields": [],
// Don't wrap these fields in CDATA tags
"meta": {
"title": "News",
"description": "Combined News Feed",
'site_url': 'http://pipes.silvrtree.co.uk/news.xml'
},
"plugins": [
'filter_3_days',
'fix_images',
'fix_scripts'
],
"sources": [
{
"count": 100,
"feed_url": "http://qz.com/feed/"
}, /*
{
"count": 100,
"feed_url": "http://feeds2.feedburner.com/businessinsider"
},
/*
{
"count": 100,
"feed_url": "http://feeds.reuters.com/reuters/UKTopNews"
},
{
"count": 100,
"feed_url": "http://feeds.reuters.com/reuters/UKdomesticNews"
},
{
"count": 100,
"feed_url": "http://feeds.reuters.com/reuters/UKWorldNews"
}
,
{
"count": 100,
"feed_url": "http://feeds.reuters.com/reuters/topNews"
}
,
{
"count": 100,
"feed_url": "http://feeds.reuters.com/Reuters/worldNews"
}
"count": 5,
"feed_url": "http://qz.com/feed/"
}
,
{
"count": 100,
"feed_url": "http://feeds.reuters.com/reuters/globalmarketsNews"
}
, /*
{
"count": 100,
"feed_url": "http://hosted2.ap.org/atom/APDEFAULT/cae69a7523db45408eeb2b3a98c0c9c5"
}, /*
{
"count": 100,
"feed_url": "http://www.cityam.com/feeds/main.xml"
}, /*
{
"count": 100,
"feed_url": "http://www.londonlovesbusiness.com/navrss?navsectioncode=121"
}, /*
{
"count": 100,
"feed_url": "http://www.ibtimes.co.uk/rss/uk"
}, /*
{
"count": 100,
"feed_url": "http://feeds.bbci.co.uk/news/rss.xml?edition=uk"
},
{
"count": 100,
"feed_url": "http://feeds.bbci.co.uk/news/scotland/rss.xml?edition=uk"
}, /*
{
"count": 100,
"feed_url": "http://news.google.com/?output=rss"
},/*
{
"count": 100,
"feed_url": "http://feeds.feedburner.com/TheAtlantic"
}, /*
{
"count": 100,
"feed_url": "http://www.telegraph.co.uk/newsfeed/rss/news-uk_news.xml"
},
{
"count": 100,
"feed_url": "http://www.telegraph.co.uk/news/worldnews/rss"
}, /*
{
"count": 100,
"feed_url": "http://www.guardian.co.uk/rssfeed/0,,1,00.xml"
},
{
"count": 100,
"feed_url": "http://www.marketwatch.com/rss/topstories"
},
{
"count": 100,
"feed_url": "http://feeds.feedburner.com/wingsoverscotland/FgKv"
},
{
"count": 100,
"feed_url": "http://bellacaledonia.org.uk/feed/"
}
*/
]
};
var braider_options = {
feeds : feeds,
indent : " ",
date_sort_order : "desc", // Newest first
log_level : "debug",
dedupe_fields : ['link','guid'],
plugins_directories : [__dirname + "/plugins/"],
}
;
var braider_options = {
feeds: feeds,
indent: " ",
date_sort_order: "desc", // Newest first
log_level: "warn",
dedupe_fields: ['link', 'guid'],
plugins_directories: [__dirname + "/plugins/"]
};
var rss_braider = RssBraider.createClient(braider_options);
// Override logging level (debug, info, warn, err, off)
rss_braider.logger.level('debug');
//rss_braider.logger.level('off');
// Output braided feed as rss. use 'json' for JSON output.
//rss_braider.processFeed('simple_test_feed', 'rss', function(err, data){
rss_braider.processFeed('simple_test_feed', 'json', function(err, data){
rss_braider.processFeed('simple_test_feed', 'json', function(err, data) {
console.log('A');
if (err) {
return console.log(err);
logger.error(err);
return err;
}
var j = JSON.parse(data);
console.log('B');
var j = JSON.parse(data);
/* j.items.forEach(function (obj, index) {
// console.log(obj); // logs "3", "5", "7"
// console.log(index); // logs "0", "1", "2"
console.log('C');
var ejsOutput = ejs.compile(str)(j);
var desc = obj.description;
console.log('D');
fs.writeFile(__dirname + "/dist/" + outputFile + ".html", ejsOutput, function(err) {
var imgRegEx = /<img[^>]+src="([^">]+)"/;
var myArray = imgRegEx.exec(desc) || [];
if (err) {
logger.error(err);
return console.error(err);
}
if (myArray.length > 0)
{
console.log('Length: ' + myArray.length);
console.log(myArray[0]);
console.log(myArray[1]);
console.log('- - -');
}
console.log("The file was saved!");
});
fs.writeFile(__dirname + "/dist/" + outputFile + ".json", data, function(err) {
if (err) {
logger.error(err);
return console.error(err);
}
console.log("The file was saved!");
});
});
*/
// var ejsOutput = ejs.compile(str)(j);
//console.log(j);
// console.log(ejsOutput);
});
/*
// grabbing images
<img[^>]+src="([^">]+)"
var fs = require('fs');
var request = require('request');
// Or with cookies
// var request = require('request').defaults({jar: true});
request.get({url: 'https://someurl/somefile.torrent', encoding: 'binary'}, function (err, response, body) {
fs.writeFile("/tmp/test.torrent", body, 'binary', function(err) {
if(err)
console.log(err);
else
console.log("The file was saved!");
});
});
*/
var DateDiff = {
inDays: function(d1, d2) {
var t2 = d2.getTime();
var t1 = d1.getTime();
return parseInt((t2-t1)/(24*3600*1000));
},
inWeeks: function(d1, d2) {
var t2 = d2.getTime();
var t1 = d1.getTime();
return parseInt((t2-t1)/(24*3600*1000*7));
},
inMonths: function(d1, d2) {
var d1Y = d1.getFullYear();
var d2Y = d2.getFullYear();
var d1M = d1.getMonth();
var d2M = d2.getMonth();
return (d2M+12*d2Y)-(d1M+12*d1Y);
},
inYears: function(d1, d2) {
return d2.getFullYear()-d1.getFullYear();
}
}