mongoid_acts_as_tree 0.2.0 → 0.3.0.rc0

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2@mongoid_acts_as_tree
+rvm 1.9.3@mongoid_acts_as_tree --create

data/Gemfile

@@ -1,6 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'mongoid'
+gem 'mongo'
 gem 'bson'
 gem 'bson_ext'
 gem 'shoulda'

data/Gemfile.lock

@@ -1,32 +1,44 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.7)
-    bson (1.3.1)
-    bson_ext (1.3.1)
-    builder (2.1.2)
-    gemcutter (0.7.0)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    bson (1.7.0)
+    bson_ext (1.7.0)
+      bson (~> 1.7.0)
+    builder (3.0.3)
     git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
+    i18n (0.6.1)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.5.1)
+      rake
+      rdoc
+    json (1.7.5)
     mongo (1.3.1)
       bson (>= 1.3.1)
-    mongoid (2.0.2)
-      activemodel (~> 3.0)
-      mongo (~> 1.3)
+    mongoid (3.0.5)
+      activemodel (~> 3.1)
+      moped (~> 1.1)
+      origin (~> 1.0)
       tzinfo (~> 0.3.22)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    shoulda (2.11.3)
-    tzinfo (0.3.27)
+    moped (1.2.1)
+    multi_json (1.3.6)
+    origin (1.0.8)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    shoulda (3.1.1)
+      shoulda-context (~> 1.0)
+      shoulda-matchers (~> 1.2)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.3.0)
+      activesupport (>= 3.0.0)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
@@ -35,5 +47,6 @@ DEPENDENCIES
   bson
   bson_ext
   jeweler
+  mongo
   mongoid
   shoulda

data/Rakefile

@@ -2,53 +2,52 @@ require 'rubygems'
 require 'rake'
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "mongoid_acts_as_tree"
-    gem.summary = %Q{ActsAsTree plugin for Mongoid}
-    gem.description = %Q{Port of the old, venerable ActsAsTree with a bit of a twist}
-    gem.email = "saksmlz@gmail.com"
-    gem.homepage = "http://github.com/saks/mongoid_acts_as_tree"
-    gem.authors = ["Jakob Vidmar, Aliaksandr Rahalevich"]
-    gem.add_dependency("mongoid", ">= 2.0.0")
-    gem.add_dependency("bson", ">= 0.20.1")
-
-    gem.add_development_dependency "shoulda", ">=2.10.2"
-  end
-  Jeweler::GemcutterTasks.new
+	require 'jeweler'
+	Jeweler::Tasks.new do |gem|
+		gem.name = "mongoid_acts_as_tree"
+		gem.summary = %Q{ActsAsTree plugin for Mongoid}
+		gem.description = %Q{Port of the old, venerable ActsAsTree with a bit of a twist}
+		gem.email = "saksmlz@gmail.com"
+		gem.homepage = "http://github.com/saks/mongoid_acts_as_tree"
+		gem.authors = ["Jakob Vidmar, Aliaksandr Rahalevich"]
+		gem.add_dependency("mongoid", ">= 2.0.0")
+		gem.add_dependency("bson", ">= 0.20.1")
+
+		gem.add_development_dependency "shoulda", ">=2.10.2"
+	end
+	Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+	puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+	test.libs << 'lib' << 'test'
+	test.pattern = 'test/**/test_*.rb'
+	test.verbose = true
 end
 
 begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
+	require 'rcov/rcovtask'
+	Rcov::RcovTask.new do |test|
+		test.libs << 'test'
+		test.pattern = 'test/**/test_*.rb'
+		test.verbose = true
+	end
 rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+	task :rcov do
+		abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+	end
 end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+	version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "mongoid_acts_as_tree #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+	rdoc.rdoc_dir = 'rdoc'
+	rdoc.title = "mongoid_acts_as_tree #{version}"
+	rdoc.rdoc_files.include('README*')
+	rdoc.rdoc_files.include('lib/**/*.rb')
 end
-

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0.rc0

data/config/mongoid.yml

@@ -0,0 +1,6 @@
+test:
+  sessions:
+    default:
+      database: 'acts_as_tree-test'
+      hosts:
+        - localhost:27017

data/lib/mongoid_acts_as_tree.rb

@@ -12,9 +12,9 @@ module Mongoid
 			module InitializerMethods
 				def acts_as_tree(options = {})
 					options = {
-						:parent_id_field => "parent_id",
-						:path_field      => "path",
-						:depth_field     => "depth",
+						:parent_id_field => 'parent_id',
+						:path_field      => 'path',
+						:depth_field     => 'depth',
 						:class           => self
 					}.merge(options)
 
@@ -27,19 +27,22 @@ module Mongoid
 					extend ClassMethods
 
 					field parent_id_field, :type => BSON::ObjectId
-					field path_field, :type => Array,  :default => [], :index => true
+					field path_field, :type => Array,  :default => []
 					field depth_field, :type => Integer, :default => 0
 
+					index path_field => 1
+
+
 					self.class_eval do
 						define_method "#{parent_id_field}=" do | new_parent_id |
-						  if new_parent_id.present?
+							if new_parent_id.present?
 								new_parent = acts_as_tree_options[:class].find new_parent_id
 								new_parent.children.push self, false
 							else
 								self.write_attribute parent_id_field, nil
 								self[path_field] = []
 								self[depth_field] = 0
-						  end
+							end
 						end
 					end
 
@@ -103,7 +106,7 @@ module Mongoid
 
 				def ancestors
 					return [] if root?
-					acts_as_tree_options[:class].where(:_id.in => self[path_field]).order_by(depth_field)
+					acts_as_tree_options[:class].in(_id: self[path_field])
 				end
 
 				def self_and_ancestors
@@ -165,12 +168,11 @@ module Mongoid
 				end
 
 				def move_children
-
 					if @_will_move
 						@_will_move = false
 						self.children.each do | child |
 							child.fix_position
-							child.save
+						child.save
 						end
 						@_will_move = true
 					end
@@ -219,15 +221,15 @@ module Mongoid
 				#To delete object use <tt>object.destroy</tt>.
 				def delete(object_or_id)
 					object = case object_or_id
-						when String, BSON::ObjectId
-							@parent.class.find object_or_id
-						else
-							object_or_id
+					when String, Moped::BSON::ObjectId
+						@parent.class.find object_or_id
+					else
+						object_or_id
 					end
 
 					object.write_attribute object.parent_id_field, nil
-					object[object.path_field]      = []
-					object[object.depth_field]     = 0
+					object[object.path_field]  = []
+					object[object.depth_field] = 0
 					object.save
 
 					super(object)
@@ -269,4 +271,3 @@ module Mongoid
 		end
 	end
 end
-

data/mongoid_acts_as_tree.gemspec

@@ -1,68 +1,77 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = "mongoid_acts_as_tree"
-  s.version = "0.2.0"
+  s.version = "0.3.0.rc0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakob Vidmar, Aliaksandr Rahalevich"]
-  s.date = "2012-01-24"
+  s.date = "2012-09-11"
   s.description = "Port of the old, venerable ActsAsTree with a bit of a twist"
   s.email = "saksmlz@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     ".rvmrc",
-     "CHANGELOG",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/mongoid_acts_as_tree.rb",
-     "mongoid_acts_as_tree.gemspec",
-     "test/helper.rb",
-     "test/models/category.rb",
-     "test/models/ordered_category.rb",
-     "test/models/sub_category.rb",
-     "test/test_order.rb",
-     "test/test_tree.rb"
+    ".rvmrc",
+    "CHANGELOG",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "config/mongoid.yml",
+    "lib/mongoid_acts_as_tree.rb",
+    "mongoid_acts_as_tree.gemspec",
+    "test/helper.rb",
+    "test/models/category.rb",
+    "test/models/ordered_category.rb",
+    "test/models/sub_category.rb",
+    "test/test_order.rb",
+    "test/test_tree.rb"
   ]
   s.homepage = "http://github.com/saks/mongoid_acts_as_tree"
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "ActsAsTree plugin for Mongoid"
-  s.test_files = [
-    "test/models/category.rb",
-     "test/models/ordered_category.rb",
-     "test/models/sub_category.rb",
-     "test/helper.rb",
-     "test/test_tree.rb",
-     "test/test_order.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mongoid>, [">= 0"])
+      s.add_runtime_dependency(%q<mongo>, [">= 0"])
+      s.add_runtime_dependency(%q<bson>, [">= 0"])
+      s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
+      s.add_runtime_dependency(%q<shoulda>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0"])
       s.add_runtime_dependency(%q<bson>, [">= 0.20.1"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
     else
+      s.add_dependency(%q<mongoid>, [">= 0"])
+      s.add_dependency(%q<mongo>, [">= 0"])
+      s.add_dependency(%q<bson>, [">= 0"])
+      s.add_dependency(%q<bson_ext>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<mongoid>, [">= 2.0.0"])
       s.add_dependency(%q<bson>, [">= 0.20.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.2"])
     end
   else
+    s.add_dependency(%q<mongoid>, [">= 0"])
+    s.add_dependency(%q<mongo>, [">= 0"])
+    s.add_dependency(%q<bson>, [">= 0"])
+    s.add_dependency(%q<bson_ext>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<mongoid>, [">= 2.0.0"])
     s.add_dependency(%q<bson>, [">= 0.20.1"])
     s.add_dependency(%q<shoulda>, [">= 2.10.2"])

data/test/helper.rb

@@ -1,33 +1,33 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'mongo'
+require 'mongoid'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'mongoid'
 
-Mongoid.configure.master = Mongo::Connection.new.db('acts_as_tree-test')
+Mongoid.load! '/home/mlz/projects/mongoid_acts_as_tree/config/mongoid.yml', :test
 
 Dir["#{File.dirname(__FILE__)}/models/*.rb"].each {|file| require file}
 
 class Test::Unit::TestCase
-  # Drop all columns after each test case.
-    def teardown
-    Mongoid.database.collections.each do |coll|
-      coll.remove
-    end
-  end
+	# Drop all columns after each test case.
+	def teardown
+		Mongoid::session(:default).collections.each do |coll|
+			coll.drop
+		end
+	end
 
-  # Make sure that each test case has a teardown
-  # method to clear the db after each test.
-  def inherited(base)
-    base.define_method teardown do
-      super
-    end
-  end
+	# Make sure that each test case has a teardown
+	# method to clear the db after each test.
+	def inherited(base)
+		base.define_method teardown do
+			super
+		end
+	end
 
-  def eql_arrays?(first, second)
-    first.map{|i| i._id}.to_set == second.map{|i| i._id}.to_set
-  end
+	def eql_arrays?(first, second)
+		first.map{|i| i._id}.to_set == second.map{|i| i._id}.to_set
+	end
 end
-

data/test/models/category.rb

@@ -2,11 +2,10 @@ require "mongoid"
 require "mongoid_acts_as_tree"
 
 class Category
-  include Mongoid::Document
-  include Mongoid::Acts::Tree
+	include Mongoid::Document
+	include Mongoid::Acts::Tree
 
-  field :name, :type => String
+	field :name, :type => String
 
-  acts_as_tree
+	acts_as_tree
 end
-

data/test/models/sub_category.rb

@@ -1,3 +1,5 @@
+require File.join File.dirname(__FILE__), 'category'
+
 class SubCategory < Category
 
 end

data/test/test_order.rb

@@ -1,35 +1,34 @@
-require 'helper'
+require File.join(File.dirname(__FILE__), 'helper')
 require 'set'
 
 class TestMongoidActsAsTree < 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", :value => 1)
-      @child_2    = OrderedCategory.create(:name => "Child 2", :value => 9)
-      @child_2_1  = OrderedCategory.create(:name => "Child 2.1", :value => 2)
-
-      @child_3    = OrderedCategory.create(:name => "Child 3", :value => 5)
-      @root_2     = OrderedCategory.create(:name => "Root 2", :value => 1)
-
-      @root_1.children << @child_1
-      @root_1.children << @child_2
-      @root_1.children << @child_3
-
-      @child_2.children << @child_2_1
-    end
-
-    should "be in order" do
-      assert_equal OrderedCategory.roots.to_a, [@root_2, @root_1]
-      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 @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
+	context "Ordered tree" do
+		setup do
+			@root_1     = OrderedCategory.create(:name => "Root 1", :value => 2)
+			@child_1    = OrderedCategory.create(:name => "Child 1", :value => 1)
+			@child_2    = OrderedCategory.create(:name => "Child 2", :value => 9)
+			@child_2_1  = OrderedCategory.create(:name => "Child 2.1", :value => 2)
+
+			@child_3    = OrderedCategory.create(:name => "Child 3", :value => 5)
+			@root_2     = OrderedCategory.create(:name => "Root 2", :value => 1)
+
+			@root_1.children << @child_1
+			@root_1.children << @child_2
+			@root_1.children << @child_3
+
+			@child_2.children << @child_2_1
+		end
+
+		should "be in order" do
+			assert_equal OrderedCategory.roots.to_a, [@root_2, @root_1]
+			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 @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_tree.rb

@@ -4,31 +4,31 @@ require 'set'
 $verbose = false
 
 class TestMongoidActsAsTree < Test::Unit::TestCase
-  context "Tree" do
-    setup do
-      @root_1     = Category.create(:name => "Root 1")
-      @child_1    = Category.create(:name => "Child 1")
-      @child_2    = Category.create(:name => "Child 2")
-      @child_2_1  = SubCategory.create(:name => "Child 2.1")
-
-      @child_3    = SubCategory.create(:name => "Child 3")
-      @root_2     = Category.create(:name => "Root 2")
-
-      @root_1.children << @child_1
-      @root_1.children << @child_2
-      @root_1.children << @child_3
-
-      @child_2.children << @child_2_1
-    end
-
-    should "add child via create or build" do
-      @root_1.children.build :name => "Child 2.2"
-      assert Category.where(:name => "Child 2.2").first.parent == @root_1
-    end
-
-   	should "add child via <<" do
-   		child = Category.create(:name => "Child 2.2")
-   		@root_1.children << child
+	context "Tree" do
+		setup do
+			@root_1     = Category.create(:name => "Root 1")
+			@child_1    = Category.create(:name => "Child 1")
+			@child_2    = Category.create(:name => "Child 2")
+			@child_2_1  = SubCategory.create(:name => "Child 2.1")
+
+			@child_3    = SubCategory.create(:name => "Child 3")
+			@root_2     = Category.create(:name => "Root 2")
+
+			@root_1.children << @child_1
+			@root_1.children << @child_2
+			@root_1.children << @child_3
+
+			@child_2.children << @child_2_1
+		end
+
+		should "add child via create or build" do
+			@root_1.children.build :name => "Child 2.2"
+			assert Category.where(:name => "Child 2.2").first.parent == @root_1
+		end
+
+		should "add child via <<" do
+			child = Category.create(:name => "Child 2.2")
+			@root_1.children << child
 			assert child.parent == @root_1
 		end
 
@@ -54,9 +54,9 @@ class TestMongoidActsAsTree < Test::Unit::TestCase
 			assert_equal([], @root_1.children)
 		end
 
-    should "have roots" do
-      assert eql_arrays?(Category.roots, [@root_1, @root_2])
-    end
+		should "have roots" do
+			assert eql_arrays?(Category.roots, [@root_1, @root_2])
+		end
 
 		should "assign parent_id" do
 			child  = Category.create :name => 'child'
@@ -111,127 +111,126 @@ class TestMongoidActsAsTree < Test::Unit::TestCase
 			assert_equal [], @child_1.path
 		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.ancestors, [@root_1]
-        assert_equal @child_2_1.ancestors, [@root_1, @child_2]
-        assert_equal @root_1.self_and_ancestors, [@root_1]
-        assert_equal @child_2.self_and_ancestors, [@root_1, @child_2]
-        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
+		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.ancestors.to_a, [@root_1]
+				assert_equal @child_2_1.ancestors.to_a, [@root_1, @child_2]
+				assert_equal @root_1.self_and_ancestors, [@root_1]
+				assert_equal @child_2.self_and_ancestors, [@root_1, @child_2]
+				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_2.children << @child_3
-          @child_3.save
+					@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
+					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
+				should "move children on save" do
 					@root_2.children << @child_2
 
 					@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
-          @child_2_1.children << @root_1
-          assert !@root_1.save
-        end
-      end
-
-      should "destroy descendants when destroyed" do
-        @child_2.destroy
-        assert_nil Category.where(:id => @child_2_1._id).first
-      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
+					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
+					@child_2_1.children << @root_1
+					assert !@root_1.save
+				end
+			end
+
+			should "destroy descendants when destroyed" do
+				@child_2.destroy
+				assert_nil Category.where(:id => @child_2_1._id).first
+			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

metadata

@@ -1,19 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_acts_as_tree
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0.rc0
+  prerelease: 6
 platform: ruby
 authors:
 - Jakob Vidmar, Aliaksandr Rahalevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &69860600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bson
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +117,15 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *69860600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &69860070 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +133,15 @@ dependencies:
         version: 0.20.1
   type: :runtime
   prerelease: false
-  version_requirements: *69860070
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.20.1
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &69859660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +149,12 @@ dependencies:
         version: 2.10.2
   type: :development
   prerelease: false
-  version_requirements: *69859660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.10.2
 description: Port of the old, venerable ActsAsTree with a bit of a twist
 email: saksmlz@gmail.com
 executables: []
@@ -53,7 +164,6 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
-- .gitignore
 - .rvmrc
 - CHANGELOG
 - Gemfile
@@ -62,6 +172,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- config/mongoid.yml
 - lib/mongoid_acts_as_tree.rb
 - mongoid_acts_as_tree.gemspec
 - test/helper.rb
@@ -73,8 +184,7 @@ files:
 homepage: http://github.com/saks/mongoid_acts_as_tree
 licenses: []
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -83,22 +193,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1606393504334424851
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ActsAsTree plugin for Mongoid
-test_files:
-- test/models/category.rb
-- test/models/ordered_category.rb
-- test/models/sub_category.rb
-- test/helper.rb
-- test/test_tree.rb
-- test/test_order.rb
+test_files: []

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC