mongo_mapper_tree 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MWJhYjAwZDk3OWI3MGYxNmNlYzdmNGY4YjI0NDczYjY0ODYxNjg0MQ==
+  data.tar.gz: !binary |-
+    NTZiNWRlMGJjMWZhMzIzZjdkMzdhYzFkMDdkYzA1OGIzYzVhM2YxOQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YjkxMzI3Mjk3MWM0MzJhMWMxMDgyYmU5MjU3ZmI2NDcxY2I1YTdkZGExNmE4
+    NGRmODY1ZWRjNDIxY2MyYjYyOWQ3ZGRmNzc2OTEwNzE0ZDNiNTQ4MTc0Mjc4
+    ZWFlNGZjY2QwZWNiNzVjMTA0ZjgwMzQwNTFjMDUwNDQ1OWNhODM=
+  data.tar.gz: !binary |-
+    ZmZmZjlkNWM3OTNiNGE3Mzk0MDQxNmQxZmRhMTU0NDA4ZDE4YTk0NzU3NGIw
+    YjIyY2Y4MmVjY2ExMDE0ZTIyNjdkMTc5YWMwZWZiMDMzYmQ2OTVkMDRkZDNh
+    YTJjNWY3YmFkNDNhZmQxYWJhMzY2YWJhMTQzNzIzNTVhZGU1ODE=

data/README.rdoc

@@ -1,6 +1,6 @@
 = mongo_mapper_tree
 
-This is an modernized version of mongo_mapper_acts_as_tree (https://github.com/ramdiv/mongo_mapper_acts_as_tree)
+This is an maintained version of mongo_mapper_acts_as_tree (https://github.com/ramdiv/mongo_mapper_acts_as_tree) (ie. most of the code is written by Jacob Vidmar)
 In it's essence it's an implementation of a tree structure for MongoMapper, think acts as tree but for mongodb.
 
 
@@ -43,4 +43,5 @@ For best performance add a index on the field called path_field.
 
 == Copyright
 
+Original code written by Jakob Vidmar https://github.com/ramdiv/mongo_mapper_acts_as_tree
 Copyright (c) 2011 Joel Junström. See LICENSE for details.

data/lib/mongo_mapper/plugins/tree.rb

@@ -115,7 +115,9 @@ module MongoMapper
       end
 
       def destroy_descendants
-        tree_search_class.destroy(self.descendants.map(&:_id))
+        self.descendants.each do |descendant|
+          descendant.destroy
+        end
       end
 
       included do

data/lib/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module MongoMapperTree
-  Version = '1.0.0'
+  Version = '1.1.0'
 end

data/test/helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
-require 'test/unit'
-require 'shoulda'
+gem "minitest"
 require 'database_cleaner'
+require "minitest/autorun"
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -13,29 +13,6 @@ Dir["#{File.dirname(__FILE__)}/models/*.rb"].each {|file| require file}
 
 DatabaseCleaner.strategy = :truncation
 
-class Test::Unit::TestCase
-  # Drop all collections after each test case.
-  def setup
-    DatabaseCleaner.start
-  end
-
-  def teardown
-    DatabaseCleaner.clean
-  end
-
-  # Make sure that each test case has a teardown
-  # method to clear the db after each test.
-  def inherited(base)
-    base.define_method setup do
-      super
-    end
-
-    base.define_method teardown do
-      super
-    end
-  end
-
-  def eql_arrays?(first, second)
-    first.collect(&:_id).to_set == second.collect(&:_id).to_set
-  end
-end
+def eql_arrays?(first, second)
+  first.collect(&:_id).to_set == second.collect(&:_id).to_set
+end

data/test/models/ordered_category.rb

@@ -6,4 +6,4 @@ class OrderedCategory
   key :value, Integer
 
   self.tree_order = :value.asc
-end
+end

data/test/test_order.rb

@@ -1,26 +1,30 @@
 require 'helper'
-class TestMongomapperActsAsTree < Test::Unit::TestCase
-  context "Ordered tree" do
-    setup do
-      @root_1     = OrderedCategory.create(:name => "Root 1", :value => 2)
-      @child_1    = OrderedCategory.create(:name => "Child 1", :parent => @root_1, :value => 1)
-      @child_2    = OrderedCategory.create(:name => "Child 2", :parent => @root_1, :value => 9)
-      @child_2_1  = OrderedCategory.create(:name => "Child 2.1", :parent => @child_2, :value => 2)
-      @child_3    = OrderedCategory.create(:name => "Child 3", :parent => @root_1, :value => 5)
-      @root_2     = OrderedCategory.create(:name => "Root 2", :value => 1)
-    end
+class TestOrder < Minitest::Test
+  def setup
+    DatabaseCleaner.start
 
-    should "be in order" do
-      assert_equal OrderedCategory.roots, [@root_2, @root_1]
+    @root_1     = OrderedCategory.create(:name => "Root 1", :value => 2)
+    @child_1    = OrderedCategory.create(:name => "Child 1", :parent => @root_1, :value => 1)
+    @child_2    = OrderedCategory.create(:name => "Child 2", :parent => @root_1, :value => 9)
+    @child_2_1  = OrderedCategory.create(:name => "Child 2.1", :parent => @child_2, :value => 2)
+    @child_3    = OrderedCategory.create(:name => "Child 3", :parent => @root_1, :value => 5)
+    @root_2     = OrderedCategory.create(:name => "Root 2", :value => 1)
+  end
+
+  def teardown
+    DatabaseCleaner.clean
+  end
+
+  def test_in_order
+    assert_equal OrderedCategory.roots, [@root_2, @root_1]
 
-      assert_equal @root_1.children, [@child_1, @child_3, @child_2]
+    assert_equal @root_1.children, [@child_1, @child_3, @child_2]
 
-      assert_equal @root_1.descendants, [@child_1, @child_2_1, @child_3, @child_2]
-      assert_equal @root_1.self_and_descendants, [@root_1, @child_1, @child_2_1, @child_3, @child_2]
+    assert_equal @root_1.descendants, [@child_1, @child_2_1, @child_3, @child_2]
+    assert_equal @root_1.self_and_descendants, [@root_1, @child_1, @child_2_1, @child_3, @child_2]
 
-      assert_equal @child_2.siblings, [@child_1, @child_3]
-      assert_equal @child_2.self_and_siblings, [@child_1, @child_3, @child_2]
-      assert_equal @root_1.self_and_siblings, [@root_2, @root_1]
-    end
+    assert_equal @child_2.siblings, [@child_1, @child_3]
+    assert_equal @child_2.self_and_siblings, [@child_1, @child_3, @child_2]
+    assert_equal @root_1.self_and_siblings, [@root_2, @root_1]
   end
-end
+end

data/test/test_search_mixed_tree.rb

@@ -0,0 +1,54 @@
+require 'helper'
+
+class TestSearchMixedTree < Minitest::Test
+  def setup
+    DatabaseCleaner.start
+    shape = Shape.create(name: "Root")
+    circle = Circle.create(name: "Circle", parent: shape)
+    Square.create(name: "Square", parent: circle)
+
+    @shape, @circle, @square = Shape.first, Circle.first, Square.first
+  end
+
+  def teardown
+    DatabaseCleaner.clean
+  end
+
+  def test_circle_is_child_of_shape
+    assert_equal [@circle], @shape.children
+  end
+
+  def test_square_is_child_of_circle
+    assert_equal [@square], @circle.children
+  end
+
+  def test_circle_is_parent_of_square
+    assert_equal @circle, @square.parent
+  end
+
+  def test_shape_is_parent_of_circle
+    assert_equal @shape, @circle.parent
+  end
+
+  def test_shape_decendants
+    assert_equal [@circle, @square], @shape.descendants
+  end
+
+  def test_circle_decendants
+    assert_equal [@square], @circle.descendants
+  end
+
+  def test_square_ancestors
+    assert_equal [@shape, @circle], @square.ancestors
+  end
+
+  def test_circle_ansestors
+    assert_equal [@shape], @circle.ancestors
+  end
+
+  def test_destroy_shape_decendants
+    @shape.destroy_descendants
+    assert_nil Shape.find(@circle._id)
+    assert_nil Shape.find(@square._id)
+  end
+end

data/test/test_search_tree.rb

@@ -0,0 +1,52 @@
+require 'helper'
+
+class TestSearchTree < Minitest::Test
+  def setup
+    DatabaseCleaner.start
+    shape = Shape.create(name: "Root")
+    Circle.create(name: "Circle", parent: shape)
+    Square.create(name: "Square", parent: shape)
+
+    # We are loading from the database here because this process proves the point. If we never did it this
+    # way, there would be no reason to change the code.
+    @shape, @circle, @square = Shape.first, Circle.first, Square.first
+  end
+
+  def teardown
+    DatabaseCleaner.clean
+  end
+
+  def text_children
+    assert_equal [@circle, @square], @shape.children
+  end
+
+  def test_shape_parenhood
+    assert_equal @shape, @circle.parent
+    assert_equal @shape, @square.parent
+  end
+
+  def text_siblings
+    assert_equal [@square], @circle.siblings
+    assert_equal [@circle, @square], @circle.self_and_siblings
+
+    assert_equal [@circle], @square.siblings
+    assert_equal [@circle, @square], @square.self_and_siblings
+  end
+
+  def test_deendants
+    assert_equal [@circle, @square], @shape.descendants
+    assert_equal [@shape, @circle, @square], @shape.self_and_descendants
+  end
+
+  def test_ancestors
+    assert_equal [@shape], @circle.ancestors
+    assert_equal [@shape, @circle], @circle.self_and_ancestors
+    assert_equal [@shape], @square.ancestors
+    assert_equal [@shape, @square], @square.self_and_ancestors
+  end
+
+  def test_roots
+    assert_equal @shape, @square.root
+    assert_equal @shape, @circle.root
+  end
+end

data/test/test_tree.rb

@@ -1,157 +1,151 @@
 require 'helper'
-class TestMongomapperActsAsTree < Test::Unit::TestCase
-  context "Tree" do
-    setup do
-      @root_1     = Category.create(:name => "Root 1")
-      @child_1    = Category.create(:name => "Child 1", :parent => @root_1)
-      @child_2    = Category.create(:name => "Child 2", :parent => @root_1)
-      @child_2_1  = Category.create(:name => "Child 2.1", :parent => @child_2)
-      @child_3    = Category.create(:name => "Child 3", :parent => @root_1)
-      @root_2     = Category.create(:name => "Root 2")
-    end
-
-    should "create node from id " do
-      assert Category.create(:name => "Child 2.2", :parent_id => @root_1.id).parent == @root_1
-    end
-
-    should "have roots" do
-      assert eql_arrays?(Category.roots, [@root_1, @root_2])
-    end
-
-    context "node" do
-      should "have a root" do
-        assert_equal @root_1.root, @root_1
-        assert_not_equal @root_1.root, @root_2.root
-        assert_equal @root_1, @child_2_1.root
-      end
-
-      should "have ancestors" do
-        assert_equal @root_1.ancestors, []
-        assert_equal @child_2_1.ancestors, [@root_1, @child_2]
-        assert_equal @root_1.self_and_ancestors, [@root_1]
-        assert_equal @child_2_1.self_and_ancestors, [@root_1, @child_2, @child_2_1]
-      end
-
-      should "have siblings" do
-        assert eql_arrays?(@root_1.siblings, [@root_2])
-        assert eql_arrays?(@child_2.siblings, [@child_1, @child_3])
-        assert eql_arrays?(@child_2_1.siblings, [])
-        assert eql_arrays?(@root_1.self_and_siblings, [@root_1, @root_2])
-        assert eql_arrays?(@child_2.self_and_siblings, [@child_1, @child_2, @child_3])
-        assert eql_arrays?(@child_2_1.self_and_siblings, [@child_2_1])
-      end
-
-      should "set depth" do
-        assert_equal 0, @root_1.depth
-        assert_equal 1, @child_1.depth
-        assert_equal 2, @child_2_1.depth
-      end
-
-      should "have children" do
-        assert @child_2_1.children.empty?
-        assert eql_arrays?(@root_1.children, [@child_1, @child_2, @child_3])
-      end
-
-      should "have descendants" do
-        assert eql_arrays?(@root_1.descendants, [@child_1, @child_2, @child_3, @child_2_1])
-        assert eql_arrays?(@child_2.descendants, [@child_2_1])
-        assert @child_2_1.descendants.empty?
-        assert eql_arrays?(@root_1.self_and_descendants, [@root_1, @child_1, @child_2, @child_3, @child_2_1])
-        assert eql_arrays?(@child_2.self_and_descendants, [@child_2, @child_2_1])
-        assert eql_arrays?(@child_2_1.self_and_descendants, [@child_2_1])
-      end
-
-      should "be able to tell if ancestor" do
-        assert @root_1.is_ancestor_of?(@child_1)
-        assert ! @root_2.is_ancestor_of?(@child_2_1)
-        assert ! @child_2.is_ancestor_of?(@child_2)
-
-        assert @root_1.is_or_is_ancestor_of?(@child_1)
-        assert ! @root_2.is_or_is_ancestor_of?(@child_2_1)
-        assert @child_2.is_or_is_ancestor_of?(@child_2)
-      end
-
-      should "be able to tell if descendant" do
-        assert ! @root_1.is_descendant_of?(@child_1)
-        assert @child_1.is_descendant_of?(@root_1)
-        assert ! @child_2.is_descendant_of?(@child_2)
-
-        assert ! @root_1.is_or_is_descendant_of?(@child_1)
-        assert @child_1.is_or_is_descendant_of?(@root_1)
-        assert @child_2.is_or_is_descendant_of?(@child_2)
-      end
-
-      should "be able to tell if sibling" do
-        assert ! @root_1.is_sibling_of?(@child_1)
-        assert ! @child_1.is_sibling_of?(@child_1)
-        assert ! @child_2.is_sibling_of?(@child_2)
-
-        assert ! @root_1.is_or_is_sibling_of?(@child_1)
-        assert @child_1.is_or_is_sibling_of?(@child_2)
-        assert @child_2.is_or_is_sibling_of?(@child_2)
-      end
-
-      context "when moving" do
-        should "recalculate path and depth" do
-          @child_3.parent = @child_2
-          @child_3.save
-
-          assert @child_2.is_or_is_ancestor_of?(@child_3)
-          assert @child_3.is_or_is_descendant_of?(@child_2)
-          assert @child_2.children.include?(@child_3)
-          assert @child_2.descendants.include?(@child_3)
-          assert @child_2_1.is_or_is_sibling_of?(@child_3)
-          assert_equal 2, @child_3.depth
-        end
-
-        should "move children on save" do
-          @child_2.parent = @root_2
-
-          assert ! @root_2.is_or_is_ancestor_of?(@child_2_1)
-          assert ! @child_2_1.is_or_is_descendant_of?(@root_2)
-          assert ! @root_2.descendants.include?(@child_2_1)
-
-          @child_2.save
-          @child_2_1.reload
-
-          assert @root_2.is_or_is_ancestor_of?(@child_2_1)
-          assert @child_2_1.is_or_is_descendant_of?(@root_2)
-          assert @root_2.descendants.include?(@child_2_1)
-        end
-
-        should "check against cyclic graph" do
-          @root_1.parent = @child_2_1
-          assert ! @root_1.valid?
-          assert_equal I18n.t(:'mongo_mapper.errors.messages.cyclic'), @root_1.errors[:base].first
-        end
-
-        should "be able to become root" do
-          @child_2.parent = nil
-          @child_2.save
-          @child_2.reload
-          assert_nil @child_2.parent
-          @child_2_1.reload
-          assert (@child_2_1.path == [@child_2.id])
-        end
-
-      end
-
-      should "destroy descendants when destroyed" do
-        @child_2.destroy
-        assert_nil Category.find(@child_2_1._id)
-      end
-    end
-
-    context "root node" do
-      should "not have a parent" do
-        assert_nil @root_1.parent
-      end
-    end
-
-    context "child_node" do
-      should "have a parent" do
-        assert_equal @child_2, @child_2_1.parent
-      end
-    end
-  end
-end
+class TestTree < Minitest::Test
+  def setup
+    DatabaseCleaner.start
+    @root_1     = Category.create(name: "Root 1")
+    @child_1    = Category.create(name: "Child 1", parent: @root_1)
+    @child_2    = Category.create(name: "Child 2", parent: @root_1)
+    @child_2_1  = Category.create(name: "Child 2.1", parent: @child_2)
+    @child_3    = Category.create(name: "Child 3", parent: @root_1)
+    @root_2     = Category.create(name: "Root 2")
+  end
+
+  def teardown
+    DatabaseCleaner.clean
+  end
+
+  def test_create_node_from_id
+    assert Category.create(name: "Child 2.2", parent_id: @root_1.id).parent == @root_1
+  end
+
+  def test_category_roots
+    assert eql_arrays?(Category.roots, [@root_1, @root_2])
+  end
+
+  def test_roots
+    assert_equal @root_1.root, @root_1
+    refute_equal @root_1.root, @root_2.root
+    assert_equal @root_1, @child_2_1.root
+  end
+
+  def test_ancestors
+    assert_equal @root_1.ancestors, []
+    assert_equal @child_2_1.ancestors, [@root_1, @child_2]
+    assert_equal @root_1.self_and_ancestors, [@root_1]
+    assert_equal @child_2_1.self_and_ancestors, [@root_1, @child_2, @child_2_1]
+  end
+
+  def test_siblings
+    assert eql_arrays?(@root_1.siblings, [@root_2])
+    assert eql_arrays?(@child_2.siblings, [@child_1, @child_3])
+    assert eql_arrays?(@child_2_1.siblings, [])
+    assert eql_arrays?(@root_1.self_and_siblings, [@root_1, @root_2])
+    assert eql_arrays?(@child_2.self_and_siblings, [@child_1, @child_2, @child_3])
+    assert eql_arrays?(@child_2_1.self_and_siblings, [@child_2_1])
+  end
+
+  def test_depths
+    assert_equal 0, @root_1.depth
+    assert_equal 1, @child_1.depth
+    assert_equal 2, @child_2_1.depth
+  end
+
+  def test_children
+    assert @child_2_1.children.empty?
+    assert eql_arrays?(@root_1.children, [@child_1, @child_2, @child_3])
+  end
+
+  def test_decendants
+    assert eql_arrays?(@root_1.descendants, [@child_1, @child_2, @child_3, @child_2_1])
+    assert eql_arrays?(@child_2.descendants, [@child_2_1])
+    assert @child_2_1.descendants.empty?
+    assert eql_arrays?(@root_1.self_and_descendants, [@root_1, @child_1, @child_2, @child_3, @child_2_1])
+    assert eql_arrays?(@child_2.self_and_descendants, [@child_2, @child_2_1])
+    assert eql_arrays?(@child_2_1.self_and_descendants, [@child_2_1])
+  end
+
+  def test_knows_if_ancestor
+    assert @root_1.is_ancestor_of?(@child_1)
+    assert ! @root_2.is_ancestor_of?(@child_2_1)
+    assert ! @child_2.is_ancestor_of?(@child_2)
+
+    assert @root_1.is_or_is_ancestor_of?(@child_1)
+    assert ! @root_2.is_or_is_ancestor_of?(@child_2_1)
+    assert @child_2.is_or_is_ancestor_of?(@child_2)
+  end
+
+  def test_knows_if_decendant
+    assert ! @root_1.is_descendant_of?(@child_1)
+    assert @child_1.is_descendant_of?(@root_1)
+    assert ! @child_2.is_descendant_of?(@child_2)
+
+    assert ! @root_1.is_or_is_descendant_of?(@child_1)
+    assert @child_1.is_or_is_descendant_of?(@root_1)
+    assert @child_2.is_or_is_descendant_of?(@child_2)
+  end
+
+  def test_knows_if_sibling
+    assert ! @root_1.is_sibling_of?(@child_1)
+    assert ! @child_1.is_sibling_of?(@child_1)
+    assert ! @child_2.is_sibling_of?(@child_2)
+
+    assert ! @root_1.is_or_is_sibling_of?(@child_1)
+    assert @child_1.is_or_is_sibling_of?(@child_2)
+    assert @child_2.is_or_is_sibling_of?(@child_2)
+  end
+
+  def test_recalculates_path_and_depth_when_moved
+    @child_3.parent = @child_2
+    @child_3.save
+
+    assert @child_2.is_or_is_ancestor_of?(@child_3)
+    assert @child_3.is_or_is_descendant_of?(@child_2)
+    assert @child_2.children.include?(@child_3)
+    assert @child_2.descendants.include?(@child_3)
+    assert @child_2_1.is_or_is_sibling_of?(@child_3)
+    assert_equal 2, @child_3.depth
+  end
+
+  def test_moved_children_when_moved
+    @child_2.parent = @root_2
+
+    assert ! @root_2.is_or_is_ancestor_of?(@child_2_1)
+    assert ! @child_2_1.is_or_is_descendant_of?(@root_2)
+    assert ! @root_2.descendants.include?(@child_2_1)
+
+    @child_2.save
+    @child_2_1.reload
+
+    assert @root_2.is_or_is_ancestor_of?(@child_2_1)
+    assert @child_2_1.is_or_is_descendant_of?(@root_2)
+    assert @root_2.descendants.include?(@child_2_1)
+  end
+
+  def test_checks_against_cyclic_graph
+    @root_1.parent = @child_2_1
+    assert ! @root_1.valid?
+    assert_equal I18n.t(:'mongo_mapper.errors.messages.cyclic'), @root_1.errors[:base].first
+  end
+
+  def test_can_become_root
+    @child_2.parent = nil
+    @child_2.save
+    @child_2.reload
+    assert_nil @child_2.parent
+    @child_2_1.reload
+    assert (@child_2_1.path == [@child_2.id])
+  end
+
+  def test_destroys_decendants
+    assert @child_2.destroy
+    assert_nil Category.find(@child_2_1._id)
+  end
+
+  def test_roots_cannot_have_parents
+    assert_nil @root_1.parent
+  end
+
+  def test_children_have_a_parent
+    assert_equal @child_2, @child_2_1.parent
+  end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_mapper_tree
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Joel Junström
@@ -10,30 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &70110048249320 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.13.0.beta2
   type: :runtime
   prerelease: false
-  version_requirements: *70110048249320
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70110048247860 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.10'
-  type: :development
-  prerelease: false
-  version_requirements: *70110048247860
+        version: 0.13.0.beta2
 description: An Acts As Tree like implementation for MongoMapper based on mongo_mapper_acts_as_tree
 email:
 - bender@oktavilla.se
@@ -50,39 +41,33 @@ files:
 - test/models/ordered_category.rb
 - test/models/shapes.rb
 - test/test_order.rb
-- test/test_search_class.rb
+- test/test_search_mixed_tree.rb
+- test/test_search_tree.rb
 - test/test_tree.rb
 - LICENSE
 - README.rdoc
 homepage: http://github.com/Oktavilla/mongo_mapper_tree
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1182322477251881257
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1182322477251881257
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.0.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An Acts As Tree like implementation for MongoMapper
 test_files:
 - test/helper.rb
@@ -90,5 +75,6 @@ test_files:
 - test/models/ordered_category.rb
 - test/models/shapes.rb
 - test/test_order.rb
-- test/test_search_class.rb
+- test/test_search_mixed_tree.rb
+- test/test_search_tree.rb
 - test/test_tree.rb

data/test/test_search_class.rb

@@ -1,90 +0,0 @@
-require 'helper'
-
-class TestSearchScope < Test::Unit::TestCase
-  context "Simple, mixed type tree" do
-    setup do
-      shape = Shape.create(:name => "Root")
-      Circle.create(:name => "Circle", :parent => shape)
-      Square.create(:name => "Square", :parent => shape)
-    end
-
-    setup do
-      # We are loading from the database here because this process proves the point. If we never did it this
-      # way, there would be no reason to change the code.
-      @shape, @circle, @square = Shape.first, Circle.first, Square.first
-    end
-
-    should "return circle and square as children of shape" do
-      assert_equal [@circle, @square], @shape.children
-    end
-
-    should("return shape as parent of circle") { assert_equal @shape, @circle.parent }
-    should("return shape as parent of square") { assert_equal @shape, @square.parent }
-
-    should("return square as exclusive sibling of circle") { assert_equal [@square], @circle.siblings }
-    should "return self and square as inclusive siblings of circle" do
-      assert_equal [@circle, @square], @circle.self_and_siblings
-    end
-
-    should("return circle as exclusive sibling of square") { assert_equal [@circle], @square.siblings }
-    should "return self and circle as inclusive siblings of square" do
-      assert_equal [@circle, @square], @square.self_and_siblings
-    end
-
-    should "return circle and square as exclusive descendants of shape" do
-      assert_equal [@circle, @square], @shape.descendants
-    end
-    should "return shape, circle and square as inclusive descendants of shape" do
-      assert_equal [@shape, @circle, @square], @shape.self_and_descendants
-    end
-
-    should("return shape as exclusive ancestor of circle") { assert_equal [@shape], @circle.ancestors }
-    should "return self and shape as inclusive ancestors of circle" do
-      assert_equal [@shape, @circle], @circle.self_and_ancestors
-    end
-
-    should("return shape as exclusive ancestor of square") { assert_equal [@shape], @square.ancestors }
-    should "return self and shape as inclusive ancestors of square" do
-      assert_equal [@shape, @square], @square.self_and_ancestors
-    end
-
-    should("return shape as root of circle") { assert_equal @shape, @square.root }
-    should("return shape as root of square") { assert_equal @shape, @circle.root }
-  end
-
-  context "A tree with mixed types on either side of a branch" do
-    setup do
-      shape = Shape.create(:name => "Root")
-      circle = Circle.create(:name => "Circle", :parent => shape)
-      Square.create(:name => "Square", :parent => circle)
-    end
-
-    setup do
-      @shape, @circle, @square = Shape.first, Circle.first, Square.first
-    end
-
-    should("return circle as child of shape") { assert_equal [@circle], @shape.children }
-    should("return square as child of circle") { assert_equal [@square], @circle.children }
-    should("return circle as parent of square") { assert_equal @circle, @square.parent }
-    should("return shape as parent of circle") { assert_equal @shape, @circle.parent }
-
-    should "return circle and square as descendants of shape" do
-      assert_equal [@circle, @square], @shape.descendants
-    end
-
-    should("return square as descendant of circle") { assert_equal [@square], @circle.descendants }
-
-    should "return shape and circle as ancestors of square" do
-      assert_equal [@shape, @circle], @square.ancestors
-    end
-
-    should("return shape as ancestor of circle") { assert_equal [@shape], @circle.ancestors }
-
-    should "destroy descendants of shape" do
-      @shape.destroy_descendants
-      assert_nil Shape.find(@circle._id)
-      assert_nil Shape.find(@square._id)
-    end
-  end
-
-end # TestSearchScope