JohnSmall-acts-as-hausdorff-space 0.1.3 → 0.1.4

data/lib/acts_as_hausdorff_space.rb

@@ -139,7 +139,7 @@ module MindoroMarine
     
     ############################ INSTANCE METHODS ######################################################
     module InstanceMethods
-    attr_accessor :parent,:in_tree
+    attr_accessor :in_tree
     
     # initialize isn't always called so we can't do this in initialize. This sets up things we need to hold the tree together 
     def after_initialize 
@@ -189,15 +189,15 @@ module MindoroMarine
     # set the parent to be the class.virtual_root
     # If the parent is already set then don't go to the database to look for it, just return it
     def parent
-     if !in_tree && left_col_val && right_col_val && !@parent # only get the parent by SQL if we don't know what it is
-     @parent = self.class.find :first, :conditions => " #{left_col_val} > #{self.class.left_col_name} and #{left_col_val} < #{self.class.right_col_name} ",:order =>'#{self.class.left_col_name} DESC'
-         if !@parent        
+   #  if !in_tree && left_col_val && right_col_val && !@parent # only get the parent by SQL if we don't know what it is
+   #  @parent = self.class.find :first, :conditions => " #{left_col_val} > #{self.class.left_col_name} and #{left_col_val} < #{self.class.right_col_name} ",:order =>'#{self.class.left_col_name} DESC'
+   #      if !@parent        
           # @is_root = (lft == rgt) || (id == root.id)
-           return self.class.virtual_root
-         end 
-     else
+   #        return self.class.virtual_root
+   #      end 
+   #  else
      @parent
-     end
+   #  end
     end
     
     # set a new parent. This will save the parent, which will force a save of this child after the parent has had its lft and rgt set
@@ -293,11 +293,15 @@ def children
 end
 
 # Where most of the clever action happens.
-# 1. If there's no parent then set the <class>.virtual_root to be the parent before continuing
-# 2. Find the left boundary and the right boundary from the parent or the siblings or both
-# 3. If this record has no children then set lft=rgt and put it well on the left of the gap
-# 4. If there are children then set the lft and rgt to a comfortable size to hold the children
+# 1. If we haven't got a parent and it's not a new record then leave things alone. This allows us to update
+#    records in isolation without messing with tree positions
+# 2. If there's no parent then set the <class>.virtual_root to be the parent before continuing
+# 3. Find the left boundary and the right boundary from the parent or the siblings or both
+# 4. If this record has no children then set lft=rgt and put it well on the left of the gap
+# 5. If there are children then set the lft and rgt to a comfortable size to hold the children
+
 def before_save
+if new_record? || parent
  if !@parent
    self.class.roots # this loads virtual_root with roots
    self.class.virtual_root.children << self  # if we haven't got a parent then make the virtual root the parent
@@ -312,6 +316,7 @@ gap = far_right - far_left
   else    
      self.left_col_val = self.right_col_val = far_left+(gap/self.class.bias)       
   end
+end  
 end
 
 # Where most of the remaining action happens
@@ -320,19 +325,22 @@ end
 # The code works out the values required for a single SQL statement that pulls the entire branch across
 #
 # If we haven't moved from elsewhere then save each child that needs saving
+# If we haven't got a parent then leave things alone - this allows records to be updated in isolation
 def after_save
+ if parent
   if @prev_left && @prev_right && @children.size > 0 # if we're moving from somewhere else
         @children.clear
         scale = ((right_col_val-left_col_val)/(@prev_right - @prev_left)).abs
         old_mid_point = (@prev_right + @prev_left)/2
         new_mid_point = (right_col_val+left_col_val)/2
-        sql = "update #{self.class.table_name} t1 set t1.#{left_col_name} = ((t1.#{left_col_name} - #{old_mid_point})*#{scale})+#{new_mid_point}, t1.#{right_col_name} = ((t1.#{right_col_name} - #{old_mid_point})*#{scale})+#{new_mid_point} where t1.#{left_col_name} >#{@prev_left} and t1.#{right_col_name} < #{@prev_right} "       
+        sql = "update #{self.class.table_name}  set #{left_col_name} = ((#{left_col_name} - #{old_mid_point})*#{scale})+#{new_mid_point}, #{right_col_name} = ((#{right_col_name} - #{old_mid_point})*#{scale})+#{new_mid_point} where #{left_col_name} >#{@prev_left} and #{right_col_name} < #{@prev_right} "       
         connection.update_sql(sql)
         build_full_tree # get the children back
   else   
         @children.each{|child| child.save if !(child.left_col_val && child.right_col_val) } # save only the ones that need lft and rgt
   end
-  @prev_left = @prev_right = nil  
+  @prev_left = @prev_right = nil
+ end   
 end
 
 # get the siblings. All immediate children of the parent minus self

data/test/acts_as_hausdorff_space_test.rb

@@ -92,6 +92,19 @@ context 'Instance Methods - Add a Root' do
     assert_equal 4,read_root.children.size,"the child didn't get moved"
     assert_equal 1,read_root.children.first.children.size,"the child didn't appear in the right place"     
    end
+   
+   should 'allow editing one child on its own' do
+   all_recs = HausdorffSpaceTest.find :all
+   rec = all_recs[3]
+   lft = rec.left_col
+   rgt = rec.right_col
+   id = rec.id
+   rec.name = 'new name'
+   rec.save
+   read_rec = HausdorffSpaceTest.find id
+   assert_equal lft,read_rec.left_col,'the left column is wrong on a read read'
+   assert_equal rgt,read_rec.right_col,'the right column is wrong on a read read' 
+   end
   end # context 'add many children' 
   
   context 'add many grandchildren' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: JohnSmall-acts-as-hausdorff-space
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - John Small
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-25 00:00:00 -07:00
+date: 2009-05-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,10 +23,54 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .document
+- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- acts-as-hausdorff-space.gemspec
+- design_idea.rdoc
+- doc/LICENSE.html
+- doc/MindoroMarine.html
+- doc/MindoroMarine/Acts.html
+- doc/MindoroMarine/Acts/HausdorffSpace.html
+- doc/MindoroMarine/Acts/HausdorffSpace/ActMethods.html
+- doc/MindoroMarine/Acts/HausdorffSpace/ClassMethods.html
+- doc/MindoroMarine/Acts/HausdorffSpace/Gap.html
+- doc/MindoroMarine/Acts/HausdorffSpace/HSArray.html
+- doc/MindoroMarine/Acts/HausdorffSpace/InstanceMethods.html
+- doc/MindoroMarine/Acts/HausdorffSpace/VirtualRoot.html
+- doc/README_rdoc.html
+- doc/created.rid
+- doc/images/brick.png
+- doc/images/brick_link.png
+- doc/images/bug.png
+- doc/images/bullet_black.png
+- doc/images/bullet_toggle_minus.png
+- doc/images/bullet_toggle_plus.png
+- doc/images/date.png
+- doc/images/find.png
+- doc/images/loadingAnimation.gif
+- doc/images/macFFBgHack.png
+- doc/images/package.png
+- doc/images/page_green.png
+- doc/images/page_white_text.png
+- doc/images/page_white_width.png
+- doc/images/plugin.png
+- doc/images/ruby.png
+- doc/images/tag_green.png
+- doc/images/wrench.png
+- doc/images/wrench_orange.png
+- doc/images/zoom.png
+- doc/index.html
+- doc/js/darkfish.js
+- doc/js/jquery.js
+- doc/js/quicksearch.js
+- doc/js/thickbox-compressed.js
+- doc/lib/acts-as-hausdorff-space_rb.html
+- doc/lib/acts_as_hausdorff_space_rb.html
+- doc/rdoc.css
 - lib/acts-as-hausdorff-space.rb
 - lib/acts_as_hausdorff_space.rb
 - test/acts_as_hausdorff_space_test.rb
@@ -36,7 +80,7 @@ files:
 - test/schema.rb
 - test/sqlite3.rb
 - test/test_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/JohnSmall/acts-as-hausdorff-space
 post_install_message: 
 rdoc_options: 
@@ -60,7 +104,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Use real numbers instead of integers for nested sets because real numbers are a Hausdorff space
 test_files: 
 - test/schema.rb