mongoid-tree 0.6.2 → 0.7.0

data/Gemfile

@@ -2,5 +2,5 @@ source :rubygems
 
 gemspec
 
-gem 'bson_ext', '>= 1.0.4'
+gem 'bson_ext',    '>= 1.0.4', :platform => :ruby
 gem 'SystemTimer', '>= 1.2.0', :platform => :ruby_18

data/Rakefile

@@ -7,8 +7,7 @@ RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
-Rake::RDocTask.new do |rdoc|
-  rdoc.generator = 'hanna'
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title = "#{spec.name} #{spec.version}"
   rdoc.options += spec.rdoc_options

data/lib/mongoid/tree/traversal.rb

@@ -76,9 +76,9 @@ module Mongoid # :nodoc:
       # They're extended into the base class automatically.
       module ClassMethods # :nodoc:
         def traverse(type = :depth_first, &block)
-          raise ArgumentError, "No block given" unless block_given?
-          roots.each { |root| root.traverse(type, &block) }
-          nil
+          res = []
+          roots.each { |root| res.concat root.traverse(type, &block) }
+          res
         end
       end
 
@@ -94,9 +94,14 @@ module Mongoid # :nodoc:
       #   root.traverse(:depth_first) do |node|
       #     results << node
       #   end
+      #
+      #   root.traverse(:depth_first).map(&:name)
+      #
       def traverse(type = :depth_first, &block)
-        raise ArgumentError, "No block given" unless block_given?
+        res = []
+        block ||= lambda { |node| res << node }
         send("#{type}_traversal", &block)
+        res
       end
 
       private

data/spec/mongoid/tree/traversal_spec.rb

@@ -8,10 +8,6 @@ describe Mongoid::Tree::Traversal do
 
     subject { Node.new }
 
-    it "should require a block" do
-      expect { subject.traverse }.to raise_error(/No block given/)
-    end
-
     [:depth_first, :breadth_first].each do |method|
       it "should support #{method} traversal" do
         expect { subject.traverse(method) {} }.to_not raise_error
@@ -86,12 +82,17 @@ describe Mongoid::Tree::Traversal do
         node(:node5).move_above(node(:node6))
       end
 
-      it 'should return the nodes in the correct order' do
+      it 'should iterate through the nodes in the correct order' do
         result = []
         node(:node1).traverse(:depth_first) { |node| result << node }
         result.collect { |n| n.name.to_sym }.should == [:node1, :node2, :node3, :node4, :node5, :node6, :node7]
       end
 
+      it 'should return the nodes in the correct order' do
+        result = node(:node1).traverse(:depth_first)
+        result.collect { |n| n.name.to_sym }.should == [:node1, :node2, :node3, :node4, :node5, :node6, :node7]
+      end
+
     end
 
   end
@@ -117,21 +118,12 @@ describe Mongoid::Tree::Traversal do
   end
 
   describe '.traverse' do
-
-    describe 'when not given a block' do
-
-      it 'raises an error' do
-        expect {Node.traverse}.to raise_error ArgumentError, 'No block given'
-      end
-    end
-
     before :each do
       setup_tree <<-ENDTREE
         - root1
         - root2
       ENDTREE
 
-      @block = Proc.new {}
       @root1 = node(:root1)
       @root2 = node(:root2)
 
@@ -141,35 +133,31 @@ describe Mongoid::Tree::Traversal do
     it 'grabs each root' do
       Node.should_receive(:roots).and_return []
 
-      Node.traverse &@block
+      Node.traverse.should == []
     end
 
     it 'defaults the "type" arg to :depth_first' do
-      @root1.should_receive(:traverse).with(:depth_first)
-      @root2.should_receive(:traverse).with(:depth_first)
+      @root1.should_receive(:traverse).with(:depth_first).and_return([])
+      @root2.should_receive(:traverse).with(:depth_first).and_return([])
 
-      Node.traverse &@block
+      Node.traverse.should == []
     end
 
     it 'traverses each root' do
-      @root1.should_receive(:traverse)
-      @root2.should_receive(:traverse)
+      @root1.should_receive(:traverse).and_return([1, 2])
+      @root2.should_receive(:traverse).and_return([3, 4])
 
-      Node.traverse &@block
+      Node.traverse.should == [1, 2, 3, 4]
     end
 
     describe 'when the "type" arg is :breadth_first' do
 
       it 'traverses breadth-first' do
-        @root1.should_receive(:traverse).with(:breadth_first)
-        @root2.should_receive(:traverse).with(:breadth_first)
+        @root1.should_receive(:traverse).with(:breadth_first).and_return([])
+        @root2.should_receive(:traverse).with(:breadth_first).and_return([])
 
-        Node.traverse :breadth_first, &@block
+        Node.traverse :breadth_first
       end
     end
-
-    it 'returns nil' do
-      Node.traverse(&@block).should be nil
-    end
   end
 end

data/spec/mongoid/tree_spec.rb

@@ -45,7 +45,7 @@ describe Mongoid::Tree do
     it "should save its unsaved children" do
       root = Node.new(:name => 'root'); child = Node.new(:name => 'child')
       root.children << child
-      child.should_receive(:save)
+      child.should_receive(:save).at_most(2).times
       root.save
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-tree
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-23 00:00:00.000000000Z
+date: 2012-02-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70159403726680 !ruby/object:Gem::Requirement
+  requirement: &70188241262500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70159403726680
+  version_requirements: *70188241262500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70159403726180 !ruby/object:Gem::Requirement
+  requirement: &70188241262000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70159403726180
+  version_requirements: *70188241262000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70159403725700 !ruby/object:Gem::Requirement
+  requirement: &70188241261520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,29 +43,29 @@ dependencies:
         version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *70159403725700
+  version_requirements: *70188241261520
 - !ruby/object:Gem::Dependency
-  name: autotest
-  requirement: &70159403755660 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: &70188241261040 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.2
+        version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70159403755660
+  version_requirements: *70188241261040
 - !ruby/object:Gem::Dependency
-  name: hanna-nouveau
-  requirement: &70159403755180 !ruby/object:Gem::Requirement
+  name: autotest
+  requirement: &70188241260560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 4.3.2
   type: :development
   prerelease: false
-  version_requirements: *70159403755180
+  version_requirements: *70188241260560
 description: A tree structure for Mongoid documents using the materialized path pattern
 email:
 - benedikt@synatic.net