mongoid_acts_as_tree 0.1.5 → 0.1.6

data/Rakefile

@@ -15,7 +15,7 @@ begin
 
     gem.add_development_dependency "shoulda", ">=2.10.2"
   end
-  Jeweler::GemcutterTasks.new
+#  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/mongoid_acts_as_tree.rb

@@ -14,7 +14,8 @@ module Mongoid
 					options = {
 						:parent_id_field => "parent_id",
 						:path_field      => "path",
-						:depth_field     => "depth"
+						:depth_field     => "depth",
+						:class           => self
 					}.merge(options)
 
 					write_inheritable_attribute :acts_as_tree_options, options
@@ -25,14 +26,20 @@ module Mongoid
 					extend Fields
 					extend ClassMethods
 
-					field parent_id_field, :type => BSON::ObjectID
+					field parent_id_field, :type => BSON::ObjectId
 					field path_field, :type => Array,  :default => [], :index => true
 					field depth_field, :type => Integer, :default => 0
 
 					self.class_eval do
 						define_method "#{parent_id_field}=" do | new_parent_id |
-							new_parent = self.class.find new_parent_id
-							new_parent.children.push self, false
+						  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
 
@@ -59,7 +66,7 @@ module Mongoid
 
 				def ==(other)
 					return true if other.equal?(self)
-					return true if other.instance_of?(self.class) and other._id == self._id
+					return true if other.kind_of?(acts_as_tree_options[:class]) and other._id == self._id
 					false
 				end
 
@@ -83,7 +90,7 @@ module Mongoid
 				end
 
 				def parent
-					@_parent or (self[parent_id_field].nil? ? nil : self.class.find(self[parent_id_field]))
+					@_parent or (self[parent_id_field].nil? ? nil : acts_as_tree_options[:class].find(self[parent_id_field]))
 				end
 
 				def root?
@@ -91,12 +98,12 @@ module Mongoid
 				end
 
 				def root
-					self[path_field].first.nil? ? self : self.class.find(self[path_field].first)
+					self[path_field].first.nil? ? self : acts_as_tree_options[:class].find(self[path_field].first)
 				end
 
 				def ancestors
 					return [] if root?
-					self.class.where(:_id.in => self[path_field]).order_by(depth_field)
+					acts_as_tree_options[:class].where(:_id.in => self[path_field]).order_by(depth_field)
 				end
 
 				def self_and_ancestors
@@ -104,11 +111,11 @@ module Mongoid
 				end
 
 				def siblings
-					self.class.where(:_id.ne => self._id, parent_id_field => self[parent_id_field]).order_by tree_order
+					acts_as_tree_options[:class].where(:_id.ne => self._id, parent_id_field => self[parent_id_field]).order_by tree_order
 				end
 
 				def self_and_siblings
-					self.class.where(parent_id_field => self[parent_id_field]).order_by tree_order
+					acts_as_tree_options[:class].where(parent_id_field => self[parent_id_field]).order_by tree_order
 				end
 
 				def children
@@ -125,8 +132,12 @@ module Mongoid
 				alias replace children=
 
 				def descendants
-					return [] if new_record?
-					self.class.where(path_field => self._id).order_by tree_order
+					# workorund for mongoid unexpected behavior
+					_new_record_var = self.instance_variable_get(:@new_record)
+					_new_record = _new_record_var != false
+
+					return [] if _new_record
+					acts_as_tree_options[:class].all_in(path_field => [self._id]).order_by tree_order
 				end
 
 				def self_and_descendants
@@ -198,13 +209,21 @@ module Mongoid
 					super(object)
 				end
 
+				def build(attributes)
+					child = @parent.class.new(attributes)
+					self.push child
+					child
+				end
+
+				alias create build
+
 				alias push <<
 
 				#Deletes object only from children list.
 				#To delete object use <tt>object.destroy</tt>.
 				def delete(object_or_id)
 					object = case object_or_id
-						when String
+						when String, BSON::ObjectId
 							@parent.class.find object_or_id
 						else
 							object_or_id

data/mongoid_acts_as_tree.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_acts_as_tree}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakob Vidmar, Aliaksandr Rahalevich"]
-  s.date = %q{2010-07-05}
+  s.date = %q{2010-11-02}
   s.description = %q{Port of the old, venerable ActsAsTree with a bit of a twist}
   s.email = %q{saksmlz@gmail.com}
   s.extra_rdoc_files = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "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"
   ]
@@ -38,11 +39,12 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{ActsAsTree plugin for Mongoid}
   s.test_files = [
-    "test/test_order.rb",
+    "test/models/category.rb",
      "test/models/ordered_category.rb",
-     "test/models/category.rb",
+     "test/models/sub_category.rb",
      "test/helper.rb",
-     "test/test_tree.rb"
+     "test/test_tree.rb",
+     "test/test_order.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/models/sub_category.rb

@@ -0,0 +1,3 @@
+class SubCategory < Category
+
+end

data/test/test_tree.rb

@@ -9,9 +9,9 @@ class TestMongoidActsAsTree < Test::Unit::TestCase
       @root_1     = Category.create(:name => "Root 1")
       @child_1    = Category.create(:name => "Child 1")
       @child_2    = Category.create(:name => "Child 2")
-      @child_2_1  = Category.create(:name => "Child 2.1")
+      @child_2_1  = SubCategory.create(:name => "Child 2.1")
 
-      @child_3    = Category.create(:name => "Child 3")
+      @child_3    = SubCategory.create(:name => "Child 3")
       @root_2     = Category.create(:name => "Root 2")
 
       @root_1.children << @child_1
@@ -21,6 +21,11 @@ class TestMongoidActsAsTree < Test::Unit::TestCase
       @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
@@ -90,6 +95,22 @@ class TestMongoidActsAsTree < Test::Unit::TestCase
 			assert more_deep_child.ancestors.include? parent
 		end
 
+		should "assign blank parent_id" do
+			@child_1.parent_id = ''
+			@child_1.save
+
+			assert_nil @child_1.reload.parent_id
+			assert_equal 0, @child_1.depth
+			assert_equal [], @child_1.path
+
+			@child_1.parent_id = nil
+			@child_1.save
+
+			assert_nil @child_1.reload.parent_id
+			assert_equal 0, @child_1.depth
+			assert_equal [], @child_1.path
+		end
+
     context "node" do
       should "have a root" do
         assert_equal @root_1.root, @root_1

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Jakob Vidmar, Aliaksandr Rahalevich
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 +03:00
+date: 2010-11-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,7 @@ files:
 - 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
 has_rdoc: true
@@ -119,8 +120,9 @@ signing_key:
 specification_version: 3
 summary: ActsAsTree plugin for Mongoid
 test_files: 
-- test/test_order.rb
-- test/models/ordered_category.rb
 - 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