Changeset 1781 in products

Timestamp:

Feb 18, 2010 6:22:12 PM (14 years ago)

Author:

liebster

Message:

Kill accessors usage in 'metatags order' property

Location:

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer

Files:

• adapters.py (modified) (2 diffs)
• profiles/default/propertiestool.xml (modified) (1 diff)
• tests/testQSEOptimizerResponse.py (modified) (1 diff)

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/adapters.py

@@ -11 +11 @@
 from quintagroup.seoptimizer.interfaces import IMetaKeywords, IMappingMetaTags
 
+METADATA_MAPS = dict([
+    ("DC.publisher", "Publisher"),
+    ("DC.description", "Description"),
+    ("DC.contributors", "Contributors"),
+    ("DC.creator", "Creator"),
+    ("DC.format", "Format"),
+    ("DC.rights", "Rights"),
+    ("DC.language", "Language"),
+    ("DC.date.modified", "ModificationDate"),
+    ("DC.date.created", "CreationDate"),
+    ("DC.type", "Type"),
+    ("DC.subject", "Subject"),
+    ("DC.distribution", "seo_distribution"),
+    ("description", "seo_description"),
+    ("keywords", "meta_keywords"),
+    ("robots", "seo_robots"),
+    ("distribution", "seo_distribution")])
 
 class MetaKeywordsAdapter(object):
@@ -45 +62 @@
         metadata_name = SortedDict()
         if self.seo_props:
-            pmn = self.seo_props.getProperty('metatags_order')
-            pmn = pmn and pmn or ''
-            for mt in [mt.split(' ') for mt in pmn if len(mt.split(' '))==2]:
-                metadata_name[mt[0]] = mt[1]
+            pmn = self.seo_props.getProperty('metatags_order', ())
+            for mt in pmn:
+                if METADATA_MAPS.has_key(mt):
+                    metadata_name[mt] = METADATA_MAPS[mt]
         return metadata_name
 

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/profiles/default/propertiestool.xml

@@ -70 +70 @@
   <property name="default_custom_metatags" type="lines" purge='False'/>
   <property name="metatags_order" type="lines" purge='False'>
-   <element value="DC.publisher Publisher"/>
-   <element value="DC.description Description"/>
-   <element value="DC.contributors Contributors"/>
-   <element value="DC.creator Creator"/>
-   <element value="DC.format Format"/>
-   <element value="DC.rights Rights"/>
-   <element value="DC.language Language"/>
-   <element value="DC.date.modified ModificationDate"/>
-   <element value="DC.date.created CreationDate"/>
-   <element value="DC.type Type"/>
-   <element value="DC.subject Subject"/>
-   <element value="DC.distribution seo_distribution"/>
-   <element value="description seo_description"/>
-   <element value="keywords meta_keywords"/>
-   <element value="robots seo_robots"/>
-   <element value="distribution seo_distribution"/>
+   <element value="DC.publisher"/>
+   <element value="DC.description"/>
+   <element value="DC.contributors"/>
+   <element value="DC.creator"/>
+   <element value="DC.format"/>
+   <element value="DC.rights"/>
+   <element value="DC.language"/>
+   <element value="DC.date.modified"/>
+   <element value="DC.date.created"/>
+   <element value="DC.type"/>
+   <element value="DC.subject"/>
+   <element value="DC.distribution"/>
+   <element value="description"/>
+   <element value="keywords"/>
+   <element value="robots"/>
+   <element value="distribution"/>
   </property>
  </object>

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests/testQSEOptimizerResponse.py

@@ -85 +85 @@
 
     def testTagsOrder(self):
-        mtop = self.sp.getProperty('metatags_order')
-        metatags_order = [t.split(' ')[0] for t in mtop if len(t.split(' '))==2 and t.split(' ')[0] in VIEW_METATAGS]
+        metatags_order = [t for t in self.sp.getProperty('metatags_order') if t in VIEW_METATAGS]
         m = re.search('.*'.join(['<meta.*name="%s".*/>' %t for t in metatags_order]), self.html, re.S|re.M)
-        #m = re.match('.*'.join(['.*(<meta\s+(?:(?:name="%s"\s*)|(?:content=".*"\s*)){2}/>)' %t for t in metatags_order]), self.html, re.S|re.M)
         self.assert_(m, "Meta tags order not supported.")
 
-        mtop = list(mtop)
-        mtop.reverse()
-        metatags_order = [t.split(' ')[0] for t in mtop if len(t.split(' '))==2 and t.split(' ')[0] in VIEW_METATAGS]
+        metatags_order.reverse()
         m = re.search('.*'.join(['<meta.*name="%s".*/>' %t for t in metatags_order]), self.html, re.S|re.M)
         self.assertFalse(m, "Meta tags order not supported.")
 
-        self.sp.manage_changeProperties(**{'metatags_order':tuple(mtop)})
+        self.sp.manage_changeProperties(**{'metatags_order':metatags_order})
         html = self.publish(self.abs_path, self.basic_auth).getBody()
         m = re.search('.*'.join(['<meta.*name="%s".*/>' %t for t in metatags_order]), self.html, re.S|re.M)