Changeset 1019

Timestamp:

12/05/07 09:24:22

Author:

piv

Message:

version 1.4.0

Files:

• qSEOptimizer/trunk/HISTORY.txt (modified) (1 diff)
• qSEOptimizer/trunk/TODO.txt (modified) (1 diff)
• qSEOptimizer/trunk/adapters.py (modified) (2 diffs)
• qSEOptimizer/trunk/browser/keywords.py (modified) (4 diffs)
• qSEOptimizer/trunk/skins/qSEOptimizer/2.5.4-final (added)
• qSEOptimizer/trunk/skins/qSEOptimizer/2.5.4-final/header.pt (added)
• qSEOptimizer/trunk/tests/testQSEOptimizer.py (modified) (3 diffs)
• qSEOptimizer/trunk/version.txt (modified) (1 diff)

qSEOptimizer/trunk/HISTORY.txt

@@ +1 @@
+1.4.0
+
+    * added layer for plone 2.5.4 version
+    
+    * refactored additional keywords adapter (now lynx is required)
+    
+    * fixed sorting of keywords in keywords meta tag
+
-1.3.0
-

qSEOptimizer/trunk/TODO.txt

@@ -1 +1 @@
-Future
-
+  * 3 tests failures (lynx require running of a real host)
+
-  * Generic Setup integration for skin layers

qSEOptimizer/trunk/adapters.py

@@ +1 @@
+import re, commands
-from zope.interface import implements
-from Products.CMFCore.utils import getToolByName
@@ -13 +14 @@
-        portal_props = getToolByName(self.context, 'portal_properties')
-        seo_props = getToolByName(portal_props, 'seo_properties')
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return ', '.join(keywords)

qSEOptimizer/trunk/browser/keywords.py

@@ -18 +18 @@
-
-        # extract keywords from text
+        if not text.strip():
+            return _(u'Keywords list is empty!')
+
-        keywords = map(lambda x: x.strip(), text.lower().split('\n'))
-        if not keywords:
@@ -23 +26 @@
-
-        # request html page of context object
-
+'%s?qseo_without_additional_keywords=1' % 
-        #try:
-            #page = urllib.urlopen(url)
@@ -58 +61 @@
-
-        # extract words from url page using lynx browser
-
+.lower()
-        if page_text and page_text != 'sh: lynx: command not found':
-            #page_words = page_text.lower().split()
-.lower()
+
-        else:
-            return _(u'Could not find lynx browser!')
@@ -69 +72 @@
-        added = {}
-        for keyword in keywords:
-
-
+
-                missing.append(keyword)
-                added[keyword] = 1

qSEOptimizer/trunk/tests/testQSEOptimizer.py

@@ -198 +198 @@
-
-    def testDescription(self):
-content="it is description" name="
+name="description" content="it is 
-        self.assert_(m, 'Description not set in')
-
-    def testKeywords(self):
-content="my1|key2" name="keywords
+name="keywords" content="my1|key2
-        self.assert_(m, 'Keywords not set in')
-
-    def testRobots(self):
-content="ALL" name="robots
+name="robots" content="ALL
-        self.assert_(m, 'Robots not set in')
-
-    def testDistribution(self):
-content="Global" name="distribution
+name="distribution" content="Global
-        self.assert_(m, 'Distribution not set in')
-
@@ -223 +223 @@
-    def testCustomMetaTags(self):
-        for tag in custom_metatags:
-content="%(meta_content)s" name="%(meta_name
+name="%(meta_name)s" content="%(meta_content
-            self.assert_(m, "Custom meta tag %s not applied." % tag['meta_name'])
-
@@ -342 +342 @@
-        self.html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
-
-content=".*?" name="DC.format" />', self.html, re.S|re.M) and re.match('.*<meta content=".*?" name="DC.distribution
+name="DC.format" content=".*?" />', self.html, re.S|re.M) and re.match('.*<meta name="DC.distribution" content=".*?
-
-        self.assert_(m, 'DC meta tags not avaliable when createManager=True')

qSEOptimizer/trunk/version.txt

@@ -1 @@
-3
+4