arboreal 0.2.0 → 0.2.1

data/lib/arboreal/instance_methods.rb

@@ -10,7 +10,7 @@ module Arboreal
     def ancestor_ids
       ancestry_string.sub(/^-/, "").split("-").map { |x| x.to_i }
     end
-    
+
     # return a scope matching all ancestors of this node
     def ancestors
       model_base_class.scoped(:conditions => ancestor_conditions, :order => :ancestry_string)
@@ -20,12 +20,12 @@ module Arboreal
     def descendants
       model_base_class.scoped(:conditions => descendant_conditions)
     end
-    
+
     # return a scope matching all descendants of this node, AND the node itself
     def subtree
       model_base_class.scoped(:conditions => subtree_conditions)
     end
-    
+
     # return a scope matching all siblings of this node (NOT including the node itself)
     def siblings
       model_base_class.scoped(:conditions => sibling_conditions)
@@ -35,17 +35,17 @@ module Arboreal
     def root
       ancestors.first || self
     end
-    
+
     private
 
     def model_base_class
       self.class.base_class
     end
-    
+
     def table_name
       self.class.table_name
     end
-    
+
     def ancestor_conditions
       ["id in (?)", ancestor_ids]
     end
@@ -60,7 +60,7 @@ module Arboreal
         id, path_string + "%"
       ]
     end
-    
+
     def sibling_conditions
       [
         "#{table_name}.id <> ? AND #{table_name}.parent_id = ?",
@@ -69,13 +69,14 @@ module Arboreal
     end
 
     def populate_ancestry_string
+      self.ancestry_string = nil if parent_id_changed?
       model_base_class.send(:with_exclusive_scope) do
-        self.ancestry_string = parent ? parent.path_string : "-"
+        self.ancestry_string ||= parent ? parent.path_string : "-"
       end
     end
-    
+
     def validate_parent_not_ancestor
-      if self.id 
+      if self.id
         if parent_id == self.id
           errors.add(:parent, "can't be the record itself")
         end
@@ -84,25 +85,25 @@ module Arboreal
         end
       end
     end
-    
+
     def detect_ancestry_change
       if ancestry_string_changed? && !new_record?
         old_path_string = "#{ancestry_string_was}#{id}-"
         @ancestry_change = [old_path_string, path_string]
       end
     end
-    
+
     def apply_ancestry_change_to_descendants
       if @ancestry_change
         old_ancestry_string, new_ancestry_string = *@ancestry_change
         connection.update(<<-SQL.squish)
-          UPDATE #{table_name} 
+          UPDATE #{table_name}
             SET ancestry_string = REPLACE(ancestry_string, '#{old_ancestry_string}', '#{new_ancestry_string}')
             WHERE ancestry_string LIKE '#{old_ancestry_string}%'
         SQL
         @ancestry_change = nil
       end
     end
-    
+
   end
 end

data/lib/arboreal/version.rb

@@ -1,3 +1,3 @@
 module Arboreal
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

metadata

@@ -1,38 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: arboreal
 version: !ruby/object:Gem::Version
-  version: 0.2.0
   prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-02 00:00:00.000000000Z
+date: 2012-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: &70308116360600 !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.0
-  type: :runtime
+  name: activerecord
   prerelease: false
-  version_requirements: *70308116360600
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70308116360000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.0
+- !ruby/object:Gem::Dependency
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  name: activesupport
   prerelease: false
-  version_requirements: *70308116360000
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 description: ! 'Arboreal is yet another extension to ActiveRecord to support tree-shaped
   data structures.
 
@@ -90,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Efficient tree structures for ActiveRecord