Updated README and context processors values

4 files changed, 37 insertions, 12 deletions

diff --git a/README.rst b/README.rst
index 78f88d3..7d9af20 100644
--- a/README.rst
+++ b/README.rst
@@ -61,6 +61,22 @@ Configuration
  # but uses this settings insted to generate  absolute urls
  BREVISURL_BACKEND_LOCAL_DOMAIN = 'http://brevisurl.net/' # Default is None
 
+ # Characters that are used to generate tokens for local backend.
+ BREVISURL_LOCAL_BACKEND_TOKEN_CHARS = list(string.ascii_letters + string.digits)
+
+ # Settings for token length.
+ BREVISURL_LOCAL_BACKEND_TOKEN_LENGTH = 5
+
+ # Settings for url pattern.
+ BREVISURL_LOCAL_BACKEND_URL_PATTERN = r'^(?P<token>[a-zA-Z0-9]{' + str(LOCAL_BACKEND_TOKEN_LENGTH) + r'})$'
+
+ # Protocol for local backend.
+ BREVISURL_LOCAL_BACKEND_DOMAIN_PROTOCOL = getattr(settings, 'BREVISURL_LOCAL_BACKEND_DOMAIN_PROTOCOL', 'http')
+
+ # Do we need slash in newly generated token url ?
+ BREVISURL_LOCAL_BACKEND_STRIP_TOKEN_URL_SLASH = getattr(settings, 'BREVISURL_LOCAL_BACKEND_STRIP_TOKEN_URL_SLASH', False)
+
+
 
 **Append brevisurl url patterns to your urls.py at the end of module, if you're using local backend**
 
@@ -160,7 +176,7 @@ Tests
 - Xubuntu Linux 12.04 LTS precise 64-bit
 - python 2.7.3+
 - python unittest
-- django 1.4
+- django 1.4.1
 
 **Running tests**
 
@@ -175,7 +191,7 @@ Author
 
 | char0n (Vladimír Gorej, CodeScale s.r.o.)
 | email: gorej@codescale.net
-| web: http://www.codescale.net
+| web: http://www.codescale.net/
 
 
 References
diff --git a/brevisurl/context_processors.py b/brevisurl/context_processors.py
index ea4ed7b..10ae356 100644
--- a/brevisurl/context_processors.py
+++ b/brevisurl/context_processors.py
@@ -3,6 +3,15 @@ import brevisurl.settings
 
 def brevisurl_data(request):
     return {
+        # Still present due to historic reasons. Now deprecated.
         'BREVIS_BACKEND': brevisurl.settings.DEFAULT_BACKEND,
-        'BREVIS_BACKEND_LOCAL_DOMAIN': brevisurl.settings.LOCAL_BACKEND_DOMAIN
+        'BREVIS_BACKEND_LOCAL_DOMAIN': brevisurl.settings.LOCAL_BACKEND_DOMAIN,
+        # Up-to-date context variables.
+        'BREVISURL_BACKEND': brevisurl.settings.DEFAULT_BACKEND,
+        'BREVISURL_BACKEND_LOCAL_DOMAIN': brevisurl.settings.LOCAL_BACKEND_DOMAIN,
+        'BREVISURL_LOCAL_BACKEND_TOKEN_CHARS': brevisurl.settings.LOCAL_BACKEND_TOKEN_CHARS,
+        'BREVISURL_LOCAL_BACKEND_TOKEN_LENGTH': brevisurl.settings.LOCAL_BACKEND_TOKEN_LENGTH,
+        'BREVISURL_LOCAL_BACKEND_URL_PATTERN': brevisurl.settings.LOCAL_BACKEND_URL_PATTERN,
+        'BREVISURL_LOCAL_BACKEND_DOMAIN_PROTOCOL': brevisurl.settings.LOCAL_BACKEND_DOMAIN_PROTOCOL,
+        'BREVISURL_LOCAL_BACKEND_STRIP_TOKEN_URL_SLASH': brevisurl.settings.LOCAL_BACKEND_STRIP_TOKEN_URL_SLASH
     }
\ No newline at end of file
diff --git a/brevisurl/settings.py b/brevisurl/settings.py
index 80b3989..641020b 100644
--- a/brevisurl/settings.py
+++ b/brevisurl/settings.py
@@ -3,22 +3,22 @@ import string
 from django.conf import settings
 
 
-# Default backend used to for get_connection() fuction
+# Default backend used to for get_connection() function.
 DEFAULT_BACKEND = getattr(settings, 'BREVISURL_BACKEND', 'brevisurl.backends.local.BrevisUrlBackend')
 
-# Domain that is used to create shortened urls
-LOCAL_BACKEND_DOMAIN = getattr(settings, 'BREVISURL_BACKEND_LOCAL_DOMAIN', None)
+# Domain that is used to create shortened urls.
+LOCAL_BACKEND_DOMAIN = getattr(settings, 'BREVISURL_BACKEND_LOCAL_DOMAIN', None) or getattr(settings, 'BREVISURL_LOCAL_BACKEND_DOMAIN', None)
 
-# Characters that are used to generate tokens for local backend
+# Characters that are used to generate tokens for local backend.
 LOCAL_BACKEND_TOKEN_CHARS = getattr(settings, 'BREVISURL_LOCAL_BACKEND_TOKEN_CHARS', list(string.ascii_letters + string.digits))
 
-# Settings for token length
+# Settings for token length.
 LOCAL_BACKEND_TOKEN_LENGTH = getattr(settings, 'BREVISURL_LOCAL_BACKEND_TOKEN_LENGTH', 5)
 
-# Settings for url pattern
+# Settings for url pattern.
 LOCAL_BACKEND_URL_PATTERN = getattr(settings, 'BREVISURL_LOCAL_BACKEND_URL_PATTERN',
                                     r'^(?P<token>[a-zA-Z0-9]{' + str(LOCAL_BACKEND_TOKEN_LENGTH) + r'})$')
-# Protocol for local backend
+# Protocol for local backend.
 LOCAL_BACKEND_DOMAIN_PROTOCOL = getattr(settings, 'BREVISURL_LOCAL_BACKEND_DOMAIN_PROTOCOL', 'http')
 
 # Do we need slash in newly generated token url ?
diff --git a/setup.py b/setup.py
index 1a34d2b..b6e23bb 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ def read(fname):
 
 setup(
     name='django-brevisurl',
-    version='0.9.3',
+    version='1.0',
     description='django-brevisurl is django app for shortening urls',
     long_description=read('README.rst'),
     author=u'Vladimír Gorej',
@@ -29,7 +29,7 @@ setup(
     install_requires=['django'],
     platforms='any',
     classifiers=[
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
         'Intended Audience :: Information Technology',