mongoid_acts_as_tree 0.1.1 → 0.1.2

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/saks/mongoid_acts_as_tree"
     gem.authors = ["Jakob Vidmar, Aliaksandr Rahalevich"]
     gem.add_dependency("mongoid", "<= 2.0.0")
+    gem.add_dependency("bson", ">= 0.20.1")
 
     gem.add_development_dependency "shoulda", ">=2.10.2"
   end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/mongoid_acts_as_tree.rb

@@ -1,171 +1,171 @@
 require "mongoid"
 
 module Mongoid
-  module Acts
-    module Tree
-      def self.included(model)
-        model.class_eval do
-          extend InitializerMethods
-        end
-      end
-
-      module InitializerMethods
-        def acts_as_tree(options = {})
-          options = {
-            :parent_id_field => "parent_id",
-            :path_field      => "path",
-            :depth_field     => "depth"
-          }.merge(options)
-
-          write_inheritable_attribute :acts_as_tree_options, options
-          class_inheritable_reader :acts_as_tree_options
-
-          include InstanceMethods
-          include Fields
-          extend Fields
-          extend ClassMethods
-
-          field parent_id_field, :type => Mongo::ObjectID
-          field path_field, :type => Array,  :default => [], :index => true
-          field depth_field, :type => Integer, :default => 0
-
-          after_save      :move_children
-          validate        :will_save_tree
-          before_destroy  :destroy_descendants
-        end
-      end
-
-      module ClassMethods
-        def roots
-        	self.where(parent_id_field => nil).order_by tree_order
-        end
-      end
-
-      module InstanceMethods
-      	def [](field_name)
-      		self.send field_name
-      	end
-
-      	def []=(field_name, value)
-      		self.send "#{field_name}=", value
-      	end
-
-        def ==(other)
-          return true if other.equal?(self)
-          return true if other.instance_of?(self.class) and other._id == self._id
-          false
-        end
-
-        def will_save_tree
-          if @_cyclic
-            errors.add(:base, "Can't be children of a descendant")
-          end
-        end
-
-        def fix_position
-          if parent.nil?
-            self[parent_id_field] = nil
-            self[path_field] = []
-            self[depth_field] = 0
-          else
-            self[parent_id_field] = parent._id
-            self[path_field] = parent[path_field] + [parent._id]
-            self[depth_field] = parent[depth_field] + 1
-            self.save
-          end
-        end
-
-        def parent
-          @_parent or (self[parent_id_field].nil? ? nil : self.class.find(self[parent_id_field]))
-        end
-
-        def root?
-          self[parent_id_field].nil?
-        end
-
-        def root
-          self[path_field].first.nil? ? self : self.class.find(self[path_field].first)
-        end
-
-        def ancestors
-          return [] if root?
-          self.class.find(self[path_field])
-        end
-
-        def self_and_ancestors
-          ancestors << self
-        end
-
-        def siblings
-          self.class.where(:_id.ne => self._id, parent_id_field => self[parent_id_field]).order_by tree_order
-        end
-
-        def self_and_siblings
-          self.class.where(parent_id_field => self[parent_id_field]).order_by tree_order
-        end
-
-        def children
-        	Children.new self
-        end
-
-        def children=(new_children_list)
-        	self.children.clear
-        	new_children_list.each do | child |
-        		self.children << child
-        	end
-        end
+	module Acts
+		module Tree
+			def self.included(model)
+				model.class_eval do
+					extend InitializerMethods
+				end
+			end
+
+			module InitializerMethods
+				def acts_as_tree(options = {})
+					options = {
+						:parent_id_field => "parent_id",
+						:path_field      => "path",
+						:depth_field     => "depth"
+					}.merge(options)
+
+					write_inheritable_attribute :acts_as_tree_options, options
+					class_inheritable_reader :acts_as_tree_options
+
+					include InstanceMethods
+					include Fields
+					extend Fields
+					extend ClassMethods
+
+					field parent_id_field, :type => BSON::ObjectID
+					field path_field, :type => Array,  :default => [], :index => true
+					field depth_field, :type => Integer, :default => 0
+
+					after_save      :move_children
+					validate        :will_save_tree
+					before_destroy  :destroy_descendants
+				end
+			end
+
+			module ClassMethods
+				def roots
+					self.where(parent_id_field => nil).order_by tree_order
+				end
+			end
+
+			module InstanceMethods
+				def [](field_name)
+					self.send field_name
+				end
+
+				def []=(field_name, value)
+					self.send "#{field_name}=", value
+				end
+
+				def ==(other)
+					return true if other.equal?(self)
+					return true if other.instance_of?(self.class) and other._id == self._id
+					false
+				end
+
+				def will_save_tree
+					if @_cyclic
+						errors.add(:base, "Can't be children of a descendant")
+					end
+				end
+
+				def fix_position
+					if parent.nil?
+						self[parent_id_field] = nil
+						self[path_field] = []
+						self[depth_field] = 0
+					else
+						self[parent_id_field] = parent._id
+						self[path_field] = parent[path_field] + [parent._id]
+						self[depth_field] = parent[depth_field] + 1
+						self.save
+					end
+				end
+
+				def parent
+					@_parent or (self[parent_id_field].nil? ? nil : self.class.find(self[parent_id_field]))
+				end
+
+				def root?
+					self[parent_id_field].nil?
+				end
+
+				def root
+					self[path_field].first.nil? ? self : self.class.find(self[path_field].first)
+				end
+
+				def ancestors
+					return [] if root?
+					self.class.find(self[path_field])
+				end
+
+				def self_and_ancestors
+					ancestors << self
+				end
+
+				def siblings
+					self.class.where(:_id.ne => self._id, parent_id_field => self[parent_id_field]).order_by tree_order
+				end
+
+				def self_and_siblings
+					self.class.where(parent_id_field => self[parent_id_field]).order_by tree_order
+				end
+
+				def children
+					Children.new self
+				end
+
+				def children=(new_children_list)
+					self.children.clear
+					new_children_list.each do | child |
+						self.children << child
+					end
+				end
 
 				alias replace children=
 
-        def descendants
-          return [] if new_record?
-          self.class.where(path_field => self._id).order_by tree_order
-        end
+				def descendants
+					return [] if new_record?
+					self.class.where(path_field => self._id).order_by tree_order
+				end
 
-        def self_and_descendants
-          [self] + self.descendants
-        end
+				def self_and_descendants
+					[self] + self.descendants
+				end
 
-        def is_ancestor_of?(other)
-          other[path_field].include?(self._id)
-        end
+				def is_ancestor_of?(other)
+					other[path_field].include?(self._id)
+				end
 
-        def is_or_is_ancestor_of?(other)
-          (other == self) or is_ancestor_of?(other)
-        end
+				def is_or_is_ancestor_of?(other)
+					(other == self) or is_ancestor_of?(other)
+				end
 
-        def is_descendant_of?(other)
-          self[path_field].include?(other._id)
-        end
+				def is_descendant_of?(other)
+					self[path_field].include?(other._id)
+				end
 
-        def is_or_is_descendant_of?(other)
-          (other == self) or is_descendant_of?(other)
-        end
+				def is_or_is_descendant_of?(other)
+					(other == self) or is_descendant_of?(other)
+				end
 
-        def is_sibling_of?(other)
-          (other != self) and (other[parent_id_field] == self[parent_id_field])
-        end
+				def is_sibling_of?(other)
+					(other != self) and (other[parent_id_field] == self[parent_id_field])
+				end
 
-        def is_or_is_sibling_of?(other)
-          (other == self) or is_sibling_of?(other)
-        end
+				def is_or_is_sibling_of?(other)
+					(other == self) or is_sibling_of?(other)
+				end
 
-        def move_children
+				def move_children
 
-          if @_will_move
-            @_will_move = false
-            self.children.each do | child |
-              child.fix_position
-              child.save
-            end
-            @_will_move = true
-          end
-        end
+					if @_will_move
+						@_will_move = false
+						self.children.each do | child |
+							child.fix_position
+							child.save
+						end
+						@_will_move = true
+					end
+				end
 
-        def destroy_descendants
-          self.descendants.each &:destroy
-        end
-      end
+				def destroy_descendants
+					self.descendants.each &:destroy
+				end
+			end
 
 			#proxy class
 			class Children < Array
@@ -181,11 +181,11 @@ module Mongoid
 					if object.descendants.include? @parent
 						object.instance_variable_set :@_cyclic, true
 					else
-	          object[object.parent_id_field] = @parent._id
-	          object[object.path_field] = @parent[@parent.path_field] + [@parent._id]
-	          object[object.depth_field] = @parent[@parent.depth_field] + 1
+						object[object.parent_id_field] = @parent._id
+						object[object.path_field] = @parent[@parent.path_field] + [@parent._id]
+						object[object.depth_field] = @parent[@parent.depth_field] + 1
 						object.instance_variable_set :@_will_move, true
-	          object.save
+						object.save
 					end
 
 					super(object)
@@ -225,24 +225,24 @@ module Mongoid
 
 			end
 
-      module Fields
-        def parent_id_field
-          acts_as_tree_options[:parent_id_field]
-        end
-
-        def path_field
-          acts_as_tree_options[:path_field]
-        end
-
-        def depth_field
-          acts_as_tree_options[:depth_field]
-        end
-
-        def tree_order
-          acts_as_tree_options[:order] or []
-        end
-      end
-    end
-  end
+			module Fields
+				def parent_id_field
+					acts_as_tree_options[:parent_id_field]
+				end
+
+				def path_field
+					acts_as_tree_options[:path_field]
+				end
+
+				def depth_field
+					acts_as_tree_options[:depth_field]
+				end
+
+				def tree_order
+					acts_as_tree_options[:order] or []
+				end
+			end
+		end
+	end
 end
 

data/mongoid_acts_as_tree.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_acts_as_tree}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakob Vidmar, Aliaksandr Rahalevich"]
-  s.date = %q{2010-04-05}
+  s.date = %q{2010-05-04}
   s.description = %q{Port of the old, venerable ActsAsTree with a bit of a twist}
   s.email = %q{saksmlz@gmail.com}
   s.extra_rdoc_files = [
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/saks/mongoid_acts_as_tree}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.6.1}
   s.summary = %q{ActsAsTree plugin for Mongoid}
   s.test_files = [
     "test/test_tree.rb",
@@ -49,15 +49,18 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mongoid>, ["<= 2.0.0"])
+      s.add_runtime_dependency(%q<bson>, [">= 0.20.1"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
     else
       s.add_dependency(%q<mongoid>, ["<= 2.0.0"])
+      s.add_dependency(%q<bson>, [">= 0.20.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.2"])
     end
   else
     s.add_dependency(%q<mongoid>, ["<= 2.0.0"])
+    s.add_dependency(%q<bson>, [">= 0.20.1"])
     s.add_dependency(%q<shoulda>, [">= 2.10.2"])
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jakob Vidmar, Aliaksandr Rahalevich
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 +03:00
+date: 2010-05-04 00:00:00 +03: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 
@@ -32,9 +33,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: bson
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 20
+        - 1
+        version: 0.20.1
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,7 +61,7 @@ dependencies:
         - 2
         version: 2.10.2
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: Port of the old, venerable ActsAsTree with a bit of a twist
 email: saksmlz@gmail.com
 executables: []
@@ -79,6 +96,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -86,6 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -95,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.6.1
 signing_key: 
 specification_version: 3
 summary: ActsAsTree plugin for Mongoid