Merge lp:~terrycojones/tickery/fluiddb-to-fluidinfo-798338 into lp:tickery

[Terry Jones]

Use Fluidinfo instead of FluidDB in many places...

[Terry Jones (terrycojones)]

LGTM!

review: Approve

=== modified file 'README'
--- README	2010-07-20 09:47:02 +0000
+++ README	2011-06-16 17:39:31 +0000
@@ -1,16 +1,16 @@
 Welcome!
 --------
 
-Tickery is an open-source application written on FluidDB
+Tickery is an open-source application written on Fluidinfo
 (http://fluidinfo.com/). You can play with our running version at
 http://tickery.net
 
 Tickery provides a fun way to explore sets of Twitter friends. There's much
-more to the story however, as its underlying data is stored in FluidDB.  This
+more to the story however, as its underlying data is stored in Fluidinfo.  This
 means it can be added to by anyone (i.e., you!), and searched on in any way.
 
 We've open-sourced Tickery to help programmers see the insides of a
-substantial application written to use FluidDB. Although the Tickery
+substantial application written to use Fluidinfo. Although the Tickery
 documentation is currently very light, we hope to be able to change this.
 You're welcome to help, of course.
 
@@ -21,10 +21,10 @@
 Fluidinfo blog:
 
   Meet Tickery
-  http://blogs.fluidinfo.com/fluidDB/2010/01/21/meet-tickery/
+  http://blogs.fluidinfo.com/fluidinfo/2010/01/21/meet-tickery/
 
   Tickery, for programmers
-  http://blogs.fluidinfo.com/fluidDB/2010/01/21/tickery-for-programmers/
+  http://blogs.fluidinfo.com/fluidinfo/2010/01/21/tickery-for-programmers/
 
 Running Tickery
 ---------------
@@ -39,10 +39,10 @@
 Questions?
 ----------
 
-For discussion of Tickery, we suggest you join the FluidDB users mailing list
-at http://groups.google.com/group/fluiddb-users or join us in #fluiddb on
+For discussion of Tickery, we suggest you join the Fluidinfo users mailing list
+at http://groups.google.com/group/fluiddb-users or join us in #fluidinfo on
 irc.freenode.net Please say hi, we're very interested in helping people to
-understand both Tickery and FluidDB.
+understand both Tickery and Fluidinfo.
 
 
 Happy hacking!
 
=== modified file 'bin/create-twitter-namespaces-and-tags.py'
--- bin/create-twitter-namespaces-and-tags.py	2011-06-16 16:10:07 +0000
+++ bin/create-twitter-namespaces-and-tags.py	2011-06-16 17:39:31 +0000
@@ -80,7 +80,7 @@
         (TWITTER_ID_TAG_NAME, 'Twitter user id.'),
         (TWITTER_SCREENNAME_TAG_NAME, 'Twitter screen name.'),
         (TWITTER_UPDATED_AT_TAG_NAME,
-         'Time (in seconds) of last update of this user in FluidDB.'),
+         'Time (in seconds) of last update of this user in Fluidinfo.'),
         (TWITTER_N_FRIENDS_TAG_NAME, 'Number of friends of a Twitter user.'),
         (TWITTER_N_FOLLOWERS_TAG_NAME,
          'Number of followers of a Twitter user.'),
@@ -97,13 +97,13 @@
     def nok(failure):
         print 'Failed:', failure
         if hasattr(failure.value, 'response_headers'):
-            foundFluidDBHeader = False
+            foundFluidinfoHeader = False
             for header in failure.value.response_headers:
                 if header.startswith('x-fluiddb-'):
-                    foundFluidDBHeader = True
+                    foundFluidinfoHeader = True
                     print '\t%s: %s' % (
                         header, failure.value.response_headers[header][0])
-            if not foundFluidDBHeader:
+            if not foundFluidinfoHeader:
                 print 'Headers: %r' % (failure.value.response_headers)
         else:
             return failure
 
=== modified file 'doc/Makefile'
--- doc/Makefile	2011-06-14 20:36:36 +0000
+++ doc/Makefile	2011-06-16 17:39:31 +0000
@@ -60,9 +60,9 @@
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in _build/qthelp, like this:"
-	@echo "# qcollectiongenerator _build/qthelp/fluidDB.qhcp"
+	@echo "# qcollectiongenerator _build/qthelp/fluidinfo.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile _build/qthelp/fluidDB.qhc"
+	@echo "# assistant -collectionFile _build/qthelp/fluidinfo.qhc"
 
 latex:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex
 
=== modified file 'doc/conf.py'
--- doc/conf.py	2011-06-16 16:10:07 +0000
+++ doc/conf.py	2011-06-16 17:39:31 +0000
@@ -155,7 +155,7 @@
 #html_file_suffix = ''
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'fluidDBdoc'
+htmlhelp_basename = 'fluidinfodoc'
 
 
 # -- Options for LaTeX output ------------------------------------------------
 
=== modified file 'doc/running.rst'
--- doc/running.rst	2010-07-20 09:47:02 +0000
+++ doc/running.rst	2011-06-16 17:39:31 +0000
@@ -9,7 +9,7 @@
 Tickery's behavior with what you'll see in the source code.
 
 We've open sourced Tickery so other developers can have a close look at
-how a non-trivial FluidDB application is put together.
+how a non-trivial Fluidinfo application is put together.
 
 But we also want to make it possible for you to run your own version of
 Tickery.
@@ -38,23 +38,23 @@
 * `Ply <http://www.dabeaz.com/ply/>`_.
 * `Sphinx <http://sphinx.pocoo.org/>`_ (to build this documentation)
 
-One-time FluidDB setup
-----------------------
+One-time Fluidinfo setup
+------------------------
 
 To run your own version of Tickery (as opposed to just browsing the source
-code to see how Tickery does its thing), you'll need to use a FluidDB user
-other than the one we use (we use ``twitter.com``). If you have a FluidDB
+code to see how Tickery does its thing), you'll need to use a Fluidinfo user
+other than the one we use (we use ``twitter.com``). If you have a Fluidinfo
 account, you can use it, otherwise go to http://fluidinfo.com/accounts/new/
-and create a FluidDB account.
+and create a Fluidinfo account.
 
-Put the FluidDB username you want to use into the ``TWITTER_USERNAME``
-variable in ``tickery/www/defaults`` and the FluidDB password into an
-environment variable named ``FLUIDDB_TWITTER_PASSWORD``. You should then be
-able to create the necessary FluidDB namespaces and tags for your FluidDB
+Put the Fluidinfo username you want to use into the ``TWITTER_USERNAME``
+variable in ``tickery/www/defaults`` and the Fluidinfo password into an
+environment variable named ``FLUIDINFO_TWITTER_PASSWORD``. You should then be
+able to create the necessary Fluidinfo namespaces and tags for your Fluidinfo
 user with the ``bin/create-twitter-namespaces-and-tags.py`` script.
 
 This does as it says: creates the namespaces and tags that the user in
-FluidDB will need to have in order for Tickery to work.
+Fluidinfo will need to have in order for Tickery to work.
 
 One-time Twitter setup
 ----------------------
 
=== modified file 'doc/todo.rst'
--- doc/todo.rst	2010-07-20 09:47:02 +0000
+++ doc/todo.rst	2011-06-16 17:39:31 +0000
@@ -19,14 +19,14 @@
 * Make status window auto-update
 * Canonicalize some queries to improve cache hit ratio.
 * Set a timer to periodically update # of users tracked by Tickery.
-* Add a button to allow a user to update their Twitter details in FluidDB.
+* Add a button to allow a user to update their Twitter details in Fluidinfo.
   (i.e., we spider them, update their followers etc)
-* Add a refreshFromFluidDB method to the caches that can use it.
+* Add a refreshFromFluidinfo method to the caches that can use it.
 * The cache should expire things. Switch to memcached?
 * Need to re-spider users and refresh/update/expire other cache info.
 * Add twitter.com/SUL tags.
-* Requests to twitter (and FluidDB?) should have timeouts.
-* Add an offline mode that only works on cached data in case FluidDB 
+* Requests to twitter (and Fluidinfo?) should have timeouts.
+* Add an offline mode that only works on cached data in case Fluidinfo 
   or Twitter are down/inaccessible. Set this on/off on the admin page.
 * What do we do when a user changes from public to protected?
 * Setting the visible limit on the simple tab text boxes doesn't work too well.
@@ -66,8 +66,8 @@
 * Add the ability to toggle noisy logging.
 * Make admin interface auto-update?
 * Allow us to act on the cache.
-* Allow us to rebuild or refresh from FluidDB.
-* Ability to remove users from FluidDB?
+* Allow us to rebuild or refresh from Fluidinfo.
+* Ability to remove users from Fluidinfo?
 * Shows usage stats.
 * Should be able to send a HUP to Tickery to have caches dumped.
 
 
=== modified file 'fabfile.py'
--- fabfile.py	2011-06-16 17:12:50 +0000
+++ fabfile.py	2011-06-16 17:39:31 +0000
@@ -1,6 +1,6 @@
 """
 This fabfile contains the recipe for automatically testing and deploying the
-api.fluiddb.com website.
+tickery.net website.
 
 Fabfiles are strange and configuring them is sometimes a bit hit and miss,
 but nevertheless the following functions are defined by fabric:
@@ -56,7 +56,8 @@
 
     run('. /srv/tickery/%(path)s/bin/activate' % env)
 
-    run('/srv/tickery/%(path)s/bin/pip install --upgrade -r /srv/tickery/%(path)s/requirements.txt' % env)
+    run('/srv/tickery/%(path)s/bin/pip install --upgrade '
+        '-r /srv/tickery/%(path)s/requirements.txt' % env)
 
     run('mkdir -p /srv/tickery/%(path)s/var/run' % env)
     run('chmod a+w /srv/tickery/%(path)s/var/run' % env)
@@ -73,7 +74,7 @@
     require('hosts', provided_by=[live])
     run('rm -f /srv/tickery/%(sitename)s' % env)
     run('ln -s /srv/tickery/%(path)s /srv/tickery/%(sitename)s' % env)
-#    run('restart %(sitename)s' % env)
+    # run('restart %(sitename)s' % env)
 
 
 def deploy():
 
=== modified file 'resources/upstart/www.tickery.net.conf'
--- resources/upstart/www.tickery.net.conf	2011-06-16 17:12:50 +0000
+++ resources/upstart/www.tickery.net.conf	2011-06-16 17:39:31 +0000
@@ -13,7 +13,7 @@
 . $VIRTUALENV_HOME/bin/activate
 export TICKERY_CONSUMER_KEY=xxx
 export TICKERY_CONSUMER_SECRET=xxx
-export FLUIDDB_TWITTER_PASSWORD=xxx
+export FLUIDINFO_TWITTER_PASSWORD=xxx
 exec /sbin/start-stop-daemon --start --chdir $VIRTUALENV_HOME \
     --chuid $TICKERY_USER --exec /usr/bin/env -- twistd \
     --pidfile=/srv/tickery/tickery.net/var/run/tickery.$$.pid \
 
=== modified file 'tickery/ftwitter.py'
--- tickery/ftwitter.py	2011-06-16 16:57:37 +0000
+++ tickery/ftwitter.py	2011-06-16 17:39:31 +0000
@@ -30,7 +30,7 @@
     TWITTER_N_FOLLOWERS_TAG_NAME, TWITTER_N_STATUSES_TAG_NAME)
 
 # This is the maximum requests that will be sent out at once by anything
-# using a task.Cooperator. That's usually FluidDB, but it can also mean
+# using a task.Cooperator. That's usually Fluidinfo, but it can also mean
 # this many requests going at once to Twitter to pick up user details.
 MAX_SIMULTANEOUS_REQUESTS = 5
 
@@ -109,19 +109,19 @@
     pass
 
 
-class FluidDBParseError(Exception):
-    pass
-
-
-class FluidDBNonexistentAttribute(Exception):
-    pass
-
-
-class FluidDBPermissionDenied(Exception):
-    pass
-
-
-class FluidDBError(Exception):
+class FluidinfoParseError(Exception):
+    pass
+
+
+class FluidinfoNonexistentAttribute(Exception):
+    pass
+
+
+class FluidinfoPermissionDenied(Exception):
+    pass
+
+
+class FluidinfoError(Exception):
     pass
 
 
@@ -269,7 +269,7 @@
         userJob.workToDo += (nFriendsToAdd * WORK_TO_CREATE_A_FRIEND)
         start = time.time()
 
-        # Create FluidDB objects for all the friends that we don't yet know
+        # Create Fluidinfo objects for all the friends that we don't yet know
         # about.
         jobs = makeCreateUserJobs(friendsToAdd)
         deferreds = []
@@ -419,10 +419,10 @@
         log.msg('Query cache hit (size %d) for %r.' % (len(result), queryStr))
         return defer.succeed(result)
 
-_fluidDBErrors = {
-    'TParseError': FluidDBParseError,
-    'TPathPermissionDenied': FluidDBPermissionDenied,
-    'TNonexistentAttribute': FluidDBNonexistentAttribute,
+_fluidinfoErrors = {
+    'TParseError': FluidinfoParseError,
+    'TPathPermissionDenied': FluidinfoPermissionDenied,
+    'TNonexistentAttribute': FluidinfoNonexistentAttribute,
     }
 
 
@@ -430,23 +430,23 @@
     fail.trap(error.Error)
     errorClass = fail.value.response_headers.get('x-fluiddb-error-class')
     if errorClass is None:
-        log.msg('No Fluiddb error class header! Query %r got HTTP status %s' %
-                (query, fail.value.status))
-        raise FluidDBError()
+        log.msg('No Fluidinfo error class header! '
+                'Query %r got HTTP status %s' % (query, fail.value.status))
+        raise FluidinfoError()
     else:
         errorClass = errorClass[0]
 
     try:
         log.msg('Error Class %r' % (errorClass,))
-        raise _fluidDBErrors[errorClass]()
+        raise _fluidinfoErrors[errorClass]()
     except KeyError:
-        log.msg('Unhandled Fluiddb error class %r Query %r got '
+        log.msg('Unhandled Fluidinfo error class %r Query %r got '
                 'HTTP status %s' %
                 (errorClass, query, fail.value.status))
-        raise FluidDBError()
-
-
-def fluidDBQuery(endpoint, query):
+        raise FluidinfoError()
+
+
+def fluidinfoQuery(endpoint, query):
     d = Object.query(endpoint, query)
     d.addCallback(lambda results: [r.uuid for r in results])
     d.addErrback(_queryErr, query)
@@ -511,7 +511,7 @@
     d = cache.oidUidScreennameCache.objectByUid(
         uid, userNameCache=cache.userCache)
     d.addCallback(lambda o: o.set(endpoint, tag, None))
-    # The logged in user may not yet exist in FluidDB.
+    # The logged in user may not yet exist in Fluidinfo.
     d.addErrback(_ignoreHTTPStatus, http.NOT_FOUND)
     return d
 
@@ -523,7 +523,7 @@
     d = cache.oidUidScreennameCache.objectByUid(
         uid, userNameCache=cache.userCache)
     d.addCallback(lambda o: o.delete(endpoint, tag))
-    # The logged in user may not yet exist in FluidDB.
+    # The logged in user may not yet exist in Fluidinfo.
     d.addErrback(_ignoreHTTPStatus, http.NOT_FOUND)
     return d
 
 
=== modified file 'tickery/oidcache.py'
--- tickery/oidcache.py	2011-06-16 16:10:07 +0000
+++ tickery/oidcache.py	2011-06-16 17:39:31 +0000
@@ -91,14 +91,14 @@
                 nResults = len(results)
                 if nResults == 0:
                     raise Exception(
-                        'Screenname %r not known to FluidDB' % screenname)
+                        'Screenname %r not known to Fluidinfo' % screenname)
                 elif nResults == 1:
                     objectId = results[0].uuid
                     self.add(objectId, screenname=screenname)
                     return objectId
                 else:
                     log.err('ERROR: Twitter screenname %r found %d times '
-                            'in FluidDB! ObjectIds = %r' %
+                            'in Fluidinfo! ObjectIds = %r' %
                             (screenname, nResults, results))
                     # Don't crash: just return the first object id found.
                     return results[0]
@@ -118,13 +118,14 @@
             if nResults:
                 if nResults > 1:
                     msg = ('User with Twitter id %d exists %d times '
-                           'in FluidDB! Ignoring.' % (uid, nResults))
+                           'in Fluidinfo! Ignoring.' % (uid, nResults))
                     log.err(msg)
                     raise Exception(msg)
                 else:
                     o = results[0]
                     self.add(o.uuid, uid, screenname)
-                    log.msg('Found FluidDB object for Twitter user %d.' % uid)
+                    log.msg('Found Fluidinfo object for Twitter user %d.' %
+                            uid)
             else:
                 about = '%s:uid:%d' % (TWITTER_USERNAME, uid)
                 o = yield Object.create(self.endpoint, about)
@@ -160,8 +161,8 @@
             self.clean = False
 
     def objectIdsToUsers(self, objectIds, userCache):
-        '''Convert a list of FluidDB object ids to a 2-tuple, a list of
-        Twitter screennames and a list of any FluidDB object ids that did
+        '''Convert a list of Fluidinfo object ids to a 2-tuple, a list of
+        Twitter screennames and a list of any Fluidinfo object ids that did
         not correspond to Twitter users.'''
         users = []
         ids = []
 
=== modified file 'tickery/options.py'
--- tickery/options.py	2011-06-14 20:36:36 +0000
+++ tickery/options.py	2011-06-16 17:39:31 +0000
@@ -19,11 +19,11 @@
 
 class EndpointOptions(usage.Options):
     optParameters = [
-        ['endpoint', None, None, 'The FluidDB endpoint URL.'],
+        ['endpoint', None, None, 'The Fluidinfo endpoint URL.'],
         ]
     optFlags = [
-        ['local', 'L', 'If True use the a local FluidDB'],
-        ['sandbox', 'S', 'If True use the sandbox FluidDB'],
+        ['local', 'L', 'If True use the a local Fluidinfo'],
+        ['sandbox', 'S', 'If True use the sandbox Fluidinfo'],
         ]
 
     def postOptions(self):
@@ -41,7 +41,7 @@
                 else:
                     endpointURL = defaults.SANDBOX_ENDPOINT
             else:
-                endpointURL = defaults.FLUIDDB_ENDPOINT
+                endpointURL = defaults.FLUIDINFO_ENDPOINT
         if not endpointURL.endswith('/'):
             endpointURL += '/'
         self['endpoint'] = endpointURL
 
=== modified file 'tickery/query.py'
--- tickery/query.py	2011-06-16 16:10:07 +0000
+++ tickery/query.py	2011-06-16 17:39:31 +0000
@@ -189,7 +189,7 @@
 
 
 def queryTreeToString(queryTree, fdbUsername, fdbNamespace):
-    """Return a query string that can be sent to FluidDB. Note that we turn
+    """Return a query string that can be sent to Fluidinfo. Note that we turn
     all screennames into lowercase in the complete tag names. That's
     because that's the way we create the tags.
     """
 
=== modified file 'tickery/service.py'
--- tickery/service.py	2011-06-16 16:10:07 +0000
+++ tickery/service.py	2011-06-16 17:39:31 +0000
@@ -56,7 +56,7 @@
                 [self.cache.adderCache.added(s) for s in screennames]}
 
     def _objectIdsToUsers(self, (users, ids)):
-        '''Convert a list of FluidDB object ids to a JSON RPC result dict
+        '''Convert a list of Fluidinfo object ids to a JSON RPC result dict
         containing a list of Twitter screennames.'''
         if ids:
             log.err('Unexpected object ids matched query: %r' % (ids,))
@@ -158,13 +158,13 @@
             d.addErrback(log.err)
             return d
 
-    def _fluidDBError(self, fail, query):
-        err = fail.check(ftwitter.FluidDBParseError,
-                         ftwitter.FluidDBError,
-                         ftwitter.FluidDBNonexistentAttribute,
-                         ftwitter.FluidDBPermissionDenied)
+    def _fluidinfoError(self, fail, query):
+        err = fail.check(ftwitter.FluidinfoParseError,
+                         ftwitter.FluidinfoError,
+                         ftwitter.FluidinfoNonexistentAttribute,
+                         ftwitter.FluidinfoPermissionDenied)
         if err is None:
-            log.msg('Error on FluidDB query %r:' % query)
+            log.msg('Error on Fluidinfo query %r:' % query)
             log.err(fail)
             errorClass = 'unknown'
         else:
@@ -176,7 +176,7 @@
                 }
             }
 
-    def jsonrpc_fluidDBQuery(self, cookie, tabName, query):
+    def jsonrpc_fluidinfoQuery(self, cookie, tabName, query):
         try:
             data = self.cache.cookieCache[cookie]
         except KeyError:
@@ -185,14 +185,14 @@
             screenname = data[0]['screen_name']
         log.msg('QUERY: tab=%s user=%r query=%r' % (
             tabName, screenname, query))
-        d = ftwitter.fluidDBQuery(self.endpoint, query)
+        d = ftwitter.fluidinfoQuery(self.endpoint, query)
         d.addCallback(self._checkTooManyResults)
         d.addCallback(
             self.cache.oidUidScreennameCache.objectIdsToUsers,
             self.cache.userCache)
         d.addCallback(self._objectIdsToUsersWherePossible)
         d.addErrback(self._screennameListError)  # Catches TooManyResults
-        d.addErrback(self._fluidDBError, query)
+        d.addErrback(self._fluidinfoError, query)
         return d
 
     def _loginRedirectURL(self, URL):
 
=== modified file 'tickery/utils.py'
--- tickery/utils.py	2011-06-16 16:10:07 +0000
+++ tickery/utils.py	2011-06-16 17:39:31 +0000
@@ -19,18 +19,18 @@
 from txfluiddb.client import _HasPath
 
 
-def fluidDBRootPassword():
-    VAR = 'FLUIDDB_ROOT_PASSWORD'
+def fluidinfoRootPassword():
+    VAR = 'FLUIDINFO_ROOT_PASSWORD'
     try:
         return os.environ[VAR]
     except KeyError:
         raise usage.UsageError('You must set a %s environment variable.' % VAR)
 
 
-class FluidDBOptions(usage.Options):
+class FluidinfoOptions(usage.Options):
     optParameters = [
-        ['fluiddb-user', None, 'fluiddb', "The system user's name."],
-        ['fluiddb-password', None, None, "The system user's password."],
+        ['fluidinfo-user', None, 'fluidinfo', "The system user's name."],
+        ['fluidinfo-password', None, None, "The system user's password."],
         ]
 
 
 
=== modified file 'tickery/www/about.py'
--- tickery/www/about.py	2011-06-16 16:10:07 +0000
+++ tickery/www/about.py	2011-06-16 17:39:31 +0000
@@ -34,27 +34,27 @@
 
 But there's a more important reason why we built Tickery: to
 illustrate the flexibility and potential of
-<a href=\"http://fluidinfo.com/fluiddb\">FluidDB</a>,
+<a href=\"http://fluidinfo.com/fluiddb\">Fluidinfo</a>,
 the underlying database.
 
 </p>
 
 <p>
 
-FluidDB is quite different from traditional databases. What distinguishes
+Fluidinfo is quite different from traditional databases. What distinguishes
 it most is its open approach to information control: anyone, or any
 application, is always permitted to add information to any object in
-FluidDB.
+Fluidinfo.
 
 </p>
 
 <p>
 
-This means that <em>Tickery is completely open.</em> The FluidDB objects
+This means that <em>Tickery is completely open.</em> The Fluidinfo objects
 that Tickery uses to hold information about Twitter users are yours to play
 with too.  You can contribute additional information about Twitter users,
 and can query on it (using the advanced tab). You can also build your own
-applications that use FluidDB, exactly as Tickery does. Those applications
+applications that use Fluidinfo, exactly as Tickery does. Those applications
 can search using the tags that Tickery has added, or on anything that you
 or others might add.
 
@@ -63,9 +63,9 @@
 <p>
 
 
-With FluidDB, no one&mdash;not even you&mdash;has to anticipate your future
+With Fluidinfo, no one&mdash;not even you&mdash;has to anticipate your future
 needs, and you never have to ask for permission to add new information. To
-complement this openness at the highest-level, FluidDB has an underlying
+complement this openness at the highest-level, Fluidinfo has an underlying
 identity and permissions system that ensures existing data can only be
 accessed by the people and applications you choose.
 
@@ -74,49 +74,49 @@
 <p>
 
 At Fluidinfo, we believe it will one day be <em>much</em> easier to work
-with information. We've built FluidDB to show you what we think the future
+with information. We've built Fluidinfo to show you what we think the future
 will look like. It's a future in which we'll work with information in more
 flexible ways, and with data that is
-<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/24/\
+<a href=\"http://blogs.fluidinfo.com/fluidinfo/2009/08/24/\
 truly-social-data/\">truly social</a>.
 
 </p>
 
 <h3>Next</h3>
 
-For details on how Tickery uses FluidDB to hold information on Twitter
+For details on how Tickery uses Fluidinfo to hold information on Twitter
 users, read the help popup on the Advanced tab.  To learn more about how
-FluidDB works, a good starting place is the <a
+Fluidinfo works, a good starting place is the <a
 href=\"http://doc.fluidinfo.com/fluidDB/\">high-level description</a>.
 
 To learn more about how we think about information, and what we're aiming
-at with FluidDB, have a look at the <a
-href=\"http://blogs.fluidinfo.com/fluidDB\">FluidDB blog</a>. In particular,
-the following articles provide a good set of viewpoints:
+at with Fluidinfo, have a look at the <a
+href=\"http://blogs.fluidinfo.com/fluidinfo\">Fluidinfo blog</a>. In
+particular, following articles provide a good set of viewpoints:
 
-<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/24/\
+<a href=\"http://blogs.fluidinfo.com/fluidinfo/2009/08/24/\
 truly-social-data/\">Truly Social Data</a>,
-<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/25/\
-kaleidoscope-10-takes-on-fluiddb/\">Kaleidoscope: 10 Takes on FluidDB</a>,
-<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/28/\
+<a href=\"http://blogs.fluidinfo.com/fluidinfo/2009/08/25/\
+kaleidoscope-10-takes-on-fluiddb/\">Kaleidoscope: 10 Takes on Fluidinfo</a>,
+<a href=\"http://blogs.fluidinfo.com/fluidinfo/2009/08/28/\
 information-naturally/\">Information. Naturally.</a>,
-<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/10/03/\
-fluiddb-as-a-universal-metadata-engine/\">FluidDB as a Universal Metadata
+<a href=\"http://blogs.fluidinfo.com/fluidinfo/2009/10/03/\
+fluiddb-as-a-universal-metadata-engine/\">Fluidinfo as a Universal Metadata
 Engine</a>,
-<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/11/12/\
+<a href=\"http://blogs.fluidinfo.com/fluidinfo/2009/11/12/\
 why-are-post-it-notes-sticky/\">Why are Post-It Notes Sticky?</a>,
 and
-<a href=\"http://blogs.fluidinfo.com/fluidDB/2009/12/01/\
+<a href=\"http://blogs.fluidinfo.com/fluidinfo/2009/12/01/\
 putting-metadata-onto-tweets-with-fluiddb/\">Putting Metadata onto Tweets
-with FluidDB</a>.
+with Fluidinfo</a>.
 
 <p>
 
-If you'd like to use the FluidDB API, please <a
-href=\"http://fluidinfo.com/accounts/new\">reserve a FluidDB username</a>
+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 FluidDB is still in an early <a
-href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/17/\
+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.
 
 </p>
 
=== modified file 'tickery/www/advanced.py'
--- tickery/www/advanced.py	2011-06-16 16:10:07 +0000
+++ tickery/www/advanced.py	2011-06-16 17:39:31 +0000
@@ -19,34 +19,34 @@
 from pyjamas.ui.HTML import HTML
 
 _instructions = """
-<h3 class=\"huh-h3\">Exposing FluidDB</h3>
+<h3 class=\"huh-h3\">Exposing Fluidinfo</h3>
 
 <p>
 
 Tickery stores information on Twitter users in
-<a href=\"http://fluidinfo.com/fluiddb\">FluidDB</a>.
+<a href=\"http://fluidinfo.com/fluiddb\">Fluidinfo</a>.
 
 The simple and intermediate tabs just provide convenient&mdash;but also
-constrained&mdash;query interfaces to FluidDB. The advanced tab takes the
+constrained&mdash;query interfaces to Fluidinfo. The advanced tab takes the
 gloves off, letting you interact with <a
-href=\"http://fluidinfo.com/fluiddb\">FluidDB</a> using its native query
+href=\"http://fluidinfo.com/fluiddb\">Fluidinfo</a> using its native query
 language. Though the native query language is a little more verbose, there
 are <span class=\"instructions-em\">many</span> interesting possibilities
 when you can search on anything you like.
 
 </p><p>
 
-Why FluidDB and not just a traditional database? Part of the answer is that
-FluidDB allows anyone to add new data. You can query on that too, right
+Why Fluidinfo and not just a traditional database? Part of the answer is that
+Fluidinfo allows anyone to add new data. You can query on that too, right
 here on the advanced tab.
 
 </p>
 
-<h3 class=\"huh-h3\">The FluidDB query language</h3>
+<h3 class=\"huh-h3\">The Fluidinfo query language</h3>
 
 <p>
 
-FluidDB stores a tagged object for each Twitter user that Tickery knows
+Fluidinfo stores a tagged object for each Twitter user that Tickery knows
 about.  The query language is designed to match objects based on the
 presence of tags, and their values.  Let's first see what happens behind
 the scenes on the simple and intermediate tabs.
@@ -61,23 +61,23 @@
 %(friends)s/%(simpleUser2)s\">has %(friends)s/%(simpleUser1)s and \
 has %(friends)s/%(simpleUser2)s</a>
 
-being sent to FluidDB. I.e., Tickery asks FluidDB for all objects that have
+being sent to Fluidinfo. I.e., Tickery asks Fluidinfo for all objects that have
 a <span class=\"example\">%(friends)s/%(simpleUser1)s</span> tag and also a
 <span class=\"example\">%(friends)s/%(simpleUser2)s</span> tag.
 
 </p><p>
 
-On the intermediate tab, queries are also translated directly into FluidDB
+On the intermediate tab, queries are also translated directly into Fluidinfo
 queries. For example, the query
 
 <a href=\"%(intq)sbiz+except+ev\">biz except ev</a>
 
-results in the FluidDB query:
+results in the Fluidinfo query:
 
 <a href=\"%(advancedq)shas+%(friends)s/biz+except+has+%(friends)s/ev\">\
 has %(friends)s/biz except has %(friends)s/ev</a>.
 
-That is, Tickery asks FluidDB for all objects that have a
+That is, Tickery asks Fluidinfo for all objects that have a
 <span class=\"example\">%(friends)s/biz</span>
 tag,
 <span class=\"example\">except</span>
@@ -95,7 +95,7 @@
 
 <p>
 
-The FluidDB objects matching the above queries all also have <span
+The Fluidinfo objects matching the above queries all also have <span
 class=\"example\">twitter.com/users/screen_name</span> and <span
 class=\"example\">twitter.com/users/id</span> tags, which Tickery uses to
 help display its results.
@@ -110,7 +110,7 @@
 
 <a href='%(advancedq)stwitter.com/users/screen_name+=+\"%(simpleUser1)s\"'>\
 twitter.com/users/screen_name = \"%(simpleUser1)s\"</a>.
-FluidDB has some other Twitter tags on its objects too. For example, you
+Fluidinfo has some other Twitter tags on its objects too. For example, you
 can query
 
 <a href='%(advancedq)stwitter.com/users/followers_count+>+100000'>\
@@ -126,11 +126,11 @@
 
 </p><p>
 
-Because FluidDB objects can be added to by anyone, we can query on tags
+Because Fluidinfo objects can be added to by anyone, we can query on tags
 that were added by other people and that have nothing to do with
-Twitter. For example, my user name in both FluidDB and Twitter is <span
+Twitter. For example, my user name in both Fluidinfo and Twitter is <span
 class=\"example\">terrycojones</span>. I've added a <span
-class=\"example\">terrycojones/met</span> tag to FluidDB's objects for
+class=\"example\">terrycojones/met</span> tag to Fluidinfo's objects for
 Twitter people that I've met in person. So the query
 
 <a href='%(advancedq)shas+%(friends)s/terrycojones+and+has+terrycojones/met'>\
@@ -148,7 +148,7 @@
 
 The possibilities here are literally endless. They get interesting
 rapidly, even with just a couple of extra tags in the mix.  For example,
-the other FluidDB programmer, Esteve, has also added <span
+the other Fluidinfo programmer, Esteve, has also added <span
 class=\"example\">esteve/met</span> tags to the people he follows and has
 met. The query
 
@@ -168,7 +168,7 @@
 should introduce each other to. Imagine the additional richness we could
 extract from Twitter if someone wrote e.g., a Firefox extension that simply
 let you click to indicate which of the people you follow you've also met.
-And that's just one additional tag in FluidDB. It's easy to dream up many
+And that's just one additional tag in Fluidinfo. It's easy to dream up many
 others.
 
 </p>
@@ -179,14 +179,14 @@
 
 The best part of all this is that you can play too.
 
-The most important thing to understand about the underlying FluidDB objects
-is that while their tags have owners and permissions, the objects
-themselves do not. So you can use the FluidDB API
+The most important thing to understand about the underlying Fluidinfo
+objects is that while their tags have owners and permissions, the objects
+themselves do not. So you can use the Fluidinfo API
 
 (<a href=\"http://doc.fluidinfo.com/fluidDB/index.html\">description</a>,
 <a href=\"http://doc.fluidinfo.com/fluidDB/api/index.html\">details</a>)
 
-to add any tags you like to FluidDB objects, <span
+to add any tags you like to Fluidinfo objects, <span
 class=\"instructions-em\">including the objects that Tickery has
 tagged</span>, and you can query on them in any combination.
 
@@ -194,11 +194,11 @@
 
 <p>
 
-If you'd like to use the FluidDB API, please <a
-href=\"http://fluidinfo.com/accounts/new\">reserve a FluidDB username</a>
+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 FluidDB is still in an early <a
-href=\"http://blogs.fluidinfo.com/fluidDB/2009/08/17/\
+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.
 
 </p>
@@ -222,8 +222,8 @@
         {'tw': 'twitter.com', 'fr': 'friends'})
 
     def __init__(self, topPanel):
-        self.goButtonRemoteMethod = 'fluidDBQuery'
+        self.goButtonRemoteMethod = 'fluidinfoQuery'
         self.instructions = HTML(_instructions)
-        self.instructionsTitle = ('The FluidDB query language '
+        self.instructionsTitle = ('The Fluidinfo query language '
                                   '& the advanced tab')
         LargeQueryTab.__init__(self, topPanel)
 
=== modified file 'tickery/www/banner.py'
--- tickery/www/banner.py	2011-06-16 16:10:07 +0000
+++ tickery/www/banner.py	2011-06-16 17:39:31 +0000
@@ -29,7 +29,7 @@
         self.add(Image('tickery.png', StyleName='banner-image'))
         strapline = HTML(
             '''Explore <a href="http://twitter.com">Twitter</a> with
-            <a href="http://fluidinfo.com/fluiddb">FluidDB</a>''',
+            <a href="http://fluidinfo.com">Fluidinfo</a>''',
             StyleName='strapline')
         self.add(strapline)
 
 
=== modified file 'tickery/www/defaults.py'
--- tickery/www/defaults.py	2011-06-16 16:10:07 +0000
+++ tickery/www/defaults.py	2011-06-16 17:39:31 +0000
@@ -25,7 +25,7 @@
 
 OAUTH_COOKIE = 'tickery-oauth'
 
-TWITTER_PASSWORD_VAR = 'FLUIDDB_TWITTER_PASSWORD'
+TWITTER_PASSWORD_VAR = 'FLUIDINFO_TWITTER_PASSWORD'
 TWITTER_USERNAME = u'twitter.com'
 TWITTER_NAME = u'Twitter Inc.'
 TWITTER_EMAIL = u'[e-mail]'
@@ -45,7 +45,7 @@
 TWITTER_N_STATUSES_TAG_NAME = u'statuses_count'
 # TWITTER_LOCATION_TAG_NAME = u'location'
 
-FLUIDDB_ENDPOINT = 'http://fluiddb.fluidinfo.com/'
+FLUIDINFO_ENDPOINT = 'http://fluiddb.fluidinfo.com/'
 SANDBOX_ENDPOINT = 'http://sandbox.fluidinfo.com/'
 LOCAL_ENDPOINT = 'http://localhost:8080/'
 
 
=== modified file 'tickery/www/public/index.html'
--- tickery/www/public/index.html	2010-07-20 09:47:02 +0000
+++ tickery/www/public/index.html	2011-06-16 17:39:31 +0000
@@ -2,7 +2,7 @@
     <head>
         <meta name="pygwt:module" content="index">
         <link rel="stylesheet" href="index.css">
-        <title>Tickery - Explore Twitter with FluidDB</title>
+        <title>Tickery - Explore Twitter with Fluidinfo</title>
     </head>
     <body bgcolor="white">
         <script language="javascript" src="bootstrap.js"></script>
 
=== modified file 'tickery/www/results.py'
--- tickery/www/results.py	2011-06-16 16:10:07 +0000
+++ tickery/www/results.py	2011-06-16 17:39:31 +0000
@@ -59,7 +59,7 @@
                             objectIds = objectIds[:5]
                     else:
                         plural1, plural2 = '', 'es'
-                    title = '%s FluidDB object id%s match%s%s' % (
+                    title = '%s Fluidinfo object id%s match%s%s' % (
                         nObjectIds, plural1, plural2, showing)
                     text = '<br/>'.join(objectIds)
                     self.sender.results.add(HTML(
 
=== modified file 'tickery/www/server.py'
--- tickery/www/server.py	2010-07-20 09:47:02 +0000
+++ tickery/www/server.py	2011-06-16 17:39:31 +0000
@@ -19,5 +19,5 @@
     def __init__(self):
         JSONProxy.__init__(self, '/tickery',
             ['nUsers', 'spideredScreennames', 'friendOf', 'intermediateQuery',
-             'fluidDBQuery', 'simpleTweet',  'tweet', 'login', 'logout',
+             'fluidinfoQuery', 'simpleTweet',  'tweet', 'login', 'logout',
              'screenameFromCookie', 'friendsIds', 'follow', 'unfollow'])
 
=== modified file 'tickery/www/tickerytab.py'
--- tickery/www/tickerytab.py	2011-06-16 16:10:07 +0000
+++ tickery/www/tickerytab.py	2011-06-16 17:39:31 +0000
@@ -56,7 +56,7 @@
     """Explore sets of Twitter friends by querying on their user names""",
 
     'advanced':
-    """Query Twitter friends & more with the full FluidDB query language""",
+    """Query Twitter friends & more with the full Fluidinfo query language""",
     }
 
 HELP_TEXT = 'huh?'