acts_as_sane_tree 2.0.3 → 2.0.4

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== v2.0.4
+* Clean up default scope methodology within nodes_and_descendants (fixes scope smashing issues in rails 3)
+* Clean up #depth implementation to be direct instead of incurring AR overhead
+
 === v2.0.3
 * Use ordered hashes when building nested descendants (.nodes_and_descendants method)
 * Only apply dynamic depth ordering to descendant scoping

data/lib/acts_as_sane_tree/instance_methods.rb

@@ -83,33 +83,16 @@ module ActsAsSaneTree
     # Returns the depth of the current node. 0 depth represents the root of the tree
     def depth
       query = 
-        "(WITH RECURSIVE crumbs AS (
-          SELECT parent_id, 0 AS depth
+        "WITH RECURSIVE crumbs AS (
+          SELECT parent_id, 0 AS level
           FROM #{self.class.configuration[:class].table_name}
-          WHERE id = #{id} 
+          WHERE id = #{self.id} 
           UNION ALL
           SELECT alias1.parent_id, level + 1 
           FROM crumbs
           JOIN #{self.class.configuration[:class].table_name} alias1 ON alias1.id = crumbs.parent_id
-        ) SELECT depth FROM crumbs) as #{self.class.configuration[:class].table_name}"
-      if(self.class.rails_3?)
-        self.class.configuration[:class].send(:with_exclusive_scope) do
-          self.class.configuration[:class].from(
-            query
-          ).order(
-            "#{self.class.configuration[:class].table_name}.depth DESC"
-          ).limit(1).try(:first).try(:depth)
-        end
-      else
-        self.class.configuration[:class].send(:with_exclusive_scope) do
-          self.class.configuration[:class].find(
-            :first,
-            :from => query,
-            :order => "#{self.class.configuration[:class].table_name}.depth DESC",
-            :limit => 1
-          ).try(:depth)
-        end
-      end
+        ) SELECT level FROM crumbs ORDER BY level DESC LIMIT 1"
+      ActiveRecord::Base.connection.select_all(query).first.try(:[], 'level')
     end
   end
 end

data/lib/acts_as_sane_tree/singleton_methods.rb

@@ -121,21 +121,23 @@ module ActsAsSaneTree
         if(depth_clause)
           q = q.where(depth_clause)
         end
-        q = q.order(Array(configuration[:order]).join(', '))
+        if(configuration[:order].present?)
+          q = q.order(configuration[:order])
+        end
       else
         q = configuration[:class].scoped(
           :from => query, 
-          :conditions => "#{configuration[:class].table_name}.depth >= 0",
-          :order => Array(configuration[:order]).join(', ')
+          :conditions => "#{configuration[:class].table_name}.depth >= 0"
         )
+        if(configuration[:order].present?)
+          q = q.scoped(:order => configuration[:order])
+        end
         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)
+      unless(rails_3?)
+        q = q.scoped(scope(:find))
       end
       unless(raw)
         res = ActiveSupport::OrderedHash.new
@@ -157,11 +159,5 @@ 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,18 @@
 module ActsAsSaneTree
-  VERSION = '2.0.3'
+  class Version
+
+    attr_reader :major, :minor, :tiny
+
+    def initialize(version)
+      version = version.split('.')
+      @major, @minor, @tiny = [version[0].to_i, version[1].to_i, version[2].to_i]
+    end
+
+    def to_s
+      "#{@major}.#{@minor}.#{@tiny}"
+    end
+  end
+
+  VERSION = Version.new('2.0.4')
 end
+

metadata

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