mongoid-tree 0.5.0 → 0.6.0

data/Gemfile

@@ -2,4 +2,4 @@ source :rubygems
 
 gemspec
 
-gem 'bson_ext', '>= 1.0.4'
+gem 'bson_ext', '>= 1.0.4'

data/README.rdoc

@@ -5,7 +5,7 @@ A tree structure for Mongoid documents using the materialized path pattern
 
 == Requirements
 
-* mongoid (>= 2.0.0.beta.20)
+* mongoid (~> 2.0.0)
 
 
 == Install
@@ -154,6 +154,20 @@ Example:
   end
 
 
+=== Validations
+
+Mongoid::Tree currently does not validate the document's children or parent associations by default. To explicitly enable validation for children and parent documents it's required to add a <tt>validates_associated</tt> validation.
+
+Example
+
+  class Node
+    include Mongoid::Document
+    include Mongoid::Tree
+
+    validates_associated :parent, :children
+  end
+
+
 == Known issues
 
 See https://github.com/benedikt/mongoid-tree/issues
@@ -171,4 +185,4 @@ See a list of all contributors at https://github.com/benedikt/mongoid-tree/contr
 
 == Copyright
 
-Copyright (c) 2010 Benedikt Deicke. See LICENSE for details.
+Copyright (c) 2010-2011 Benedikt Deicke. See LICENSE for details.

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rspec/core/rake_task'
-require 'hanna/rdoctask'
+require 'rdoc/task'
 
 spec = Gem::Specification.load("mongoid-tree.gemspec")
 
@@ -8,6 +8,7 @@ RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
 Rake::RDocTask.new do |rdoc|
+  rdoc.generator = 'hanna'
   rdoc.rdoc_dir = 'doc'
   rdoc.title = "#{spec.name} #{spec.version}"
   rdoc.options += spec.rdoc_options

data/lib/mongoid/tree.rb

@@ -83,17 +83,9 @@ module Mongoid # :nodoc:
     autoload :Traversal, 'mongoid/tree/traversal'
 
     included do
-      references_many :children, :class_name => self.name, :foreign_key => :parent_id, :inverse_of => :parent do
-        def <<(*objects) # :nodoc:
-          super
-          objects.each do |c|
-            c.parent = @parent
-            c.save
-          end
-        end
-      end
+      references_many :children, :class_name => self.name, :foreign_key => :parent_id, :inverse_of => :parent, :autosave => true, :validate => false
 
-      referenced_in :parent, :class_name => self.name, :inverse_of => :children, :index => true
+      referenced_in :parent, :class_name => self.name, :inverse_of => :children, :index => true, :validate => false
 
       field :parent_ids, :type => Array, :default => []
       index :parent_ids
@@ -194,17 +186,21 @@ module Mongoid # :nodoc:
     ##
     # Returns this document's root node
     def root
-      base_class.find(parent_ids.first)
+      if parent_ids.present?
+        return base_class.find(parent_ids.first)
+      else
+        return self.root? ? self : self.parent.root
+      end
     end
 
     ##
-    # Returns this document's ancestors
+    # Returns a chainable criteria for this document's ancestors
     def ancestors
       base_class.where(:_id.in => parent_ids)
     end
 
     ##
-    # Returns this document's ancestors and itself
+    # Returns an array of this document's ancestors and itself
     def ancestors_and_self
       ancestors + [self]
     end
@@ -216,13 +212,13 @@ module Mongoid # :nodoc:
     end
 
     ##
-    # Returns this document's descendants
+    # Returns a chainable criteria for this document's descendants
     def descendants
       base_class.where(:parent_ids => self.id)
     end
 
     ##
-    # Returns this document's descendants and itself
+    # Returns and array of this document's descendants and itself
     def descendants_and_self
       [self] + descendants
     end
@@ -272,7 +268,7 @@ module Mongoid # :nodoc:
     ##
     # Nullifies all children's parent_id
     def nullify_children
-      children.each { |c| c.parent = nil; c.save }
+      children.nullify_all
     end
 
     ##
@@ -309,11 +305,11 @@ module Mongoid # :nodoc:
 
     def rearrange_children
       @rearrange_children = false
-      self.children.find(:all).each { |c| c.save }
+      self.children.each { |c| c.save }
     end
 
     def position_in_tree
       errors.add(:parent_id, :invalid) if self.parent_ids.include?(self.id)
     end
-  end # Tree
-end # Mongoid
+  end
+end

data/lib/mongoid/tree/ordering.rb

@@ -33,27 +33,15 @@ module Mongoid
       extend ActiveSupport::Concern
 
       included do
-        reflect_on_association(:children).options[:default_order] = :position.asc
-
         field :position, :type => Integer
 
+        default_scope asc(:position)
+
         before_save :assign_default_position
         before_save :reposition_former_siblings, :if => :sibling_reposition_required?
         after_destroy :move_lower_siblings_up
       end
 
-      ##
-      # :singleton-method: roots
-      # Returns all root documents ordered by position
-
-      module ClassMethods # :nodoc:
-
-        def roots
-          super.order_by(:position.asc)
-        end
-
-      end
-
       ##
       # Returns siblings below the current document.
       # Siblings with a position greater than this documents's position.
@@ -71,13 +59,13 @@ module Mongoid
       ##
       # Returns the lowest sibling (could be self)
       def last_sibling_in_list
-        siblings_and_self.asc(:position).last
+        siblings_and_self.last
       end
 
       ##
       # Returns the highest sibling (could be self)
       def first_sibling_in_list
-        siblings_and_self.asc(:position).first
+        siblings_and_self.first
       end
 
       ##

data/spec/mongoid/tree/ordering_spec.rb

@@ -166,7 +166,7 @@ describe Mongoid::Tree::Ordering do
     end
   end
 
-  describe 'moving nodes around', :focus => true do
+  describe 'moving nodes around' do
     before(:each) do
       setup_tree <<-ENDTREE
         - first_root:

data/spec/mongoid/tree_spec.rb

@@ -7,19 +7,18 @@ describe Mongoid::Tree do
   it "should reference many children as inverse of parent with index" do
     a = Node.reflect_on_association(:children)
     a.should be
-    a.association.should eql(Mongoid::Associations::ReferencesMany)
-    a.options.class_name.should eql('Node')
-    a.options.foreign_key.should eql('parent_id')
+    a.macro.should eql(:references_many)
+    a.class_name.should eql('Node')
+    a.foreign_key.should eql('parent_id')
     Node.index_options.should have_key('parent_id')
   end
 
   it "should be referenced in one parent as inverse of children" do
     a = Node.reflect_on_association(:parent)
     a.should be
-    a.association.should eql(Mongoid::Associations::ReferencedIn)
-    a.options.class_name.should eql('Node')
-    a.options.inverse_of.should eql(:children)
-    a.options.index.should be_true
+    a.macro.should eql(:referenced_in)
+    a.class_name.should eql('Node')
+    a.inverse_of.should eql(:children)
   end
 
   it "should store parent_ids as Array with [] as default with index" do
@@ -36,6 +35,19 @@ describe Mongoid::Tree do
       expect { root.children << child; root.save! }.to_not raise_error(Mongoid::Errors::DocumentNotFound)
       child.should be_persisted
     end
+
+    it "should not be saved when parent is not saved" do
+      root = Node.new(:name => 'root'); child = Node.new(:name => 'child')
+      child.should_not_receive(:save)
+      root.children << child
+    end
+
+    it "should save its unsaved children" do
+      root = Node.new(:name => 'root'); child = Node.new(:name => 'child')
+      root.children << child
+      child.should_receive(:save)
+      root.save
+    end
   end
 
   describe 'when saved' do
@@ -104,6 +116,12 @@ describe Mongoid::Tree do
       child.should_not be_valid
       child.errors[:parent_id].should_not be_nil
     end
+
+    it "should save its children when added" do
+      new_child = Node.new(:name => 'new_child')
+      node(:root).children << new_child
+      new_child.should be_persisted
+    end
   end
 
   describe 'when subclassed' do
@@ -237,6 +255,18 @@ describe Mongoid::Tree do
       it "should return the root for this document" do
         node(:subchild).root.should == node(:root)
       end
+
+      it "should return itself when there is no root" do
+        new_node = Node.new
+        new_node.root.should be(new_node)
+      end
+
+      it "should return it root when it's not saved yet" do
+        root = Node.new(:name => 'root')
+        new_node = Node.new(:name => 'child')
+        new_node.parent = root
+        new_node.root.should be(root)
+      end
     end
 
     describe 'ancestors' do

data/spec/support/models/node.rb

@@ -11,6 +11,18 @@ end
 class SubclassedNode < Node
 end
 
-class OrderedNode < Node
+# Adding ordering on subclasses currently doesn't work as expected.
+#
+# class OrderedNode < Node
+#   include Mongoid::Tree::Ordering
+# end
+class OrderedNode
+  include Mongoid::Document
+  include Mongoid::Tree
+  include Mongoid::Tree::Traversal
   include Mongoid::Tree::Ordering
-end
+
+  field :name
+
+  attr_accessible :name
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid-tree
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
+  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors: 
 - Benedikt Deicke
@@ -15,74 +10,64 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +01:00
+date: 2011-03-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongoid
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196427
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
+        version: 2.0.0
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: rake
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+        version: 0.8.7
   type: :development
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: autotest
-  prerelease: false
+  name: rspec
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 4
-        - 3
-        - 2
-        version: 4.3.2
+        version: "2.3"
   type: :development
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hanna
-  prerelease: false
+  name: autotest
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 1
-        - 12
-        version: 0.1.12
+        version: 4.3.2
   type: :development
+  prerelease: false
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: hanna-nouveau
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.2
+  type: :development
+  prerelease: false
+  version_requirements: *id005
 description: A tree structure for Mongoid documents using the materialized path pattern
 email: 
 - benedikt@synatic.net
@@ -124,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 1216210944947938384
       segments: 
       - 0
       version: "0"
@@ -133,14 +118,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 1216210944947938384
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A tree structure for Mongoid documents