Changeset 2415 in products for quintagroup.plonegooglesitemaps

Timestamp:

May 31, 2010 4:30:47 PM (14 years ago)

Author:

mylan

Message:

#131: Update default fallback values for news-sitemaps. Added tests for minimal news item object

Location:

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps

Files:

• browser/newssitemapview.py (modified) (2 diffs)
• browser/templates/newssitemapview.pt (modified) (1 diff)
• tests/testNewsSitemaps.py (modified) (2 diffs)

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/newssitemapview.py

@@ -3 +3 @@
 from commonview import *
 from zope.component import getMultiAdapter
+from plone.memoize.view import memoize
 
 reTrailingParenthtical = re.compile("\s*\(.*\)\s*", re.S)
@@ -12 +13 @@
     implements(ISitemapView)
 
-    additional_maps = (
-        ('publication_date', lambda x:DateTime(x.EffectiveDate).strftime("%Y-%m-%d")),
-        ('keywords', lambda x:', '.join(x.Subject)),
-        ('title', lambda x:x.Title),
-        ('name', lambda x:reTrailingParenthtical.sub("",x.Title)),
-        ('language', lambda x:x.Language),
-        ('access', lambda x:x.gsm_access),
-        ('genres', lambda x:x and ", ".join(x.gsm_genres) or ""),
-    )
+    @property
+    def additional_maps(self):
+        import pdb;pdb.set_trace()
+        return (
+            ('publication_date', lambda x:DateTime(x.EffectiveDate).strftime("%Y-%m-%d")),
+            ('keywords', lambda x:', '.join(x.Subject)),
+            ('title', lambda x:x.Title or x.getId or x.id),
+            ('name', lambda x:reTrailingParenthtical.sub("",x.Title)),
+            ('language', lambda x:x.Language or self.default_language()),
+            ('access', lambda x:x.gsm_access or ""),
+            ('genres', lambda x:x and ", ".join(x.gsm_genres) or ""),
+        )
+
+    @memoize
+    def default_language(self):
+        pps = getMultiAdapter((self.context, self.request), name="plone_portal_state")
+        return pps.default_language
 
     def getFilteredObjects(self):

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/templates/newssitemapview.pt

@@ -19 +19 @@
         <n:publication_date tal:content="result/publication_date">2006-08-14</n:publication_date>
         <n:title tal:content="result/title">Full title of the news item</n:title>
-        <n:keywords tal:content="result/keywords">Business, Mergers, Acquisitions</n:keywords>
+        <n:keywords tal:condition="result/keywords" tal:content="result/keywords">
+          Business, Mergers, Acquisitions</n:keywords>
     </n:news>
   </url>

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/tests/testNewsSitemaps.py

@@ -108 +108 @@
         self.reParse()
         self.assertNotEqual("n:genres" in self.start.keys(), True)
+
+
+class TestNewsSitemapsXMLDefaultObject(FunctionalTestCase):
+
+    def afterSetUp(self):
+        super(TestNewsSitemapsXMLDefaultObject, self).afterSetUp()
+        # Create news sitemaps 
+        _createObjectByType("Sitemap", self.portal, id="news-sitemaps",
+                            sitemapType="news", portalTypes=("News Item",))
+        self.portal["news-sitemaps"].at_post_create_script()
+        # Add minimal testing news item to portal
+        self.pubdate = (DateTime()+1).strftime("%Y-%m-%d")
+        my_news = self.portal.invokeFactory("News Item", id="my_news")
+        self.my_news = self.portal["my_news"]
+        self.my_news.edit(effectiveDate=self.pubdate)
+        self.portal.portal_workflow.doActionFor(self.my_news, "publish")
+        self.reParse()
+
+    def reParse(self):
+        # Parse news sitemap
+        self.sitemap = self.publish("/"+self.portal.absolute_url(1) + "/news-sitemaps",
+                                    "%s:%s" % (portal_owner, default_password)).getBody()
+        parsed_sitemap = parse(self.sitemap)
+        self.start = parsed_sitemap["start"]
+        self.data = parsed_sitemap["data"]
+
+    def test_nnews(self):
+        self.assert_("n:news" in self.start.keys())
+        
+    def test_npublication(self):
+        open("/tmp/news.sm.xml", "w").write(self.sitemap)
+        self.assert_("n:publication" in self.start.keys())
+        self.assert_("n:name" in self.start.keys())
+        self.assert_("my_news" in self.data, "No 'First news' in data")
+        self.assert_("n:language" in self.start.keys())
+        self.assert_("en" in self.data, "No 'en' in data")
+
+    def test_npublication_date(self):
+        self.assert_("n:publication_date" in self.start.keys())
+        self.assert_(self.pubdate in self.data, "No %s in data" % self.pubdate)
+        
+    def test_ntitle(self):
+        self.assert_("n:title" in self.start.keys())
+        self.assert_("my_news" in self.data, "No 'First news (test)' in data")
+
+    def test_no_naccess(self):
+        self.assert_("n:access" not in self.start.keys())
+
+    def test_no_ngenres(self):
+        self.assert_("n:genres" not in self.start.keys())
+
+    def test_no_keywords(self):
+        self.assert_("n:keywords" not in self.start.keys())
 
 
@@ -148 +201 @@
     suite = TestSuite()
     suite.addTest(makeSuite(TestNewsSitemapsXML))
+    suite.addTest(makeSuite(TestNewsSitemapsXMLDefaultObject))
     suite.addTest(makeSuite(TestSchemaExtending))
     return suite