acts_as_sane_tree 2.0.2 → 2.0.3

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== v2.0.3
+* Use ordered hashes when building nested descendants (.nodes_and_descendants method)
+* Only apply dynamic depth ordering to descendant scoping
+* Remove deprecated #to_a references
+* Remove depth ordering from tree building query
+
 === v2.0.2
 * Fix spelling errors (thanks {Jesse}[https://github.com/jmgarrison])
 

data/lib/acts_as_sane_tree.rb

@@ -3,4 +3,7 @@ require 'acts_as_sane_tree/version'
 
 if(defined?(Rails))
   ActiveRecord::Base.send :include, ActsAsSaneTree
+  if(defined?(ActiveRecord::Relation))
+    ActiveRecord::Relation.send :include, ActsAsSaneTree
+  end
 end

data/lib/acts_as_sane_tree/acts_as_sane_tree.rb

@@ -47,13 +47,25 @@ module ActsAsSaneTree
     # * <tt>order</tt> - makes it possible to sort the children according to this SQL snippet.
     # * <tt>counter_cache</tt> - keeps a count in a +children_count+ column if set to +true+ (default: +false+).
     def acts_as_sane_tree(options = {})
-      @configuration = { :foreign_key => "parent_id", :order => nil, :counter_cache => nil, :max_depth => 10000, :class => self }
+      @configuration = {:foreign_key => :parent_id, :order => nil, :max_depth => 100000, :class => self, :dependent => :destroy, :parent_override => false}
       @configuration.update(options) if options.is_a?(Hash)
 
-      class_eval do
+      self.class_eval do
         cattr_accessor :configuration
-        belongs_to :parent, :class_name => name, :foreign_key => @configuration[:foreign_key], :counter_cache => @configuration[:counter_cache]
-        has_many :children, :class_name => name, :foreign_key => @configuration[:foreign_key], :order => @configuration[:order], :dependent => :destroy
+        
+        has_many :children, 
+          :class_name => @configuration[:class].name, 
+          :foreign_key => @configuration[:foreign_key], 
+          :order => @configuration[:order], 
+          :dependent => @configuration[:dependent]
+        belongs_to :parent, 
+          :class_name => @configuration[:class].name, 
+          :foreign_key => @configuration[:foreign_key]
+        if(@configuration[:parent_override])
+          def parent
+            self.class.where(:id => self.parent_id).first
+          end
+        end
         
         validates_each @configuration[:foreign_key] do |record, attr, value|
           record.errors.add attr, 'cannot be own parent.' if !record.id.nil? && value.to_i == record.id.to_i

data/lib/acts_as_sane_tree/singleton_methods.rb

@@ -23,7 +23,7 @@ module ActsAsSaneTree
     # Return first root node
     def root
       if(rails_3?)
-        configuration[:class].where("#{configuration[:foriegn_key]} IS NULL").order(configuration[:order]).first
+        configuration[:class].where("#{configuration[:foreign_key]} IS NULL").order(configuration[:order]).first
       else
         configuration[:class].find(
           :first, 
@@ -113,38 +113,41 @@ module ActsAsSaneTree
         ) SELECT * FROM crumbs) as #{configuration[:class].table_name}"
       q = nil
       if(rails_3?)
-        with_exclusive_scope do
-          q = configuration[:class].from(
-            query
-          ).where(
-            "#{configuration[:class].table_name}.depth >= 0"
-          )
-          if(depth_clause)
-            q = q.where(depth_clause)
-          end
-          q = q.order("#{configuration[:class].table_name}.depth ASC, #{configuration[:class].table_name}.parent_id ASC")
+        q = configuration[:class].from(
+          query
+        ).where(
+          "#{configuration[:class].table_name}.depth >= 0"
+        )
+        if(depth_clause)
+          q = q.where(depth_clause)
         end
+        q = q.order(Array(configuration[:order]).join(', '))
       else
-        with_exclusive_scope do
-          q = configuration[:class].scoped(
-            :from => query, 
-            :conditions => "#{configuration[:class].table_name}.depth >= 0",
-            :order => "#{configuration[:class].table_name}.depth ASC, #{configuration[:class].table_name}.parent_id ASC"
-          )
-          if(depth_clause)
-            q = q.scoped(:conditions => depth_clause)
-          end
+        q = configuration[:class].scoped(
+          :from => query, 
+          :conditions => "#{configuration[:class].table_name}.depth >= 0",
+          :order => Array(configuration[:order]).join(', ')
+        )
+        if(depth_clause)
+          q = q.scoped(:conditions => depth_clause)
         end
       end
+      if(defined?(ActiveRecord::Relation) && (dfs = retrieve_default_find_scope).is_a?(ActiveRecord::Relation))
+        q = q.scoped(:conditions => dfs.where_values_hash)
+      else
+        q = q.scoped(retrieve_default_find_scope)
+      end
       unless(raw)
-        res = {}
-        cache = {}
+        res = ActiveSupport::OrderedHash.new
+        cache = ActiveSupport::OrderedHash.new
         q.all.each do |item|
-          cache[item.id] = {}
-          if(cache[item.parent_id])
-            cache[item.parent_id][item] = cache[item.id]
-          else
-            res[item] = cache[item.id]
+          res[item] = ActiveSupport::OrderedHash.new
+          cache[item] = res[item]
+        end
+        cache.each_pair do |item, values|
+          if(cache[item.parent])
+            cache[item.parent][item] = values
+            res.delete(item)
           end
         end
         res
@@ -154,5 +157,11 @@ module ActsAsSaneTree
     end
     alias_method :nodes_and_descendents, :nodes_and_descendants
 
+    private
+
+    def retrieve_default_find_scope
+      scope(:find).respond_to?(:call) ? scope(:find).call : scope(:find)
+    end
+
   end
 end

data/lib/acts_as_sane_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsSaneTree
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_sane_tree
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - Chris Roberts
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 -07:00
+date: 2011-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency