pytonc · ArslanRafique · Oct 4, 2012 · Oct 4, 2012 · Oct 5, 2012 · Oct 5, 2012
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,36 @@
-*.pyc
-.project
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+#*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+# IDEs
+.DS_Store
+.idea
+*.lint
 .pydevproject
-.settings/
+.project
+.settings*
+
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "uplusmessaging/externals/bcrypt"]
-    path = uplusmessaging/externals/bcrypt
-    url = https://github.com/erlichmen/py-bcrypt.git

diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,12 @@
+language: python
+python:
+  - "2.7"
+# command to install dependencies
+install:
+  - curl -O http://googleappengine.googlecode.com/files/google_appengine_1.7.2.zip && unzip -q google_appengine_1.7.2.zip
+  - pip install webtest
+  - pip install pyquery
+  - pip install pycrypto
+  - pip install mock
+# command to run tests
+script:  python testrunner.py google_appengine .
diff --git a/COPYING.LESSER b/COPYING.LESSER
@@ -0,0 +1,184 @@
+Google App Engine Boilerplate is released under the LGPL
+
+Copyright 2012
+
+What's LGPL?
+  LGPL (LESSER GENERAL PUBLIC LICENSE) is a free software license published by
+  the Free Software Foundation (FSF).
+  It was designed as a compromise between the strong-copyleft GNU General Public
+  License (GPL) and permissive licenses such as the BSD licenses and the MIT License.
+
+Why this Licence for Google App Engine Boilerplate?
+  Because with this licence you can use "Google App Engine Boilerplate" regardless
+  of whether it is free software or proprietary software.
+
+  If you make changes to this Boilerplate, in order to improve something or fix
+  an issue, you should share under the same licence those changes.
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/Makefile b/Makefile
@@ -0,0 +1,47 @@
+
+GAEPATH = $(HOME)/bin/google_appengine
+PORT=8089
+
+PYLINTS = $(wildcard *.py \
+	libs/*.py \
+	)
+PYLINTFILES = $(patsubst %.py,.%.lint,$(notdir $(PYLINTS)))
+PYLINT = $(join $(dir $(PYLINTS)),$(PYLINTFILES))
+
+PYTHONPATH=$(GAEPATH):$(GAEPATH)/lib/yaml/lib:$(GAEPATH)/lib/webob:$(GAEPATH)/lib/webapp2:$(GAEPATH)/lib/jinja2:.
+
+APP=$(shell grep 'application:' app.yaml | sed -e 's/^application:\s*//g')
+BRANCH=master
+
+run:
+	$(GAEPATH)/dev_appserver.py ./ --port=$(PORT) --datastore_path=/tmp/$(APP).dev_appserver.datastore
+
+
+.%.lint: %.py
+	@PYTHONPATH=$(PYTHONPATH) pychecker --only --no-miximport --no-override -Z __website__,__author__,__all__,__version__ $?
+	@touch $@
+
+
+lint: $(PYLINT)
+
+
+clean:
+	-rm ${PYLINT}
+
+
+push: lint
+	git push origin $(BRANCH)
+
+
+upload:
+	$(GAEPATH)/appcfg.py update --skip_sdk_update_check ./
+
+
+push-and-upload: push upload
+
+
+python:
+	PYTHONPATH=$(PYTHONPATH) python
+
+
+.PHONY: run lint clean push upload push-and-upload python
diff --git a/README.md b/README.md
@@ -1,8 +1,22 @@
-udacityplus
-===========
+General
+-------
+Application is in `web` directory. Top level directories take precedence over ones in `boilerplate`, hence some are duplicated. Please don't alter anything in `boilerplate` directory.
 
-stylized **U+**
+Some files are unused, I just didn't get around to cleanup. Some code may crash and be insecure against unauthorized requests.
 
-The Udacity Collaborative Social Network
+~~Users don't get automatically added to search index due to processing required to do that being executed only after user edits their profile. Registration triggers boilerplate User class (in boilerplate/models), profile triggers app specific User (in web/models).~~done, so new users get auto-put in search
 
-http://udacityplus.appspot.com
+Bulk data
+---------
+Course data is in `data/` directory. For remote deployment, upload the application before uploading data. Instructions for uploading data are in `bulkuploader.md`, some convenience code in `bulkup.sh` (for local) and `bulkup_remote.sh` (for remote).
+
+update gae-boilerplate with:
+----------------------------
+
+```
+git pull bootstrap master
+```
+
+OpenID
+------
+Not configured
diff --git a/uplusmessaging/controllers/__init__.py → admin/__init__.py b/uplusmessaging/controllers/__init__.py → admin/__init__.py
diff --git a/admin/routes.py b/admin/routes.py
@@ -0,0 +1,20 @@
+from webapp2_extras.routes import RedirectRoute
+from webapp2_extras.routes import PathPrefixRoute
+import users
+
+
+_routes = [
+    PathPrefixRoute('/admin', [
+        RedirectRoute('/logout/', users.Logout, name='admin-logout', strict_slash=True),
+        RedirectRoute('/geochart/', users.Geochart, name='geochart', strict_slash=True),
+        RedirectRoute('/users/', users.List, name='user-list', strict_slash=True),
+        RedirectRoute('/users/<user_id>/', users.Edit, name='user-edit', strict_slash=True, handler_method='edit')
+    ])
+]
+
+def get_routes():
+    return _routes
+
+def add_routes(app):
+    for r in _routes:
+        app.router.add(r)
diff --git a/admin/templates/admin/base.html b/admin/templates/admin/base.html
@@ -0,0 +1,25 @@
+{% extends 'base.html' %}
+{% import 'admin/macros.html' as lib with context %}
+
+{% block navbar %}
+        <div class="navbar navbar-fixed-top">
+            <div class="navbar-inner">
+                <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                    <span class="icon-chevron-down icon"></span>
+                </button>
+                <a class="brand" href="{{ uri_for('user-list') }}">{{ app_name }}</a>
+                <div class="nav-collapse">
+                    <ul class="nav">
+                        <li><a href="{{ uri_for('geochart') }}">{% trans %}Big Picture{% endtrans %}</a></li>
+                    </ul>
+                    <ul class="nav pull-right">
+                        <li class="divider-vertical"></li>
+                        <li><a href="{{ uri_for('admin-logout') }}">{% trans %}Logout{% endtrans %}</a></li>
+                    </ul>
+                </div><!-- /navbar-collapse -->
+            </div><!-- /navbar-inner -->
+        </div><!-- /navbar -->
+{% endblock %}
+
+{% block subnavbar %}
+{% endblock %}