acts_as_sane_tree 2.0.4 → 2.0.5

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== v2.0.5
+* Force integer type on depth result or nil if undetermined
+* Fixed query building bug in #nodes_within
+
 === 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

data/lib/acts_as_sane_tree.rb

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

data/lib/acts_as_sane_tree/instance_methods.rb

@@ -92,7 +92,7 @@ module ActsAsSaneTree
           FROM crumbs
           JOIN #{self.class.configuration[:class].table_name} alias1 ON alias1.id = crumbs.parent_id
         ) SELECT level FROM crumbs ORDER BY level DESC LIMIT 1"
-      ActiveRecord::Base.connection.select_all(query).first.try(:[], 'level')
+      ActiveRecord::Base.connection.select_all(query).first.try(:[], 'level').try(:to_i)
     end
   end
 end

data/lib/acts_as_sane_tree/singleton_methods.rb

@@ -3,7 +3,7 @@ module ActsAsSaneTree
     
     # Check if we are in rails 3
     def rails_3?
-      @is_3 ||= Rails.version.split('.').first == '3'
+      @is_3 ||= !defined?(Arel).nil?
     end
 
     # Return all root nodes
@@ -64,7 +64,7 @@ module ActsAsSaneTree
       else
         query = 
           "(WITH RECURSIVE crumbs AS (
-            SELECT #{configuration[:class].table_name}.*, 0 AS depth FROM #{configuration[:class].table_name} WHERE id in (\#{s.join(', ')})
+            SELECT #{configuration[:class].table_name}.*, 0 AS depth FROM #{configuration[:class].table_name} WHERE id in (#{s.join(', ')})
             UNION ALL
             SELECT alias1.*, crumbs.depth + 1 FROM crumbs JOIN #{configuration[:class].table_name} alias1 on alias1.parent_id = crumbs.id
             #{configuration[:max_depth] ? "WHERE crumbs.depth + 1 < #{configuration[:max_depth].to_i}" : ''}
@@ -99,9 +99,9 @@ module ActsAsSaneTree
       depth_restriction = "WHERE crumbs.depth + 1 < #{depth}" if depth
       depth_clause = nil
       if(at_depth)
-        depth_clause = "#{configuration[:class].table_name}.depth + 1 = #{at_depth.to_i}"
+        depth_clause = "#{configuration[:class].table_name}.depth + 1 = #{at_depth.to_i + 1}"
       elsif(depth)
-        depth_clause = "#{configuration[:class].table_name}.depth + 1 < #{depth.to_i}"
+        depth_clause = "#{configuration[:class].table_name}.depth + 1 < #{depth.to_i + 2}"
       end
       base_ids = args.map{|x| x.is_a?(ActiveRecord::Base) ? x.id : x.to_i}
       query = 

data/lib/acts_as_sane_tree/version.rb

@@ -13,6 +13,6 @@ module ActsAsSaneTree
     end
   end
 
-  VERSION = Version.new('2.0.4')
+  VERSION = Version.new('2.0.5')
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_sane_tree
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 2
   - 0
-  - 4
-  version: 2.0.4
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - Chris Roberts
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 -07:00
+date: 2012-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Sane tree builder for ActiveRecord and Postgresql