Merge 4104f44 into 77c492e

mmcdole · Apr 25, 2016 · 05faed1 · 05faed1
2 parents 77c492e + 4104f44
commit 05faed1
Show file tree

Hide file tree

Showing 593 changed files with 1,929 additions and 1,454 deletions.
diff --git a/atom/feed.go b/atom/feed.go
@@ -104,5 +104,5 @@ type Source struct {
 	Contributors  []*Person      `json:"contributors,omitempty"`
 	Authors       []*Person      `json:"authors,omitempty"`
 	Categories    []*Category    `json:"categories,omitempty"`
-	Extensions    ext.Extensions `json:"extensions"`
+	Extensions    ext.Extensions `json:"extensions,omitempty"`
 }
diff --git a/parser_test.go b/parser_test.go
@@ -22,10 +22,10 @@ func TestParser_Parse(t *testing.T) {
 		feedTitle string
 		hasError  bool
 	}{
-		{"atom03_feed.xml", "atom", "Atom Title", false},
-		{"atom10_feed.xml", "atom", "Atom Title", false},
-		{"rss_feed.xml", "rss", "RSS Title", false},
-		{"rdf_feed.xml", "rss", "RDF Title", false},
+		{"atom03_feed.xml", "atom", "Feed Title", false},
+		{"atom10_feed.xml", "atom", "Feed Title", false},
+		{"rss_feed.xml", "rss", "Feed Title", false},
+		{"rdf_feed.xml", "rss", "Feed Title", false},
 		{"unknown_feed.xml", "", "", true},
 		{"empty_feed.xml", "", "", true},
 	}
@@ -60,10 +60,10 @@ func TestParser_ParseString(t *testing.T) {
 		feedTitle string
 		hasError  bool
 	}{
-		{"atom03_feed.xml", "atom", "Atom Title", false},
-		{"atom10_feed.xml", "atom", "Atom Title", false},
-		{"rss_feed.xml", "rss", "RSS Title", false},
-		{"rdf_feed.xml", "rss", "RDF Title", false},
+		{"atom03_feed.xml", "atom", "Feed Title", false},
+		{"atom10_feed.xml", "atom", "Feed Title", false},
+		{"rss_feed.xml", "rss", "Feed Title", false},
+		{"rdf_feed.xml", "rss", "Feed Title", false},
 		{"unknown_feed.xml", "", "", true},
 		{"empty_feed.xml", "", "", true},
 	}
@@ -98,10 +98,10 @@ func TestParser_ParseURL_Success(t *testing.T) {
 		feedTitle string
 		hasError  bool
 	}{
-		{"atom03_feed.xml", "atom", "Atom Title", false},
-		{"atom10_feed.xml", "atom", "Atom Title", false},
-		{"rss_feed.xml", "rss", "RSS Title", false},
-		{"rdf_feed.xml", "rss", "RDF Title", false},
+		{"atom03_feed.xml", "atom", "Feed Title", false},
+		{"atom10_feed.xml", "atom", "Feed Title", false},
+		{"rss_feed.xml", "rss", "Feed Title", false},
+		{"rdf_feed.xml", "rss", "Feed Title", false},
 		{"unknown_feed.xml", "", "", true},
 	}
 

diff --git a/testdata/parser/atom/atom03_feed_author_email.json b/testdata/parser/atom/atom03_feed_author_email.json
@@ -1,7 +1,7 @@
 {
     "authors": [
         {
-            "email": "me@example.com"
+            "email": "email@example.org"
         }
     ],
     "entries": [],

diff --git a/testdata/parser/atom/atom03_feed_author_homepage.json b/testdata/parser/atom/atom03_feed_author_homepage.json
@@ -1,7 +1,7 @@
 {
     "authors": [
         {
-            "uri": "http://example.com/"
+            "uri": "http://example.org/"
         }
     ],
     "entries": [],

diff --git a/testdata/parser/atom/atom03_feed_author_mixed_content.json b/testdata/parser/atom/atom03_feed_author_mixed_content.json
@@ -0,0 +1,9 @@
+{
+    "authors": [
+        {
+            "name": "Feed Author"
+        }
+    ],
+    "entries": [],
+    "version": "0.3"
+}
diff --git a/testdata/parser/atom/atom03_feed_author_mixed_content.xml b/testdata/parser/atom/atom03_feed_author_mixed_content.xml
@@ -0,0 +1,9 @@
+<!--
+Description: feed author - mixed content
+-->
+<feed version="0.3" xmlns="http://purl.org/atom/ns#">
+  <author>
+    <name>Feed Author</name>
+    Mixed content
+  </author>
+</feed>
diff --git a/testdata/parser/atom/atom03_feed_author_name.json b/testdata/parser/atom/atom03_feed_author_name.json
@@ -1,7 +1,7 @@
 {
     "authors": [
         {
-            "name": "Example author"
+            "name": "Feed Author"
         }
     ],
     "entries": [],

diff --git a/testdata/parser/atom/atom03_feed_author_uri.json b/testdata/parser/atom/atom03_feed_author_uri.json
@@ -1,7 +1,7 @@
 {
     "authors": [
         {
-            "uri": "http://example.com/"
+            "uri": "http://example.org/"
         }
     ],
     "entries": [],

diff --git a/testdata/parser/atom/atom03_feed_author_url.json b/testdata/parser/atom/atom03_feed_author_url.json
@@ -1,7 +1,7 @@
 {
     "authors": [
         {
-            "uri": "http://example.com/"
+            "uri": "http://example.org/"
         }
     ],
     "entries": [],

diff --git a/testdata/parser/atom/atom03_feed_contributor_email.json b/testdata/parser/atom/atom03_feed_contributor_email.json
@@ -1,7 +1,7 @@
 {
     "contributors": [
         {
-            "email": "me@example.com"
+            "email": "email@example.org"
         }
     ],
     "entries": [],

diff --git a/testdata/parser/atom/atom03_feed_contributor_homepage.json b/testdata/parser/atom/atom03_feed_contributor_homepage.json
@@ -1,7 +1,7 @@
 {
     "contributors": [
         {
-            "uri": "http://example.com/"
+            "uri": "http://example.org/"
         }
     ],
     "entries": [],

diff --git a/testdata/parser/atom/atom03_feed_contributor_mixed_content.json b/testdata/parser/atom/atom03_feed_contributor_mixed_content.json
@@ -0,0 +1,9 @@
+{
+    "contributors": [
+        {
+            "name": "Feed Contributor"
+        }
+    ],
+    "entries": [],
+    "version": "0.3"
+}
diff --git a/testdata/parser/atom/atom03_feed_contributor_mixed_content.xml b/testdata/parser/atom/atom03_feed_contributor_mixed_content.xml
@@ -0,0 +1,9 @@
+<!--
+Description: feed contributor - mixed content
+-->
+<feed version="0.3" xmlns="http://purl.org/atom/ns#">
+  <contributor>
+    <name>Feed Contributor</name>
+    Mixed content
+  </contributor>
+</feed>
diff --git a/testdata/parser/atom/atom03_feed_contributor_multiple.json b/testdata/parser/atom/atom03_feed_contributor_multiple.json
@@ -1,14 +1,14 @@
 {
     "contributors": [
         {
-            "name": "Contributor 1",
-            "email": "me@example.com",
-            "uri": "http://example.com/"
+            "name": "Contributor Name 1",
+            "email": "email@example.org",
+            "uri": "http://example.org/"
         },
         {
-            "name": "Contributor 2",
-            "email": "you@example.com",
-            "uri": "http://two.example.com/"
+            "name": "Contributor Name 2",
+            "email": "email2@example.org",
+            "uri": "http://two.example.org/"
         }
     ],
     "entries": [],

diff --git a/testdata/parser/atom/atom03_feed_contributor_name.json b/testdata/parser/atom/atom03_feed_contributor_name.json
@@ -1,7 +1,7 @@
 {
     "contributors": [
         {
-            "name": "Example contributor"
+            "name": "Feed Contributor"
         }
     ],
     "entries": [],

diff --git a/testdata/parser/atom/atom03_feed_contributor_uri.json b/testdata/parser/atom/atom03_feed_contributor_uri.json
@@ -1,7 +1,7 @@
 {
     "contributors": [
         {
-            "uri": "http://example.com/"
+            "uri": "http://example.org/"
         }
     ],
     "entries": [],

diff --git a/testdata/parser/atom/atom03_feed_contributor_url.json b/testdata/parser/atom/atom03_feed_contributor_url.json
@@ -1,7 +1,7 @@
 {
     "contributors": [
         {
-            "uri": "http://example.com/"
+            "uri": "http://example.org/"
         }
     ],
     "entries": [],

diff --git a/testdata/parser/atom/atom03_feed_copyright.json b/testdata/parser/atom/atom03_feed_copyright.json
@@ -1,5 +1,5 @@
 {
-    "rights": "Example Atom",
+    "rights": "Feed Rights",
     "entries": [],
     "version": "0.3"
 }
diff --git a/testdata/parser/atom/atom03_feed_copyright_base64.json b/testdata/parser/atom/atom03_feed_copyright_base64.json
@@ -1,5 +1,5 @@
 {
-    "rights": "Example <b>Atom</b>",
+    "rights": "Feed <b>Rights</b>",
     "entries": [],
     "version": "0.3"
 }
diff --git a/testdata/parser/atom/atom03_feed_copyright_html_escaped_markup.json b/testdata/parser/atom/atom03_feed_copyright_html_escaped_markup.json
@@ -1,5 +1,5 @@
 {
-    "rights": "Example <b>Atom</b>",
+    "rights": "Feed <b>Rights</b>",
     "entries": [],
     "version": "0.3"
 }
diff --git a/testdata/parser/atom/atom03_feed_copyright_naked_markup.json b/testdata/parser/atom/atom03_feed_copyright_naked_markup.json
@@ -1,5 +1,5 @@
 {
-    "rights": "Example <b>Atom</b>",
+    "rights": "Feed <b>Rights</b>",
     "entries": [],
     "version": "0.3"
 }
diff --git a/testdata/parser/atom/atom03_feed_copyright_text.json b/testdata/parser/atom/atom03_feed_copyright_text.json
@@ -1,5 +1,5 @@
 {
-    "rights": "Example Atom",
+    "rights": "Feed Rights",
     "entries": [],
     "version": "0.3"
 }
diff --git a/testdata/parser/atom/atom03_feed_copyright_xhtml_inline_markup.json b/testdata/parser/atom/atom03_feed_copyright_xhtml_inline_markup.json
@@ -1,5 +1,5 @@
 {
-    "rights": "Example <b>Atom</b>",
+    "rights": "Feed <b>Rights</b>",
     "entries": [],
     "version": "0.3"
 }
diff --git a/testdata/parser/atom/atom03_feed_entry_author_email.json b/testdata/parser/atom/atom03_feed_entry_author_email.json
@@ -3,7 +3,7 @@
         {
             "authors": [
                 {
-                    "email": "me@example.com"
+                    "email": "email@example.org"
                 }
             ]
         }

diff --git a/testdata/parser/atom/atom03_feed_entry_author_homepage.json b/testdata/parser/atom/atom03_feed_entry_author_homepage.json
@@ -3,7 +3,7 @@
         {
             "authors": [
                 {
-                    "uri": "http://example.com/"
+                    "uri": "http://example.org/"
                 }
             ]
         }

diff --git a/testdata/parser/atom/atom03_feed_entry_author_mixed_content.json b/testdata/parser/atom/atom03_feed_entry_author_mixed_content.json
@@ -0,0 +1,12 @@
+{
+    "entries": [
+        {
+            "authors": [
+                {
+                    "name": "Author Name"
+                }
+            ]
+        }
+    ],
+    "version": "0.3"
+}
diff --git a/testdata/parser/atom/atom03_feed_entry_author_mixed_content.xml b/testdata/parser/atom/atom03_feed_entry_author_mixed_content.xml
@@ -0,0 +1,11 @@
+<!--
+Description: entry author - mixed content
+-->
+<feed version="0.3" xmlns="http://purl.org/atom/ns#">
+  <entry>
+    <author>
+      <name>Author Name</name>
+      Mixed content
+    </author>
+  </entry>
+</feed>
diff --git a/testdata/parser/atom/atom03_feed_entry_author_name.json b/testdata/parser/atom/atom03_feed_entry_author_name.json
@@ -3,7 +3,7 @@
         {
             "authors": [
                 {
-                    "name": "Example author"
+                    "name": "Author Name"
                 }
             ]
         }

diff --git a/testdata/parser/atom/atom03_feed_entry_author_uri.json b/testdata/parser/atom/atom03_feed_entry_author_uri.json
@@ -3,7 +3,7 @@
         {
             "authors": [
                 {
-                    "uri": "http://example.com/"
+                    "uri": "http://example.org/"
                 }
             ]
         }

diff --git a/testdata/parser/atom/atom03_feed_entry_author_url.json b/testdata/parser/atom/atom03_feed_entry_author_url.json
@@ -3,7 +3,7 @@
         {
             "authors": [
                 {
-                    "uri": "http://example.com/"
+                    "uri": "http://example.org/"
                 }
             ]
         }

diff --git a/testdata/parser/atom/atom03_feed_entry_content.json b/testdata/parser/atom/atom03_feed_entry_content.json
@@ -2,7 +2,7 @@
     "entries": [
         {
             "content": {
-                "value": "Example Atom"
+                "value": "Entry Content"
             }
         }
     ],

diff --git a/testdata/parser/atom/atom03_feed_entry_contributor_email.json b/testdata/parser/atom/atom03_feed_entry_contributor_email.json
@@ -3,7 +3,7 @@
         {
             "contributors": [
                 {
-                    "email": "me@example.com"
+                    "email": "email@example.org"
                 }
             ]
         }

diff --git a/testdata/parser/atom/atom03_feed_entry_contributor_homepage.json b/testdata/parser/atom/atom03_feed_entry_contributor_homepage.json
@@ -3,7 +3,7 @@
         {
             "contributors": [
                 {
-                    "uri": "http://example.com/"
+                    "uri": "http://example.org/"
                 }
             ]
         }

diff --git a/testdata/parser/atom/atom03_feed_entry_contributor_mixed_content.json b/testdata/parser/atom/atom03_feed_entry_contributor_mixed_content.json
@@ -0,0 +1,12 @@
+{
+    "entries": [
+        {
+            "contributors": [
+                {
+                    "name": "Contributor Name"
+                }
+            ]
+        }
+    ],
+    "version": "0.3"
+}
diff --git a/testdata/parser/atom/atom03_feed_entry_contributor_mixed_content.xml b/testdata/parser/atom/atom03_feed_entry_contributor_mixed_content.xml
@@ -0,0 +1,11 @@
+<!--
+Description: entry contributor - mixed content
+-->
+<feed version="0.3" xmlns="http://purl.org/atom/ns#">
+  <entry>
+    <contributor>
+      <name>Contributor Name</name>
+      Mixed content
+    </contributor>
+  </entry>
+</feed>
diff --git a/testdata/parser/atom/atom03_feed_entry_contributor_multiple.json b/testdata/parser/atom/atom03_feed_entry_contributor_multiple.json
@@ -3,14 +3,14 @@
         {
             "contributors": [
                 {
-                    "name": "Contributor 1",
-                    "email": "me@example.com",
-                    "uri": "http://example.com/"
+                    "name": "Contributor Name 1",
+                    "email": "email@example.org",
+                    "uri": "http://example.org/"
                 },
                 {
-                    "name": "Contributor 2",
-                    "email": "you@example.com",
-                    "uri": "http://two.example.com/"
+                    "name": "Contributor Name 2",
+                    "email": "email2@example.org",
+                    "uri": "http://two.example.org/"
                 }
             ]
         }

diff --git a/testdata/parser/atom/atom03_feed_entry_contributor_name.json b/testdata/parser/atom/atom03_feed_entry_contributor_name.json
@@ -3,7 +3,7 @@
         {
             "contributors": [
                 {
-                    "name": "Example contributor"
+                    "name": "Contributor Name"
                 }
             ]
         }