Merge branch 'release/0.0.2'

Author: uralbash

.gitignore

@@ -18,3 +18,5 @@ TODO
 TODO.txt
 nohup.out
 .cache
+.tox
+__pycache__

.travis.yml

@@ -14,11 +14,17 @@ notifications:
 python:
   - "2.7"
 
+env:
+  - TOXENV=py27
+  - TOXENV=py33
+
 install:
   - pip install nose coverage coveralls
   - pip install -r requirements.txt
+  - pip install tox
 
 script:
+  - tox
   - nosetests --with-coverage --cover-package=sqlalchemy_mptt --cover-erase --with-doctest
 
 after_success:

sqlalchemy_mptt/__init__.py

@@ -5,7 +5,7 @@
 # Copyright © 2014 uralbash <root@uralbash.ru>
 #
 # Distributed under terms of the MIT license.
-from mixins import BaseNestedSets
+from .mixins import BaseNestedSets
 
 __version__ = "0.0.1"
 __mixins__ = [BaseNestedSets]

sqlalchemy_mptt/events.py

@@ -173,7 +173,7 @@ def mptt_before_update(mapper, connection, instance):
                     table.c.tree_id == instance.tree_id))
         .order_by(table.c.lft)
     ).fetchall()
-    subtree = map(lambda x: x[0], subtree)
+    subtree = [x[0] for x in subtree]
 
     """ step 0: Initialize parameters.
 

sqlalchemy_mptt/mixins.py

@@ -15,7 +15,7 @@
 from sqlalchemy.orm import backref, relationship
 from sqlalchemy.orm.session import Session
 
-from events import mptt_before_delete, mptt_before_insert, mptt_before_update
+from .events import mptt_before_delete, mptt_before_insert, mptt_before_update
 
 
 class BaseNestedSets(object):
@@ -80,7 +80,7 @@ def move_after(self, node_id):
         session.add(self)
 
     @classmethod
-    def get_tree(self, session, json=False, json_fields=None):
+    def get_tree(cls, session, json=False, json_fields=None):
         def recursive_node_to_dict(node):
             result = {'node': node}
             if json:
@@ -93,10 +93,55 @@ def recursive_node_to_dict(node):
                 result['children'] = children
             return result
 
-        nodes = session.query(self).filter_by(parent_id=None)\
-            .order_by(self.tree_id).all()
+        nodes = session.query(cls).filter_by(parent_id=None)\
+            .order_by(cls.tree_id).all()
         tree = []
-        for i, node in enumerate(nodes):
+        for node in nodes:
             tree.append(recursive_node_to_dict(node))
 
         return tree
+
+    @classmethod
+    def rebuild_tree(cls, session, tree_id):
+        session.query(cls).filter_by(tree_id=tree_id)\
+            .update({cls.left: 0, cls.right: 0, cls.level: 0})
+        top = session.query(cls).filter_by(parent_id=None)\
+            .filter_by(tree_id=tree_id).one()
+        top.left = left = 1
+        top.right = right = 2
+        top.level = level = 1
+
+        def reqursive(children, left, right, level):
+            level = level + 1
+            for i, node in enumerate(children):
+                same_level_right = children[i-1].right
+                left = left + 1
+
+                if i > 0:
+                    left = left + 1
+                if same_level_right:
+                    left = same_level_right + 1
+
+                right = left + 1
+                node.left = left
+                node.right = right
+                parent = node.parent
+
+                j = 0
+                while parent:
+                    parent.right = right + 1 + j
+                    parent = parent.parent
+                    j += 1
+
+                node.level = level
+                reqursive(node.children, left, right, level)
+
+        reqursive(top.children, left, right, level)
+
+    @classmethod
+    def rebuild(cls, session, tree_id=None):
+        trees = session.query(cls).filter_by(parent_id=None)
+        if tree_id:
+            trees = trees.filter_by(tree_id=tree_id)
+        for tree in trees:
+            cls.rebuild_tree(session, tree.tree_id)

sqlalchemy_mptt/tests.py

@@ -15,7 +15,7 @@
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 
-from mixins import BaseNestedSets
+from .mixins import BaseNestedSets
 
 Base = declarative_base()
 
@@ -106,6 +106,10 @@ def add_mptt_tree(session):
     add_fixture(Tree, tree2, session)
 
 
+def get_obj(session, id):
+    return session.query(Tree).filter_by(id=id).one()
+
+
 class TestTree(unittest.TestCase):
 
     def setUp(self):
@@ -1029,8 +1033,11 @@ def test_move_after_between_tree(self):
 
     def test_get_tree(self):
         tree = Tree.get_tree(self.session)
-        self.assertEqual(str(tree),
-                         "[{'node': <Node (1)>, 'children': [{'node': <Node (2)>, 'children': [{'node': <Node (3)>}]}, {'node': <Node (4)>, 'children': [{'node': <Node (5)>}, {'node': <Node (6)>}]}, {'node': <Node (7)>, 'children': [{'node': <Node (8)>, 'children': [{'node': <Node (9)>}]}, {'node': <Node (10)>, 'children': [{'node': <Node (11)>}]}]}]}, {'node': <Node (12)>, 'children': [{'node': <Node (13)>, 'children': [{'node': <Node (14)>}]}, {'node': <Node (15)>, 'children': [{'node': <Node (16)>}, {'node': <Node (17)>}]}, {'node': <Node (18)>, 'children': [{'node': <Node (19)>, 'children': [{'node': <Node (20)>}]}, {'node': <Node (21)>, 'children': [{'node': <Node (22)>}]}]}]}]")
+
+        def go(id):
+            return get_obj(self.session, id)
+        self.assertEqual(tree,
+                         [{'node': go(1), 'children': [{'node': go(2), 'children': [{'node': go(3)}]}, {'node': go(4), 'children': [{'node': go(5)}, {'node': go(6)}]}, {'node': go(7), 'children': [{'node': go(8), 'children': [{'node': go(9)}]}, {'node': go(10), 'children': [{'node': go(11)}]}]}]}, {'node': go(12), 'children': [{'node': go(13), 'children': [{'node': go(14)}]}, {'node': go(15), 'children': [{'node': go(16)}, {'node': go(17)}]}, {'node': go(18), 'children': [{'node': go(19), 'children': [{'node': go(20)}]}, {'node': go(21), 'children': [{'node': go(22)}]}]}]}])
 
     def test_get_json_tree(self):
         tree = Tree.get_tree(self.session, json=True)
@@ -1043,3 +1050,78 @@ def fields(node):
         tree = Tree.get_tree(self.session, json=True, json_fields=fields)
         self.assertEqual(tree, [{'visible': None, 'children': [{'visible': True, 'children': [{'visible': True, 'id': 3, 'label': '<Node (3)>'}], 'id': 2, 'label': '<Node (2)>'}, {'visible': True, 'children': [{'visible': True, 'id': 5, 'label': '<Node (5)>'}, {'visible': True, 'id': 6, 'label': '<Node (6)>'}], 'id': 4, 'label': '<Node (4)>'}, {'visible': True, 'children': [{'visible': True, 'children': [{'visible': None, 'id': 9, 'label': '<Node (9)>'}], 'id': 8, 'label': '<Node (8)>'}, {'visible': None, 'children': [{'visible': None, 'id': 11, 'label': '<Node (11)>'}], 'id': 10, 'label': '<Node (10)>'}], 'id': 7, 'label': '<Node (7)>'}], 'id': 1, 'label': '<Node (1)>'}, {
                          'visible': None, 'children': [{'visible': None, 'children': [{'visible': None, 'id': 14, 'label': '<Node (14)>'}], 'id': 13, 'label': '<Node (13)>'}, {'visible': None, 'children': [{'visible': None, 'id': 16, 'label': '<Node (16)>'}, {'visible': None, 'id': 17, 'label': '<Node (17)>'}], 'id': 15, 'label': '<Node (15)>'}, {'visible': None, 'children': [{'visible': None, 'children': [{'visible': None, 'id': 20, 'label': '<Node (20)>'}], 'id': 19, 'label': '<Node (19)>'}, {'visible': None, 'children': [{'visible': None, 'id': 22, 'label': '<Node (22)>'}], 'id': 21, 'label': '<Node (21)>'}], 'id': 18, 'label': '<Node (18)>'}], 'id': 12, 'label': '<Node (12)>'}])
+
+    def test_rebuild(self):
+        """ level           Nested sets tree1
+            1                    1(1)22
+                    _______________|___________________
+                   |               |                   |
+            2    2(2)5           6(4)11             12(7)21
+                   |               ^                   ^
+            3    3(3)4       7(5)8   9(6)10    13(8)16   17(10)20
+                                                  |          |
+            4                                  14(9)15   18(11)19
+
+            level           Nested sets tree2
+            1                    1(12)22
+                    _______________|___________________
+                   |               |                   |
+            2    2(13)5         6(15)11             12(18)21
+                   |               ^                    ^
+            3    3(14)4     7(16)8   9(17)10   13(19)16   17(21)20
+                                                   |          |
+            4                                  14(20)15   18(22)19
+
+        """
+        self.session.query(Tree).update({'lft': 0, 'rgt': 0, 'level': 0})
+        Tree.rebuild(self.session, 1)
+        self.assertEqual(self.result.all(),
+                         [(1,   1, 22, 1, None, 1),
+                          (2,   2,  5, 2, 1,  1),
+                          (3,   3,  4, 3, 2,  1),
+                          (4,   6, 11, 2, 1,  1),
+                          (5,   7,  8, 3, 4,  1),
+                          (6,   9, 10, 3, 4,  1),
+                          (7,  12, 21, 2, 1,  1),
+                          (8,  13, 16, 3, 7,  1),
+                          (9,  14, 15, 4, 8,  1),
+                          (10, 17, 20, 3, 7,  1),
+                          (11, 18, 19, 4, 10, 1),
+
+                          (12, 0, 0, 0, None, 2),
+                          (13, 0, 0, 0, 12, 2),
+                          (14, 0, 0, 0, 13, 2),
+                          (15, 0, 0, 0, 12, 2),
+                          (16, 0, 0, 0, 15, 2),
+                          (17, 0, 0, 0, 15, 2),
+                          (18, 0, 0, 0, 12, 2),
+                          (19, 0, 0, 0, 18, 2),
+                          (20, 0, 0, 0, 19, 2),
+                          (21, 0, 0, 0, 18, 2),
+                          (22, 0, 0, 0, 21, 2)])
+
+        Tree.rebuild(self.session)
+        self.assertEqual(self.result.all(),
+                         [(1,   1, 22, 1, None, 1),
+                          (2,   2,  5, 2, 1,  1),
+                          (3,   3,  4, 3, 2,  1),
+                          (4,   6, 11, 2, 1,  1),
+                          (5,   7,  8, 3, 4,  1),
+                          (6,   9, 10, 3, 4,  1),
+                          (7,  12, 21, 2, 1,  1),
+                          (8,  13, 16, 3, 7,  1),
+                          (9,  14, 15, 4, 8,  1),
+                          (10, 17, 20, 3, 7,  1),
+                          (11, 18, 19, 4, 10, 1),
+
+                          (12,  1, 22, 1, None, 2),
+                          (13,  2,  5, 2, 12, 2),
+                          (14,  3,  4, 3, 13, 2),
+                          (15,  6, 11, 2, 12, 2),
+                          (16,  7,  8, 3, 15, 2),
+                          (17,  9, 10, 3, 15, 2),
+                          (18, 12, 21, 2, 12, 2),
+                          (19, 13, 16, 3, 18, 2),
+                          (20, 14, 15, 4, 19, 2),
+                          (21, 17, 20, 3, 18, 2),
+                          (22, 18, 19, 4, 21, 2)])

tox.ini

@@ -0,0 +1,8 @@
+# content of: tox.ini , put in same dir as setup.py
+[tox]
+envlist = py27,py33
+[testenv]
+deps=
+    -rrequirements.txt
+    nose
+commands=nosetests