Changeset 556

Timestamp:

09/29/06 12:02:22

Author:

mylan

Message:

Update to rev. [555] (svn merge -r 191:555 http://svn.quintagroup.com/products/SimpleBlog/branches/plone-2.1-Blogging-APIs)

Files:

• SimpleBlog/trunk/Blog.py (modified) (6 diffs)
• SimpleBlog/trunk/BlogEntry.py (modified) (5 diffs)
• SimpleBlog/trunk/BloggerAPI.py (copied) (copied from SimpleBlog/branches/plone-2.1-Blogging-APIs/BloggerAPI.py)
• SimpleBlog/trunk/Extensions/Install.py (modified) (5 diffs)
• SimpleBlog/trunk/Extensions/utils.py (modified) (1 diff)
• SimpleBlog/trunk/MetaWeblogAPI.py (copied) (copied from SimpleBlog/branches/plone-2.1-Blogging-APIs/MetaWeblogAPI.py)
• SimpleBlog/trunk/MovableTypeAPI.py (copied) (copied from SimpleBlog/branches/plone-2.1-Blogging-APIs/MovableTypeAPI.py)
• SimpleBlog/trunk/SimpleBlogTool.py (modified) (2 diffs)
• SimpleBlog/trunk/TrackbackWorkflow.py (modified) (1 diff)
• SimpleBlog/trunk/__init__.py (modified) (2 diffs)
• SimpleBlog/trunk/config.py (modified) (1 diff)
• SimpleBlog/trunk/skins/SimpleBlog/SimpleBlog_macros.pt (modified) (13 diffs)
• SimpleBlog/trunk/skins/SimpleBlog/blogentry_view.pt (modified) (2 diffs)
• SimpleBlog/trunk/skins/SimpleBlog/delicious.gif (copied) (copied from SimpleBlog/branches/plone-2.1-Blogging-APIs/skins/SimpleBlog/delicious.gif)
• SimpleBlog/trunk/skins/SimpleBlog/digg.gif (copied) (copied from SimpleBlog/branches/plone-2.1-Blogging-APIs/skins/SimpleBlog/digg.gif)
• SimpleBlog/trunk/skins/SimpleBlog/google.gif (copied) (copied from SimpleBlog/branches/plone-2.1-Blogging-APIs/skins/SimpleBlog/google.gif)
• SimpleBlog/trunk/skins/SimpleBlog/portlet_simpleblog.pt (modified) (2 diffs)
• SimpleBlog/trunk/skins/SimpleBlog/spurl.gif (copied) (copied from SimpleBlog/branches/plone-2.1-Blogging-APIs/skins/SimpleBlog/spurl.gif)
• SimpleBlog/trunk/skins/SimpleBlog/yahoo.gif (copied) (copied from SimpleBlog/branches/plone-2.1-Blogging-APIs/skins/SimpleBlog/yahoo.gif)
• SimpleBlog/trunk/util.py (modified) (1 diff)
• SimpleBlog/trunk/version.txt (modified) (1 diff)
• SimpleBlog/trunk/xmlrpcMonkeyPatch.py (copied) (copied from SimpleBlog/branches/plone-2.1-Blogging-APIs/xmlrpcMonkeyPatch.py)

SimpleBlog/trunk/Blog.py

@@ -6 +6 @@
-import Permissions
-from Products.CMFCore.utils import getToolByName
+
+import MetaWeblogAPI
+import BloggerAPI
+import MovableTypeAPI
+
-
-schema = BaseFolderSchema +  Schema((
@@ -84 +89 @@
-                                       description_msgid="help_allow_trackback",),
-               ),
+    # used to be new trackbaks notification email address
-    StringField('adminEmail',
-                accessor = 'getAdminEmail',
@@ -93 +99 @@
-                                    description_msgid="help_adminEmail",
-                                    i18n_domain="SimpleBlog",
-
+ # this line have to be removed in order to be visible/editable
-                                    description="Enter administrator's email for receaving notification about blog's activity"),
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    #BooleanField('allowComments',
-    #              default = 1,
@@ -122 +168 @@
-    global_allow=1
-    schema=schema
+
+    blogger = None
+    metaWeblog = None
-    
-    content_icon='simpleblog_icon.gif'
@@ -140 +189 @@
-          'visible':0})
-
+    def initializeArchetype(self, **kwargs):
+        BaseFolder.initializeArchetype(self, **kwargs)
+        RPCAuth = self.simpleblog_tool.findRPCAuth(self)
+
+        # Setup the MetaWeblog API
+        self.metaWeblog = MetaWeblogAPI.MetaWeblogAPI().__of__(self)
+        self.metaWeblog.setupRPCAuth(RPCAuth)
+        
+        # Setup the Blogger API
+        self.blogger = BloggerAPI.BloggerAPI().__of__(self)
+        self.blogger.setupRPCAuth(RPCAuth)
+
+        # Setup the MovableTypeAPI API
+        self.mt = MovableTypeAPI.MovableTypeAPI().__of__(self)
+        self.mt.setupRPCAuth(RPCAuth)    
+
-    def manage_afterAdd(self, item, container):
-        BaseFolder.manage_afterAdd(self, item, container)
@@ -170 +235 @@
-        return val
-
+    def listCategories(self):
+        cats=self.getCategories()
+           
+        # add the global categories
+        for c in self.simpleblog_tool.getGlobalCategories():
+            if not c in cats:
+                cats.append(c)           
+        cats = list(cats)
+        cats.sort()
+        return tuple(cats)                
+
-registerType(Blog)
-

SimpleBlog/trunk/BlogEntry.py

@@ -16 +16 @@
-import sys
-from util import *
+from config import DIGG_TOPICS
-
-schema  =  BaseFolderSchema +  Schema((
@@ -97 +98 @@
-                           i18n_domain = "SimpleBlog",
-                           description = 'Controls if the Entry (when published) shown as the first Entry. If not checked, the effective date is used.')),
-
-    LinesField('sendTrackBackURLs',
-               languageIndependent = True,
@@ -107 +107 @@
-                                  i18n_domain = "plone")),
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    ))
-
@@ -251 +288 @@
-        parent = self.aq_parent
-        portal = self.portal_url.getPortalObject()
-        
-        while parent != portal:
-           if parent.portal_type == 'Blog':
@@ -259 +295 @@
-        return tuple(tags)
-
+    def listAdesnceTemplates(self):
+        """ return list of available adsence blocks """
+        pp = getToolByName(self, 'portal_properties')
+        templates = ()
+        try:
+            templates = pp.simpleblog_properties.getProperty('adsence_templates',())
+        except:
+            pass
+        return templates
+
-registerType(BlogEntry)

SimpleBlog/trunk/Extensions/Install.py

@@ -6 +6 @@
-
-from Products.SimpleBlog.config import *
+
+from Products.SimpleBlog import MetaWeblogAPI
+from Products.SimpleBlog import BloggerAPI
+from Products.SimpleBlog import MovableTypeAPI
-
-portlets=['here/portlet_simpleblog/macros/portletBlogFull_local', 
@@ -37 +41 @@
-        site_props._updateProperty('use_folder_tabs', tuple(use_folder_tabs) + ('Blog','BlogFolder','BlogEntry'))
-    
+    if not portal.hasProperty('trackback_notification_email'):
+        portal.manage_addProperty('trackback_notification_email', '', 'string')
+    
-    # check for property use_folder_contents. This property seems not to be always there:
-    if not site_props.hasProperty('use_folder_contents'):
-        site_props.manage_addProperty('use_folder_contents', '', 'lines')
-
+
-    use_folder_contents = site_props.getProperty('use_folder_contents')
-    if not 'Blog' in use_folder_contents:
-        site_props._updateProperty('use_folder_contents', tuple(use_folder_contents) + ('Blog','BlogFolder', 'BlogEntry'))
-       
+
-    # discussion enabled by default for BlogEntries
-    getToolByName(self, 'portal_types').BlogEntry.allow_discussion=1
@@ -70 +77 @@
-    
-    add_workflow(self, 'simpleblog_workflow', 'simpleblog_workflow (Workflow for Blog Entries)', ('BlogEntry',), out)
-        
+
-
-    from Products.SimpleBlog import TrackbackWorkflow
@@ -77 +84 @@
-    add_workflow(self, 'trackback_workflow', 'trackback_workflow (TrackBack Workflow)', ('TrackBack',), out)
-    wf_tool.setChainForPortalTypes( ('TrackBack'), 'trackback_workflow') 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    print >> out, "Successfully installed %s." % PROJECTNAME
-    return out.getvalue()
@@ -93 +117 @@
-        wf_tool.setChainForPortalTypes(types, wf_id)
-    out.write('Added workflow "%s"\n'%wf_id)
+
+def installRPCAuth(self):
+    if not hasattr(self, 'RPCAuth'):
+        try:
+            self.manage_addProduct['RPCAuth'].manage_addRPCAuth('RPCAuth')
+        except:
+            raise "An RPCAuth instance could not be created.  Please make sure RPCAuth is installed correctly."
-
-

SimpleBlog/trunk/Extensions/utils.py

@@ -29 +29 @@
-            pass
-
+
+from Products.SimpleBlog import MetaWeblogAPI
+from Products.SimpleBlog import BloggerAPI
+from Products.SimpleBlog import MovableTypeAPI
+
+def migrateToAPIs(self):
+    """ migrate existing SimpleBlog instance to support BloggingAPIs """
+    RPCAuth = self.simpleblog_tool.findRPCAuth(self)
+    # Setup the MetaWeblog API
+    self.metaWeblog = MetaWeblogAPI.MetaWeblogAPI().__of__(self)
+    self.metaWeblog.setupRPCAuth(RPCAuth)
+    # Setup the Blogger API
+    self.blogger = BloggerAPI.BloggerAPI().__of__(self)
+    self.blogger.setupRPCAuth(RPCAuth)
+    # Setup the MovableTypeAPI API
+    self.mt = MovableTypeAPI.MovableTypeAPI().__of__(self)
+    self.mt.setupRPCAuth(RPCAuth)    

SimpleBlog/trunk/SimpleBlogTool.py

@@ -6 +6 @@
-from Products.CMFCore import CMFCorePermissions
-import zLOG,os
-
+
+
-import calendar
-calendar.setfirstweekday(6) #start day  Mon(0)-Sun(6)
@@ -32 +33 @@
-        self.manage_addProperty('showIcons', 1,'boolean')
-
+    security.declarePublic('getByUID')
+    def getByUID(self, uid):
+        "Shortcut method for the [Blogger,MetaWeblog]API code"
+
+        uid_catalog = getToolByName(self, 'uid_catalog')
+        lazy_cat = uid_catalog(UID=uid)
+        o = lazy_cat[0].getObject()
+        return o
+
+    security.declarePublic('findRPCAuth')
+    def findRPCAuth(self, parent):
+        while hasattr(parent,'aq_parent'):
+            RPCAuths = parent.objectValues('RPC Auth')
+            for RPCAuth in RPCAuths:
+                return RPCAuth
+            parent = parent.aq_parent
+        return None    
+    
+    security.declarePublic('idFromTitle')
+    def idFromTitle(self, title):
+        id = re.sub('[^A-Za-z0-9_]', '', re.sub(' ', '_', title)).lower()
+        return id        
-
-    def _getState(self):

SimpleBlog/trunk/TrackbackWorkflow.py

@@ -117 +117 @@
-    tdef = wf.transitions['retract']
-    tdef.setProperties(title="""Member retracts published item""",
-draft
+pending
-                       trigger_type=1,
-                       script_name="""""",

SimpleBlog/trunk/__init__.py

@@ -10 +10 @@
-from Globals import InitializeClass
-
+import xmlrpcMonkeyPatch
-
-registerDirectory(SKINS_DIR, GLOBALS)
@@ -18 +19 @@
-    from AccessControl import ModuleSecurityInfo, allow_module
-    ModuleSecurityInfo('Products.SimpleBlog.util').declarePublic('addTrackBack')
+    ModuleSecurityInfo('Products.SimpleBlog.util').declarePublic('encodeURLData')
-
-    #allow_module('Products.SimpleBlog.Extensions.utils')

SimpleBlog/trunk/config.py

@@ -11 +11 @@
-    ('descriptionOnly', 'Description only', 'display_description_only'), 
-    ('titleOnly', 'Title only', 'display_title_only') ))
+
+DIGG_TOPICS = DisplayList(( \
+     ('apple', 'Technology:Apple') \
+    ,('design', 'Technology:Design') \
+    ,('gadgets', 'Technology:Gadgets') \
+    ,('hardware', 'Technology:Hardware') \
+    ,('tech_news', 'Technology:Industry News') \
+    ,('linux_unix', 'Technology:Linux/Unix') \
+    ,('mods', 'Technology:Mods') \
+    ,('programming', 'Technology:Programming') \
+    ,('security', 'Technology:Security') \
+    ,('software', 'Technology:Software') \
+    ,('tech_deals', 'Technology:Tech Deals') \
+    ,('space', 'Science:Space') \
+    ,('environment', 'Science:Environment') \
+    ,('health', 'Science:Health') \
+    ,('general_sciences', 'Science:General Sciences') \
+    ,('business_finance', 'World & Business:Business Finance') \
+    ,('politics', 'World & Business:Political News') \
+    ,('political_opinion', 'World & Business:Political Opinion') \
+    ,('world_news', 'World & Business:World News') \
+    ,('offbeat_news', 'World & Business:Offbeat News') \
+    ,('baseball', 'Sports:Baseball') \
+    ,('basketball', 'Sports:Basketball') \
+    ,('extreme_sports', 'Sports:Extreme Sports') \
+    ,('football', 'Sports:Football - US/Canada') \
+    ,('golf', 'Sports:Golf') \
+    ,('hockey', 'Sports:Hockey') \
+    ,('motorsport', 'Sports:Motorsport') \
+    ,('soccer', 'Sports:Soccer') \
+    ,('tennis', 'Sports:Tennis') \
+    ,('other_sports', 'Sports:Other Sports') \
+    ,('videos_animation', 'Videos:Animation') \
+    ,('videos_comedy', 'Videos:Comedy') \
+    ,('videos_educational', 'Videos:Educational') \
+    ,('videos_gaming', 'Videos:Gaming') \
+    ,('videos_music', 'Videos:Music') \
+    ,('videos_people', 'Videos:People') \
+    ,('videos_sports', 'Videos:Sports') \
+    ,('celebrity', 'Entertainment:Celebrity') \
+    ,('movies', 'Entertainment:Movies') \
+    ,('music', 'Entertainment:Music') \
+    ,('television', 'Entertainment:Television') \
+    ,('gaming_news', 'Gaming:Gaming News') \
+    ,('playable_web_games', 'Gaming:Playable Web Games') \
+)).sortedByValue()

SimpleBlog/trunk/skins/SimpleBlog/SimpleBlog_macros.pt

@@ -4 +4 @@
-<body>
-
+<div metal:define-macro="blogGlobals"
+     tal:define="global fp python:here.simpleblog_tool.getFrontPage(here);
+                 global isDeliciousEnaled fp/isDeliciousEnabled;
+                 global isDiggEnabled fp/isDiggEnabled;
+                 global isYahooEnabled fp/isYahooEnabled;
+                 global isGoogleEnabled fp/isGoogleEnabled;
+                 global isSpurlEnabled fp/isSpurlEnabled;
+                 global isTagsEnabled fp/isTagsEnabled;
+                 global isAllowTrackback fp/getAllowTrackback"
+     tal:omit-tag="">
+</div>
+
-<div metal:define-macro="full" tal:define="showReadMore python:0" class="simpleBlogEntry">
+    <div metal:use-macro="obj/SimpleBlog_macros/macros/blogGlobals"/>
-    <div tal:define="size headerSize | python:1;title obj/title_or_id;
-     showIcons obj
+showIcons fp
-             class="simpleBlogTitle">
-                <tal:x replace='structure string:<h${size} class="noMargin">'/>
@@ -25 +38 @@
-
-<div metal:define-macro="descriptionOnly"  tal:define="showReadMore python:1" class="simpleBlogEntry">
+    <div metal:use-macro="obj/SimpleBlog_macros/macros/blogGlobals"/>
-    <div tal:define="size headerSize | python:1;title obj/title_or_id;
-     showIcons obj
+showIcons fp
-             class="simpleBlogTitle">
-                <tal:x replace='structure string:<h${size} class="noMargin">'/>
@@ -44 +58 @@
-
-<div metal:define-macro="titleOnly" tal:define="showReadMore python:1" class="simpleBlogTitle">
+    <div metal:use-macro="obj/SimpleBlog_macros/macros/blogGlobals"/>
-    <tal:block tal:define="size headerSize | python:1;title obj/title_or_id;
-       showIcons obj
+showIcons fp
-                <tal:x replace='structure string:<h${size} class="noMargin">'/>
-            <a href="" tal:attributes="href obj/absolute_url" style="cursor:pointer;">
@@ -58 +73 @@
-</div>
-
-
+
+
-     <span i18n:translate="blog_by_line">
-    Submitted by 
@@ -71 +87 @@
-                <strong><a href="#" 
-                           tal:define="quotedCat python:pss.url_quote(cat)"
-here/absolute_url}/SimpleBlogCatSearch?category=${quotedCat}" 
+fp/absolute_url}/SimpleBlogCatSearch?category=${quotedCat}"
-                           title="category"><span  tal:omit-tag="" tal:content="cat"/></a></strong>
-           </tal:categories>
@@ -79 +95 @@
-
-<div metal:define-macro="technoratiTags"
-
-
+
+
+
-     tal:omit-tag="">
-     _____<br/>
@@ -97 +114 @@
-    <tal:x define="allowed python:obj.portal_discussion.isDiscussionAllowedFor(obj);
-                   ccount python:allowed and obj.portal_discussion.getDiscussionFor(obj).replyCount(obj);
-
-
+
+
+
-         <span i18n:translate="blog_by_line">
-         <span tal:define="edate python:obj.simpleblog_tool.getEntryDate(obj)"
@@ -111 +129 @@
-                    <strong><a href="#" 
-                               tal:define="quotedCat python:pss.url_quote(cat)"
-here/absolute_url}/SimpleBlogCatSearch?category=${quotedCat}" 
+fp/absolute_url}/SimpleBlogCatSearch?category=${quotedCat}"
-                               title="category"><span  tal:omit-tag="" tal:content="cat"/></a></strong>
-               </tal:categories>
@@ -128 +146 @@
-         <div tal:condition="tballowed"> trackback URL: &nbsp;
-               <tal:x replace="string:${obj/absolute_url}/sbtrackback"/>
+         </div>
+         <div tal:define="entryURL obj/absolute_url;
+                          entryTitle obj/Title;
+                          entryDescription obj/Description;
+                          entryDiggTopic obj/getDiggTopic;
+                          encodeURLData python:modules['Products.SimpleBlog.util'].encodeURLData;"
+              tal:omit-tag="">
+                <span tal:condition="isDeliciousEnaled | obj/isDeliciousEnabled">
+                   <a href=""
+                      title=""
+                      tal:define="url_data python:encodeURLData({'url':entryURL,'title':entryTitle});"
+                      tal:attributes="href string:http://del.icio.us/post?${url_data};
+                                      title string:del.icio.us: ${entryTitle}">
+                      <img src=""
+                           alt="del.icio.us"
+                           tal:attributes="src string:$portal_url/delicious.gif;" /></a>
+                </span>&nbsp;<span tal:condition="isDiggEnabled | obj/isDiggEnabled">
+                    <a href=""
+                        title=""
+                        tal:define="url_data python:encodeURLData({'phase':'2','url':entryURL,'title':entryTitle,'bodytext':entryDescription,'topic':entryDiggTopic});"
+                        tal:attributes="href string:http://digg.com/submit?${url_data};
+                                        title string:Digg: ${entryTitle}">
+                    <img src=""
+                        alt="Digg"
+                        tal:attributes="src string:$portal_url/digg.gif;" /></a>
+                </span>&nbsp;<span tal:condition="isYahooEnabled | obj/isYahooEnabled">
+                   <a href=""
+                      title=""
+                      tal:define="url_data python:encodeURLData({'u':entryURL,'t':entryTitle});"
+                      tal:attributes="href string:http://myweb2.search.yahoo.com/myresults/bookmarklet?${url_data};
+                                      title string:Yahoo: ${entryTitle}">
+                      <img src=""
+                           alt="Yahoo"
+                           tal:attributes="src string:$portal_url/yahoo.gif;" /></a>
+                </span>&nbsp;<span tal:condition="isGoogleEnabled | obj/isGoogleEnabled">
+                   <a href=""
+                      title=""
+                      tal:define="url_data python:encodeURLData({'op':'edit','output':'popup','bkmk':entryURL,'title':entryTitle});"
+                      tal:attributes="href string:http://www.google.com/bookmarks/mark?${url_data};
+                                      title string:Google: ${entryTitle}">
+                      <img src=""
+                           alt="Google"
+                           tal:attributes="src string:$portal_url/google.gif;" /></a>
+                </span>&nbsp;<span tal:condition="isSpurlEnabled | obj/isSpurlEnabled">
+                   <a href=""
+                      title=""
+                      tal:define="url_data python:encodeURLData({'url':entryURL,'title':entryTitle});"
+                      tal:attributes="href string:http://www.spurl.net/spurl.php?${url_data};
+                                      title string:Spurl: ${entryTitle}">
+                      <img src=""
+                           alt="Spurl"
+                           tal:attributes="src string:$portal_url/spurl.gif;" /></a>
+                </span>
-         </div>
-
@@ -195 +266 @@
-
-<!-- macro used by the portlets to compile a list of available categories -->
-
+
+
+
-    <tal:toggle tal:define="global toggle python:toggle or 0"/>
+    <dd tal:attributes="class python:test(toggle, 'portletItem even', 'portletItem odd')">
+        <strong i18n:translate="blog_categories">Categories:</strong>
+        <tal:toggle tal:define="global toggle python:test(toggle==1,0,1)"/>
+    </dd>
-    <tal:cats tal:repeat="cat python:here.simpleblog_tool.getSortedKeys(cats)">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    </tal:cats>
-</div>
-
-<!-- macro used by the portlets to compile a list of recent additions -->
-
-
+
+
+
+
+
+
+
+
+
-        <tal:entries tal:repeat="entry recent">
-
-
-
-
-
-
-
-
-
-
-
-
+
-            <a href="#" 
-                           tal:attributes="href entry/getURL;" 
@@ -238 +307 @@
-                           <span tal:content="python:entry.Title or entry.getId"/>
-                        </a>
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        <tal:toggle tal:define="global toggle python:test(toggle==1,0,1)"/>
-
-
-
-
-
-
-
-
+
-</div>
-
@@ -263 +331 @@
-     tal:define="DateTime python:modules['DateTime'].DateTime;
-                 current python:DateTime();
-
-
+
+
+
+
+
+
+
-                 prevMonthTime python:here.getPreviousMonth(month, year);
-                 nextMonthTime python:here.getNextMonth(month, year);
-                 weeks python:here.simpleblog_tool.getEventsForCalendar(month=month, year=year, context=here);
-
-
+
+
+
+
+
-                 published_state python:here.simpleblog_tool.getPublishedState()"
-    i18n:domain="plone">
@@ -278 +354 @@
-            <tr>
-                <th id="calendar-previous">
-
+
+
+
+
+
-                </th>
-
-
+
-                    <span i18n:translate="" tal:omit-tag="">
-
-
-
-
-
-
-
+
+
+
+
+
+
-                        <span i18n:name="year"
-                              tal:define="year python:DateTime(date).year()"
-                              tal:content="string:$year"
-                              tal:attributes="id string:calendar-year-$year;"
-
+
+
-                    </span>
-
-
-
+
+
+
+
+
+
+
-                </th>
-            </tr>
-
-
-
-
+
+
+
+
+
-            </tr>
-        </thead>

SimpleBlog/trunk/skins/SimpleBlog/blogentry_view.pt

@@ -15 +15 @@
-        <tal:block tal:define="obj python:here">
-
-
-               
-
-                       </