ancestry 1.2.5 → 1.3.0

data/ancestry.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.description = 'Organise ActiveRecord model into a tree structure'
   s.summary     = 'Ancestry allows the records of a ActiveRecord model to be organised in a tree structure, using a single, intuitively formatted database column. It exposes all the standard tree structure relations (ancestors, parent, root, children, siblings, descendants) and all of them can be fetched in a single sql query. Additional features are named_scopes, integrity checking, integrity restoration, arrangement of (sub)tree into hashes and different strategies for dealing with orphaned records.'
 
-  s.version = '1.2.5'
+  s.version = '1.3.0'
 
   s.author   = 'Stefan Kroes'
   s.email    = 's.a.kroes@gmail.com'
@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
     'README.rdoc'
   ]
   
-  s.add_dependency 'activerecord', '>= 2.2.2'
+  s.add_dependency 'activerecord', '>= 2.3.14'
 end

data/lib/ancestry.rb

@@ -1 +1,4 @@
-require 'ancestry/has_ancestry'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'ancestry/class_methods')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'ancestry/instance_methods')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'ancestry/exceptions')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'ancestry/has_ancestry')

data/lib/ancestry/class_methods.rb

@@ -73,31 +73,34 @@ module Ancestry
     def check_ancestry_integrity! options = {}
       parents = {}
       exceptions = [] if options[:report] == :list
-      # For each node ...
-      self.base_class.find_each do |node|
-        begin
-          # ... check validity of ancestry column
-          if !node.valid? and !node.errors[node.class.ancestry_column].blank?
-            raise Ancestry::AncestryIntegrityException.new("Invalid format for ancestry column of node #{node.id}: #{node.read_attribute node.ancestry_column}.")
-          end
-          # ... check that all ancestors exist
-          node.ancestor_ids.each do |ancestor_id|
-            unless exists? ancestor_id
-              raise Ancestry::AncestryIntegrityException.new("Reference to non-existent node in node #{node.id}: #{ancestor_id}.")
+      
+      self.base_class.send(:with_exclusive_scope) do 
+        # For each node ...
+        self.base_class.find_each do |node|
+          begin
+            # ... check validity of ancestry column
+            if !node.valid? and !node.errors[node.class.ancestry_column].blank?
+              raise Ancestry::AncestryIntegrityException.new("Invalid format for ancestry column of node #{node.id}: #{node.read_attribute node.ancestry_column}.")
             end
-          end
-          # ... check that all node parents are consistent with values observed earlier
-          node.path_ids.zip([nil] + node.path_ids).each do |node_id, parent_id|
-            parents[node_id] = parent_id unless parents.has_key? node_id
-            unless parents[node_id] == parent_id
-              raise Ancestry::AncestryIntegrityException.new("Conflicting parent id found in node #{node.id}: #{parent_id || 'nil'} for node #{node_id} while expecting #{parents[node_id] || 'nil'}")
+            # ... check that all ancestors exist
+            node.ancestor_ids.each do |ancestor_id|
+              unless exists? ancestor_id
+                raise Ancestry::AncestryIntegrityException.new("Reference to non-existent node in node #{node.id}: #{ancestor_id}.")
+              end
+            end
+            # ... check that all node parents are consistent with values observed earlier
+            node.path_ids.zip([nil] + node.path_ids).each do |node_id, parent_id|
+              parents[node_id] = parent_id unless parents.has_key? node_id
+              unless parents[node_id] == parent_id
+                raise Ancestry::AncestryIntegrityException.new("Conflicting parent id found in node #{node.id}: #{parent_id || 'nil'} for node #{node_id} while expecting #{parents[node_id] || 'nil'}")
+              end
+            end
+          rescue Ancestry::AncestryIntegrityException => integrity_exception
+            case options[:report]
+              when :list then exceptions << integrity_exception
+              when :echo then puts integrity_exception
+              else raise integrity_exception
             end
-          end
-        rescue Ancestry::AncestryIntegrityException => integrity_exception
-          case options[:report]
-            when :list then exceptions << integrity_exception
-            when :echo then puts integrity_exception
-            else raise integrity_exception
           end
         end
       end
@@ -109,33 +112,36 @@ module Ancestry
       parents = {}
       # Wrap the whole thing in a transaction ...
       self.base_class.transaction do
-        # For each node ...
-        self.base_class.find_each do |node|
-          # ... set its ancestry to nil if invalid
-          if !node.valid? and !node.errors[node.class.ancestry_column].blank?
-            node.without_ancestry_callbacks do
-              node.update_attribute node.ancestry_column, nil
+        self.base_class.send(:with_exclusive_scope) do 
+          # For each node ...
+          self.base_class.find_each do |node|
+            # ... set its ancestry to nil if invalid
+            if !node.valid? and !node.errors[node.class.ancestry_column].blank?
+              node.without_ancestry_callbacks do
+                node.update_attribute node.ancestry_column, nil
+              end
             end
-          end
-          # ... save parent of this node in parents array if it exists
-          parents[node.id] = node.parent_id if exists? node.parent_id
+            # ... save parent of this node in parents array if it exists
+            parents[node.id] = node.parent_id if exists? node.parent_id
 
-          # Reset parent id in array to nil if it introduces a cycle
-          parent = parents[node.id]
-          until parent.nil? || parent == node.id
-            parent = parents[parent]
-          end
-          parents[node.id] = nil if parent == node.id 
-        end
-        # For each node ...
-        self.base_class.find_each do |node|
-          # ... rebuild ancestry from parents array
-          ancestry, parent = nil, parents[node.id]
-          until parent.nil?
-            ancestry, parent = if ancestry.nil? then parent else "#{parent}/#{ancestry}" end, parents[parent]
+            # Reset parent id in array to nil if it introduces a cycle
+            parent = parents[node.id]
+            until parent.nil? || parent == node.id
+              parent = parents[parent]
+            end
+            parents[node.id] = nil if parent == node.id 
           end
-          node.without_ancestry_callbacks do
-            node.update_attribute node.ancestry_column, ancestry
+          
+          # For each node ...
+          self.base_class.find_each do |node|
+            # ... rebuild ancestry from parents array
+            ancestry, parent = nil, parents[node.id]
+            until parent.nil?
+              ancestry, parent = if ancestry.nil? then parent else "#{parent}/#{ancestry}" end, parents[parent]
+            end
+            node.without_ancestry_callbacks do
+              node.update_attribute node.ancestry_column, ancestry
+            end
           end
         end
       end
@@ -143,19 +149,24 @@ module Ancestry
     
     # Build ancestry from parent id's for migration purposes
     def build_ancestry_from_parent_ids! parent_id = nil, ancestry = nil
-      self.base_class.find_each(:conditions => {:parent_id => parent_id}) do |node|
-        node.without_ancestry_callbacks do
-          node.update_attribute ancestry_column, ancestry
+      self.base_class.send(:with_exclusive_scope) do 
+        self.base_class.find_each(:conditions => {:parent_id => parent_id}) do |node|
+          node.without_ancestry_callbacks do
+            node.update_attribute ancestry_column, ancestry
+          end
+          build_ancestry_from_parent_ids! node.id, if ancestry.nil? then "#{node.id}" else "#{ancestry}/#{node.id}" end
         end
-        build_ancestry_from_parent_ids! node.id, if ancestry.nil? then "#{node.id}" else "#{ancestry}/#{node.id}" end
       end
     end
     
     # Rebuild depth cache if it got corrupted or if depth caching was just turned on
     def rebuild_depth_cache!
       raise Ancestry::AncestryException.new("Cannot rebuild depth cache for model without depth caching.") unless respond_to? :depth_cache_column
-      self.base_class.find_each do |node|
-        node.update_attribute depth_cache_column, node.depth
+      
+      self.base_class.send(:with_exclusive_scope) do 
+        self.base_class.find_each do |node|
+          node.update_attribute depth_cache_column, node.depth
+        end
       end
     end
   end

data/lib/ancestry/has_ancestry.rb

@@ -1,7 +1,3 @@
-require 'ancestry/class_methods'
-require 'ancestry/instance_methods'
-require 'ancestry/exceptions'
-
 class << ActiveRecord::Base
   def has_ancestry options = {}
     # Check options

data/lib/ancestry/instance_methods.rb

@@ -12,7 +12,7 @@ module Ancestry
         # If node is valid, not a new record and ancestry was updated ...
         if changed.include?(self.base_class.ancestry_column.to_s) && !new_record? && valid?
           # ... for each descendant ...
-          descendants.each do |descendant|
+          unscoped_descendants.each do |descendant|
             # ... replace old ancestry with new ancestry
             descendant.without_ancestry_callbacks do
               descendant.update_attribute(
@@ -34,16 +34,16 @@ module Ancestry
       unless ancestry_callbacks_disabled?
         # If this isn't a new record ...
         unless new_record?
-          # ... make al children root if orphan strategy is rootify
+          # ... make all children root if orphan strategy is rootify
           if self.base_class.orphan_strategy == :rootify
-            descendants.each do |descendant|
+            unscoped_descendants.each do |descendant|
               descendant.without_ancestry_callbacks do
                 descendant.update_attribute descendant.class.ancestry_column, (if descendant.ancestry == child_ancestry then nil else descendant.ancestry.gsub(/^#{child_ancestry}\//, '') end)
               end
             end
           # ... destroy all descendants if orphan strategy is destroy
           elsif self.base_class.orphan_strategy == :destroy
-            descendants.all.each do |descendant|
+            unscoped_descendants.each do |descendant|
               descendant.without_ancestry_callbacks do
                 descendant.destroy
               end
@@ -228,5 +228,11 @@ module Ancestry
     def primary_key_type
       @primary_key_type ||= column_for_attribute(self.class.primary_key).type
     end
+    
+    def unscoped_descendants
+      self.base_class.send(:with_exclusive_scope) do 
+        self.base_class.all(:conditions => descendant_conditions) 
+      end
+    end
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 5
-  version: 1.2.5
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Stefan Kroes
@@ -14,21 +14,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 +01:00
+date: 2012-05-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 2
-        - 2
-        version: 2.2.2
+        - 3
+        - 14
+        version: 2.3.14
   type: :runtime
   version_requirements: *id001
 description: Organise ActiveRecord model into a tree structure
@@ -60,6 +61,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -67,6 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -76,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ancestry allows the records of a ActiveRecord model to be organised in a tree structure, using a single, intuitively formatted database column. It exposes all the standard tree structure relations (ancestors, parent, root, children, siblings, descendants) and all of them can be fetched in a single sql query. Additional features are named_scopes, integrity checking, integrity restoration, arrangement of (sub)tree into hashes and different strategies for dealing with orphaned records.