Merge lp:~jderose/microfiber/couchdb-1.1.1 into lp:microfiber

[Jason Gerard DeRose]

Updates one unit test for CouchDB 1.1.1 compatability, and adds the new dmedia_env() function so the collection of utility scripts and examples out there can be ready for Dmedia being what starts CouchDB.

[David Jordan (dmj726)]

Approved!

review: Approve

=== modified file 'doc/index.rst'
--- doc/index.rst	2011-09-02 03:17:34 +0000
+++ doc/index.rst	2011-12-21 07:29:24 +0000
@@ -12,6 +12,9 @@
 packages are available for Ubuntu in the `Novacut Stable Releases PPA`_ and the
 `Novacut Daily Builds PPA`_.
 
+If you have questions or need help getting started with Microfiber, please stop
+by the `#novacut`_ IRC channel on freenode.
+
 Microfiber is licensed `LGPLv3+`_.
 
 
@@ -33,4 +36,5 @@
 .. _`Novacut`: https://wiki.ubuntu.com/Novacut
 .. _`Novacut Stable Releases PPA`: https://launchpad.net/~novacut/+archive/stable
 .. _`Novacut Daily Builds PPA`: https://launchpad.net/~novacut/+archive/daily
+.. _`#novacut`: http://webchat.freenode.net/?channels=novacut
 

=== modified file 'doc/microfiber.rst'
--- doc/microfiber.rst	2011-09-03 02:39:53 +0000
+++ doc/microfiber.rst	2011-12-21 07:29:24 +0000
@@ -448,16 +448,33 @@
 .. function:: dc3_env()
 
     Return the dc3 environment information.
-    
+
     For example, to create a :class:`Database` with the correct per-user `dc3`_
     environment:
-    
+
     >>> from microfiber import dc3_env, Database
     >>> db = Database('dmedia', dc3_env())
     >>> db.url
     'http://localhost:41289/'
 
 
+.. function:: dmedia_env()
+
+    Return the Dmedia environment information.
+
+    For example, to create a :class:`Database` with the correct per-user
+    `Dmedia`_ environment:
+
+    >>> from microfiber import dmedia_env, Database
+    >>> db = Database('dmedia', dmedia_env())
+    >>> db.url
+    'http://localhost:41289/'
+
+    If you're using Microfiber to work with Dmedia or Novacut, please use this
+    function instead of :func:`dc3_env()` as starting with the Dmedia 12.01
+    release, Dmedia itself will be what starts CouchDB. 
+
+
 Exceptions
 ==========
 
@@ -552,6 +569,7 @@
 .. _`Novacut`: https://wiki.ubuntu.com/Novacut
 .. _`desktopcouch`: https://launchpad.net/desktopcouch
 .. _`dc3`: https://launchpad.net/dc3
+.. _`Dmedia`: https://launchpad.net/dmedia
 .. _`python-couchdb`: http://packages.python.org/CouchDB/client.html#database
 
 

=== modified file 'microfiber.py'
--- microfiber.py	2011-12-08 12:25:53 +0000
+++ microfiber.py	2011-12-21 07:29:24 +0000
@@ -76,6 +76,7 @@
 USER_AGENT = 'microfiber ' + __version__
 SERVER = 'http://localhost:5984/'
 DC3_CMD = ('/usr/bin/dc3', 'GetEnv')
+DMEDIA_CMD = ('/usr/bin/dmedia-cli', 'GetEnv')
 
 RANDOM_BITS = 120
 RANDOM_BYTES = RANDOM_BITS // 8
@@ -119,6 +120,14 @@
     return json.loads(env_s.decode('utf-8'))
 
 
+def dmedia_env():
+    from gi.repository import Gio
+    conn = Gio.bus_get_sync(Gio.BusType.SESSION, None)
+    bus = 'org.freedesktop.DMedia'
+    proxy = Gio.DBusProxy.new_sync(conn, 0, None, bus, '/', bus, None)
+    return json.loads(proxy.GetEnv())
+
+
 def _json_body(obj):
     if obj is None:
         return None

=== modified file 'test_microfiber.py'
--- test_microfiber.py	2011-12-08 23:38:16 +0000
+++ test_microfiber.py	2011-12-21 07:29:24 +0000
@@ -607,11 +607,11 @@
         self.assertRaises(MethodNotAllowed, inst.post, None)
         self.assertRaises(MethodNotAllowed, inst.put, None)
         self.assertRaises(MethodNotAllowed, inst.delete)
-        self.assertEqual(
-            inst.get(),
-            {'couchdb': 'Welcome', 'version': '1.1.0'}
-        )
-
+        ret = inst.get()
+        self.assertIsInstance(ret, dict)
+        self.assertEqual(set(ret), set(['couchdb', 'version']))
+        self.assertEqual(ret['couchdb'], 'Welcome')
+        self.assertIsInstance(ret['version'], str)
 
         #####################
         # Create the database