ancestry => ancestor_ids

Author: kbrock

lib/ancestry/class_methods.rb

@@ -68,12 +68,13 @@ def arrange_serializable options={}, nodes=nil, &block
 
     # Pseudo-preordered array of nodes.  Children will always follow parents,
     # for ordering nodes within a rank provide block, eg. Node.sort_by_ancestry(Node.all) {|a, b| a.rank <=> b.rank}.
+    EMPTY_ANCESTRY=[0].freeze
     def sort_by_ancestry(nodes, &block)
       arranged = nodes if nodes.is_a?(Hash)
 
       unless arranged
         presorted_nodes = nodes.sort do |a, b|
-          a_cestry, b_cestry = a.ancestry || '0', b.ancestry || '0'
+          a_cestry, b_cestry = a.ancestor_ids || EMPTY_ANCESTRY, b.ancestor_ids || EMPTY_ANCESTRY
 
           if block_given? && a_cestry == b_cestry
             yield a, b
@@ -104,7 +105,7 @@ def check_ancestry_integrity! options = {}
           begin
             # ... check validity of ancestry column
             if !node.sane_ancestor_ids?
-              raise Ancestry::AncestryIntegrityException.new("Invalid format for ancestry column of node #{node.id}: #{node.read_attribute node.ancestry_column}.")
+              raise Ancestry::AncestryIntegrityException.new("Invalid format for ancestry column of node #{node.id}: #{node.ancestor_ids}.")
             end
             # ... check that all ancestors exist
             node.ancestor_ids.each do |ancestor_id|
@@ -114,7 +115,7 @@ def check_ancestry_integrity! options = {}
             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
+              parents[node_id] = parent_id unless parents.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

lib/ancestry/instance_methods.rb

@@ -96,6 +96,7 @@ def ancestors?
       ancestor_ids.present?
     end
     alias :has_parent? :ancestors?
+    alias :parent_id? :ancestors?
 
     def sane_ancestor_ids?
       valid? || errors[self.ancestry_base_class.ancestry_column].blank?
@@ -145,7 +146,6 @@ def parent_id= new_parent_id
     def parent_id
       ancestor_ids.last if ancestors?
     end
-    alias :parent_id? :ancestors?
 
     def parent
       unscoped_find(parent_id) if ancestors?

lib/ancestry/materialized_path.rb

@@ -78,27 +78,6 @@ def ordered_by_ancestry_and(order)
     end
 
     module InstanceMethods
-
-      # Validates the ancestry, but can also be applied if validation is bypassed to determine if children should be affected
-      def sane_ancestry?
-        ancestry_value = read_attribute(self.ancestry_base_class.ancestry_column)
-        (ancestry_value.nil? || !ancestor_ids.include?(self.id)) && valid?
-      end
-
-      def ancestor_ids=(value)
-        col = self.ancestry_base_class.ancestry_column
-        value.present? ? write_attribute(col, value.join(ANCESTRY_DELIMITER)) : write_attribute(col, nil)
-      end
-
-      def parent_id_before_last_save
-        ancestor_ids_before_last_save.last
-      end
-
-      # optimization - better to go directly to column and avoid parsing
-      def sibling_of?(node)
-        self.read_attribute(self.ancestry_base_class.ancestry_column) == node.read_attribute(self.ancestry_base_class.ancestry_column)
-      end
-
       # private (public so class methods can find it)
       # The ancestry value for this record's children (before save)
       # This is technically child_ancestry_was
@@ -110,7 +89,7 @@ def child_ancestry
       end
 
       def child_ancestry_str
-        child_ancestry.join("/")+"/%"
+        (child_ancestry + ['%']).join(ANCESTRY_DELIMITER)
       end
     end
   end