From 469e4cbaf7a169b7d1ea03aa466443b669f20bd4 Mon Sep 17 00:00:00 2001 From: John Conway Date: Wed, 8 May 2019 11:49:00 +0100 Subject: Removed AtomImage (not in spec) --- README.md | 4 +-- src/feednim/atom.nim | 10 +----- src/feednim/submodule.nim | 12 ------- tests/test_atom.nim | 16 +++++++++ tests/test_atom.xml | 89 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 23 deletions(-) delete mode 100644 src/feednim/submodule.nim create mode 100644 tests/test_atom.nim create mode 100644 tests/test_atom.xml diff --git a/README.md b/README.md index eb9566c..0097070 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Feed-Nim A feed parsing module for [Nim](https://nim-lang.org), which parses RSS, Atom, and JSONfeed syndication formats. This has been substantially re-written and expanded from [Nim-RSS](https://github.com/achesak/nim-rss) -It has not been tested, has no tests, and is mostly wriiten by an inexperienced dope who barely understands Nim. Use at your own risk. +It has not been tested, has no tests, and is mostly written by an inexperienced dope who barely understands Nim. Use at your own risk. ## Usage @@ -13,4 +13,4 @@ It has not been tested, has no tests, and is mostly wriiten by an inexperienced getRSS(url: string): RSS Gets the RSS from the specified _url_
loadJsonFeed(filename: string): JSONfeed Loads the JSONFeed from the given _filename_
-getJsonFeed(url: string): JSONfeed JsonFeed = JSONFeed from the specified _url_
\ No newline at end of file +getJsonFeed(url: string): JSONfeed JsonFeed = JSONFeed from the specified _url_
\ No newline at end of file diff --git a/src/feednim/atom.nim b/src/feednim/atom.nim index cce9c44..1b43b03 100644 --- a/src/feednim/atom.nim +++ b/src/feednim/atom.nim @@ -31,15 +31,6 @@ type name*: string # Required Atom field url*: string email*: string - - AtomImage* = object - url*: string - title*: string - link*: string - width*: string - height*: string - description*: string - AtomLink* = object href*: string rel*: string @@ -65,6 +56,7 @@ type summary*: string + proc parseEntry( node: XmlNode) : AtomEntry = var entry: AtomEntry = AtomEntry() diff --git a/src/feednim/submodule.nim b/src/feednim/submodule.nim deleted file mode 100644 index 1af4e81..0000000 --- a/src/feednim/submodule.nim +++ /dev/null @@ -1,12 +0,0 @@ -# This is just an example to get you started. Users of your library will -# import this file by writing ``import FeedNim/submodule``. Feel free to rename or -# remove this file altogether. You may create additional modules alongside -# this file as required. - -type - Submodule* = object - name*: string - -proc initSubmodule*(): Submodule = - ## Initialises a new ``Submodule`` object. - Submodule(name: "Anonymous") diff --git a/tests/test_atom.nim b/tests/test_atom.nim new file mode 100644 index 0000000..3d563da --- /dev/null +++ b/tests/test_atom.nim @@ -0,0 +1,16 @@ +# This is just an example to get you started. You may wish to put all of your +# tests into a single file, or separate them into multiple `test1`, `test2` +# etc. files (better names are recommended, just make sure the name starts with +# the letter 't'). +# +# To run these tests, simply execute `nimble test`. + + + + + +import unittest + +import FeedNim +test "can add": + check add(5, 5) == 10 diff --git a/tests/test_atom.xml b/tests/test_atom.xml new file mode 100644 index 0000000..5854868 --- /dev/null +++ b/tests/test_atom.xml @@ -0,0 +1,89 @@ + + + urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6 + Bloggs's Planes Trains and Automobiles + 2003-12-13T18:30:02Z + + Joe Bloggs + http://joe.bloggs + mail@joe.bloggs + + + Jane Bloggs + + Planes + Trains + Automobiles + nim + http://joe.bloggs/mug,jpg + + © Joe and Jane Bloggs + © Joe and Jane Bloggs + + + + urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a + Aeroplanes not Airplanes + 2003-12-13T18:30:02Z + + Joe Bloggs + http://joe.bloggs + mail@joe.bloggs + + planes + + Aero- not air-, fools! + + + 2003-12-13T18:30:02Z + © Joe Bloggs + + urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a + Aeroplane + Aeroplanes + 1755-04-15T18:30:00Z + + Samuel Johnson + http://dictionary.com + sjohnson@dictionary.com + + words + © Samual Johnson + + + + + + + + urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a + Aeroplanes not Airplanes + 2003-12-13T18:30:02Z + + Joe Bloggs + http://joe.bloggs + mail@joe.bloggs + + trains + + 2003-12-13T18:20:02Z + © Jane Bloggs + + Trains! + + + \ No newline at end of file -- cgit v1.2.3