basic_tree 1.0.1 → 1.0.2

data/lib/basic_tree/version.rb

@@ -1,5 +1,5 @@
 class BasicTree
 
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 
 end

data/lib/basic_tree.rb

@@ -3,6 +3,7 @@ require 'active_support/core_ext/object'
 class BasicTree
 
   include Enumerable
+  include Comparable
 
   class Kids < Array
     def swap!(p1, p2)
@@ -16,7 +17,9 @@ class BasicTree
   def initialize(object, parent = nil, &block)
     self.object = object
     parent.try(:insert!, self)
-    instance_eval(&block) if block_given?
+    if block_given?
+      block.arity == 1 ? yield(self) : instance_eval(&block)
+    end
   end
 
   # TODO: test
@@ -35,7 +38,7 @@ class BasicTree
     kids << basic_tree
   end
 
-  # TODO: self
+  # TODO: test
   def remove!(basic_tree)
     raise ArgumentError, "Must be a #{self.class}" unless basic_tree.is_a?(self.class)
     raise StandardError, "Can't remove root" if root?
@@ -84,7 +87,7 @@ class BasicTree
   end
 
   def siblings
-    root? ? [] : siblings_and_self.delete_if { |s| s == self }
+    root? ? [] : siblings_and_self.delete_if { |s| s.equal?(self) }
   end
 
   ##################################################
@@ -122,6 +125,12 @@ class BasicTree
     root? || siblings_and_self.last == self
   end
 
+  ##################################################
+
+  def <=>(other)
+    subtree.map(&:object) <=> other.subtree.map(&:object)
+  end
+
   ##################################################
   private
 

data/spec/lib/basic_tree_spec.rb

@@ -16,6 +16,16 @@ describe BasicTree do
     @a12 = @a1.children[1]
   end
 
+  it "allows for a different initialization syntax" do
+    @a.should == BasicTree.new("a") do |t|
+      t.add "a1" do |t|
+        t.add "a11"
+        t.add "a12"
+      end
+      t.add "a2"
+    end
+  end
+
   describe "instance methods" do
     before do
       @object = "soccer"
@@ -147,6 +157,35 @@ describe BasicTree do
         end
       end
     end
+
+    describe "#<=>" do
+      before do
+        @t1 = BasicTree.new "a" do
+          add "a1"
+          add "a2"
+        end
+        @t2 = BasicTree.new "a" do
+          add "a1"
+          add "a2"
+        end
+      end
+
+      context "when comparing the subtrees returns a 0" do
+        it { (@t1 <=> @t2).should eq(0) }
+      end
+
+      context "when comparing the subtrees returns a 1" do
+        before { @t2 = BasicTree.new("a") { add "a1" } }
+
+        it { (@t1 <=> @t2).should eq(1) }
+      end
+
+      context "when comparing the subtrees returns a -1" do
+        before { @t2.add "a3" }
+
+        it { (@t1 <=> @t2).should eq(-1) }
+      end
+    end
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Austin Schneider
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -05:00
+date: 2011-03-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency