mongoid_tree 0.3.2 → 0.3.3

data/Gemfile

@@ -1,4 +1,9 @@
 source :rubygems
+
+if File.exist?(file = File.expand_path('../../Gemfile',__FILE__))
+  instance_eval(File.read(file))
+end
+
 gem "jeweler"
 gem "mongoid", "= 2.0.0.beta.16"
 # Currently used MongoDB version : 1.4.3

data/Gemfile.lock

@@ -6,6 +6,7 @@ GEM
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
     activesupport (3.0.0.rc)
+    awesome_print (0.2.1)
     bson (1.0.4)
     builder (2.1.2)
     cucumber (0.8.5)
@@ -48,15 +49,18 @@ GEM
     trollop (1.16.2)
     tzinfo (0.3.22)
     will_paginate (3.0.pre2)
+    wirble (0.1.3)
     yard (0.5.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  awesome_print
   cucumber (>= 0.8.5)
   factory_girl
   jeweler
   mongoid (= 2.0.0.beta.16)
   rspec (>= 2.0.0.beta.19)
+  wirble
   yard

data/README.textile

@@ -6,6 +6,17 @@ Initially I thought of an embedded solution, but this will only be possible once
 
 However this tree is right now on the top of our priority list, means we will put effort into this and release everything in this public gem, as soon as we implement and test it. It will be fully tested with Cucumber and RSpec.
 
+h3. Screencasts
+
+I've made a screencast demonstrating our tree gem, where I go over the basic methods provided: 
+* "Demo Youtube":http://www.youtube.com/watch?v=TcARGLkBzHw 
+* "Demo screencast.com":http://www.screencast.com/t/N2FlYWFlYz 
+
+and a "Making Of" screencast, mostly about ruby metaprogramming 
+* "Making Of Youtube":http://www.youtube.com/watch?v=PzjWFrfO7gc 
+* "Making Of screencast.com":http://www.screencast.com/t/M2QxNDY3M
+
+
 h2. Installation
 
 Install as Gem
@@ -15,11 +26,11 @@ Install as Gem
 
 via Gemfile
 <code>
-  gem 'mongoid_tree', '0.3.1'
+  gem 'mongoid_tree', '0.3.3'
 </code>
 
 h2. Usage
-  
+
 mongoid_tree can be included as a module
 
 <pre><code>

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/mongoid_tree.rb

@@ -6,11 +6,14 @@ module Mongoid
 
             included do
                 references_many :children, 
-                                :class_name => self.name, 
-                                :stored_as => :array, 
-                                :inverse_of => :parents,
-                                :dependent => :destroy do
+                :class_name => self.name, 
+                :stored_as => :array, 
+                :inverse_of => :parents,
+                :dependent => :destroy do
                     def <<(*objects)
+                        # in this version I did not call super, but instead copy the code from the mongoid gem in here
+                        # I had some persistence fails on saved objects so I'm trying it this way now
+                        @target = @target.entries
                         objects.flatten.each_with_index do |object, index|
                             reverse_key = reverse_key(object)
                             if object.position == nil
@@ -20,16 +23,37 @@ module Mongoid
                             # Stores the parents path into it's own path array.
                             #raise @parent.inspect
                             object.send(reverse_key).concat(@parent.send(reverse_key))
-                        end
-                        super(objects)
+                            # object.save unless @parent.new_record?
+                            # First set the documents id on the parent array of ids.
+                            @parent.send(@foreign_key) << object.id
+                            # Then we need to set the parent's id on the documents array of ids
+                            # to get the inverse side of the association as well. Note, need a
+                            # clean way to handle this with new documents - we want to set the
+                            # actual objects as well, but dont want to get in an infinite loop
+                            # while doing so.
+
+                            if inverse?
+                                reverse_key = reverse_key(object)
+                                case inverse_of(object).macro
+                                when :references_many
+                                    object.send(reverse_key) << @parent.id
+                                when :referenced_in
+                                    object.send("#{reverse_key}=", @parent.id)
+                                end
+                            end
+                            @target << object
+                            object.save unless @parent.new_record?
 
+                        end  
+                        @parent.save unless @parent.new_record?                      
+                        # super(objects)                        
                     end
                 end
 
                 references_many :parents, 
-                                :class_name => self.name, 
-                                :stored_as => :array, 
-                                :inverse_of => :children
+                :class_name => self.name, 
+                :stored_as => :array, 
+                :inverse_of => :children
 
                 # This stores the position in the children array of the parent object.
                 # Makes it easier to flatten / export / import a tree
@@ -80,7 +104,7 @@ module Mongoid
                     return result
                 end
                 alias :bfs :breadth_first
-                
+
                 def insert_before( new_child )
                     new_child.position = self.position
                     self.parent.children.each do |child|
@@ -95,12 +119,12 @@ module Mongoid
                     new_child.position = self.position + 1
                     self.parent.children.each do |child|
                         if child.position >= new_child.position
-                          child.update_attributes(:position => child.position + 1)
+                            child.update_attributes(:position => child.position + 1)
                         end
                     end
                     self.parent.children << new_child
                 end
-                
+
                 def move_to(target_node)
                     # unhinge - I was getting a nil on another implementation, so this is a bit longer but works
                     child_ids_array = self.parent.child_ids.clone
@@ -112,18 +136,18 @@ module Mongoid
                     # recurse through subtree
                     self.rebuild_paths
                 end
-                
+
                 def rebuild_paths
                     self.update_path
                     self.children.each do |child|
                         child.rebuild_paths
                     end
                 end
-                
+
                 def update_path
                     self.update_attributes(:parent_ids => self.parent.parent_ids + [self.parent.id])
                 end
-                
+
             end
         end
     end

data/mongoid_tree.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_tree}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rainer Kuhn"]
-  s.date = %q{2010-08-18}
+  s.date = %q{2010-08-26}
   s.description = %q{Fully featured tree implementation for Mongoid using materialized paths and relative associations. Featuring Depth and Breadth first search.}
   s.email = %q{rkuhn@littleweblab.com}
   s.extra_rdoc_files = [
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
      "spec/factories/node.rb",
      "spec/models/node.rb",
      "spec/mongoid_tree_spec.rb",
+     "spec/on_saved_spec.rb",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/ticktricktrack/mongoid_tree}
@@ -65,6 +66,7 @@ Gem::Specification.new do |s|
     "spec/factories/node.rb",
      "spec/models/node.rb",
      "spec/mongoid_tree_spec.rb",
+     "spec/on_saved_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/on_saved_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "MongoidTree" do
+  context "on a saved node" do
+    
+    before do
+      @parent = Factory.create(:node)
+      @parent.new_record?.should be(false)
+      @child = Factory.create(:node)
+      @child.new_record?.should be(false)
+      @parent.children << @child
+    end
+    
+    it "should be add a saved node to children" do
+      
+      @parent.children.first.should eq(@child)
+    end
+    
+    context "when reloading the orm objects" do
+      it "should be add a saved node to children" do
+        @parent.reload.children.first.should eq(@child.reload)
+      end
+    end
+    
+    context "when fetching the objects to from the database" do
+      it "should be add a saved node to children with reload" do
+        Node.find(@parent.id).child_ids.first.should eq(@child.id)
+        Node.find(@child.id).parent_ids.first.should eq(@parent.id)
+      end
+    end
+   
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Rainer Kuhn
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 +02:00
+date: 2010-08-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,6 +81,7 @@ files:
 - spec/factories/node.rb
 - spec/models/node.rb
 - spec/mongoid_tree_spec.rb
+- spec/on_saved_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/ticktricktrack/mongoid_tree
@@ -118,4 +119,5 @@ test_files:
 - spec/factories/node.rb
 - spec/models/node.rb
 - spec/mongoid_tree_spec.rb
+- spec/on_saved_spec.rb
 - spec/spec_helper.rb