mongoid-ancestry 0.2.2 → 0.2.3

data/.gitignore

@@ -1,5 +1,3 @@
-log/**
-
 # rcov generated
 coverage
 

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -3,5 +3,6 @@ source :rubygems
 gemspec
 
 group :test do
+  gem 'rake'
   gem 'rspec', '~> 2.5'
 end

data/Gemfile.lock

@@ -1,30 +1,33 @@
 PATH
   remote: .
   specs:
-    mongoid-ancestry (0.2.2)
-      bson_ext (~> 1.3)
-      mongoid (~> 2.0)
+    mongoid-ancestry (0.2.3)
+      bson_ext (>= 1.3)
+      mongoid (>= 2.0)
 
 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.0)
-    bson_ext (1.3.0)
-    builder (2.1.2)
+    activemodel (3.2.5)
+      activesupport (= 3.2.5)
+      builder (~> 3.0.0)
+    activesupport (3.2.5)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    bson (1.6.4)
+    bson_ext (1.6.4)
+      bson (~> 1.6.4)
+    builder (3.0.0)
     diff-lcs (1.1.2)
-    i18n (0.5.0)
-    mongo (1.3.0)
-      bson (>= 1.3.0)
-    mongoid (2.0.1)
-      activemodel (~> 3.0)
+    i18n (0.6.0)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
+    mongoid (2.4.7)
+      activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
+    multi_json (1.3.6)
+    rake (0.9.2.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -33,12 +36,12 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    tzinfo (0.3.26)
-    will_paginate (3.0.pre2)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   mongoid-ancestry!
+  rake
   rspec (~> 2.5)

data/README.md

@@ -1,6 +1,8 @@
 Mongoid-ancestry
 ================
 
+[![travis](https://secure.travis-ci.org/joe1chen/mongoid-ancestry.png)](http://travis-ci.org/joe1chen/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
@@ -23,9 +25,9 @@ Your model is now a tree!
 
 ## 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:
+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')
 
@@ -69,15 +71,18 @@ To navigate an Ancestry model, use the following methods on any instance / recor
 
 ## Options for has_ancestry
 
-The has_ancestry methods supports the following options:
+The `has_ancestry` methods supports the following options:
 
     :ancestry_field        Pass in a symbol to store ancestry 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
                            :restrict  An Error is raised if any children exist
-    :cache_depth           Cache the depth of each node in the 'ancestry_depth' field (default: false)
+    :cache_depth           Cache the depth of each node in the `ancestry_depth` field (default: false)
                            If you turn depth_caching on for an existing model:
+                           - Mongoid has default configuration attribute `allow_dynamic_fields` as `true`.
+                           You should manually add this depth field with `Integer` type and `0` as default value
+                           into your model if `allow_dynamic_fields` is disabled in your configuration.
                            - Build cache: TreeNode.rebuild_depth_cache!
     :depth_cache_field     Pass in a symbol to store depth cache in a different field
 
@@ -107,7 +112,7 @@ Thanks to some convenient rails magic, it is even possible to create nodes throu
 
 ## Selecting nodes by depth
 
-When depth caching is enabled (see has_ancestry options), five more named scopes can be used to select nodes on their depth:
+When depth caching is enabled (see `has_ancestry` options), five more named scopes can be used to select nodes on their depth:
 
     before_depth(depth)     Return nodes that are less deep than depth (node.depth < depth)
     to_depth(depth)         Return nodes up to a certain depth (node.depth <= depth)
@@ -115,7 +120,7 @@ When depth caching is enabled (see has_ancestry options), five more named scopes
     from_depth(depth)       Return nodes starting from a certain depth (node.depth >= depth)
     after_depth(depth)      Return nodes that are deeper than depth (node.depth > depth)
 
-The depth scopes are also available through calls to descendants, descendant_ids, subtree, subtree_ids, path and ancestors. In this case, depth values are interpreted relatively. Some examples:
+The depth scopes are also available through calls to `descendants`, `descendant_ids`, `subtree`, `subtree_ids`, `path` and `ancestors`. In this case, depth values are interpreted relatively. Some examples:
 
     node.subtree(:to_depth => 2)      Subtree of node, to a depth of node.depth + 2 (self, children and grandchildren)
     node.subtree.to_depth(5)          Subtree of node to an absolute depth of 5
@@ -129,7 +134,10 @@ The depth scopes are also available through calls to descendants, descendant_ids
     node.descendants(:from_depth => 2, :to_depth => 4)
     node.subtree.from_depth(10).to_depth(12)
 
-Please note that depth constraints cannot be passed to ancestor_ids and path_ids. The reason for this is that both these relations can be fetched directly from the ancestry column without performing a database query. It would require an entirely different method of applying the depth constraints which isn't worth the effort of implementing. You can use ancestors(depth_options).map(&:id) or ancestor_ids.slice(min_depth..max_depth) instead.
+Please note that depth constraints cannot be passed to `ancestor_ids` and `path_ids`. The reason for this is that
+both these relations can be fetched directly from the ancestry column without performing a database query. It would
+require an entirely different method of applying the depth constraints which isn't worth the effort of implementing.
+You can use `ancestors(depth_options).map(&:id)` or `ancestor_ids.slice(min_depth..max_depth)` instead.
 
 ## STI support
 
@@ -157,11 +165,11 @@ The arrange method takes Mongoid find options. If you want your hashes to be ord
 
 ## Migrating from plugin that uses parent_id column
 
-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:
+With Mongoid-ancestry its easy to migrate from any of these plugins, to do so, use the `Model.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:
+  * Add to app/models/model.rb:
 
             include Mongoid::Ancestry
             has_ancestry
@@ -173,13 +181,13 @@ Most tree calls will probably work fine with ancestry
 Others must be changed or proxied
 Check if all your data is intact and all tests pass
 
-3. Drop parent_id field
+3. Drop `parent_id` field
 
 ## Integrity checking and restoration
 
-I don't see any way Mongoid-ancestry tree integrity could get compromised without explicitly setting cyclic parents or invalid ancestry and circumventing validation with update_attribute, if you do, please let me know.
+I don't see any way Mongoid-ancestry tree integrity could get compromised without explicitly setting cyclic parents or invalid ancestry and circumventing validation with `update_attribute`, if you do, please let me know.
 
-Mongoid-ancestry includes some methods for detecting integrity problems and restoring integrity just to be sure. To check integrity use: [Model].check_ancestry_integrity!. An Mongoid::Ancestry::Error will be raised if there are any problems. You can also specify :report => :list to return an array of exceptions or :report => :echo to echo any error messages. To restore integrity use: [Model].restore_ancestry_integrity!.
+Mongoid-ancestry includes some methods for detecting integrity problems and restoring integrity just to be sure. To check integrity use: `Model.check_ancestry_integrity!`. An Mongoid::Ancestry::Error will be raised if there are any problems. You can also specify `:report => :list` to return an array of exceptions or `:report => :echo` to echo any error messages. To restore integrity use: `Model.restore_ancestry_integrity!`.
 
 For example, from IRB:
 
@@ -202,13 +210,13 @@ Additionally, if you think something is wrong with your depth cache:
 
 ## Tests
 
-The Mongoid-ancestry gem comes with rspec and guard(for automatically specs running) suite consisting of about 40 specs. It takes about 10 seconds to run. To run it yourself check out the repository from GitHub, run `bundle install`, run `guard` and press `Ctrl+\` or just `rake spec`.
+The Mongoid-ancestry gem comes with rspec and guard(for automatically specs running) suite consisting of about 40 specs. It takes about 10 seconds to run. To run it yourself check out the repository from GitHub, run `bundle install`, run `guard` and press `Ctrl+\ ` or just `rake spec`.
 
 ## Internals
 
 As can be seen in the previous section, Mongoid-ancestry stores a path from the root to the parent for every node. This is a variation on the materialised path database pattern. It allows to fetch any relation (siblings, descendants, etc.) in a single query without the complicated algorithms and incomprehensibility associated with left and right values. Additionally, any inserts, deletes and updates only affect nodes within the affected node's own subtree.
 
-The materialised path pattern requires Mongoid-ancestry to use a 'regexp' condition in order to fetch descendants. This should not be particularly slow however since the the condition never starts with a wildcard which allows the DBMS to use the column index. If you have any data on performance with a large number of records, please drop me line.
+The materialised path pattern requires Mongoid-ancestry to use a `regexp` condition in order to fetch descendants. This should not be particularly slow however since the the condition never starts with a wildcard which allows the DBMS to use the column index. If you have any data on performance with a large number of records, please drop me line.
 
 ## Contact and copyright
 

data/Rakefile

@@ -10,7 +10,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/lib/mongoid-ancestry/instance_methods.rb

@@ -1,243 +1,243 @@
 module Mongoid
   module Ancestry
-    module InstanceMethods
-      # Validate that the ancestors don't include itself
-      def ancestry_exclude_self
-        if ancestor_ids.include? id
-          errors.add(:base, "#{self.class.name.humanize} cannot be a descendant of itself.")
-        end
+
+    # Validate that the ancestors don't include itself
+    def ancestry_exclude_self
+      if ancestor_ids.include? id
+        errors.add(:base, "#{self.class.name.humanize} cannot be a descendant of itself.")
       end
+    end
 
-      # Update descendants with new ancestry
-      def update_descendants_with_new_ancestry
-        # Skip this if callbacks are disabled
-        unless ancestry_callbacks_disabled?
-          # If node is valid, not a new record and ancestry was updated ...
-          if changed.include?(self.base_class.ancestry_field.to_s) && !new_record? && valid?
-            # ... for each descendant ...
-            descendants.each do |descendant|
-              # ... replace old ancestry with new ancestry
-              descendant.without_ancestry_callbacks do
-                for_replace = \
-                  if read_attribute(self.class.ancestry_field).blank?
-                    id.to_s
-                  else
-                    "#{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)
-              end
+    # Update descendants with new ancestry
+    def update_descendants_with_new_ancestry
+      # Skip this if callbacks are disabled
+      unless ancestry_callbacks_disabled?
+        # If node is valid, not a new record and ancestry was updated ...
+        if changed.include?(self.base_class.ancestry_field.to_s) && !new_record? && valid?
+          # ... for each descendant ...
+          descendants.each do |descendant|
+            # ... replace old ancestry with new ancestry
+            descendant.without_ancestry_callbacks do
+              for_replace = \
+                if read_attribute(self.class.ancestry_field).blank?
+                  id.to_s
+                else
+                  "#{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)
             end
           end
         end
       end
+    end
 
-      # Apply orphan strategy
-      def apply_orphan_strategy
-        # Skip this if callbacks are disabled
-        unless ancestry_callbacks_disabled?
-          # If this isn't a new record ...
-          unless new_record?
-            # ... make al children root if orphan strategy is rootify
-            if self.base_class.orphan_strategy == :rootify
-              descendants.each do |descendant|
-                descendant.without_ancestry_callbacks do
-                  val = \
-                    unless descendant.ancestry == child_ancestry
-                      descendant.read_attribute(descendant.class.ancestry_field).gsub(/^#{child_ancestry}\//, '')
-                    end
-                  descendant.update_attribute descendant.class.ancestry_field, val
-                end
-              end
-              # ... destroy all descendants if orphan strategy is destroy
-            elsif self.base_class.orphan_strategy == :destroy
-              descendants.all.each do |descendant|
-                descendant.without_ancestry_callbacks { descendant.destroy }
+    # Apply orphan strategy
+    def apply_orphan_strategy
+      # Skip this if callbacks are disabled
+      unless ancestry_callbacks_disabled?
+        # If this isn't a new record ...
+        unless new_record?
+          # ... make al children root if orphan strategy is rootify
+          if self.base_class.orphan_strategy == :rootify
+            descendants.each do |descendant|
+              descendant.without_ancestry_callbacks do
+                val = \
+                  unless descendant.ancestry == child_ancestry
+                    descendant.read_attribute(descendant.class.ancestry_field).gsub(/^#{child_ancestry}\//, '')
+                  end
+                descendant.update_attribute descendant.class.ancestry_field, val
               end
-              # ... throw an exception if it has children and orphan strategy is restrict
-            elsif self.base_class.orphan_strategy == :restrict
-              raise Error.new('Cannot delete record because it has descendants.') unless is_childless?
             end
+            # ... destroy all descendants if orphan strategy is destroy
+          elsif self.base_class.orphan_strategy == :destroy
+            descendants.all.each do |descendant|
+              descendant.without_ancestry_callbacks { descendant.destroy }
+            end
+            # ... throw an exception if it has children and orphan strategy is restrict
+          elsif self.base_class.orphan_strategy == :restrict
+            raise Error.new('Cannot delete record because it has descendants.') unless is_childless?
           end
         end
       end
+    end
 
-      # The ancestry value for this record's children
-      def child_ancestry
-        # New records cannot have children
-        raise Error.new('No child ancestry for new record. Save record before performing tree operations.') if new_record?
+    # The ancestry value for this record's children
+    def child_ancestry
+      # New records cannot have children
+      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?
-          id.to_s
-        else
-          "#{self.send "#{self.base_class.ancestry_field}_was"}/#{id}"
-        end
+      if self.send("#{self.base_class.ancestry_field}_was").blank?
+        id.to_s
+      else
+        "#{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 { |id| cast_primary_key(id) }
-      end
+    # Ancestors
+    def ancestor_ids
+      read_attribute(self.base_class.ancestry_field).to_s.split('/').map { |id| cast_primary_key(id) }
+    end
 
-      def ancestor_conditions
-        { :_id.in => ancestor_ids }
-      end
+    def ancestor_conditions
+      { :_id.in => ancestor_ids }
+    end
 
-      def ancestors depth_options = {}
-        self.base_class.scope_depth(depth_options, depth).where(ancestor_conditions)
-      end
+    def ancestors depth_options = {}
+      self.base_class.scope_depth(depth_options, depth).where(ancestor_conditions)
+    end
 
-      def path_ids
-        ancestor_ids + [id]
-      end
+    def path_ids
+      ancestor_ids + [id]
+    end
 
-      def path_conditions
-        { :_id.in => path_ids }
-      end
+    def path_conditions
+      { :_id.in => path_ids }
+    end
 
-      def path depth_options = {}
-        self.base_class.scope_depth(depth_options, depth).where(path_conditions)
-      end
+    def path depth_options = {}
+      self.base_class.scope_depth(depth_options, depth).where(path_conditions)
+    end
 
-      def depth
-        ancestor_ids.size
-      end
+    def depth
+      ancestor_ids.size
+    end
 
-      def cache_depth
-        write_attribute self.base_class.depth_cache_field, depth
-      end
+    def cache_depth
+      write_attribute self.base_class.depth_cache_field, depth
+    end
 
-      # Parent
-      def parent= parent
-        write_attribute(self.base_class.ancestry_field, parent.blank? ? nil : parent.child_ancestry)
-      end
+    # Parent
+    def parent= parent
+      write_attribute(self.base_class.ancestry_field, parent.blank? ? nil : parent.child_ancestry)
+    end
 
-      def parent_id= parent_id
-        self.parent = parent_id.blank? ? nil : self.base_class.find(parent_id)
-      end
+    def parent_id= parent_id
+      self.parent = parent_id.blank? ? nil : self.base_class.find(parent_id)
+    end
 
-      def parent_id
-        ancestor_ids.empty? ? nil : ancestor_ids.last
-      end
+    def parent_id
+      ancestor_ids.empty? ? nil : ancestor_ids.last
+    end
 
-      def parent
-        parent_id.blank? ? nil : self.base_class.find(parent_id)
-      end
+    def parent
+      parent_id.blank? ? nil : self.base_class.find(parent_id)
+    end
 
-      # Root
-      def root_id
-        ancestor_ids.empty? ? id : ancestor_ids.first
-      end
+    # Root
+    def root_id
+      ancestor_ids.empty? ? id : ancestor_ids.first
+    end
 
-      def root
-        (root_id == id) ? self : self.base_class.find(root_id)
-      end
+    def root
+      (root_id == id) ? self : self.base_class.find(root_id)
+    end
 
-      def is_root?
-        read_attribute(self.base_class.ancestry_field).blank?
-      end
+    def is_root?
+      read_attribute(self.base_class.ancestry_field).blank?
+    end
 
-      # Children
-      def child_conditions
-        {self.base_class.ancestry_field => child_ancestry}
-      end
+    # Children
+    def child_conditions
+      {self.base_class.ancestry_field => child_ancestry}
+    end
 
-      def children
-        self.base_class.where(child_conditions)
-      end
+    def children
+      self.base_class.where(child_conditions)
+    end
 
-      def child_ids
-        children.only(:_id).map(&:id)
-      end
+    def child_ids
+      children.only(:_id).map(&:id)
+    end
 
-      def has_children?
-        self.children.present?
-      end
+    def has_children?
+      self.children.present?
+    end
 
-      def is_childless?
-        !has_children?
-      end
+    def is_childless?
+      !has_children?
+    end
 
-      # Siblings
-      def sibling_conditions
-        {self.base_class.ancestry_field => read_attribute(self.base_class.ancestry_field)}
-      end
+    # Siblings
+    def sibling_conditions
+      {self.base_class.ancestry_field => read_attribute(self.base_class.ancestry_field)}
+    end
 
-      def siblings
-        self.base_class.where sibling_conditions
-      end
+    def siblings
+      self.base_class.where sibling_conditions
+    end
 
-      def sibling_ids
-        siblings.only(:_id).map(&:id)
-      end
+    def sibling_ids
+      siblings.only(:_id).map(&:id)
+    end
 
-      def has_siblings?
-        self.siblings.count > 1
-      end
+    def has_siblings?
+      self.siblings.count > 1
+    end
 
-      def is_only_child?
-        !has_siblings?
-      end
+    def is_only_child?
+      !has_siblings?
+    end
 
-      # Descendants
-      def descendant_conditions
-        [
-          { self.base_class.ancestry_field => /^#{child_ancestry}\// },
-          { self.base_class.ancestry_field => child_ancestry }
-        ]
-      end
+    # Descendants
+    def descendant_conditions
+      [
+        { self.base_class.ancestry_field => /^#{child_ancestry}\// },
+        { self.base_class.ancestry_field => child_ancestry }
+      ]
+    end
 
-      def descendants depth_options = {}
-        self.base_class.scope_depth(depth_options, depth).any_of(descendant_conditions)
-      end
+    def descendants depth_options = {}
+      self.base_class.scope_depth(depth_options, depth).any_of(descendant_conditions)
+    end
 
-      def descendant_ids depth_options = {}
-        descendants(depth_options).only(:_id).map(&:id)
-      end
+    def descendant_ids depth_options = {}
+      descendants(depth_options).only(:_id).map(&:id)
+    end
 
-      # Subtree
-      def subtree_conditions
-        [
-          { :_id => id },
-          { self.base_class.ancestry_field => /^#{child_ancestry}\// },
-          { self.base_class.ancestry_field => child_ancestry }
-        ]
-      end
+    # Subtree
+    def subtree_conditions
+      [
+        { :_id => id },
+        { self.base_class.ancestry_field => /^#{child_ancestry}\// },
+        { self.base_class.ancestry_field => child_ancestry }
+      ]
+    end
 
-      def subtree depth_options = {}
-        self.base_class.scope_depth(depth_options, depth).any_of(subtree_conditions)
-      end
+    def subtree depth_options = {}
+      self.base_class.scope_depth(depth_options, depth).any_of(subtree_conditions)
+    end
 
-      def subtree_ids depth_options = {}
-        subtree(depth_options).only(:_id).map(&:id)
-      end
+    def subtree_ids depth_options = {}
+      subtree(depth_options).only(:_id).map(&:id)
+    end
 
-      # Callback disabling
-      def without_ancestry_callbacks
-        @disable_ancestry_callbacks = true
-        yield
-        @disable_ancestry_callbacks = false
-      end
+    # Callback disabling
+    def without_ancestry_callbacks
+      @disable_ancestry_callbacks = true
+      yield
+      @disable_ancestry_callbacks = false
+    end
 
-      def ancestry_callbacks_disabled?
-        !!@disable_ancestry_callbacks
-      end
+    def ancestry_callbacks_disabled?
+      !!@disable_ancestry_callbacks
+    end
 
-      private
+    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
+    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
+    def primary_key_type
+      @primary_key_type ||= self.base_class.fields['_id'].options[:type]
     end
   end
+
 end

data/lib/mongoid-ancestry/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Ancestry
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

data/lib/mongoid-ancestry.rb

@@ -3,12 +3,13 @@ module Mongoid
     extend ActiveSupport::Concern
 
     autoload :ClassMethods,    'mongoid-ancestry/class_methods'
-    autoload :InstanceMethods, 'mongoid-ancestry/instance_methods'
     autoload :Error,           'mongoid-ancestry/exceptions'
 
     included do
       cattr_accessor :base_class
       self.base_class = self
     end
+
+    require 'mongoid-ancestry/instance_methods'
   end
 end

data/log/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

data/mongoid-ancestry.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
 
-  s.add_dependency('mongoid', "~> 2.0")
-  s.add_dependency('bson_ext', "~> 1.3")
+  s.add_dependency('mongoid', ">= 2.0")
+  s.add_dependency('bson_ext', ">= 1.3")
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-ancestry
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,31 +10,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-26 00:00:00.000000000 +04:00
-default_executable: 
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &19610840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19610840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &19610240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *19610240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: Organise Mongoid model into a tree structure
 email:
 - eagle.anton@gmail.com
@@ -44,6 +53,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -57,13 +67,13 @@ files:
 - lib/mongoid-ancestry/exceptions.rb
 - lib/mongoid-ancestry/instance_methods.rb
 - lib/mongoid-ancestry/version.rb
+- log/.gitignore
 - mongoid-ancestry.gemspec
 - spec/lib/ancestry_spec.rb
 - spec/lib/mongoid-ancestry/class_methods_spec.rb
 - spec/lib/mongoid-ancestry/instance_methods_spec.rb
 - spec/spec_helper.rb
 - spec/support/models.rb
-has_rdoc: true
 homepage: http://github.com/skyeagle/mongoid-ancestry
 licenses:
 - MIT
@@ -79,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 582045907932447253
+      hash: -4473599239750644479
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -88,10 +98,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 582045907932447253
+      hash: -4473599239750644479
 requirements: []
 rubyforge_project: mongoid-ancestry
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ancestry allows the records of a Mongoid model to be organised in a tree