Automated merge with http://hg.mozilla.org/labs/bespin

.hgtags

@@ -1,2 +1,5 @@
 30b7a1db05072c555ec7930ae6a84c1f31f26ae3 0.1.3
 4f73e9e89e81e3f8a3c1ecf28e5e04d0bf63eeb5 0.1.3
+78adea9fb4b7e33df220817a48a13fab36258861 0.1.4
+d44a4512c0022bae23a36a3d3a5ac4a701f41156 0.1.5
+1fcf4e024671c5c62caed100ac8f788a90eb2886 0.1.6

README.txt

@@ -7,7 +7,6 @@ editor using HTML 5 technology.
 Project home page: http://labs.mozilla.com/projects/bespin/
 Live system: https://bespin.mozilla.com/
 
-
 Thanks for downloading the code to the Bespin project. You can easily get 
 Bespin's Python server running on your local Mac or Linux machine (see note 
 about Windows below).
@@ -48,15 +47,21 @@ You can run the unit tests by running::
 Updating the Required Files
 ---------------------------
 
-If the "requirements.txt" file changes, you can re-install the required packages
-by running::
+If the "requirements.txt" file changes, you can re-install the
+required packages by running::
 
   paver required
 
 You can also force upgrade all of the packages like so::
 
   pip install -U -r requirements.txt
 
+More Documentation
+------------------
+
+Documentation for Bespin's code and APIs are actually part of every
+instance of the Bespin server. To view the docs on your local instance, just
+browse to http://127.0.0.1:8080/docs/.
 
 Contributing to Bespin
 ----------------------
@@ -67,12 +72,14 @@ For details see:
 The source repository is in Mercurial at:
   http://hg.mozilla.org/labs/bespin/
 
-
 Note about running on Windows
 -----------------------------
 
-The current, up-to-date Bespin backend is written in Python. Because Python is cross-platform, it should be possible (and likely not too difficult) to make the backend work on Windows once Python 2.5 is installed. However, this has not been tested and there are likely two issues:
+The current, up-to-date Bespin backend is written in Python. Because
+Python is cross-platform, it should be possible (and likely not too
+difficult) to make the backend work on Windows once Python 2.5 is
+installed. However, this has not been tested and there are likely two
+issues:
 
 1. some libraries used by Bespin try to compile C code
-2. some paths may not be correct on Windows systems
-
+2. some paths may not be correct on Windows systems

backend/python/bespin/__init__.py

@@ -28,6 +28,6 @@
 
 # BEGIN VERSION BLOCK
 VERSION = 'tip'
-VERSION_NAME = '(none)'
+VERSION_NAME = 'DEVELOPMENT MODE'
 API_VERSION = 'dev'
 # END VERSION BLOCK

backend/python/bespin/controllers.py

@@ -344,12 +344,17 @@ def _perform_import(file_manager, user, project_name, filename, fileobj):
     func(user,
         project, filename, fileobj)
     return
+
+def validate_url(url):
+    if not url.startswith("http://") and not url.startswith("https://"):
+        raise BadRequest("Invalid url: " + url)
+    return url
 
 @expose(r'^/project/fromurl/(?P<project_name>[^/]+)', "POST")
 def import_from_url(request, response):
     project_name = request.kwargs['project_name']
 
-    url = request.body
+    url = validate_url(request.body)
     try:
         resp = httplib2.Http().request(url, method="HEAD")
     except httplib2.HttpLib2Error, e:

backend/python/bespin/model.py

@@ -57,8 +57,8 @@
 
 Base = declarative_base()
 
-# quotas are expressed in 1 million byte increments
-QUOTA_UNITS = 1000000
+# quotas are expressed in 1 megabyte increments
+QUOTA_UNITS = 1048576
 
 class ConflictError(Exception):
     pass

backend/python/pavement.py

@@ -32,7 +32,10 @@
 from setuptools import find_packages
 from paver.setuputils import find_package_data
 
-from paver.defaults import *
+from paver.easy import *
+from paver import setuputils
+setuputils.install_distutils_tasks()
+
 
 execfile(os.path.join('bespin', '__init__.py'))
 
@@ -85,8 +88,6 @@ def production():
         non_production_packages.add(name)
         external_libs.append("libs/%s" % (f.basename()))
 
-    sh("../../bin/pip freeze -r ../../requirements.txt %s" % (production_requirements))
-
     lines = production_requirements.lines()
 
     requirement_pattern = re.compile(r'^(.*)==')

backend/python/production/pavement.py

@@ -1,4 +1,4 @@
-from paver.defaults import *
+from paver.easy import *
 
 import paver.virtual
 

backend/python/setup.py

@@ -1,5 +1,7 @@
 # Don't run this. This is just for pip.
 
+from paver import tasks
+tasks.environment = tasks.Environment()
 import pavement
 from setuptools import setup