Merge lp:~terrycojones/tickery/remove-api-806704 into lp:tickery

[Terry Jones]

Removes the Tickery API - a very simple change.

[Esteve Fernandez (esteve)]

+1 LGTM. I didn't know Tickery had an API until you told me :-)

review: Approve

[Jamu Kakar (jkakar)]

Nice one, +1!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-06-16 23:49:06 +0000
+++ .bzrignore	2011-07-11 23:04:44 +0000
@@ -8,3 +8,4 @@
 twisted/plugins/dropin.cache
 pyjamas
 distribute-*.tar.gz
+pip-log.txt

=== removed file 'tickery/api.py'
--- tickery/api.py	2011-06-16 16:10:07 +0000
+++ tickery/api.py	1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-# Copyright 2010 Fluidinfo Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you
-# may not use this file except in compliance with the License.  You
-# may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.  See the License for the specific language governing
-# permissions and limitations under the License.
-
-from twisted.python import log
-from twisted.web import server, resource, error, http
-
-
-def _returnUID(obj, request):
-    uid = str(obj.uuid)
-    request.setHeader('Content-length', str(len(uid)))
-    request.setHeader('Content-type', 'text/plain')
-    request.write(uid)
-    request.finish()
-
-
-def _error(failure, request):
-    if failure.check(error.Error):
-        code = int(failure.value.status)
-    else:
-        code = http.BAD_REQUEST
-    ep = error.ErrorPage(code, 'An error was encountered', str(failure.value))
-    response = ep.render(request)
-    request.setHeader('Content-length', str(len(response)))
-    request.write(response)
-    request.finish()
-
-
-class API(resource.Resource):
-
-    def __init__(self, cache):
-        resource.Resource.__init__(self)
-        self.cache = cache
-        self.putChild('uids', UIDs(self.cache))
-        self.putChild('screennames', Screennames(self.cache))
-
-    def getChild(self, what, request):
-        return error.ErrorPage(
-            http.NOT_FOUND, 'Huh?', "I don't know anything about %r." % what)
-
-
-class UIDs(resource.Resource):
-
-    allowedMethods = ('GET',)
-
-    def __init__(self, cache):
-        resource.Resource.__init__(self)
-        self.cache = cache
-
-    def getChild(self, uid, request):
-        if uid == '':
-            return self
-        else:
-            try:
-                uid = int(uid)
-            except ValueError:
-                return error.ErrorPage(
-                    http.BAD_REQUEST,
-                    'Malformed UID',
-                    'The value you supplied (%r) could not be converted '
-                    'to an integer.' % uid)
-            else:
-                log.msg('API: request for uid %d.' % uid)
-                return UID(uid, self.cache)
-
-
-class UID(resource.Resource):
-
-    allowedMethods = ('GET',)
-    isLeaf = True
-
-    def __init__(self, uid, cache):
-        resource.Resource.__init__(self)
-        self.uid = uid
-        self.cache = cache
-
-    def render_GET(self, request):
-        d = self.cache.oidUidScreennameCache.objectByUid(
-            self.uid, userNameCache=self.cache.userCache)
-        d.addCallback(_returnUID, request)
-        d.addErrback(_error, request)
-        return server.NOT_DONE_YET
-
-
-class Screennames(resource.Resource):
-
-    allowedMethods = ('GET',)
-
-    def __init__(self, cache):
-        resource.Resource.__init__(self)
-        self.cache = cache
-
-    def getChild(self, screenname, request):
-        if screenname == '':
-            return self
-        else:
-            log.msg('API: request for screenname %r.' % screenname)
-            return Screenname(screenname, self.cache)
-
-
-class Screenname(resource.Resource):
-
-    allowedMethods = ('GET',)
-    isLeaf = True
-
-    def __init__(self, screenname, cache):
-        resource.Resource.__init__(self)
-        self.screenname = screenname
-        self.cache = cache
-
-    def _getObjectId(self, uid, request):
-        d = self.cache.oidUidScreennameCache.objectByUid(
-            uid, screenname=self.screenname)
-        d.addCallback(_returnUID, request)
-        return d
-
-    def render_GET(self, request):
-        d = self.cache.userCache.uidByScreenname(self.screenname)
-        d.addCallback(self._getObjectId, request)
-        d.addErrback(_error, request)
-        return server.NOT_DONE_YET

=== modified file 'tickery/www/about.py'
--- tickery/www/about.py	2011-06-16 17:37:48 +0000
+++ tickery/www/about.py	2011-07-11 23:04:44 +0000
@@ -113,11 +113,7 @@
 <p>
 
 If you'd like to use the Fluidinfo API, please <a
-href=\"http://fluidinfo.com/accounts/new\">reserve a Fluidinfo username</a>
-and then <a href=\"mailto:[e-mail]\">send us mail</a> to get a
-password.  Note that Fluidinfo is still in an early <a
-href=\"http://blogs.fluidinfo.com/fluidinfo/2009/08/17/\
-a-private-alpha-launch/\">private alpha</a> phase.
+href=\"http://fluidinfo.com/accounts/new\">sign up</a>.
 
 </p>
 

=== modified file 'twisted/plugins/tickery_service.py'
--- twisted/plugins/tickery_service.py	2011-06-22 00:09:29 +0000
+++ twisted/plugins/tickery_service.py	2011-07-11 23:04:44 +0000
@@ -23,7 +23,6 @@
 from tickery.www import defaults
 from tickery.endpoint import twitterEndpoint
 from tickery.cache import TickeryCache
-from tickery.api import API
 from tickery.service import RegularService, AdminService
 from tickery.options import EndpointOptions
 from tickery import callback
@@ -69,8 +68,6 @@
         adminRoot.putChild('tickery', AdminService(cache))
         root.putChild('admin', adminRoot)
 
-        root.putChild('api', API(cache))
-
         factory = server.Site(root)
         if options['promiscuous']:
             kw = {}