@@ -122,9 +122,12 @@ class ServiceController(BaseController):
@requires_role('admin')
def appeditform(self,id=0):
- c.item = App.get(-1,id)
- if not (c.item.list_public or (c.user and c.user.site_id == c.item.site_id)):
- c.item = None
+ if id == 0 or id == None or id == '0':
+ c.item = App()
+ else:
+ c.item = App.get(-1,id)
+ if not (c.item.list_public or (c.user and c.user.site_id == c.item.site_id)):
+ c.item = None
return render('/service/app_edit.html')
@requires_role('admin')
@@ -140,7 +143,7 @@ class ServiceController(BaseController):
else:
app = App.get(site.id,id)
- app.slug = slugify(sanitize(request.POST['app_name']))
+ app.slug = sanitize(request.POST['real_permalink2'])
app.name = sanitize(request.POST['app_name'])
app.authn = sanitize(request.POST['authn'])
app.description = sanitize(request.POST['description'])
demisauce/trunk/demisauce/controllers/service.py
@@ -99,51 +99,50 @@ app = '''
"name": "demisauce.com",
"list_public" : "1",
"slug": "demisauce",
- "url_format":"{base_url}/api/{format}/{service}/{key}?apikey={api_key}",
"base_url": "http://localhost:4951",
- "authn": "0"
+ "authn": "demisauce"
},{
"site_id": "1",
"owner_id": "1",
"name": "demisauce.com alternate api",
- "slug": "demisauce",
+ "slug": "demisaucealt",
"base_url": "http://localhost:4951",
- "authn": "0"
+ "authn": "demisauce"
},{
"site_id": "2",
"owner_id": "3",
"name": "djangodemo",
"slug": "djangodemo",
"base_url": "http://djangodemo.test:8001",
- "authn": "3"
+ "authn": "none"
},{
"site_id": "3",
"owner_id": "4",
"name": "phpdemo",
"slug": "phpdemo",
"base_url": "http://demisauce.test",
- "authn": "3"
+ "authn": "none"
},{
"site_id": "1",
"owner_id": "1",
"name": "wordpress",
"slug": "wordpress",
- "base_url": "http://192.168.125.133/blog/xmlrpc.php",
- "authn": "3"
+ "base_url": "http://192.168.0.106/blog/xmlrpc.php",
+ "authn": "xmlrpc"
},{
"site_id": "1",
"owner_id": "1",
"name": "delicious.com",
"slug": "deliciouscom",
"base_url": "http://delicious.com",
- "authn": "3"
+ "authn": "none"
},{
"site_id": "1",
"owner_id": "1",
"name": "delicious feeds",
"slug": "deliciousfeeds",
"base_url": "http://feeds.delicious.com",
- "authn": "3"
+ "authn": "none"
}]
}'''
@@ -157,6 +156,7 @@ service = '''
"owner_id": "1",
"list_public": "1",
"name": "Poll Html Service",
+ "method_url": "/api/{format}/poll/{key}?apikey={api_key}",
"key": "poll",
"views": "",
"description": "Simple Polls, embeddable within your application"
@@ -166,6 +166,7 @@ service = '''
"owner_id": "1",
"list_public": "1",
"name": "Comment Html Service",
+ "method_url": "/api/{format}/comment/{key}?apikey={api_key}",
"key": "comment",
"views": "",
"description": "Comment html and form "
@@ -175,7 +176,7 @@ service = '''
"owner_id": "1",
"list_public": "1",
"name": "Email Template service",
- "method_url": "{base_url}/api/xml/email/{key}?apikey={api_key}",
+ "method_url": "/api/xml/email/{key}?apikey={api_key}",
"key": "email",
"format": "xml",
"description": "Email template"
@@ -220,9 +221,9 @@ service = '''
},{
"site_id": "1",
"app_id": "5",
- "owner_id": "4",
+ "owner_id": "1",
"name": "Wordpress content service",
- "method_url": "blog/xmlrpc.php",
+ "method_url": "metaWeblog.getRecentPosts",
"key": "wordpress",
"format": "xmlrpc",
"views": "",
demisauce/trunk/demisauce/fixture.py
@@ -19,6 +19,9 @@ from pylons.controllers.util import redirect_to
import webhelpers.paginate
import math
+def wordpress_page():
+ """Get a wordpress page"""
+ pass
def dspager(qry,perpage=15):
temp = """
demisauce/trunk/demisauce/lib/helpers.py
@@ -34,13 +34,13 @@ class App(ModelBase):
info about service, partly from declatative (in code)
partly from app registration/webadmin, partly config ???
- :name: name of the service
- :description: description of service
+ :name: name of the Application
+ :slug: url/app friendly key for this app
+ :description: description of Application
:base_url: base url of site (http://localhost:4950 if dev etc)
:site: site of this app
:authn: which authN method?
- :cache: where to cache (memcached, config etc)
- :env: [dev,test,prod] (needed??? or ?: leave for later)
+ :list_public: True/False to show publicly for other users and accounts
"""
def __init__(self, **kwargs):
super(App, self).__init__(**kwargs)
demisauce/trunk/demisauce/model/service.py
@@ -44,7 +44,7 @@
<div class="box box2">
<h3 style="">Other Services for ${c.item.name}</h3>
% if c.item is not None and c.item.services:
- ${service.appminilist(c.item.services)}
+ ${service.minilist(c.item.services)}
% endif
</div>
demisauce/trunk/demisauce/templates/service/app.html
@@ -42,6 +42,12 @@
% if c.item:
<div class="box box2">
+ <h3 style="">Other Services for App: ${c.item.app.name}</h3>
+ % if c.item is not None and c.item.app.services:
+ ${service.minilist(c.item.app.services)}
+ % endif
+ </div>
+ <div class="box box2">
<h3 style="">Other Services for ${c.item.site.name}</h3>
% if c.item is not None and c.item.site.services:
${service.minilist(c.item.site.services)}
demisauce/trunk/demisauce/templates/service/service.html
@@ -132,6 +132,17 @@
<label for="app_name">App Name</label>
${h.text_field('app_name', value=(item and item.name) or '', size=40)}
</div>
+ <div class="required" id="permalink_div2" style="display:block;">
+ <label for="slug">Permalink:</label>
+ <span id="permalink2" class="secondary">
+ <span id="editable-slug-span2" title="Click to edit this part of the permalink">${(item and item.slug) or ''}</span>
+ <a href="javascript:void(0)" id="editable-slug-href2">Edit</a>
+ </span>
+ <input type="hidden" size="100" id="permalink2" value="${(item and item.slug) or ''}" />
+ <br />
+ <input type="text" id="real_permalink2" name="real_permalink2"
+ value="${(item and item.slug) or ''}" style="display:none;"/>
+ </div>
<div class="required">
<label for="base_url">Base Url</label>
${h.text_field('base_url', value=(item and item.base_url) or '', size=40)}
@@ -145,7 +156,7 @@
<legend>Auth Method?</legend>
${h.radio_button('authn', 'demisauce',checked=(item and str(item.authn) == 'demisauce'))} demisauce <br />
${h.radio_button('authn', 'oauth',checked=(item and str(item.authn) == 'oauth'))} oauth <br />
- ${h.radio_button('authn', 'CAS',checked=(item and str(item.authn) == 'CAS'))} CAS <br />
+ ${h.radio_button('authn', 'xmlrpc',checked=(item and str(item.authn) == 'xmlrpc'))} xmlrpc <br />
${h.radio_button('authn', 'None',checked=(item and str(item.authn) == 'None'))} None <br />
</fieldset>
</div>
@@ -158,7 +169,11 @@
${h.end_form()}
<script type="text/javascript">
$(document).ready(function(){
-
+ $('#app_form').slugeditor({permalink_sel: '#real_permalink2',
+ permalink_span: '#editable-slug-span2',
+ permalink_edit: '#editable-slug-href2',
+ permalink_div: '#permalink_div2',
+ slugfrom: '#app_name'});
});
</script>
</%def>
@@ -213,6 +228,7 @@
<dt>AuthN:</dt> <dd>${item.app.authn}</dd>
<dt>Service URL:</dt> <dd>${item.method_url or 'na'}</dd>
<dt>View XML:</dt> <dd>${h.link_to('View Xml', "/api/xml/service/%s/%s" % (item.app.slug,item.key))}</dd>
+ <dt>Cache Time:</dt> <dd>${item.cache_time}</dd>
<dt>Description:</dt> <dd>${item.description}</dd>
</dl>
@@ -222,15 +238,13 @@
</%def>
<%def name="app_view(item)">
<dl>
- <dt>Name:</dt> <dd><h3>${item.name}</h3></dd>
+ <dt>Name:</dt> <dd><h3>${item.name}
+ % if c.user and c.user.isadmin and c.user.site_id == item.site_id:
+ ${h.link_to('Edit', h.url(controller="service",action="appeditform", id=item.id))}
+ % endif
+ </h3></dd>
<dt>Slug:</dt> <dd>${item.slug}</dd>
- % if c.user and c.user.isadmin and c.user.site_id == item.site_id:
- <dt>Edit:</dt> <dd>
-
- ${h.link_to('Edit', h.url(controller="service",action="appeditform", id=item.id))}
-
- </dd>
- % endif
+
<dt>Author:</dt> <dd>
% if c.user and c.user.isadmin and c.user.site_id == item.site_id:
${h.link_to(item.owner.displayname, h.url(controller="account",action="viewh", id=item.owner.hashedemail))}
demisauce/trunk/demisauce/templates/service/service_bits.html
@@ -81,7 +81,7 @@ ${h.form(h.url(action='edit'), method='post', id="site_form")}
</div>
<div class="actions">
<input type="submit" class="primary" id="submit" value="Save »">
- <a href="/admin" id="cancelnode">cancel</a>
+ <a href="/site/view" id="cancelnode">cancel</a>
</div>
</div>
demisauce/trunk/demisauce/templates/site/site_edit.html
@@ -37,7 +37,7 @@ def LoadConfig(file, config={}):
def hash_email(email):
return hashlib.md5(email.lower()).hexdigest()
-def UrlFormatter(url_format,sub_dict):
+def args_substitute(url_format,sub_dict):
for k in sub_dict.keys():
if sub_dict[k] is not None:
url_format = url_format.replace('{%s}'%k,sub_dict[k])
@@ -85,28 +85,38 @@ class ServiceDefinition(object):
if base_url == None:
self.base_url = cfg.CFG['demisauce.url']
+ def substitute_args(self,pattern,data={},request=''):
+ """Create a dictionary of all name/value pairs
+ you could reasonably expect to use in substitution"""
+ data.update({"base_url":self.base_url,
+ "format":self.format,
+ "service":self.name,
+ "key":request,
+ "request":request,
+ "app_slug":self.app_slug,
+ "api_key":self.api_key})
+ #print('substituteargs = %s' % (data))
+ return args_substitute(pattern, data)
+
def get_url(self,request):
urlformat = ''
- if self.method_url is not None and self.method_url != "None":
+ if self.format == 'xmlrpc':
+ urlformat = self.base_url
+ elif self.method_url is not None and self.method_url != "None" and \
+ self.method_url.find('{base_url}') < 0:
# use service.method_url not url_format
- urlformat = '{base_url}/%s' % (self.method_url)
+ if self.method_url.find('/') == 0:
+ urlformat = '{base_url}%s' % (self.method_url)
+ else:
+ urlformat = '{base_url}/%s' % (self.method_url)
else:
urlformat = self.url_format
- urlformat = urlformat.replace('//','/')
- d = {}
+ url = ''
try:
- d = {"base_url":self.base_url,
- "format":self.format,
- "service":self.name,
- "method_url":self.method_url,
- "key":request,
- "request":request,
- "app_slug":self.app_slug,
- "api_key":self.api_key}
+ url = self.substitute_args(urlformat,request=request)
except AttributeError, e:
raise RetrievalError('Attribute URL problems')
- #print('urlformat=%s, d=%s' % (urlformat,d))
- return UrlFormatter(urlformat, d)
+ return url
def clone(self):
"""Create a clone of this service definition"""
@@ -144,7 +154,6 @@ class ServiceDefinition(object):
client.use_cache = self.cache
#client.connect()
#client.authorize()
- #print('about to call request= %s/%s' % (self.app_slug, self.name))
response = client.fetch_service(request=('%s/%s' % (self.app_slug, self.name)))
#print response.data
# setup more service definition
@@ -278,9 +287,13 @@ class GAEXMLRPCTransport(object):
class XmlRpcServiceTransport(ServiceTransportBase):
+ def __init__(self, request=None,**kwargs):
+ super(XmlRpcServiceTransport, self).__init__(**kwargs)
+ self.request = request
+
#http://svn.python.org/projects/python/trunk/Lib/xmlrpclib.py
def fetch(self,url,data={},extra_headers={},response=None):
- print 'in xmlrpcservicetransport: %s' % url
+ #print('in xmlrpcservicetransport: %s' % url)
response = response or ServiceResponse()
if openanything.ISGAE == True:
rpc_server = xmlrpclib.ServerProxy(url,
@@ -291,11 +304,22 @@ class XmlRpcServiceTransport(ServiceTransportBase):
#response.data = rpc_server.blogger.getUsersBlogs('','admin','admin')
#response.data = rpc_server.metaWeblog.getRecentPosts(1,'admin', 'admin', 5)
#response.data = getattr(getattr(rpc_server,'metaWeblog'),'getRecentPosts')(1,'admin', 'admin', 5)
- t = tuple([s for s in '1,admin,admin,5'.split(',')])
- response.data = getattr(rpc_server,'metaWeblog.getRecentPosts')(t)
- response.format = 'xmlrpc'
- response.xmlrpc = xmlrpcreflector.parse_result(response.data)
- logging.debug('request successful?')
+ #print('inXmlRpcTransport.fetch data=%s' % (data))
+ #print('inXmlRpcTransport.fetch method_url=%s' % (self.service.method_url))
+ # wp.getPage,{blog_id},{request},{user},{password}
+ args = self.service.substitute_args(self.service.method_url,data=data,request=self.request)
+ args = args.split(',')
+ if len(args) > 0:
+ method = args[0]
+ t = tuple([s for s in args[1:]])
+ #response.data = getattr(rpc_server,'metaWeblog.getRecentPosts')(t)
+ #print('inXmlRpcTransport.fetch args=%s' % (args))
+ response.data = getattr(rpc_server,method)(t)
+ #print('In XmlrpcFetch, data= %s' % (response.data))
+ response.format = 'xmlrpc'
+ response.xmlrpc = xmlrpcreflector.parse_result(response.data)
+ response.success = True
+ #print('exiting xmlrpc.fetch')
return response
@@ -429,14 +453,15 @@ class ServiceClient(ServiceClientBase):
if self.service.format == 'xmlrpc':
log.debug('about to create xmlrpc servicetransport')
- self.transport = XmlRpcServiceTransport()
+ self.transport = XmlRpcServiceTransport(request=request)
self.transport.service = self.service
url = self.service.get_url(request=request)
self.response.url = url
+ #print('About to call fetch_service url= %s' % (url))
cache_key = self.cache_key(url=url)
log.debug('about to check cache for url=%s' % url)
- #print('url = %s' % (url))
if not self.check_cache(cache_key):
+ #print('no cache found')
self.response = self.transport.fetch(url,data=data,extra_headers=self.extra_headers)
if self.response.success:
log.debug('success for service %s, %s' % (self.service.name,cache))
demisaucepy/trunk/demisaucepy/__init__.py
@@ -20,7 +20,7 @@ from demisaucepy import cfg
from demisaucepy.cache import cache
from demisaucepy import demisauce_ws, hash_email, \
ServiceDefinition, ServiceClient, RetrievalError, \
- UrlFormatter
+ args_substitute
DSDEBUG = False
@@ -108,7 +108,7 @@ class ServiceHandler(object):
d = {"app_slug":self.this_app_slug,
"class_name":self.model_instance.__class__.__name__,
"local_key":str(getattr(self.model_instance,self.local_key))}
- return UrlFormatter(self.key_format, d)
+ return args_substitute(self.key_format, d)
def __getattr__(self,get_what):
log.debug('ServiceHandler __getattr__ %s' % (get_what))
demisaucepy/trunk/demisaucepy/declarative.py
@@ -55,6 +55,11 @@ def demisauce_xmlnodes(**kwargs):
raise NotImplementedError
+def wordpress_page(page_id):
+ """wordpress content"""
+
+ return ''
+
def remote_html(resource_id='',routes_dict=None,append_path=False,**kwargs):
"""
Accepts a key of which content is desired
demisaucepy/trunk/demisaucepy/pylons_helper.py
@@ -28,16 +28,6 @@ class TestApi(TestDSBase):
assert email.subject == 'Welcome To Demisauce', 'ensure suject for each node is what we want'
assert email.key == 'welcome_to_demisauce'
assert 'Welcome' in email.template
-
- def test_cmshtmlget(self):
- """
- Test the html get capabilities of cms
- """
- item = demisauce_ws_get('cms','blog',format='html')
- assert item.success == True
- assert item.data
- assert item.data.find('Demisauce Server') >= 0
-
def test_xmlproc(self):
"""
@@ -45,11 +35,25 @@ class TestApi(TestDSBase):
"""
from demisaucepy import cfg
from demisaucepy.cache import cache
- from demisaucepy import demisauce_ws, hash_email, \
- ServiceDefinition, ServiceClient, RetrievalError, \
- UrlFormatter
- #from google.appengine.api import urlfetch
+ from demisaucepy import demisauce_ws, hash_email, ServiceClient, \
+ ServiceDefinition, RetrievalError, args_substitute
+ """{'wp_author': 'admin',
+ 'userid': '1',
+ 'excerpt': '',
+ 'wp_page_parent_id': '0',
+ 'mt_allow_comments': 1,
+ 'text_more': '',
+ 'custom_fields': [{'value': '1', 'id': '2', 'key': '_edit_last'}, {'value': '1232858127', 'id': '1', 'key': '_edit_lock'}],
+ 'wp_author_id': '1',
+ 'title': 'About',
+ 'wp_password': '',
+ 'wp_page_parent_title': '',
+ 'page_id': '2',
+ 'wp_slug': 'about', 'wp_page_order': '0',
+ 'permaLink': 'http://192.168.0.106/blog/about/',
+ 'description': 'This is an example of a <strong>WordPress</strong> page, you could edit this to put information about yourself or your site so readers know where you are coming from. You can create as many pages like this one or sub-pages as you like and manage all of your content inside of WordPress.', 'dateCreated': <DateTime '20090124T12:02:32' at 143cda0>, 'wp_author_display_name': 'admin', 'link': 'http://192.168.0.106/blog/about/', 'page_status': 'publish', 'categories': ['Uncategorized'], 'wp_page_template': 'default', 'mt_allow_pings': 1, 'date_created_gmt': <DateTime '20090124T19:02:32' at 143cfa8>}
+ """
sd = ServiceDefinition(
name='wordpress',
app_slug='wordpress'
@@ -58,11 +62,13 @@ class TestApi(TestDSBase):
sd.method_url = None
#.service_registry = None
#self.api_key = api_key
- sd.base_url = "http://192.168.125.133/blog/xmlrpc.php"
+ #sd.base_url = "http://192.168.0.106/blog/xmlrpc.php"
client = ServiceClient(service=sd)
#client.extra_headers = self.extra_headers
- response = client.fetch_service(request="wp.getPages",data={})
+ response = client.fetch_service(request="2",data={'blog_id':'1','user':'admin','password':'admin'})
+ page = response.model[0]
assert client.service.format == 'xmlrpc'
-
- assert response.model[0].wp_slug == 'demisauce-official-introduction'
+ assert page.wp_author == 'admin'
+ assert page.wp_slug == 'about'
+ #print page.description
demisaucepy/trunk/demisaucepy/tests/test_api.py
@@ -6,6 +6,8 @@ def parse_result(xml_list):
Recursive call to process this dict
"""
result = []
+ if type(xml_list) is dict:
+ xml_list = [xml_list]
for row in xml_list:
if type(row) is not dict and type(row) is not list:
result.append(row)
demisaucepy/trunk/demisaucepy/xmlrpcreflector.py
@@ -184,7 +184,7 @@ then
Alias /blog /home/demisauce/wordpress
<Directory "/home/demisauce/wordpress">
- AllowOverride None
+ AllowOverride All
Order allow,deny
Allow from all
</Directory>
@@ -193,7 +193,6 @@ then
#RewriteLog /home/demisauce/log/apacherw.txt
#RewriteLogLevel 3
#RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -f
- #RewriteCond %{PATH_INFO} !^/blog/$ # can't get this to work?
RewriteCond %{REQUEST_FILENAME} !\.(php|js|css|gif|jpg|png|ico|txt|swf|mp3|pdf|ps|wav|mid|midi|flv|zip|rar|gz|tar|bmp)$ [NC]
RewriteCond %{REQUEST_URI} !^/blog(.*)$ [NC]
RewriteRule ^/(.*) $PASTER_HOST [P]
install/install.sh
3c6f9b90768b6cef4737363ebf393b74123276b2
Aaron Raddon
araddon@yahoo.com
http://github.com/araddon/demisauce/commit/4dc375ca785fb324f7a7ddce0d6688d23ce1bb6e
4dc375ca785fb324f7a7ddce0d6688d23ce1bb6e
2009-01-25T20:02:04-08:00
2009-01-25T20:02:04-08:00
wordpress support and testing, wordpress installer, adding slug support to app, service, app cleanup for ui and admin
042cab9285fb76a2e3a5271d06b9a92a710820fb
Aaron Raddon
araddon@yahoo.com