Merge lp:~shakaran/userwebkit/class-refactor into lp:userwebkit

[Angel Guzman Maeso]

Major changes:
- Split userwebkit classes (Hub, Inspector and CouchView) in different files for reuse components easily. Useful when you want use only a component from other project and don't import all module or only a part. Also it makes more easily to track changes with more reduced files.
- Update test according to last refactor.

Minor changes:
- Update copyright year (debian file), demo-app.py and demo-app2.py
- Remove blank lines and update shebang in demo-app.py and demo-app2.py

Problems to review:
- I cannot fix one test regarding to FactoryHub signals. I think that signals are not properly erased in teardown test. - Also check if setup.py include all refactored files in installation.

[Jason Gerard DeRose (jderose)]

Sorry Angel, I'm gonna say no on this one :)

As userwebkit.py is less than 500 lines, I don't think this split is yet needed for maintainability. Plus, I think we need more work on the existing API before we know how such a split should be done.

The startup time of a Python app also has a somewhat steep per-module overhead. So in terms of looking at performance and memory usage, it's generally more import to split modules based on what those modules themselves then import. And in this case, everything needs to import `gi.repository.Gtk` (which is where the biggest overhead is), so if you're using anything from userwebkit.py, there is little benefit to importing just a fragment of it.

One more note: once a split like this is done, the best way to do it is to bzr mv the current userwebkit.py into userwebkit/__init__.py and put new modules inside the userwebkit/ Python package.

I'm going to do the above when I bring back the JavaScript unit tester that used to be in Dmedia (it hasn't yet been ported to Python3 because of dependency issues). But this is something that will only be used for unit tests, not at run-time, so having it in a separate module makes sense.

review: Disapprove

Unmerged revisions

70. By Angel Guzman Maeso <email address hidden> on 2012-09-06

Update test according to last refactor. Only I cannot fix one test. I think that signals are not properly erased in teardown test. Also check if setup.py include all refactored files in installation. Needs review

69. By Angel Guzman Maeso <email address hidden> on 2012-09-06

Split userwebkit classes (Hub, Inspector and CouchView) in different files for reuse components easily

68. By Angel Guzman Maeso <email address hidden> on 2012-09-06

Update copyright year, remove blank lines and update shebang

67. By Angel Guzman Maeso <email address hidden> on 2012-09-06

Update copyright year

=== added file 'couchview.py'
--- couchview.py	1970-01-01 00:00:00 +0000
+++ couchview.py	2012-09-06 20:58:20 +0000
@@ -0,0 +1,158 @@
+#!/usr/bin/env python
+# -*- coding: utf-8; tab-width: 4; mode: python -*-
+# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: t -*-
+# vi: set ft=python sts=4 ts=4 sw=4 noet 
+#
+# novacut: the collaborative video editor
+# Copyright (C) 2011-2012 Novacut Inc
+#
+# This file is part of `novacut`.
+#
+# `novacut` is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# `novacut` is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for
+# more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with `novacut`.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authors:
+#   Jason Gerard DeRose <[e-mail]>
+
+from urllib.parse import urlparse, parse_qsl
+from gi.repository import GObject, Gtk, WebKit
+from gi.repository.GObject import TYPE_PYOBJECT
+from microfiber import _oauth_header, _basic_auth_header
+
+import logging
+log = logging.getLogger('userwebkit')
+
+class CouchView(WebKit.WebView):
+    __gsignals__ = {
+        'open': (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE,
+            [TYPE_PYOBJECT]
+        ),
+    }
+
+    def __init__(self, env=None, dmedia_resolver=None):
+        super().__init__()
+        self._logging_enabled = False
+        ##
+        self.connect('resource-request-starting', self._on_request)
+        self.connect('navigation-policy-decision-requested',
+            self._on_nav_policy_decision
+        )
+        self.set_env(env)
+        self._dmedia_resolver = dmedia_resolver
+
+    def set_env(self, env):
+        self._env = env
+        if env is None:
+            self._u = None
+            self._oauth = None
+            self._basic = None
+            return
+        self._u = urlparse(env['url'])
+        self._oauth = env.get('oauth')
+        self._basic = env.get('basic')
+
+    def set_recv(self, recv):
+        """ Executed by Hub object when recieve data """
+        self._recv = recv
+        self.connect('notify::title', self._on_notify_title)
+
+    def enable_logging(self):
+        """
+        Enables send console message to Python logging
+        """
+        if not self._logging_enabled:
+            self._logging_enabled = True
+            self.connect('console-message', self._on_console_message)
+    
+    def _on_console_message(self, view, message, line, source_id):
+        log.debug('%s @%s: %s', source_id, line, message)
+
+    def enable_view_editable(self):
+        """
+        Enables the webkit view as editable
+        """
+        self.set_editable(True)
+
+    def _on_request(self, view, frame, resource, request, response):
+        if self._env is None:
+            return
+        uri = request.get_uri()
+        message = request.get_message()
+        if uri.startswith('dmedia'):
+            if self._dmedia_resolver is None:
+                request.set_uri('')
+            else:
+                request.set_uri(self._dmedia_resolver(uri))
+            return
+        u = urlparse(uri)
+        if u.netloc != self._u.netloc:
+            return
+        if u.scheme != self._u.scheme:
+            return
+        if self._oauth:
+            query = dict(parse_qsl(u.query))
+            if u.query and not query:
+                query = {u.query: ''}
+            baseurl = ''.join([u.scheme, '://', u.netloc, u.path])
+            print ('baseurl:' + str(baseurl))
+            method = message.method
+            print ('method:' + str(method))
+            h = _oauth_header(self._oauth, method, baseurl, query)
+        elif self._basic:
+            h = _basic_auth_header(self._basic)
+        else:
+            return
+
+        # Clean headers previously to add new headers (reset)
+        # Removes all the headers listed in the Connection header.
+        message.request_headers.clean_connection_headers()
+       
+        for (key, value) in h.items():
+            message.request_headers.append(key, value)
+
+    def _on_nav_policy_decision(self, view, frame, request, nav, policy):
+        """
+        Handle user trying to Navigate away from current page.
+
+        Note that this will be called before `CouchView._on_resource_request()`.
+
+        The *policy* arg is a ``WebPolicyDecision`` instance.  To handle the
+        decision, call one of:
+
+            * ``WebPolicyDecision.ignore()``
+            * ``WebPolicyDecision.use()``
+            * ``WebPolicyDecision.download()``
+
+        And then return ``True``.
+
+        Otherwise, return ``False`` or ``None`` to have the WebKit default
+        behavior apply.
+        """
+        if self._env is None:
+            return
+        uri = request.get_uri()
+        u = urlparse(uri)
+        if u.netloc == self._u.netloc or u.scheme == 'file':
+            return False
+        if u.scheme in ('http', 'https'):
+            self.emit('open', uri)
+        policy.ignore()
+        return True
+
+    def _on_notify_title(self, view, notify):
+        title = view.get_property('title')
+        log.debug('Title %s',  str(title))
+        if title is None:
+            return
+        self._recv(title)
+        
\ No newline at end of file

=== modified file 'debian/copyright'
--- debian/copyright	2011-09-26 10:41:04 +0000
+++ debian/copyright	2012-09-06 20:58:20 +0000
@@ -6,7 +6,7 @@
 
 Copyright and license:
 
-| Copyright (C) 2011 Novacut Inc
+| Copyright (C) 2011-2012 Novacut Inc
 | 
 | This file is part of `userwebkit`.
 | 

=== modified file 'demo-app.py'
--- demo-app.py	2012-04-14 08:20:09 +0000
+++ demo-app.py	2012-09-06 20:58:20 +0000
@@ -1,7 +1,10 @@
-#!/usr/bin/python3
-
+#!/usr/bin/env python3
+# -*- coding: utf-8; tab-width: 4; mode: python -*-
+# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: t -*-
+# vi: set ft=python sts=4 ts=4 sw=4 noet 
+#
 # novacut: the collaborative video editor
-# Copyright (C) 2011 Novacut Inc
+# Copyright (C) 2011-2012 Novacut Inc
 #
 # This file is part of `novacut`.
 #
@@ -27,7 +30,6 @@
 import userwebkit
 from userwebkit import BaseApp
 
-
 class App(BaseApp):
     name = 'demo'
     dbname = 'demo-0'
@@ -86,7 +88,5 @@
     def dmedia_resolver(self, uri):
         return self.proxy.ResolveURI(uri)
 
-
 app = App()
-app.run()
-
+app.run()
\ No newline at end of file

=== modified file 'demo-app2.py'
--- demo-app2.py	2012-04-14 08:10:53 +0000
+++ demo-app2.py	2012-09-06 20:58:20 +0000
@@ -1,5 +1,8 @@
-#!/usr/bin/python3
-
+#!/usr/bin/env python3
+# -*- coding: utf-8; tab-width: 4; mode: python -*-
+# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: t -*-
+# vi: set ft=python sts=4 ts=4 sw=4 noet 
+#
 # novacut: the collaborative video editor
 # Copyright (C) 2011 Novacut Inc
 #
@@ -24,7 +27,6 @@
 import userwebkit
 from userwebkit import BaseApp
 
-
 class App(BaseApp):
     name = 'demo'
     dbname = 'demo-0'
@@ -34,7 +36,5 @@
     page = 'index2.html'
     proxy_bus = 'org.freedesktop.Dmedia'
 
-
 app = App()
-app.run()
-
+app.run()
\ No newline at end of file

=== added file 'hub.py'
--- hub.py	1970-01-01 00:00:00 +0000
+++ hub.py	2012-09-06 20:58:20 +0000
@@ -0,0 +1,81 @@
+# -*- coding: utf-8; tab-width: 4; mode: python -*-
+# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: t -*-
+# vi: set ft=python sts=4 ts=4 sw=4 noet 
+#
+# userwebkit: so WebKitGtk apps can to talk to a usercouch
+# Copyright (C) 2011-2012 Novacut Inc
+# 
+# This file is part of `userwebkit`.
+# 
+# `userwebkit` is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+# 
+# `userwebkit` is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+# 
+# You should have received a copy of the GNU Lesser General Public License along
+# with `userwebkit`.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authors:
+#   Jason Gerard DeRose <[e-mail]>
+from gi.repository import GObject
+
+import json
+
+import logging
+log = logging.getLogger('userwebkit')
+
+def iter_gsignals(signals):
+    print (signals)
+    assert isinstance(signals, dict)
+    for (name, argnames) in signals.items():
+        assert isinstance(argnames, list)
+        args = [GObject.TYPE_PYOBJECT for argname in argnames]
+        yield (name, (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, args))
+        
+def hub_factory(signals):
+    if signals:
+        class FactoryHub(Hub):
+            __gsignals__ = dict(iter_gsignals(signals))
+        return FactoryHub
+    return Hub
+
+class Hub(GObject.GObject):
+    def __init__(self, view):
+        super().__init__()
+        self._view = view
+        
+        # Key aspect, send via notify::title to view the recieved data
+        view.set_recv(self.recv)
+
+    def recv(self, data):
+        try:
+            obj = json.loads(data)
+            log.debug('Hub event(recv): %s', str(obj))
+            
+            if obj['args'] == None:
+                self.emit(obj['signal'], None)
+            else:
+                self.emit(obj['signal'], *obj['args'])
+        except ValueError:
+            pass
+
+    def send(self, signal, *args):
+        """
+        Emit a signal by calling the JavaScript Signal.recv() function.
+        """
+        
+        log.debug('Hub event(send): signal=%s', str(signal))
+        
+        script = 'Hub.recv({!r})'.format(
+            json.dumps({'signal': signal, 'args': args})
+        )
+        
+        log.debug('Executing javascript:\n%s', str(script))
+        
+        self._view.execute_script(script)
+        self.emit(signal, *args)   
\ No newline at end of file

=== added file 'inspector.py'
--- inspector.py	1970-01-01 00:00:00 +0000
+++ inspector.py	2012-09-06 20:58:20 +0000
@@ -0,0 +1,54 @@
+# -*- coding: utf-8; tab-width: 4; mode: python -*-
+# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: t -*-
+# vi: set ft=python sts=4 ts=4 sw=4 noet 
+#
+# userwebkit: so WebKitGtk apps can to talk to a usercouch
+# Copyright (C) 2011-2012 Novacut Inc
+# 
+# This file is part of `userwebkit`.
+# 
+# `userwebkit` is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+# 
+# `userwebkit` is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+# details.
+# 
+# You should have received a copy of the GNU Lesser General Public License along
+# with `userwebkit`.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authors:
+#   Jason Gerard DeRose <[e-mail]>
+
+from gi.repository import Gtk
+from couchview import CouchView
+
+class Inspector(Gtk.VBox):
+    def __init__(self, env):
+        super().__init__()
+
+        hbox = Gtk.HBox()
+        self.pack_start(hbox, False, False, 0)
+
+        close = Gtk.Button(stock=Gtk.STOCK_CLOSE)
+        hbox.pack_start(close, False, False, 2)
+        close.connect('clicked', self.on_close)
+
+        self.reload = Gtk.Button('Reload')
+        hbox.pack_start(self.reload, False, False, 2)
+
+        self.futon = Gtk.Button('CouchDB Futon')
+        hbox.pack_start(self.futon, False, False, 2)
+
+        scroll = Gtk.ScrolledWindow()
+        self.pack_start(scroll, True, True, 0)
+        scroll.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+
+        self.view = CouchView(env)
+        scroll.add(self.view)
+
+    def on_close(self, button):
+        self.destroy()
\ No newline at end of file

=== modified file 'test_userwebkit.py'
--- test_userwebkit.py	2012-08-13 06:56:11 +0000
+++ test_userwebkit.py	2012-09-06 20:58:20 +0000
@@ -37,7 +37,8 @@
 from gi.repository.GObject import SIGNAL_RUN_LAST, TYPE_NONE, TYPE_PYOBJECT
 
 import userwebkit
-
+import hub
+import couchview
 
 orig_log = userwebkit.log
 random = SystemRandom()
@@ -144,7 +145,7 @@
 class TestFunctions(TestCase):
     def test_iter_gsignals(self):
         self.assertEqual(
-            dict(userwebkit.iter_gsignals({})), 
+            dict(hub.iter_gsignals({})), # Breaks here, signals are filled by test_hub_factory and it get no reset?
             {}
         )
         signals = {
@@ -158,21 +159,22 @@
             'baz': (SIGNAL_RUN_LAST, TYPE_NONE, [TYPE_PYOBJECT, TYPE_PYOBJECT]),
         }
         self.assertEqual(
-            dict(userwebkit.iter_gsignals(signals)), 
+            dict(hub.iter_gsignals(signals)), 
             gsignals
         )
 
     def test_hub_factory(self):
-        self.assertIs(userwebkit.hub_factory(None), userwebkit.Hub)
-        self.assertIs(userwebkit.hub_factory({}), userwebkit.Hub)
+        global hub # Avoid UnboundLocalError
+        self.assertIs(hub.hub_factory(None), hub.Hub)
+        self.assertIs(hub.hub_factory({}), hub.Hub)
         signals = {
             'foo': [],
             'bar': ['one'],
             'baz': ['one', 'two'],
         }
-        klass = userwebkit.hub_factory(signals)
-        self.assertIsNot(klass, userwebkit.Hub)
-        self.assertTrue(issubclass(klass, userwebkit.Hub))
+        klass = hub.hub_factory(signals)
+        self.assertIsNot(klass, hub.Hub)
+        self.assertTrue(issubclass(klass, hub.Hub))
         self.assertEqual(klass.__name__, 'FactoryHub')
 
         # Make sure we can connect to all the expected signals:
@@ -263,9 +265,9 @@
         self.assertIsNone(view.enable_logging())
 
     def test_on_console_message(self):
-        view = userwebkit.CouchView()
+        view = couchview.CouchView()
         log = DummyLogger()
-        userwebkit.log = log
+        couchview.log = log
         message = 'hello ' + random_id()
         line = 25
         source_id = 'http://localhost:36163/_intree/index.html'

=== modified file 'userwebkit.py'
--- userwebkit.py	2012-08-29 00:04:45 +0000
+++ userwebkit.py	2012-09-06 20:58:20 +0000
@@ -1,5 +1,9 @@
+# -*- coding: utf-8; tab-width: 4; mode: python -*-
+# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: t -*-
+# vi: set ft=python sts=4 ts=4 sw=4 noet 
+#
 # userwebkit: so WebKitGtk apps can to talk to a usercouch
-# Copyright (C) 2011 Novacut Inc
+# Copyright (C) 2011-2012 Novacut Inc
 # 
 # This file is part of `userwebkit`.
 # 
@@ -29,14 +33,11 @@
 import json
 import optparse
 import logging
+from gi.repository import GObject, Gtk
 
 import microfiber
-from microfiber import _oauth_header, _basic_auth_header
 import dbus
 from dbus.mainloop.glib import DBusGMainLoop
-from gi.repository import GObject, Gtk, WebKit
-from gi.repository.GObject import TYPE_PYOBJECT
-
 
 __version__ = '12.09.0'
 APPS = '/usr/share/couchdb/apps/'
@@ -44,187 +45,15 @@
 DBusGMainLoop(set_as_default=True)
 log = logging.getLogger('userwebkit')
 
-
 def handler(d):
     assert path.abspath(d) == d
     return 	'{{couch_httpd_misc_handlers, handle_utils_dir_req, {}}}'.format(
         json.dumps(d)
     )
 
-
-class CouchView(WebKit.WebView):
-    __gsignals__ = {
-        'open': (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE,
-            [TYPE_PYOBJECT]
-        ),
-    }
-
-    def __init__(self, env=None, dmedia_resolver=None):
-        super().__init__()
-        self._logging_enabled = False
-        self.connect('resource-request-starting', self._on_request)
-        self.connect('navigation-policy-decision-requested',
-            self._on_nav_policy_decision
-        )
-        self.set_env(env)
-        self._dmedia_resolver = dmedia_resolver
-
-    def set_env(self, env):
-        self._env = env
-        if env is None:
-            self._u = None
-            self._oauth = None
-            self._basic = None
-            return
-        self._u = urlparse(env['url'])
-        self._oauth = env.get('oauth')
-        self._basic = env.get('basic')
-
-    def set_recv(self, recv):
-        self._recv = recv
-        self.connect('notify::title', self._on_notify_title)
-
-    def enable_logging(self):
-        if not self._logging_enabled:
-            self._logging_enabled = True
-            self.connect('console-message', self._on_console_message)
-
-    def _on_console_message(self, view, message, line, source_id):
-        log.debug('%s @%s: %s', source_id, line, message)
-
-    def _on_request(self, view, frame, resource, request, response):
-        if self._env is None:
-            return
-        uri = request.get_uri()
-        message = request.get_message()
-        if uri.startswith('dmedia'):
-            if self._dmedia_resolver is None:
-                request.set_uri('')
-            else:
-                request.set_uri(self._dmedia_resolver(uri))
-            return
-        u = urlparse(uri)
-        if u.netloc != self._u.netloc:
-            return
-        if u.scheme != self._u.scheme:
-            return
-        if self._oauth:
-            query = dict(parse_qsl(u.query))
-            if u.query and not query:
-                query = {u.query: ''}
-            baseurl = ''.join([u.scheme, '://', u.netloc, u.path])
-            method = message.method
-            h = _oauth_header(self._oauth, method, baseurl, query)
-        elif self._basic:
-            h = _basic_auth_header(self._basic)
-        else:
-            return
-        for (key, value) in h.items():
-            message.request_headers.append(key, value)
-
-    def _on_nav_policy_decision(self, view, frame, request, nav, policy):
-        """
-        Handle user trying to Navigate away from current page.
-
-        Note that this will be called before `CouchView._on_resource_request()`.
-
-        The *policy* arg is a ``WebPolicyDecision`` instance.  To handle the
-        decision, call one of:
-
-            * ``WebPolicyDecision.ignore()``
-            * ``WebPolicyDecision.use()``
-            * ``WebPolicyDecision.download()``
-
-        And then return ``True``.
-
-        Otherwise, return ``False`` or ``None`` to have the WebKit default
-        behavior apply.
-        """
-        if self._env is None:
-            return
-        uri = request.get_uri()
-        u = urlparse(uri)
-        if u.netloc == self._u.netloc or u.scheme == 'file':
-            return False
-        if u.scheme in ('http', 'https'):
-            self.emit('open', uri)
-        policy.ignore()
-        return True
-
-    def _on_notify_title(self, view, notify):
-        title = view.get_property('title')
-        if title is None:
-            return
-        self._recv(title)
-
-
-class Inspector(Gtk.VBox):
-    def __init__(self, env):
-        super().__init__()
-
-        hbox = Gtk.HBox()
-        self.pack_start(hbox, False, False, 0)
-
-        close = Gtk.Button(stock=Gtk.STOCK_CLOSE)
-        hbox.pack_start(close, False, False, 2)
-        close.connect('clicked', self.on_close)
-
-        self.reload = Gtk.Button('Reload')
-        hbox.pack_start(self.reload, False, False, 2)
-
-        self.futon = Gtk.Button('CouchDB Futon')
-        hbox.pack_start(self.futon, False, False, 2)
-
-        scroll = Gtk.ScrolledWindow()
-        self.pack_start(scroll, True, True, 0)
-        scroll.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
-
-        self.view = CouchView(env)
-        scroll.add(self.view)
-
-    def on_close(self, button):
-        self.destroy()
-
-
-class Hub(GObject.GObject):
-    def __init__(self, view):
-        super().__init__()
-        self._view = view
-        view.set_recv(self.recv)
-
-    def recv(self, data):
-        try:
-            obj = json.loads(data)
-            self.emit(obj['signal'], *obj['args'])
-        except ValueError:
-            pass
-
-    def send(self, signal, *args):
-        """
-        Emit a signal by calling the JavaScript Signal.recv() function.
-        """
-        script = 'Hub.recv({!r})'.format(
-            json.dumps({'signal': signal, 'args': args})
-        )
-        self._view.execute_script(script)
-        self.emit(signal, *args)        
-
-
-def iter_gsignals(signals):
-    assert isinstance(signals, dict)
-    for (name, argnames) in signals.items():
-        assert isinstance(argnames, list)
-        args = [TYPE_PYOBJECT for argname in argnames]
-        yield (name, (GObject.SIGNAL_RUN_LAST, GObject.TYPE_NONE, args))
-
-
-def hub_factory(signals):
-    if signals:
-        class FactoryHub(Hub):
-            __gsignals__ = dict(iter_gsignals(signals))
-        return FactoryHub
-    return Hub
-
+from couchview import CouchView
+from inspector import Inspector
+from hub import hub_factory
 
 class BaseApp(object):
     name = 'userwebkit'  # The namespace of your app, likely source package name
@@ -235,6 +64,7 @@
 
     enable_inspector = True  # If True, enable WebKit inspector
     enable_logging = True  # If True, send console message to Python logging
+    view_editable = False # If True, the webkit view is editable
 
     dmedia_resolver = None  # Callback to resolve Dmedia URIs
 
@@ -352,6 +182,10 @@
 
         # Add the CouchView
         self.view = CouchView(None, self.dmedia_resolver)
+        
+        if self.view_editable:
+            self.view.enable_view_editable()
+        
         self.view.connect('open', self.on_open)
         self.scroll.add(self.view)
         if self.enable_inspector:
@@ -360,6 +194,7 @@
             inspector.connect('inspect-web-view', self.on_inspect)
         if self.enable_logging:
             self.view.enable_logging()
+        
         self.view.show()
 
         # Create the hub