acts_as_sane_tree 1.2 → 1.3

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== v1.3
+* Allow restricting results to given depth
+* Load properly within rails if provided via rubygems (bundler)
+
 === v1.2
 * Allow nodes_and_descendents to accept no base nodes resulting in complete build of all trees
 * Add default max depth to catch runaway recursions (can be turned off by setting :max_depth to nil)
@@ -7,4 +11,4 @@
 * Updated instance method #descendents to call class method nodes_and_descendents
 
 === v1.0
-* Initial release
+* Initial release

data/acts_as_sane_tree.gemspec

@@ -1,5 +1,5 @@
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__)) + '/lib/'
-require 'lib/version'
+require 'acts_as_sane_tree/version'
 Gem::Specification.new do |s|
   s.name = 'acts_as_sane_tree'
   s.version = ActsAsSaneTree::VERSION
@@ -11,13 +11,13 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.rdoc']
-  s.add_dependency 'activerecord', '>= 2.3'
+  s.add_dependency 'activerecord', '> 0'
   s.files = %w{
 acts_as_sane_tree.gemspec
 init.rb
 README.rdoc
 CHANGELOG.rdoc
 lib/acts_as_sane_tree.rb
-lib/version.rb
+lib/acts_as_sane_tree/version.rb
 }
 end

data/lib/acts_as_sane_tree.rb

@@ -1,3 +1,5 @@
+require 'active_record'
+
 module ActsAsSaneTree
   
   def self.included(base) # :nodoc:
@@ -34,6 +36,8 @@ module ActsAsSaneTree
   #   * :raw - No Hash nesting
   #   * :no_self - Will not return given nodes in result set
   #   * {:depth => n} - Will set maximum depth to query
+  #   * {:to_depth => n} - Alias for :depth
+  #   * {:at_depth => n} - Will return times at given depth (takes precedence over :depth/:to_depth)
   module ClassMethods
     # Configuration options are:
     #
@@ -99,20 +103,30 @@ module ActsAsSaneTree
         def self.nodes_and_descendents(*args)
           raw = args.delete(:raw)
           no_self = args.delete(:no_self)
-          depth = args.detect{|x|x.is_a?(Hash)}
-          if(depth)
-            args.delete(depth)
-            depth = depth[:depth]
+          at_depth = nil
+          depth = nil
+          hash = args.detect{|x|x.is_a?(Hash)}
+          if(hash)
+            args.delete(hash)
+            depth = hash[:depth] || hash[:to_depth]
+            at_depth = hash[:at_depth]
+          end
+          depth ||= #{configuration[:max_depth].to_i}
+          depth_restriction = "WHERE crumbs.level + 1 < \#{depth}" if depth
+          depth_clause = nil
+          if(at_depth)
+            depth_clause = "level + 1 = \#{at_depth.to_i}"
+          elsif(depth)
+            depth_clause = "level + 1 < \#{depth.to_i}"
           end
-          depth = #{configuration[:max_depth]} unless depth
           base_ids = args.map{|x| x.is_a?(ActiveRecord::Base) ? x.id : x.to_i}
           q = self.find_by_sql(
             "WITH RECURSIVE crumbs AS (
               SELECT #{self.table_name}.*, \#{no_self ? -1 : 0} AS level FROM #{self.table_name} WHERE \#{base_ids.empty? ? 'parent_id IS NULL' : "id in (\#{base_ids.join(', ')})"}
               UNION ALL
               SELECT alias1.*, crumbs.level + 1 FROM crumbs JOIN #{self.table_name} alias1 on alias1.parent_id = crumbs.id
-              \#{depth ? "WHERE crumbs.level + 1 < \#{depth.to_i}" : ''}
-            ) SELECT * FROM crumbs WHERE level >= 0 ORDER BY level, parent_id ASC"
+              \#{depth_restriction}
+            ) SELECT * FROM crumbs WHERE level >= 0 \#{"AND " + depth_clause if depth_clause} ORDER BY level, parent_id ASC"
           )
           unless(raw)
             res = {}
@@ -216,4 +230,4 @@ module ActsAsSaneTree
   end
 end
 
-ActiveRecord::Base.send :include, ActsAsSaneTree
+ActiveRecord::Base.send :include, ActsAsSaneTree

data/lib/{version.rb → acts_as_sane_tree/version.rb}

@@ -1,3 +1,3 @@
 module ActsAsSaneTree
-  VERSION = '1.2'
+  VERSION = '1.3'
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_sane_tree
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 1
-  - 2
-  version: "1.2"
+  - 3
+  version: "1.3"
 platform: ruby
 authors: 
 - Chris Roberts
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 -08:00
+date: 2011-01-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,13 +23,12 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
-        - 2
-        - 3
-        version: "2.3"
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id001
 description: Sane ActiveRecord tree builder
@@ -46,7 +45,7 @@ files:
 - README.rdoc
 - CHANGELOG.rdoc
 - lib/acts_as_sane_tree.rb
-- lib/version.rb
+- lib/acts_as_sane_tree/version.rb
 has_rdoc: true
 homepage: http://github.com/chrisroberts/acts_as_sane_tree
 licenses: []