mongoid-tree 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -0,0 +1,56 @@
+PATH
+  remote: .
+  specs:
+    mongoid-tree (0.2.1)
+      mongoid (>= 2.0.0.beta.14)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activesupport (3.0.0.rc)
+    autotest (4.3.2)
+    bson (1.0.4)
+    bson_ext (1.0.4)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    haml (2.2.24)
+    hanna (0.1.12)
+      haml (~> 2.2.8)
+      rake (~> 0.8.2)
+      rdoc (~> 2.3.0)
+    i18n (0.4.1)
+    mongo (1.0.6)
+      bson (>= 1.0.4)
+    mongoid (2.0.0.beta.14)
+      activemodel (= 3.0.0.rc)
+      bson (= 1.0.4)
+      mongo (= 1.0.6)
+      tzinfo (= 0.3.22)
+      will_paginate (~> 3.0.pre)
+    rake (0.8.7)
+    rdoc (2.3.0)
+    rspec (2.0.0.beta.19)
+      rspec-core (= 2.0.0.beta.19)
+      rspec-expectations (= 2.0.0.beta.19)
+      rspec-mocks (= 2.0.0.beta.19)
+    rspec-core (2.0.0.beta.19)
+    rspec-expectations (2.0.0.beta.19)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.19)
+    tzinfo (0.3.22)
+    will_paginate (3.0.pre2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  autotest (>= 4.3.2)
+  bson_ext (>= 1.0.4)
+  hanna (>= 0.1.12)
+  mongoid (>= 2.0.0.beta.14)
+  mongoid-tree!
+  rspec (>= 2.0.0.beta.18)

data/README.rdoc

@@ -4,7 +4,7 @@ A tree structure for Mongoid documents using the materialized path pattern
 
 == Requirements
 
-* mongoid (>= 2.0.0.beta9)
+* mongoid (>= 2.0.0.beta.14)
 
 == Install
 

data/lib/mongoid/tree.rb

@@ -63,15 +63,18 @@ module Mongoid # :nodoc:
 
     included do
       references_many :children, :class_name => self.name, :foreign_key => :parent_id, :inverse_of => :parent
-      referenced_in :parent, :class_name => self.name, :inverse_of => :children
+      referenced_in :parent, :class_name => self.name, :inverse_of => :children, :index => true
 
       field :parent_ids, :type => Array, :default => []
+      index :parent_ids
 
       set_callback :save, :after, :rearrange_children, :if => :rearrange_children?
       set_callback :validation, :before do
         run_callbacks(:rearrange) { rearrange }
       end
 
+      validate :position_in_tree
+
       define_model_callbacks :rearrange, :only => [:before, :after]
     end
 
@@ -242,5 +245,10 @@ module Mongoid # :nodoc:
       @rearrange_children = false
       self.children.find(:all).each { |c| c.save }
     end
+
+    def position_in_tree
+      errors.add(:parent_id, :invalid) if self.parent_ids.include?(self.id)
+    end
+
   end
 end

data/spec/mongoid/tree_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Mongoid::Tree do
 
-  it "should reference many children as inverse of parent" do
+  it "should reference many children as inverse of parent with index" do
     a = Node.associations['children']
     a.should_not be_nil
     a.association.should == Mongoid::Associations::ReferencesMany
     a.options.class_name.should == 'Node'
     a.options.foreign_key.should == 'parent_id'
-    a.options.inverse_of.should == :parent
+    Node.index_options.should have_key('parent_id')
   end
 
   it "should be referenced in one parent as inverse of children" do
@@ -17,13 +17,15 @@ describe Mongoid::Tree do
     a.association.should == Mongoid::Associations::ReferencedIn
     a.options.class_name.should == 'Node'
     a.options.inverse_of.should == :children
+    a.options.index.should be_true
   end
 
-  it "should store parent_ids as Array with [] as default" do
+  it "should store parent_ids as Array with [] as default with index" do
     f = Node.fields['parent_ids']
     f.should_not be_nil
     f.options[:type].should == Array
     f.options[:default].should == []
+    Node.index_options.should have_key(:parent_ids)
   end
 
   describe 'when saved' do
@@ -79,6 +81,13 @@ describe Mongoid::Tree do
       root.save
     end
 
+    it "should prevent cycles" do
+      child = node(:child)
+      child.parent = node(:subchild)
+      child.should_not be_valid
+      child.errors[:parent_id].should_not be_nil
+    end
+
   end
 
   describe 'utility methods' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid-tree
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Benedikt Deicke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +02:00
+date: 2010-07-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,13 +26,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1848230043
+        hash: 62196479
         segments: 
         - 2
         - 0
         - 0
-        - beta9
-        version: 2.0.0.beta9
+        - beta
+        - 14
+        version: 2.0.0.beta.14
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -107,6 +108,7 @@ files:
 - README.rdoc
 - Rakefile
 - Gemfile
+- Gemfile.lock
 - .rspec
 has_rdoc: true
 homepage: http://github.com/benedikt/mongoid-tree