Reorganise the project

anthony-tresontani · May 4, 2012 · f8f61c8 · f8f61c8
1 parent c289008
commit f8f61c8
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 *.pyc
-rules/.idea/*
+*/.idea/*
diff --git a/rules/__init__.py → rules_engine/__init__.py b/rules/__init__.py → rules_engine/__init__.py
diff --git a/rules/manage.py → rules_engine/manage.py b/rules/manage.py → rules_engine/manage.py
diff --git a/rules_engine/overview.rst b/rules_engine/overview.rst
@@ -0,0 +1,5 @@
+Automatic group creation
+========================
+
+Any object is automatically assigned a group by default containing the all objects of the same model.
+For ex, any Product instead will belong to the group group_product_model.
diff --git a/rules/overview.txt → rules_engine/overview.txt b/rules/overview.txt → rules_engine/overview.txt
diff --git a/rules/core/__init__.py → rules_engine/rules_handler/__init__.py b/rules/core/__init__.py → rules_engine/rules_handler/__init__.py
diff --git a/rules/core/models.py → rules_engine/rules_handler/models.py b/rules/core/models.py → rules_engine/rules_handler/models.py
@@ -1,3 +1,5 @@
+import logging
+
 from django.contrib.auth.models import Permission
 from django.db import models
 from django.db.models.query import QuerySet
@@ -6,6 +8,8 @@
 
 from peak.rules import abstract, when
 
+logger = logging.getLogger("rules")
+
 # Create your models here.
 class Group(object):
     groups = set([])
@@ -52,11 +56,13 @@ def belong(cls_, obj):
 
 @receiver(class_prepared)
 def create_group_model(sender, **kwargs):
+    logging.debug("Receive prepared signal for %s", sender)
     if isinstance(sender, type):
 	class_name = get_model_group_name(sender.__name__)
 	if not Group.get_by_name(class_name):
             group = create_group_class(sender)
 	    Group.register(group)
+            logger.info("Creating and registering automatic group %s" , class_name)
 
 
 @abstract

diff --git a/rules/core/rules.py → rules_engine/rules_handler/rules.py b/rules/core/rules.py → rules_engine/rules_handler/rules.py
@@ -1,7 +1,7 @@
 import logging
 
 from django.db.models.query_utils import Q
-from core.models import ACL, Group, Rule
+from rules_handler.models import ACL, Group, Rule
 
 
 logger = logging.getLogger("rules")

diff --git a/rules/core/tests.py → rules_engine/rules_handler/tests.py b/rules/core/tests.py → rules_engine/rules_handler/tests.py
@@ -3,14 +3,14 @@
 from hamcrest import *
 from django_dynamic_fixture import get
 
-from core.rules import ApplyRules, IsRuleMatching
+from rules_handler.rules import ApplyRules, IsRuleMatching
 
 from sample.models import *
 from sample.rules import *
 from sample.groups import *
 
 from django.contrib.auth.models import User
-from core.models import Group, ACL
+from rules_handler.models import Group, ACL
 
 class TestRules(TestCase):
 

diff --git a/rules/core/views.py → rules_engine/rules_handler/views.py b/rules/core/views.py → rules_engine/rules_handler/views.py
diff --git a/rules/run_test.sh → rules_engine/run_test.sh b/rules/run_test.sh → rules_engine/run_test.sh
diff --git a/rules/sample/__init__.py → rules_engine/sample/__init__.py b/rules/sample/__init__.py → rules_engine/sample/__init__.py
diff --git a/rules/sample/groups.py → rules_engine/sample/groups.py b/rules/sample/groups.py → rules_engine/sample/groups.py
@@ -1,5 +1,5 @@
 # Create your models here.
-from core.models import Group
+from rules_handler.models import Group
 
 class CustomerGroup(Group):
     name = "customergroup"

diff --git a/rules/sample/models.py → rules_engine/sample/models.py b/rules/sample/models.py → rules_engine/sample/models.py
diff --git a/rules/sample/rules.py → rules_engine/sample/rules.py b/rules/sample/rules.py → rules_engine/sample/rules.py
@@ -1,6 +1,6 @@
 from django.contrib.auth.models import User
 from django.db.models.query_utils import Q
-from core.models import Rule, Group
+from rules_handler.models import Rule, Group
 from sample.groups import CustomerGroup
 from sample.models import Product
 

diff --git a/rules/sample/views.py → rules_engine/sample/views.py b/rules/sample/views.py → rules_engine/sample/views.py
diff --git a/rules/settings.py → rules_engine/settings.py b/rules/settings.py → rules_engine/settings.py
@@ -118,7 +118,7 @@
     'django.contrib.staticfiles',
     'django_nose',
 
-    'core',
+    'rules_handler',
 
     'sample',
     # Uncomment the next line to enable the admin:
@@ -135,6 +135,11 @@
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
+    'formatters':{
+        'simple': {
+            'format': '%(levelname)s %(funcName)s | %(message)s'
+        },
+    },
     'handlers': {
         'mail_admins': {
             'level': 'ERROR',
@@ -143,6 +148,7 @@
     'console': {
             'level':'DEBUG',
             'class':'logging.StreamHandler',
+            'formatter': 'simple',
             'strm' if int(sys.version[2:3]) < 7 else 'stream': sys.stdout ,
         }
     },
@@ -159,7 +165,7 @@
         },
         'rules': {
             'handlers': ['console'],
-            'level':'DEBUG',
+            'level':'INFO',
             'propagate': False,
         },
     }

diff --git a/rules/todo → rules_engine/todo b/rules/todo → rules_engine/todo
diff --git a/rules/urls.py → rules_engine/urls.py b/rules/urls.py → rules_engine/urls.py
diff --git a/setup.py b/setup.py
@@ -1,11 +1,10 @@
 from distutils.core import setup
 
-requires = ['PEAK-Rules==0.5a1.dev-r2707']
-
 setup(name='django-rules',
       version='0.1',
       description='Dynamic rule handling',
       author='Anthony Tresontani',
       author_email='dev.tresontani@gmail.com',
-      packages=['rules'],
+      packages=['rules_engine'],
+      install_requires = ['PEAK-Rules==0.5a1.dev-r2707']
      )