Fix merge conflicts and fix release.py

.gitignore

@@ -1,8 +1,27 @@
-.DS_Store
-*.pyc
+*.py[co]
+
+# Packages
 *.egg
 *.egg-info
-.project
-.pydevproject
-.settings
 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

.travis.yml

@@ -0,0 +1,22 @@
+language: python
+
+python:
+  - "2.6"
+  - "2.7"
+
+install:
+  - pip install . --quiet --use-mirrors
+  - "if [[ $TRAVIS_PYTHON_VERSION != '2.7' ]]; then pip install importlib --quiet --use-mirrors; fi"
+  - pip install nose simplejson Flask-SQLAlchemy Flask-MongoEngine Flask-Mail py-bcrypt MySQL-python --quiet --use-mirrors
+
+before_script:
+  - mysql -e 'create database flask_security_test;'
+
+services:
+  - mongodb
+
+script: nosetests
+
+branches:
+  only:
+    - develop

CHANGES

@@ -3,33 +3,42 @@ Flask-Security Changelog
 
 Here you can see the full list of changes between each Flask-Security release.
 
+Version 1.5.0
+-------------
+
+Released October 11th 2012
+
+- Major release. Upgrading from previous versions will require a bit of work to
+  accomodate API changes. See documentation for a list of new features and for
+  help on how to upgrade.
+
 Version 1.2.3
 -------------
 
-Released June 12th, 2012
+Released June 12th 2012
 
 - Fixed a bug in the RoleMixin eq/ne functions
 
 Version 1.2.2
 -------------
 
-Released April 27th, 2012
+Released April 27th 2012
 
 - Fixed bug where `roles_required` and `roles_accepted` did not pass the next
   argument to the login view
 
 Version 1.2.1
 -------------
 
-Released March 28th, 2012
+Released March 28th 2012
 
 - Added optional user model mixin parameter for datastores
 - Added CreateRoleCommand to available Flask-Script commands
 
 Version 1.2.0
 -------------
 
-Released March 12th, 2012
+Released March 12th 2012
 
 - Added configuration option `SECURITY_FLASH_MESSAGES` which can be set to a 
   boolean value to specify if Flask-Security should flash messages or not.

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (C) 2012 by Matt Wright
+Copyright (C) 2012 by Matthew Wright
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 

MANIFEST.in

@@ -1 +1,2 @@
-include tests/*.py
+recursive-include tests *.py
+recursive-include flask_security/templates *.*

README.rst

@@ -0,0 +1,15 @@
+Flask-Security
+==============
+
+.. image:: https://secure.travis-ci.org/mattupstate/flask-security.png?branch=develop
+
+Flask-Security quickly adds security features to your Flask application.
+
+Resources
+---------
+
+- `Documentation <http://packages.python.org/Flask-Security/>`_
+- `Issue Tracker <http://github.com/mattupstate/flask-security/issues>`_
+- `Code <http://github.com/mattupstate/flask-security/>`_
+- `Development Version
+  <http://github.com/mattupstate/flask-security/zipball/develop#egg=Flask-Security-dev>`_

docs/_templates/sidebarintro.html

@@ -0,0 +1,17 @@
+<h3>About</h3>
+<p>
+  Flask-Security is an opinionated Flask extension which adds basic
+  security and authentication features to your Flask apps quickly
+  and easily. Flask-Social can also be used to add "social" or OAuth
+  login and connection management.
+</p>
+<h3>Useful Links</h3>
+<ul>
+  <li><a href="http://pypi.python.org/pypi/Flask-Security">Flask-Security @ PyPI</a></li>
+  <li><a href="http://github.com/mattupstate/flask-security">Flask-Security @ github</a></li>
+  <li><a href="http://github.com/jfinkels/flask-security/issues">Issue Tracker</a></li>
+</ul>
+<ul>
+  <li><a href="http://pypi.python.org/pypi/Flask-Social">Flask-Social</a></li>
+  <li><a href="http://github.com/mattupstate/flask-social">Flask-Social @ github</a></li>
+</ul>

docs/_templates/sidebarlogo.html

@@ -0,0 +1,3 @@
+<p class="logo"><a href="{{ pathto(master_doc) }}">
+  <img class="logo" src="{{ pathto('_static/logo-helmet.png', 1) }}" alt="Logo"/>
+</a></p>

docs/api.rst

@@ -0,0 +1,57 @@
+API
+===
+
+Core
+----
+.. autoclass:: flask_security.core.Security
+    :members:
+
+.. data:: flask_security.core.current_user
+
+   A proxy for the current user.
+
+
+Protecting Views
+----------------
+.. autofunction:: flask_security.decorators.login_required
+
+.. autofunction:: flask_security.decorators.roles_required
+
+.. autofunction:: flask_security.decorators.roles_accepted
+
+.. autofunction:: flask_security.decorators.http_auth_required
+
+.. autofunction:: flask_security.decorators.auth_token_required
+
+
+User Object Helpers
+-------------------
+.. autoclass:: flask_security.core.UserMixin
+   :members:
+
+.. autoclass:: flask_security.core.RoleMixin
+   :members:
+
+.. autoclass:: flask_security.core.AnonymousUser
+   :members:
+
+
+Datastores
+----------
+.. autoclass:: flask_security.datastore.UserDatastore
+    :members:
+
+.. autoclass:: flask_security.datastore.SQLAlchemyUserDatastore
+    :members:
+    :inherited-members:
+
+.. autoclass:: flask_security.datastore.MongoEngineUserDatastore
+    :members:
+    :inherited-members:
+
+
+Signals
+-------
+See the documentation for the signals provided by the Flask-Login and
+Flask-Principal extensions. Flask-Security does not provide any additional
+signals.

docs/conf.py

@@ -18,7 +18,6 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('..'))
 sys.path.append(os.path.abspath('_themes'))
-#from setup import __version__
 
 # -- General configuration -----------------------------------------------------
 
@@ -50,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.2.3'
+version = '1.3.0-dev'
 # The full version, including alpha/beta/rc tags.
 release = version
 
@@ -93,14 +92,16 @@
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'flask_small'
+html_theme = 'flask'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
 html_theme_options = {
-    'github_fork': 'mattupstate/flask-security',
-    'index_logo': False
+    #'github_fork': 'mattupstate/flask-security',
+    #'index_logo': False
+    'touch_icon':   'touch-icon.png',
+    'index_logo':   'logo-full.png'
 }
 
 # Add any paths that contain custom themes here, relative to this directory.
@@ -136,7 +137,11 @@
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+html_sidebars = {
+    'index':    ['sidebarintro.html', 'sourcelink.html', 'searchbox.html'],
+    '**':       ['sidebarlogo.html', 'localtoc.html', 'relations.html',
+                 'sourcelink.html', 'searchbox.html']
+}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.