closure_tree 3.2.0 → 3.2.1

data/README.md

@@ -178,10 +178,13 @@ When you include ```acts_as_tree``` in your model, you can provide a hash to ove
 * ```tag.parent``` returns the node's immediate parent. Root nodes will return nil.
 * ```tag.children``` is a ```has_many``` of immediate children (just those nodes whose parent is the current node).
 * ```tag.ancestors``` is a ordered scope of [ parent, grandparent, great grandparent, … ]. Note that the size of this array will always equal ```tag.depth```.
+* ```tag.ancestor_ids``` is an array of the IDs of the ancestors.
 * ```tag.self_and_ancestors``` returns a scope containing self, parent, grandparent, great grandparent, etc.
 * ```tag.siblings``` returns a scope containing all nodes with the same parent as ```tag```, excluding self.
+* ```tag.sibling_ids``` returns an array of the IDs of the siblings.
 * ```tag.self_and_siblings``` returns a scope containing all nodes with the same parent as ```tag```, including self.
 * ```tag.descendants``` returns a scope of all children, childrens' children, etc., excluding self ordered by depth.
+* ```tag.descendant_ids``` returns an array of the IDs of the descendants.
 * ```tag.self_and_descendants``` returns a scope of all children, childrens' children, etc., including self, ordered by depth.
 * ```tag.destroy``` will destroy a node and do <em>something</em> to its children, which is determined by the ```:dependent``` option passed to ```acts_as_tree```.
 
@@ -282,6 +285,11 @@ Closure tree is [tested under every combination](https://secure.travis-ci.org/mc
 
 ## Change log
 
+### 3.2.1
+
+* Added ```ancestor_ids```, ```descendant_ids```, and ```sibling_ids```
+* Added example spec to solve [issue 9](https://github.com/mceachen/closure_tree/issues/9)
+
 ### 3.2.0
 
 * Added support for deterministic ordering of nodes.

data/lib/closure_tree/acts_as_tree.rb

@@ -136,6 +136,10 @@ module ClosureTree
       without_self(self_and_ancestors)
     end
 
+    def ancestor_ids
+      ids_from(ancestors)
+    end
+
     # Returns an array, root first, of self_and_ancestors' values of the +to_s_column+, which defaults
     # to the +name_column+.
     # (so child.ancestry_path == +%w{grandparent parent child}+
@@ -147,6 +151,10 @@ module ClosureTree
       without_self(self_and_descendants)
     end
 
+    def descendant_ids
+      ids_from(descendants)
+    end
+
     def self_and_siblings
       s = self.class.scoped.where(:parent_id => parent)
       quoted_order_column ? s.order(quoted_order_column) : s
@@ -156,6 +164,10 @@ module ClosureTree
       without_self(self_and_siblings)
     end
 
+    def sibling_ids
+      ids_from(siblings)
+    end
+
     # Alias for appending to the children collection.
     # You can also add directly to the children collection, if you'd prefer.
     def add_child(child_node)
@@ -252,8 +264,12 @@ module ClosureTree
       scope.where(["#{quoted_table_name}.#{self.class.primary_key} != ?", self])
     end
 
+    def ids_from(scope)
+      scope.select(:id).collect(&:id)
+    end
+
     def ct_parent_id
-      send(parent_column_name)
+      read_attribute(parent_column_sym)
     end
 
     # TODO: _parent_id will be removed in the next major version
@@ -393,12 +409,11 @@ module ClosureTree
     end
 
     def order_value
-      send(order_column_sym)
+      read_attribute(order_column_sym)
     end
 
     def order_value=(new_order_value)
-      require_order_column
-      send("#{order_column}=".to_sym, new_order_value)
+      write_attribute(order_column_sym, new_order_value)
     end
 
     def quoted_order_column(include_table_name = true)

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = "3.2.0" unless defined?(::ClosureTree::VERSION)
+  VERSION = "3.2.1" unless defined?(::ClosureTree::VERSION)
 end

data/spec/db/schema.rb

@@ -30,6 +30,10 @@ ActiveRecord::Schema.define(:version => 0) do
     t.datetime "updated_at"
   end
 
+  create_table "contracts", :force => true do |t|
+    t.integer  "user_id",   :null => false
+  end
+
   create_table "referral_hierarchies", :id => false, :force => true do |t|
     t.integer "ancestor_id",   :null => false
     t.integer "descendant_id", :null => false

data/spec/support/models.rb

@@ -21,6 +21,13 @@ class User < ActiveRecord::Base
   acts_as_tree :parent_column_name => "referrer_id",
     :name_column => 'email',
     :hierarchy_table_name => 'referral_hierarchies'
+
+  has_many :contracts
+
+  def indirect_contracts
+    Contract.where(:user_id => descendant_ids)
+  end
+
   attr_accessible :email, :referrer
 
   def to_s
@@ -28,6 +35,10 @@ class User < ActiveRecord::Base
   end
 end
 
+class Contract < ActiveRecord::Base
+  belongs_to :user
+end
+
 class Label < ActiveRecord::Base
   acts_as_tree :order => "sort_order"
   attr_accessible :name

data/spec/user_spec.rb

@@ -75,4 +75,15 @@ describe "empty db" do
       User.leaves.should == [@leaf]
     end
   end
+
+  it "supports users with contracts" do
+    u = User.find_or_create_by_path(%w(a@t.co b@t.co c@t.co))
+    u.descendant_ids.should == []
+    u.ancestor_ids.should == [u.parent.id, u.root.id]
+    u.root.descendant_ids.should == [u.parent.id, u.id]
+    u.root.ancestor_ids.should == []
+    c1 = u.contracts.create!
+    c2 = u.parent.contracts.create!
+    u.root.indirect_contracts.to_a.should =~ [c1, c2]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1361799512496949037
+      hash: -1184203510025686599
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1361799512496949037
+      hash: -1184203510025686599
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21