mongoid-ancestry 0.1.0 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongoid-ancestry (0.0.0)
+    mongoid-ancestry (0.1.0)
       bson_ext (~> 1.3)
       mongoid (~> 2.0)
       mongoid-ancestry

data/README.md

@@ -3,40 +3,37 @@ Mongoid-ancestry
 
 Mongoid-ancestry is a gem/plugin that allows the records of a Ruby on Rails Mongoid model to be organised as a tree structure (or hierarchy). It uses a single, intuitively formatted database column, using a variation on the materialised path pattern. It exposes all the standard tree structure relations (ancestors, parent, root, children, siblings, descendants) and all of them can be fetched in a single query. Additional features are STI support, scopes, depth caching, depth constraints, easy migration from older plugins/gems, integrity checking, integrity restoration, arrangement of (sub)tree into hashes and different strategies for dealing with orphaned records.
 
-Installation
-------------
+## Installation
 
-## It's Rails 3 only.
+### It's Rails 3 only.
 
 To apply Mongoid-ancestry to any Mongoid model, follow these simple steps:
 
 1. Install
-Add to Gemfile: `gem 'ancestry'`
-Install required gems: `bundle install`
+
+  * Add to Gemfile: `gem 'ancestry'`
+  * Install required gems: `bundle install`
 
 2. Add ancestry to your model
-Add to app/models/[model].rb:
 
-     include Mongoid::Ancestry
-     has_ancestry
+        include Mongoid::Ancestry
+        has_ancestry
 
 Your model is now a tree!
 
-= Organising records into a tree
-By default MongoDB provide records with an unique id which can't be use to order their. Therefore, Mongoid-Ancestry
-adds to the all records of your's model an autoincremented unique id(by default `uid` attribute). You can use the parent
-attribute to organise your records into a tree. For these purposes you should use `uid` attribute. You have already had
-the `uid` of the record and you want to use it as a parent and don't want to fetch it, you can use parent_id. Like any
-virtual model attributes, parent and parent_id can be set using parent= and parent_id= on a record or by including them
-in the hash passed to new, create, create!, update_attributes and update_attributes!. For example:
+## Organising records into a tree
+You can use the parent attribute to organise your records into a tree. If you have the id of the record you want
+to use as a parent and don't want to fetch it, you can also use parent_id. Like any virtual model attributes,
+parent and parent_id can be set using parent= and parent_id= on a record or by including them in the hash passed
+to new, create, create!, update_attributes and update_attributes!. For example:
 
     TreeNode.create :name => 'Stinky', :parent => TreeNode.create(:name => 'Squeeky')
 
 or
 
-    TreeNode.create :name => 'Stinky', :parent_id => TreeNode.create(:name => 'Squeeky').uid
+    TreeNode.create :name => 'Stinky', :parent_id => TreeNode.create(:name => 'Squeeky').id
 
-### Note: It doesn't work with `.create!` at the moment(mongoid bug? needs more investigation). But it absolutely will be fixed.
+#### Note: It doesn't work with `.create!` at the moment(mongoid bug? needs more investigation). But it absolutely will be fixed.
 
 
 You can also create children through the children relation on a node:
@@ -75,7 +72,6 @@ To navigate an Ancestry model, use the following methods on any instance / recor
 The has_ancestry methods supports the following options:
 
     :ancestry_field        Pass in a symbol to store ancestry in a different field
-    :uid_field             Pass in a symbol to store unique id in a different field
     :orphan_strategy       Instruct Ancestry what to do with children of a node that is destroyed:
                            :destroy   All children are destroyed as well (default)
                            :rootify   The children of the destroyed node become root nodes
@@ -85,7 +81,7 @@ The has_ancestry methods supports the following options:
                            - Build cache: TreeNode.rebuild_depth_cache!
     :depth_cache_field     Pass in a symbol to store depth cache in a different field
 
-## (Named) Scopes
+## Scopes
 
 Where possible, the navigation methods return scopes instead of records, this means additional ordering, conditions, limits, etc. can be applied and that the result can be either retrieved, counted or checked for existence. For example:
 
@@ -164,13 +160,13 @@ The arrange method takes Mongoid find options. If you want your hashes to be ord
 With Mongoid-ancestry its easy to migrate from any of these plugins, to do so, use the build_ancestry_from_parent_ids! method on your model. These steps provide a more detailed explanation:
 
 1. Remove old tree plugin or gem and add in Mongoid-ancestry
-See 'Installation' for more info on installing and configuring gem
-Add to app/models/[model].rb:
+  * See 'Installation' for more info on installing and configuring gem
+  * Add to app/models/[model].rb:
 
-     include Mongoid::Ancestry
-     has_ancestry
+            include Mongoid::Ancestry
+            has_ancestry
 
-Create indexes
+  * Create indexes
 
 2. Change your code
 Most tree calls will probably work fine with ancestry
@@ -220,6 +216,6 @@ It's a fork of [original ancestry](https://github.com/stefankroes/ancestry) gem
 
 All thanks should goes to Stefan Kroes for his great work.
 
-Bug report? Faulty/incomplete documentation? Feature request? Please post an issue on 'http://github.com/skyeagle/mongoid-ancestry/issues'.
+Bug report? Faulty/incomplete documentation? Feature request? Please post an issue on [issues tracker](http://github.com/skyeagle/mongoid-ancestry/issues).
 
 Copyright (c) 2009 Stefan Kroes, released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/mongoid/ancestry/class_methods.rb

@@ -3,14 +3,13 @@ module Mongoid
     module ClassMethods
       def has_ancestry(opts = {})
         defaults = {
-          :uid_field         => :uid,
           :ancestry_field    => :ancestry,
           :cache_depth       => false,
           :depth_cache_field => :ancestry_depth,
           :orphan_strategy   => :destroy
         }
 
-        valid_opts = [:uid_field, :ancestry_field, :cache_depth, :depth_cache_field, :orphan_strategy]
+        valid_opts = [:ancestry_field, :cache_depth, :depth_cache_field, :orphan_strategy]
         unless opts.is_a?(Hash) &&  opts.keys.all? {|opt| valid_opts.include?(opt) }
           raise Error.new("Invalid options for has_ancestry. Only hash is allowed.\n Defaults: #{defaults.inspect}")
         end
@@ -19,13 +18,6 @@ module Mongoid
 
         opts.reverse_merge!(defaults)
 
-        cattr_accessor :uid_field
-        self.uid_field = opts[:uid_field]
-
-        # Create unique id field accessor and set to option or default
-        self.field uid_field, :type => Integer
-        self.index uid_field, :unique => true
-
         # Create ancestry field accessor and set to option or default
         cattr_accessor :ancestry_field
         self.ancestry_field = opts[:ancestry_field]
@@ -38,7 +30,7 @@ module Mongoid
         self.orphan_strategy = opts[:orphan_strategy]
 
         # Validate format of ancestry column value
-        primary_key_format = opts[:primary_key_format] || /[0-9]+/
+        primary_key_format = opts[:primary_key_format] || /[a-z0-9]+/
         validates_format_of ancestry_field, :with => /\A#{primary_key_format.source}(\/#{primary_key_format.source})*\Z/, :allow_nil => true
 
         # Validate that the ancestor ids don't include own id
@@ -74,8 +66,6 @@ module Mongoid
         scope :ordered_by_ancestry, asc(:"#{self.base_class.ancestry_field}")
         scope :ordered_by_ancestry_and, lambda {|by| ordered_by_ancestry.order_by([by]) }
 
-        before_create :set_uid
-
         # Update descendants with new ancestry before save
         before_save :update_descendants_with_new_ancestry
 
@@ -83,10 +73,6 @@ module Mongoid
         before_destroy :apply_orphan_strategy
       end
 
-      def find_by_uid!(uid)
-        where(self.base_class.uid_field => uid).first || raise(Mongoid::Errors::DocumentNotFound.new(self, uid))
-      end
-
       # Fetch tree node if necessary
       def to_node object
         object.is_a?(self.base_class) ? object : find(object)
@@ -128,7 +114,7 @@ module Mongoid
           node.ancestor_ids.inject(arranged_nodes) do |insertion_point, ancestor_id|
             insertion_point.each do |parent, children|
               # Change the insertion point to children if node is a descendant of this parent
-              insertion_point = children if ancestor_id == parent.read_attribute(self.base_class.uid_field)
+              insertion_point = children if ancestor_id == parent.id
             end; insertion_point
           end[node] = ActiveSupport::OrderedHash.new; arranged_nodes
         end
@@ -143,19 +129,19 @@ module Mongoid
           begin
             # ... check validity of ancestry column
             if !node.valid? and !node.errors[node.class.ancestry_field].blank?
-              raise IntegrityError.new "Invalid format for ancestry column of node #{node.read_attribute node.uid_field}: #{node.read_attribute node.ancestry_field}."
+              raise IntegrityError.new "Invalid format for ancestry column of node #{node.id}: #{node.read_attribute node.ancestry_field}."
             end
             # ... check that all ancestors exist
             node.ancestor_ids.each do |ancestor_id|
-              unless where(:uid => ancestor_id).first
-                raise IntegrityError.new "Reference to non-existent node in node #{node.read_attribute node.uid_field}: #{ancestor_id}."
+              unless where(:_id => ancestor_id).first
+                raise IntegrityError.new "Reference to non-existent node in node #{node.id}: #{ancestor_id}."
               end
             end
             # ... check that all node parents are consistent with values observed earlier
             node.path_ids.zip([nil] + node.path_ids).each do |node_id, parent_id|
               parents[node_id] = parent_id unless parents.has_key? node_id
               unless parents[node_id] == parent_id
-                raise IntegrityError.new "Conflicting parent id found in node #{node.read_attribute node.uid_field}: #{parent_id || 'nil'} for node #{node_id} while expecting #{parents[node_id] || 'nil'}"
+                raise IntegrityError.new "Conflicting parent id found in node #{node.id}: #{parent_id || 'nil'} for node #{node_id} while expecting #{parents[node_id] || 'nil'}"
               end
             end
           rescue IntegrityError => integrity_exception
@@ -181,19 +167,19 @@ module Mongoid
             end
           end
           # ... save parent of this node in parents array if it exists
-          parents[node.read_attribute(node.uid_field)] = node.parent_id if exists? node.parent_id
+          parents[node.id] = node.parent_id if exists? node.parent_id
 
           # Reset parent id in array to nil if it introduces a cycle
-          parent = parents[node.read_attribute(node.uid_field)]
-          until parent.nil? || parent == node.read_attribute(node.uid_field)
+          parent = parents[node.id]
+          until parent.nil? || parent == node.id
             parent = parents[parent]
           end
-          parents[node.read_attribute(node.uid_field)] = nil if parent == node.read_attribute(node.uid_field)
+          parents[node.id] = nil if parent == node.id
         end
         # For each node ...
         self.base_class.all.each do |node|
           # ... rebuild ancestry from parents array
-          ancestry, parent = nil, parents[node.read_attribute(node.uid_field)]
+          ancestry, parent = nil, parents[node.id]
           until parent.nil?
             ancestry, parent = if ancestry.nil? then parent else "#{parent}/#{ancestry}" end, parents[parent]
           end
@@ -207,17 +193,10 @@ module Mongoid
       def build_ancestry_from_parent_ids! parent_id = nil, ancestry = nil
         self.base_class.where(:parent_id => parent_id).all.each do |node|
           node.without_ancestry_callbacks do
-            retries = 3
-            begin
-              node.set_uid
-              node.send(:"#{ancestry_field}=", ancestry)
-              node.save!
-            rescue Mongo::OperationFailure => e
-              (retries -= 1) > 0 && e.to_s =~ %r{duplicate key error.+\$#{self.base_class.uid_field}} ? retry : raise(e)
-            end
+            node.update_attribute(self.base_class.ancestry_field, ancestry)
           end
           build_ancestry_from_parent_ids! node.id,
-            if ancestry.nil? then "#{node.read_attribute(self.base_class.uid_field)}" else "#{ancestry}/#{node.read_attribute(self.base_class.uid_field)}" end
+            if ancestry.nil? then node.id.to_s else "#{ancestry}/#{node.id}" end
         end
       end
 

data/lib/mongoid/ancestry/instance_methods.rb

@@ -1,26 +1,9 @@
 module Mongoid
   module Ancestry
     module InstanceMethods
-      def save!(opts = {})
-        opts.merge!(:safe => true)
-        retries = 3
-        begin
-          super(opts)
-        rescue Mongo::OperationFailure => e
-          (retries -= 1) > 0 && e.to_s =~ %r{duplicate key error.+\$#{self.base_class.uid_field}} ? retry : raise(e)
-        end
-      end
-      alias_method :save, :save!
-
-      def set_uid
-        previous = self.class.desc(:"#{self.base_class.uid_field}").first
-        uniq_id = previous ? previous.read_attribute(:"#{uid_field}").to_i + 1 : 1
-        send :"#{uid_field}=", uniq_id
-      end
-
       # Validate that the ancestors don't include itself
       def ancestry_exclude_self
-        if ancestor_ids.include? read_attribute(self.base_class.uid_field)
+        if ancestor_ids.include? id
           errors.add(:base, "#{self.class.name.humanize} cannot be a descendant of itself.")
         end
       end
@@ -37,9 +20,9 @@ module Mongoid
               descendant.without_ancestry_callbacks do
                 for_replace = \
                   if read_attribute(self.class.ancestry_field).blank?
-                    read_attribute(self.base_class.uid_field).to_s
+                    id.to_s
                   else
-                    "#{read_attribute self.class.ancestry_field }/#{uid}"
+                    "#{read_attribute self.class.ancestry_field}/#{id}"
                   end
                 new_ancestry = descendant.read_attribute(descendant.class.ancestry_field).gsub(/^#{self.child_ancestry}/, for_replace)
                 descendant.update_attribute(self.base_class.ancestry_field, new_ancestry)
@@ -85,19 +68,19 @@ module Mongoid
         raise Error.new('No child ancestry for new record. Save record before performing tree operations.') if new_record?
 
         if self.send("#{self.base_class.ancestry_field}_was").blank?
-          read_attribute(self.base_class.uid_field).to_s
+          id.to_s
         else
-          "#{self.send "#{self.base_class.ancestry_field}_was"}/#{read_attribute(self.base_class.uid_field)}"
+          "#{self.send "#{self.base_class.ancestry_field}_was"}/#{id}"
         end
       end
 
       # Ancestors
       def ancestor_ids
-        read_attribute(self.base_class.ancestry_field).to_s.split('/').map{ |uid| uid.to_i }
+        read_attribute(self.base_class.ancestry_field).to_s.split('/').map { |id| cast_primary_key(id) }
       end
 
       def ancestor_conditions
-        {self.base_class.uid_field.in => ancestor_ids}
+        { :_id.in => ancestor_ids }
       end
 
       def ancestors depth_options = {}
@@ -105,11 +88,11 @@ module Mongoid
       end
 
       def path_ids
-        ancestor_ids + [read_attribute(self.base_class.uid_field)]
+        ancestor_ids + [id]
       end
 
       def path_conditions
-        {self.base_class.uid_field.in => path_ids}
+        { :_id.in => path_ids }
       end
 
       def path depth_options = {}
@@ -130,7 +113,7 @@ module Mongoid
       end
 
       def parent_id= parent_id
-        self.parent = parent_id.blank? ? nil : self.base_class.find_by_uid!(parent_id)
+        self.parent = parent_id.blank? ? nil : self.base_class.find(parent_id)
       end
 
       def parent_id
@@ -138,16 +121,16 @@ module Mongoid
       end
 
       def parent
-        parent_id.blank? ? nil : self.base_class.find_by_uid!(parent_id)
+        parent_id.blank? ? nil : self.base_class.find(parent_id)
       end
 
       # Root
       def root_id
-        ancestor_ids.empty? ? read_attribute(self.base_class.uid_field) : ancestor_ids.first
+        ancestor_ids.empty? ? id : ancestor_ids.first
       end
 
       def root
-        (root_id == read_attribute(self.base_class.uid_field)) ? self : self.base_class.find_by_uid!(root_id)
+        (root_id == id) ? self : self.base_class.find(root_id)
       end
 
       def is_root?
@@ -164,7 +147,7 @@ module Mongoid
       end
 
       def child_ids
-        children.only(self.base_class.uid_field).all.map(&self.base_class.uid_field)
+        children.only(:_id).map(&:id)
       end
 
       def has_children?
@@ -185,7 +168,7 @@ module Mongoid
       end
 
       def sibling_ids
-        siblings.only(self.base_class.uid_field).all.collect(&self.base_class.uid_field)
+        siblings.only(:_id).map(&:id)
       end
 
       def has_siblings?
@@ -198,7 +181,6 @@ module Mongoid
 
       # Descendants
       def descendant_conditions
-        #["#{self.base_class.ancestry_field} like ? or #{self.base_class.ancestry_column} = ?", "#{child_ancestry}/%", child_ancestry]
         [
           { self.base_class.ancestry_field => /^#{child_ancestry}\// },
           { self.base_class.ancestry_field => child_ancestry }
@@ -210,17 +192,16 @@ module Mongoid
       end
 
       def descendant_ids depth_options = {}
-        descendants(depth_options).only(self.base_class.uid_field).collect(&self.base_class.uid_field)
+        descendants(depth_options).only(:_id).map(&:id)
       end
 
       # Subtree
       def subtree_conditions
-        #["#{self.base_class.primary_key} = ? or #{self.base_class.ancestry_column} like ? or #{self.base_class.ancestry_column} = ?", self.id, "#{child_ancestry}/%", child_ancestry]
-          [
-            { self.base_class.uid_field => read_attribute(self.base_class.uid_field) },
-            { self.base_class.ancestry_field => /^#{child_ancestry}\// },
-            { self.base_class.ancestry_field => child_ancestry }
-          ]
+        [
+          { :_id => id },
+          { self.base_class.ancestry_field => /^#{child_ancestry}\// },
+          { self.base_class.ancestry_field => child_ancestry }
+        ]
       end
 
       def subtree depth_options = {}
@@ -228,7 +209,7 @@ module Mongoid
       end
 
       def subtree_ids depth_options = {}
-        subtree(depth_options).select(self.base_class.uid_field).all.collect(&self.base_class.uid_field)
+        subtree(depth_options).only(:_id).map(&:id)
       end
 
       # Callback disabling
@@ -241,6 +222,22 @@ module Mongoid
       def ancestry_callbacks_disabled?
         !!@disable_ancestry_callbacks
       end
+
+      private
+
+      def cast_primary_key(key)
+        if primary_key_type == Integer
+          key.to_i
+        elsif primary_key_type == BSON::ObjectId && key =~ /[a-z0-9]{24}/
+          BSON::ObjectId.convert(self, key)
+        else
+          key
+        end
+      end
+
+      def primary_key_type
+        @primary_key_type ||= self.base_class.fields['_id'].options[:type]
+      end
     end
   end
 end

data/mongoid-ancestry.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid-ancestry}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stefan Kroes", "Anton Orel"]
-  s.date = %q{2011-04-16}
+  s.date = %q{2011-04-19}
   s.description = %q{Organise Mongoid model into a tree structure}
   s.email = %q{eagle.anton@gmail.com}
   s.extra_rdoc_files = [
@@ -67,6 +67,12 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<libnotify>, ["~> 0.3"])
       s.add_development_dependency(%q<rb-inotify>, ["~> 0.8"])
       s.add_development_dependency(%q<fuubar>, ["~> 0.0.4"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<guard-rspec>, ["~> 0.2"])
+      s.add_development_dependency(%q<libnotify>, ["~> 0.3"])
+      s.add_development_dependency(%q<rb-inotify>, ["~> 0.8"])
+      s.add_development_dependency(%q<fuubar>, ["~> 0.0.4"])
       s.add_runtime_dependency(%q<mongoid>, ["~> 2.0"])
       s.add_runtime_dependency(%q<bson_ext>, ["~> 1.3"])
       s.add_development_dependency(%q<rspec>, ["~> 2.5"])
@@ -89,6 +95,12 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<libnotify>, ["~> 0.3"])
       s.add_dependency(%q<rb-inotify>, ["~> 0.8"])
       s.add_dependency(%q<fuubar>, ["~> 0.0.4"])
+      s.add_dependency(%q<rspec>, ["~> 2.5"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<guard-rspec>, ["~> 0.2"])
+      s.add_dependency(%q<libnotify>, ["~> 0.3"])
+      s.add_dependency(%q<rb-inotify>, ["~> 0.8"])
+      s.add_dependency(%q<fuubar>, ["~> 0.0.4"])
       s.add_dependency(%q<mongoid>, ["~> 2.0"])
       s.add_dependency(%q<bson_ext>, ["~> 1.3"])
       s.add_dependency(%q<rspec>, ["~> 2.5"])
@@ -112,6 +124,12 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<libnotify>, ["~> 0.3"])
     s.add_dependency(%q<rb-inotify>, ["~> 0.8"])
     s.add_dependency(%q<fuubar>, ["~> 0.0.4"])
+    s.add_dependency(%q<rspec>, ["~> 2.5"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<guard-rspec>, ["~> 0.2"])
+    s.add_dependency(%q<libnotify>, ["~> 0.3"])
+    s.add_dependency(%q<rb-inotify>, ["~> 0.8"])
+    s.add_dependency(%q<fuubar>, ["~> 0.0.4"])
     s.add_dependency(%q<mongoid>, ["~> 2.0"])
     s.add_dependency(%q<bson_ext>, ["~> 1.3"])
     s.add_dependency(%q<rspec>, ["~> 2.5"])

data/spec/mongoid/ancestry/class_methods_spec.rb

@@ -31,7 +31,7 @@ describe MongoidAncestry do
 
   it "should be arranged" do
     subject.with_model :depth => 3, :width => 3 do |model, roots|
-      id_sorter = Proc.new do |a, b|; a.uid <=> b.uid; end
+      id_sorter = Proc.new {|a, b|; a.to_param <=> b.to_param }
       arranged_nodes = model.arrange
       arranged_nodes.size.should eql(3)
       arranged_nodes.each do |node, children|
@@ -48,8 +48,8 @@ describe MongoidAncestry do
 
   it "should have arrange order option" do
     subject.with_model :width => 3, :depth => 3 do |model, roots|
-      descending_nodes_lvl0 = model.arrange :order => [:uid, :desc]
-      ascending_nodes_lvl0 = model.arrange :order => [:uid, :asc]
+      descending_nodes_lvl0 = model.arrange :order => [:_id, :desc]
+      ascending_nodes_lvl0 = model.arrange :order => [:_id, :asc]
 
       descending_nodes_lvl0.keys.zip(ascending_nodes_lvl0.keys.reverse).each do |descending_node, ascending_node|
         ascending_node.should eql(descending_node)
@@ -105,14 +105,6 @@ describe MongoidAncestry do
     end
   end
 
-  it "should find record by uid" do
-    subject.with_model do |model|
-      expect { model.find_by_uid!(1)}.to raise_error(Mongoid::Errors::DocumentNotFound)
-      instance = model.create!
-      expect { model.find_by_uid!(1).should eql(instance)}.to_not raise_error(Mongoid::Errors::DocumentNotFound)
-    end
-  end
-
   it "should check that there are no errors on a valid tree" do
     subject.with_model :width => 3, :depth => 3 do |model, roots|
       expect { model.check_ancestry_integrity! }.to_not raise_error(Mongoid::Ancestry::Error)
@@ -130,7 +122,10 @@ describe MongoidAncestry do
 
   it "should check detection of non-existent ancestor" do
     subject.with_model :width => 3, :depth => 3 do |model, roots|
-      roots.first.first.update_attribute model.ancestry_field, 35
+      node = roots.first.first
+      node.without_ancestry_callbacks do
+       node.update_attribute model.ancestry_field, 35
+      end
       expect { model.check_ancestry_integrity! }.to raise_error(Mongoid::Ancestry::IntegrityError)
       model.check_ancestry_integrity!(:report => :list).size.should eql(1)
     end
@@ -139,7 +134,7 @@ describe MongoidAncestry do
   it "should check detection of cyclic ancestry" do
     subject.with_model :width => 3, :depth => 3 do |model, roots|
       node = roots.first.first
-      node.update_attribute model.ancestry_field, node.uid
+      node.update_attribute model.ancestry_field, node.id
       expect { model.check_ancestry_integrity! }.to raise_error(Mongoid::Ancestry::IntegrityError)
       model.check_ancestry_integrity!(:report => :list).size.should eql(1)
     end
@@ -148,7 +143,7 @@ describe MongoidAncestry do
   it "should check detection of conflicting parent id" do
     subject.with_model do |model|
       model.destroy_all
-      model.create!(model.ancestry_field => model.create!(model.ancestry_field => model.create!(model.ancestry_field => nil).uid).uid)
+      model.create!(model.ancestry_field => model.create!(model.ancestry_field => model.create!(model.ancestry_field => nil).id).id)
       expect { model.check_ancestry_integrity! }.to raise_error(Mongoid::Ancestry::IntegrityError)
       model.check_ancestry_integrity!(:report => :list).size.should eql(1)
     end
@@ -177,7 +172,7 @@ describe MongoidAncestry do
   it "should check that integrity is restored for cyclic ancestry" do
     subject.with_model :width => 3, :depth => 3 do |model, roots|
       node = roots.first.first
-      node.update_attribute model.ancestry_field, node.uid
+      node.update_attribute model.ancestry_field, node.id
       assert_integrity_restoration model
     end
   end
@@ -185,7 +180,7 @@ describe MongoidAncestry do
   it "should check that integrity is restored for conflicting parent id" do
     subject.with_model do |model|
       model.destroy_all
-      model.create!(model.ancestry_field => model.create!(model.ancestry_field => model.create!(model.ancestry_field => nil).uid).uid)
+      model.create!(model.ancestry_field => model.create!(model.ancestry_field => model.create!(model.ancestry_field => nil).id).id)
       assert_integrity_restoration model
     end
   end

data/spec/mongoid/ancestry/instance_methods_spec.rb

@@ -4,110 +4,85 @@ describe MongoidAncestry do
 
   subject { MongoidAncestry }
 
-  it "should be saved with unique id for new records" do
-    subject.with_model do |model|
-      new_record = model.create!
-      new_record.uid.should eql(1)
-      expect { new_record.save }.to_not change(new_record, :uid)
-      expect { new_record.save! }.to_not change(new_record, :uid)
-      model.create.uid.should eql(2)
-      model.create!.uid.should eql(3)
-    end
-  end
-
-  it "should raise error on non unique id" do
-    subject.with_model do |model|
-      model.create_indexes
-      expect do
-        first_record = model.new
-        first_record.stub!(:set_uid => true)
-        first_record.save
-        second = model.new
-        second.should_receive(:set_uid).exactly(3).times.and_return(true)
-        second.save
-      end.to raise_error(Mongo::OperationFailure, /duplicate key error/)
-    end
-  end
-
   it "should have tree navigation" do
     subject.with_model :depth => 3, :width => 3 do |model, roots|
       roots.each do |lvl0_node, lvl0_children|
         # Ancestors assertions
         lvl0_node.ancestor_ids.should eql([])
         lvl0_node.ancestors.to_a.should eql([])
-        lvl0_node.path_ids.should eql([lvl0_node.uid])
+        lvl0_node.path_ids.should eql([lvl0_node.id])
         lvl0_node.path.to_a.should eql([lvl0_node])
         lvl0_node.depth.should eql(0)
         # Parent assertions
         lvl0_node.parent_id.should be_nil
         lvl0_node.parent.should be_nil
         # Root assertions
-        lvl0_node.root_id.should eql(lvl0_node.uid)
+        lvl0_node.root_id.should eql(lvl0_node.id)
         lvl0_node.root.should eql(lvl0_node)
         lvl0_node.is_root?.should be_true
         # Children assertions
-        lvl0_node.child_ids.should eql(lvl0_children.map(&:first).map(&:uid))
+        lvl0_node.child_ids.should eql(lvl0_children.map(&:first).map(&:id))
         lvl0_node.children.to_a.should eql(lvl0_children.map(&:first))
         lvl0_node.has_children?.should be_true
         lvl0_node.is_childless?.should be_false
         # Siblings assertions
-        lvl0_node.sibling_ids.should eql(roots.map(&:first).map(&:uid))
+        lvl0_node.sibling_ids.should eql(roots.map(&:first).map(&:id))
         lvl0_node.siblings.to_a.should eql(roots.map(&:first))
         lvl0_node.has_siblings?.should be_true
         lvl0_node.is_only_child?.should be_false
         # Descendants assertions
         descendants = model.all.find_all do |node|
-          node.ancestor_ids.include?(lvl0_node.uid)
+          node.ancestor_ids.include?(lvl0_node.id)
         end
-        lvl0_node.descendant_ids.should eql(descendants.map(&:uid))
+        lvl0_node.descendant_ids.should eql(descendants.map(&:id))
         lvl0_node.descendants.to_a.should eql(descendants)
         lvl0_node.subtree.to_a.should eql([lvl0_node] + descendants)
 
         lvl0_children.each do |lvl1_node, lvl1_children|
           # Ancestors assertions
-          lvl1_node.ancestor_ids.should eql([lvl0_node.uid])
+          lvl1_node.ancestor_ids.should eql([lvl0_node.id])
           lvl1_node.ancestors.to_a.should eql([lvl0_node])
-          lvl1_node.path_ids.should eql([lvl0_node.uid, lvl1_node.uid])
+          lvl1_node.path_ids.should eql([lvl0_node.id, lvl1_node.id])
           lvl1_node.path.to_a.should eql([lvl0_node, lvl1_node])
           lvl1_node.depth.should eql(1)
           # Parent assertions
-          lvl1_node.parent_id.should eql(lvl0_node.uid)
+          lvl1_node.parent_id.should eql(lvl0_node.id)
           lvl1_node.parent.should eql(lvl0_node)
           # Root assertions
-          lvl1_node.root_id.should eql(lvl0_node.uid)
+          lvl1_node.root_id.should eql(lvl0_node.id)
           lvl1_node.root.should eql(lvl0_node)
           lvl1_node.is_root?.should be_false
           # Children assertions
-          lvl1_node.child_ids.should eql(lvl1_children.map(&:first).map(&:uid))
+          lvl1_node.child_ids.should eql(lvl1_children.map(&:first).map(&:id))
           lvl1_node.children.to_a.should eql(lvl1_children.map(&:first))
           lvl1_node.has_children?.should be_true
           lvl1_node.is_childless?.should be_false
           # Siblings assertions
-          lvl1_node.sibling_ids.should eql(lvl0_children.map(&:first).map(&:uid))
+          lvl1_node.sibling_ids.should eql(lvl0_children.map(&:first).map(&:id))
           lvl1_node.siblings.to_a.should eql(lvl0_children.map(&:first))
           lvl1_node.has_siblings?.should be_true
           lvl1_node.is_only_child?.should be_false
           # Descendants assertions
           descendants = model.all.find_all do |node|
-            node.ancestor_ids.include? lvl1_node.uid
+            node.ancestor_ids.include? lvl1_node.id
           end
 
-          lvl1_node.descendant_ids.should eql(descendants.map(&:uid))
+          lvl1_node.descendant_ids.should eql(descendants.map(&:id))
           lvl1_node.descendants.to_a.should eql(descendants)
           lvl1_node.subtree.to_a.should eql([lvl1_node] + descendants)
 
           lvl1_children.each do |lvl2_node, lvl2_children|
             # Ancestors assertions
-            lvl2_node.ancestor_ids.should eql([lvl0_node.uid, lvl1_node.uid])
+            lvl2_node.ancestor_ids.should eql([lvl0_node.id, lvl1_node.id])
             lvl2_node.ancestors.to_a.should eql([lvl0_node, lvl1_node])
-            lvl2_node.path_ids.should eql([lvl0_node.uid, lvl1_node.uid, lvl2_node.uid])
+            lvl2_node.path_ids.should eql([lvl0_node.id, lvl1_node.id, lvl2_node.id])
             lvl2_node.path.to_a.should eql([lvl0_node, lvl1_node, lvl2_node])
             lvl2_node.depth.should eql(2)
             # Parent assertions
-            lvl2_node.parent_id.should eql(lvl1_node.uid)
+            lvl2_node.parent_id.should eql(lvl1_node.id)
             lvl2_node.parent.should eql(lvl1_node)
             # Root assertions
-            lvl2_node.root_id.should eql(lvl0_node.uid)
+            lvl2_node.root_id.should eql(lvl0_node.id)
             lvl2_node.root.should eql(lvl0_node)
             lvl2_node.is_root?.should be_false
             # Children assertions
@@ -116,7 +91,7 @@ describe MongoidAncestry do
             lvl2_node.has_children?.should be_false
             lvl2_node.is_childless?.should be_true
             # Siblings assertions
-            lvl2_node.sibling_ids.should eql(lvl1_children.map(&:first).map(&:uid))
+            lvl2_node.sibling_ids.should eql(lvl1_children.map(&:first).map(&:id))
             lvl2_node.siblings.to_a.should eql(lvl1_children.map(&:first))
             lvl2_node.has_siblings?.should be_true
             lvl2_node.is_only_child?.should be_false
@@ -124,7 +99,7 @@ describe MongoidAncestry do
             descendants = model.all.find_all do |node|
               node.ancestor_ids.include? lvl2_node.id
             end
-            lvl2_node.descendant_ids.should eql(descendants.map(&:uid))
+            lvl2_node.descendant_ids.should eql(descendants.map(&:id))
             lvl2_node.descendants.to_a.should eql(descendants)
             lvl2_node.subtree.to_a.should eql([lvl2_node] + descendants)
           end
@@ -138,12 +113,12 @@ describe MongoidAncestry do
       node = model.create
       ['3', '10/2', '1/4/30', nil].each do |value|
         node.send :write_attribute, model.ancestry_field, value
-        node.valid?
+        node.should be_valid
         node.errors[model.ancestry_field].blank?.should be_true
       end
-      ['1/3/', '/2/3', 'a', 'a/b', '-34', '/54'].each do |value|
+      ['1/3/', '/2/3', 'A/b', '-34', '/54'].each do |value|
         node.send :write_attribute, model.ancestry_field, value
-        node.valid?
+        node.should_not be_valid
         node.errors[model.ancestry_field].blank?.should be_false
       end
     end
@@ -153,26 +128,26 @@ describe MongoidAncestry do
     subject.with_model :depth => 3, :width => 3 do |model, roots|
       root1, root2, root3 = roots.map(&:first)
 
-      descendants = root1.descendants.asc(:uid).to_a
+      descendants = root1.descendants.asc(:_id).map(&:to_param)
       expect {
         root1.parent = root2
         root1.save!
-        root1.descendants.asc(:uid).to_a.should eql(descendants)
+        root1.descendants.asc(:_id).map(&:to_param).should eql(descendants)
       }.to change(root2.descendants, 'size').by(root1.subtree.size)
 
-      descendants = root2.descendants.asc(:uid).to_a
+      descendants = root2.descendants.asc(:_id).map(&:to_param)
       expect {
         root2.parent = root3
         root2.save!
-        root2.descendants.asc(:uid).to_a.should eql(descendants)
+        root2.descendants.asc(:_id).map(&:to_param).should eql(descendants)
       }.to change(root3.descendants, 'size').by(root2.subtree.size)
 
-      descendants = root1.descendants.asc(:uid).to_a
+      descendants = root1.descendants.asc(:_id).map(&:to_param)
       expect {
         expect {
           root1.parent = nil
           root1.save!
-          root1.descendants.asc(:uid).to_a.should eql(descendants)
+          root1.descendants.asc(:_id).map(&:to_param).should eql(descendants)
         }.to change(root3.descendants, 'size').by(-root1.subtree.size)
       }.to change(root2.descendants, 'size').by(-root1.subtree.size)
     end

data/spec/mongoid/ancestry_spec.rb

@@ -10,13 +10,6 @@ describe MongoidAncestry do
   it "should have ancestry fields" do
     subject.with_model do |model|
       model.fields['ancestry'].options[:type].should eql(String)
-      model.fields['uid'].options[:type].should eql(Integer)
-    end
-  end
-
-  it "should have ancestry indexes" do
-    subject.with_model do |model|
-      model.index_options.should have_key(:uid)
     end
   end
 

data/spec/support/models.rb

@@ -28,7 +28,6 @@ class MongoidAncestry
         yield TestNode
       end
     ensure
-      #Mongoid.master.collections.reject { |c| c.name =~ /^system\./ }.each(&:drop)
       remove_const "TestNode"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-ancestry
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-16 00:00:00.000000000 +04:00
+date: 2011-04-19 00:00:00.000000000 +04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid-ancestry
-  requirement: &14616680 !ruby/object:Gem::Requirement
+  requirement: &15269160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14616680
+  version_requirements: *15269160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14615720 !ruby/object:Gem::Requirement
+  requirement: &15268300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *14615720
+  version_requirements: *15268300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14615060 !ruby/object:Gem::Requirement
+  requirement: &15267460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *14615060
+  version_requirements: *15267460
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &14614380 !ruby/object:Gem::Requirement
+  requirement: &15201860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '0.2'
   type: :development
   prerelease: false
-  version_requirements: *14614380
+  version_requirements: *15201860
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &14613640 !ruby/object:Gem::Requirement
+  requirement: &15200920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *14613640
+  version_requirements: *15200920
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &14610600 !ruby/object:Gem::Requirement
+  requirement: &15200100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *14610600
+  version_requirements: *15200100
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &14609780 !ruby/object:Gem::Requirement
+  requirement: &15199500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *14609780
+  version_requirements: *15199500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14608880 !ruby/object:Gem::Requirement
+  requirement: &15198860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *14608880
+  version_requirements: *15198860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14608080 !ruby/object:Gem::Requirement
+  requirement: &15198340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *14608080
+  version_requirements: *15198340
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &14607000 !ruby/object:Gem::Requirement
+  requirement: &15197640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,10 +122,10 @@ dependencies:
         version: '0.2'
   type: :development
   prerelease: false
-  version_requirements: *14607000
+  version_requirements: *15197640
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &14606100 !ruby/object:Gem::Requirement
+  requirement: &15196720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +133,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *14606100
+  version_requirements: *15196720
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &14605080 !ruby/object:Gem::Requirement
+  requirement: &15195680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +144,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *14605080
+  version_requirements: *15195680
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &14604300 !ruby/object:Gem::Requirement
+  requirement: &15195100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -155,10 +155,76 @@ dependencies:
         version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *14604300
+  version_requirements: *15195100
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &15194480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: *15194480
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &14985320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: *14985320
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &14984380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: *14984380
+- !ruby/object:Gem::Dependency
+  name: libnotify
+  requirement: &14982580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: *14982580
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
+  requirement: &14980880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: *14980880
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: &14978240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :development
+  prerelease: false
+  version_requirements: *14978240
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &14603580 !ruby/object:Gem::Requirement
+  requirement: &14963400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -166,10 +232,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *14603580
+  version_requirements: *14963400
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &14598940 !ruby/object:Gem::Requirement
+  requirement: &14961860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -177,10 +243,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *14598940
+  version_requirements: *14961860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14598160 !ruby/object:Gem::Requirement
+  requirement: &14960500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -188,10 +254,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *14598160
+  version_requirements: *14960500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14597460 !ruby/object:Gem::Requirement
+  requirement: &14959360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -199,10 +265,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *14597460
+  version_requirements: *14959360
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &14596700 !ruby/object:Gem::Requirement
+  requirement: &14958700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -210,10 +276,10 @@ dependencies:
         version: '0.2'
   type: :development
   prerelease: false
-  version_requirements: *14596700
+  version_requirements: *14958700
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &14595820 !ruby/object:Gem::Requirement
+  requirement: &14958060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -221,10 +287,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *14595820
+  version_requirements: *14958060
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &14594360 !ruby/object:Gem::Requirement
+  requirement: &14957520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -232,10 +298,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *14594360
+  version_requirements: *14957520
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &14593540 !ruby/object:Gem::Requirement
+  requirement: &14956920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -243,7 +309,7 @@ dependencies:
         version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *14593540
+  version_requirements: *14956920
 description: Organise Mongoid model into a tree structure
 email: eagle.anton@gmail.com
 executables: []