basic_tree 0.0.1 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.0

data/basic_tree.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{basic_tree}
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Austin Schneider"]
-  s.date = %q{2010-04-01}
+  s.date = %q{2010-07-01}
   s.description = %q{A basic tree structure}
   s.email = %q{soccer022483@gmail.com}
   s.extra_rdoc_files = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/soccer022483/basic_tree}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A basic tree structure}
   s.test_files = [
     "spec/basic_tree_spec.rb",
@@ -43,7 +43,7 @@ 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_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])

data/lib/basic_tree.rb

@@ -1,25 +1,4 @@
 class BasicTree
-  class Children
-    include Enumerable
-  
-    def each(&block)
-      trees.each(&block)
-    end
-    
-    def empty?
-      trees.empty?
-    end
-  
-    private
-  
-    def trees
-      @trees ||= []
-    end
-  
-    def <<(tree)
-      trees << tree
-    end
-  end
   
   include Enumerable
   
@@ -28,21 +7,16 @@ class BasicTree
     yield self if block_given?
   end
   
-  attr_accessor :object
-  attr_reader :parent
+  attr_accessor :object, :parent
   
   def add(object, &block)
     self.class.new(object) do |child|
-      children.send(:<<, child)
-      child.send(:parent=, self)
+      children << child
+      child.parent = self
       yield child if block_given?
     end
   end
   
-  def each(&block)
-    children.each(&block)
-  end
-  
   def path
     ancestors << self
   end
@@ -51,27 +25,20 @@ class BasicTree
     root? ? [] : (parent.ancestors << parent)
   end
   
-  def descendants(depth = -1)
-    trees = []
-    if depth != 0
-      children.each do |child|
-        trees << child
-        trees += child.descendants(depth - 1)
-      end
-    end
-    trees
+  def descendants
+    children.map { |c| [c] + c.descendants }.flatten
   end
   
-  def subtree(depth = -1)
-    [self] + descendants(depth)
+  def subtree
+    [self] + descendants
   end
   
   def siblings
-    parent.children.select { |child| child != self }
+    root? ? [] : parent.children.select { |child| child != self }
   end
   
   def root
-    ancestors.first
+    path.first
   end
   
   def level
@@ -86,20 +53,8 @@ class BasicTree
     children.empty?
   end
   
-  def leaves
-    trees = []
-    children.each do |child|
-      child.leaf? ? (trees << child) : (trees += child.leaves)
-    end
-    trees
-  end
-  
-  private
-  
-  attr_writer :parent
-  
   def children
-    @children ||= Children.new
+    @children ||= []
   end
   
 end

data/spec/basic_tree_spec.rb

@@ -1,5 +1,85 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "BasicTree" do
+describe BasicTree do
+  
+  before do
+    @a = BasicTree.new "a" do |a|
+      @a1 = a.add "a1" do |a1|
+        @a11 = a1.add "a11"
+        @a12 = a1.add "a12"
+      end
+      @a2 = a.add "a2"
+    end
+  end
+  
+  it "path" do
+    @a.path.should == [@a]
+    @a1.path.should == [@a, @a1]
+    @a11.path.should == [@a, @a1, @a11]
+    @a12.path.should == [@a, @a1, @a12]
+    @a2.path.should == [@a, @a2]
+  end
+  
+  it "ancestors" do
+    @a.ancestors.should == []
+    @a1.ancestors.should == [@a]
+    @a11.ancestors.should == [@a, @a1]
+    @a12.ancestors.should == [@a, @a1]
+    @a2.ancestors.should == [@a]
+  end
+  
+  it "descendants" do
+    @a.descendants.should == [@a1, @a11, @a12, @a2]
+    @a1.descendants.should == [@a11, @a12]
+    @a11.descendants.should == []
+    @a12.descendants.should == []
+    @a2.descendants.should == []
+  end
+  
+  it "subtree" do
+    @a.subtree.should == [@a, @a1, @a11, @a12, @a2]
+    @a1.subtree.should == [@a1, @a11, @a12]
+    @a11.subtree.should == [@a11]
+    @a12.subtree.should == [@a12]
+    @a2.subtree.should == [@a2]
+  end
+  
+  it "siblings" do
+    @a.siblings.should == []
+    @a1.siblings.should == [@a2]
+    @a11.siblings.should == [@a12]
+    @a12.siblings.should == [@a11]
+    @a2.siblings.should == [@a1]
+  end
+  
+  it "root" do
+    [@a, @a1, @a11, @a12, @a2].each do |m|
+      m.root.should == @a
+    end
+  end
+  
+  it "level" do
+    @a.level.should == 1
+    @a1.level.should == 2
+    @a11.level.should == 3
+    @a12.level.should == 3
+    @a2.level.should == 2
+  end
+  
+  it "root?" do
+    @a.root?.should be_true
+    @a1.root?.should be_false
+    @a11.root?.should be_false
+    @a12.root?.should be_false
+    @a2.root?.should be_false
+  end
+  
+  it "leaf?" do
+    @a.leaf?.should be_false
+    @a1.leaf?.should be_false
+    @a11.leaf?.should be_true
+    @a12.leaf?.should be_true
+    @a2.leaf?.should be_true
+  end
   
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: basic_tree
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Austin Schneider
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -04:00
+date: 2010-07-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -62,23 +65,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A basic tree structure