Starting parsing the atom language attribute

mmcdole · Apr 7, 2016 · dfb65d2 · dfb65d2
1 parent 56ec146
commit dfb65d2
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 1 deletion.
diff --git a/atom/parser.go b/atom/parser.go
@@ -33,6 +33,7 @@ func (ap *Parser) parseRoot(p *xpp.XMLPullParser) (*Feed, error) {
 	atom := &Feed{}
 	atom.Entries = []*Entry{}
 	atom.Version = ap.parseVersion(p)
+	atom.Language = ap.parseLanguage(p)
 
 	contributors := []*Person{}
 	authors := []*Person{}
@@ -680,6 +681,10 @@ func (ap *Parser) parseAtomText(p *xpp.XMLPullParser) (string, error) {
 	return result, nil
 }
 
+func (ap *Parser) parseLanguage(p *xpp.XMLPullParser) string {
+	return p.Attribute("lang")
+}
+
 func (ap *Parser) parseVersion(p *xpp.XMLPullParser) string {
 	ver := p.Attribute("version")
 	if ver != "" {

diff --git a/testdata/parser/atom/atom03_feed_xml_lang.json b/testdata/parser/atom/atom03_feed_xml_lang.json
@@ -0,0 +1,5 @@
+{
+    "language": "en",
+    "entries": [],
+    "version": "0.3"
+}
diff --git a/testdata/parser/atom/atom03_feed_xml_lang.xml b/testdata/parser/atom/atom03_feed_xml_lang.xml
@@ -0,0 +1,5 @@
+<!--
+Description: feed language
+-->
+<feed version="0.3" xmlns="http://purl.org/atom/ns#" xml:lang="en">
+</feed>
diff --git a/testdata/parser/atom/atom10_feed_title.xml b/testdata/parser/atom/atom10_feed_title.xml
@@ -4,4 +4,4 @@ Expect:      not bozo and feed['title'] == 'Example Atom'
 -->
 <feed xmlns="http://www.w3.org/2005/Atom">
   <title>Example Atom</title>
-</feed>
+</feed>
diff --git a/testdata/parser/atom/atom10_feed_xml_lang.json b/testdata/parser/atom/atom10_feed_xml_lang.json
@@ -0,0 +1,5 @@
+{
+  "language": "en",
+  "entries": [],
+  "version": "1.0"
+}
diff --git a/testdata/parser/atom/atom10_feed_xml_lang.xml b/testdata/parser/atom/atom10_feed_xml_lang.xml
@@ -0,0 +1,5 @@
+<!--
+Description: feed language
+-->
+<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
+</feed>
diff --git a/testdata/translator/atom/feed_language_-_atom03_feed_xml_lang.json b/testdata/translator/atom/feed_language_-_atom03_feed_xml_lang.json
@@ -0,0 +1,6 @@
+{
+    "language": "en",
+    "items": [],
+    "feedType": "atom",
+    "feedVersion": "0.3"
+}
diff --git a/testdata/translator/atom/feed_language_-_atom03_feed_xml_lang.xml b/testdata/translator/atom/feed_language_-_atom03_feed_xml_lang.xml
@@ -0,0 +1,5 @@
+<!--
+Description: feed language
+-->
+<feed version="0.3" xmlns="http://purl.org/atom/ns#" xml:lang="en">
+</feed>
diff --git a/testdata/translator/atom/feed_language_-_atom10_feed_xml_lang.json b/testdata/translator/atom/feed_language_-_atom10_feed_xml_lang.json
@@ -0,0 +1,6 @@
+{
+    "language": "en",
+    "items": [],
+    "feedType": "atom",
+    "feedVersion": "1.0"
+}
diff --git a/testdata/translator/atom/feed_language_-_atom10_feed_xml_lang.xml b/testdata/translator/atom/feed_language_-_atom10_feed_xml_lang.xml
@@ -0,0 +1,5 @@
+<!--
+Description: feed language
+-->
+<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en">
+</feed>