'robots_disallow' argument removed

Author: voronind

CHANGELOG

@@ -1,4 +1,8 @@
 
+1.1   - December 2012
+=====================
+    - remove 'robots_disallow' argument
+
 1.0   - December 2012
 =====================
     - initial working release

README.rst

@@ -28,12 +28,12 @@ The recommended way to install django-url-robots is with `pip <http://pypi.pytho
         url(r'^robots.txt$', 'url_robots.views.robots_txt'),
         )
 
-4. Describe rules by boolean keyword arguments ``robots_allow`` and ``robots_disallow`` using for it ``url_robots.utils.url`` instead ``django.conf.urls.defaults.url``::
+4. Describe rules by boolean keyword argument ``robots_allow`` using for it ``url_robots.utils.url`` instead ``django.conf.urls.defaults.url``::
 
     from url_robots.utils import url
     
     urlpatterns += patterns('',
-       url('^profile/private$', 'view', robots_disallow=True),
+       url('^profile/private$', 'view', robots_allow=False),
        )
  
 ``django-url-robots`` tested with ``Django-1.3``. Encodes unicode characters by percent-encoding.
@@ -71,7 +71,7 @@ urls_profile.py::
     urlpatterns = patterns('',
         url(r'^s$', 'view', name='profiles', robots_allow=True),
         url(r'^/(?P<nick>\w+)$', 'view'),
-        url(r'^/(?P<nick>\w+)/private', 'view', name='profile_private', robots_disallow=True),
+        url(r'^/(?P<nick>\w+)/private', 'view', name='profile_private', robots_allow=False),
         url(r'^/(?P<nick>\w+)/public', 'view', name='profile_public', robots_allow=True),
         )
 

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='django-url-robots',
-    version='1.0.4',
+    version='1.1',
     description='Django robots.txt generator',
     long_description=long_description,
     url='http://github.com/dimka665/django-url-robots',

url_robots/tests/urls_profile.py

@@ -7,6 +7,6 @@
 urlpatterns = patterns('',
     url(r'^s$', 'view', name='profiles', robots_allow=True),
     url(r'^/(?P<nick>\w+)$', 'view'),
-    url(r'^/(?P<nick>\w+)/private', 'view', name='profile_private', robots_disallow=True),
+    url(r'^/(?P<nick>\w+)/private', 'view', name='profile_private', robots_allow=False),
     url(r'^/(?P<nick>\w+)/public', 'view', name='profile_public', robots_allow=True),
     )

url_robots/utils.py

@@ -10,11 +10,10 @@
 # decorator for django.conf.urls.defaults.url
 def robots_decorator(url_function):
     def url_extended(regex, view, kwargs=None, name=None, prefix='',
-                     robots_allow=None, robots_disallow=None):
+                     robots_allow=None):
         resolver_or_pattern = url_function(regex, view, kwargs=kwargs, name=name, prefix=prefix)
 
         resolver_or_pattern.robots_allow = robots_allow
-        resolver_or_pattern.robots_disallow = robots_disallow
         return resolver_or_pattern
 
     return url_extended
@@ -37,14 +36,15 @@ def create_rule_list(parent_resolver, abs_pattern):
     for resolver in parent_resolver.url_patterns:
         pattern = join_patterns(abs_pattern, resolver.regex.pattern)
 
-        robots_allow = getattr(resolver, 'robots_allow', None)
-        robots_disallow = getattr(resolver, 'robots_disallow', None)
         rule = ''
+        robots_allow = getattr(resolver, 'robots_allow', None)
 
-        if robots_disallow:
-            rule = 'Disallow: '
+        if robots_allow is None:
+            pass
         elif robots_allow:
             rule = 'Allow: '
+        else:
+            rule = 'Disallow: '
 
         if rule:
             path = clean_pattern(pattern)