searchlogic 1.5.10 → 1.6.0

data/CHANGELOG.rdoc

@@ -1,4 +1,10 @@
-== 1.5.10 released 2008-12-10
+== 1.6.0 released 2008-12-8
+
+* Converted all tree conditions to nested set conditions for performance reasons. A nested set data structure is now required instead of a tree
+* Added DISTINCT to select if you are not provided a select, searching, and have joins.
+* Included :not_like in the list of conditions to be required upon initialization.
+
+== 1.5.10 released 2008-12-8
 
 * Create class level conditions upon instantiation to avoid conflicts.
 

data/Manifest

@@ -19,6 +19,7 @@ lib/searchlogic/condition/keywords.rb
 lib/searchlogic/condition/less_than.rb
 lib/searchlogic/condition/less_than_or_equal_to.rb
 lib/searchlogic/condition/like.rb
+lib/searchlogic/condition/nested_set.rb
 lib/searchlogic/condition/nil.rb
 lib/searchlogic/condition/not_begin_with.rb
 lib/searchlogic/condition/not_blank.rb
@@ -28,7 +29,6 @@ lib/searchlogic/condition/not_have_keywords.rb
 lib/searchlogic/condition/not_like.rb
 lib/searchlogic/condition/not_nil.rb
 lib/searchlogic/condition/sibling_of.rb
-lib/searchlogic/condition/tree.rb
 lib/searchlogic/conditions/any_or_all.rb
 lib/searchlogic/conditions/base.rb
 lib/searchlogic/conditions/groups.rb
@@ -142,7 +142,10 @@ test/fixtures/animals.yml
 test/fixtures/orders.yml
 test/fixtures/user_groups.yml
 test/fixtures/users.yml
-test/libs/acts_as_tree.rb
+test/libs/awesome_nested_set/compatability.rb
+test/libs/awesome_nested_set/helper.rb
+test/libs/awesome_nested_set/named_scope.rb
+test/libs/awesome_nested_set.rb
 test/libs/rexml_fix.rb
 test/modifier_tests/day_of_month_test.rb
 test/search_tests/base_test.rb

data/README.rdoc

@@ -347,6 +347,8 @@ Each model comes preloaded with class level conditions as well. The difference i
   :inclusive_descendant_of      Same as above but also includes the root
   :sibling_of                   Returns all records that have the same parent
 
+The above conditions are for a nested set data structure, *not* a tree. Since we need to traverse through the tree a nested set is required for performance reasons. Traversing through a large tree is very bad for performance, a nested set solves this problem.
+
 == Modifiers
 
 === What are modifiers?

data/lib/searchlogic.rb

@@ -48,13 +48,15 @@ require "searchlogic/conditions/base"
 
 # Condition
 require "searchlogic/condition/base"
-require "searchlogic/condition/tree"
-SEARCHLOGIC_CONDITIONS = [:begins_with, :blank, :child_of, :descendant_of, :ends_with, :equals, :greater_than, :greater_than_or_equal_to, :inclusive_descendant_of, :like, :nil, :not_begin_with, :not_blank, :not_end_with, :not_equal, :not_have_keywords, :not_nil, :keywords, :less_than, :less_than_or_equal_to, :sibling_of]
+require "searchlogic/condition/nested_set"
+SEARCHLOGIC_CONDITIONS = [:begins_with, :blank, :child_of, :descendant_of, :ends_with, :equals, :greater_than, :greater_than_or_equal_to, :inclusive_descendant_of, :like, :nil, :not_begin_with,
+  :not_blank, :not_end_with, :not_equal, :not_have_keywords, :not_like, :not_nil, :keywords, :less_than, :less_than_or_equal_to, :sibling_of]
 SEARCHLOGIC_CONDITIONS.each { |condition| require "searchlogic/condition/#{condition}" }
 
 # Modifiers
 require "searchlogic/modifiers/base"
-SEARCHLOGIC_MODIFIERS = [:absolute, :acos, :asin, :atan, :avg, :ceil, :char_length, :cos, :cot, :count, :day_of_month, :day_of_week, :day_of_year, :degrees, :exp, :floor, :hex, :hour, :log, :log10, :log2, :lower, :ltrim, :md5, :microseconds, :milliseconds, :minute, :month, :octal, :radians, :round, :rtrim, :second, :sign, :sin, :square_root, :sum, :tan, :trim, :upper, :week, :year]
+SEARCHLOGIC_MODIFIERS = [:absolute, :acos, :asin, :atan, :avg, :ceil, :char_length, :cos, :cot, :count, :day_of_month, :day_of_week, :day_of_year, :degrees, :exp, :floor, :hex, :hour, :log, :log10,
+  :log2, :lower, :ltrim, :md5, :microseconds, :milliseconds, :minute, :month, :octal, :radians, :round, :rtrim, :second, :sign, :sin, :square_root, :sum, :tan, :trim, :upper, :week, :year]
 SEARCHLOGIC_MODIFIERS.each { |modifier| require "searchlogic/modifiers/#{modifier}" }
 
 # Helpers

data/lib/searchlogic/condition/base.rb

@@ -121,8 +121,7 @@ module Searchlogic
         def meaningless?(v)
           case v
           when Array
-            v.each { |i| return false unless meaningless?(i) }
-            true
+            false
           else
             !explicitly_set_value? || (self.class.ignore_meaningless_value? && v != false && v.blank?)
           end

data/lib/searchlogic/condition/child_of.rb

@@ -1,6 +1,6 @@
 module Searchlogic
   module Condition
-    class ChildOf < Tree      
+    class ChildOf < NestedSet
       def to_conditions(value)
         parent_association = klass.reflect_on_association(:parent)
         foreign_key_name = (parent_association && parent_association.options[:foreign_key]) || "parent_id"

data/lib/searchlogic/condition/descendant_of.rb

@@ -1,24 +1,11 @@
 module Searchlogic
   module Condition
-    class DescendantOf < Tree      
+    class DescendantOf < NestedSet
       def to_conditions(value)
-        # Wish I knew how to do this in SQL
-        root = (value.is_a?(klass) ? value : klass.find(value)) rescue return
-        strs = []
-        subs = []
-        all_children_ids(root).each do |child_id|
-          strs << "#{quoted_table_name}.#{quote_column_name(klass.primary_key)} = ?"
-          subs << child_id
-        end
-        [strs.join(" OR "), *subs]
+        condition = InclusiveDescendantOf.new(klass, options)
+        condition.value = value
+        merge_conditions(["#{quoted_table_name}.#{quote_column_name(klass.primary_key)} != ?", (value.is_a?(klass) ? value.send(klass.primary_key) : value)], condition.sanitize)
       end
-      
-      private
-        def all_children_ids(record)
-          ids = record.children.collect { |child| child.send(klass.primary_key) }
-          record.children.each { |child| ids += all_children_ids(child) }
-          ids
-        end
     end
   end
 end

data/lib/searchlogic/condition/inclusive_descendant_of.rb

@@ -1,10 +1,9 @@
 module Searchlogic
   module Condition
-    class InclusiveDescendantOf < Tree
+    class InclusiveDescendantOf < NestedSet
       def to_conditions(value)
-        condition = DescendantOf.new(klass, options)
-        condition.value = value
-        merge_conditions(["#{quoted_table_name}.#{quote_column_name(klass.primary_key)} = ?", (value.is_a?(klass) ? value.send(klass.primary_key) : value)], condition.sanitize, :any => true)
+        root = (value.is_a?(klass) ? value : klass.find(value)) rescue return
+        ["#{quoted_table_name}.#{quote_column_name(klass.left_column_name)} >= ? AND #{quoted_table_name}.#{quote_column_name(klass.right_column_name)} <= ?", root.left, root.right]
       end
     end
   end

data/lib/searchlogic/condition/{tree.rb → nested_set.rb}

@@ -1,6 +1,6 @@
 module Searchlogic
   module Condition
-    class Tree < Base # :nodoc:
+    class NestedSet < Base # :nodoc:
       self.join_arrays_with_or = true
       
       class << self

data/lib/searchlogic/condition/not_begin_with.rb

@@ -8,7 +8,7 @@ module Searchlogic
       end
       
       def to_conditions(value)
-        begin_with = BeginWith.new(klass, options)
+        begin_with = BeginsWith.new(klass, options)
         begin_with.value = value
         conditions = being_with.sanitize
         return conditions if conditions.blank?

data/lib/searchlogic/condition/sibling_of.rb

@@ -1,6 +1,6 @@
 module Searchlogic
   module Condition
-    class SiblingOf < Tree
+    class SiblingOf < NestedSet
       def to_conditions(value)
         parent_association = klass.reflect_on_association(:parent)
         foreign_key_name = (parent_association && parent_association.options[:foreign_key]) || "parent_id"

data/lib/searchlogic/conditions/magic_methods.rb

@@ -91,7 +91,7 @@ module Searchlogic
             class_level_conditions.each do |condition_class|
               condition_class.condition_names_for_model.each_with_index do |condition_name, index|
                 if index == 0
-                  add_condition!(condition_class, condition_name)
+                  add_condition!(condition_class, condition_name, :column => klass.columns_hash[klass.primary_key])
                 else
                   add_condition_alias!(condition_name, condition_class.condition_names_for_model.first)
                 end

data/lib/searchlogic/search/base.rb

@@ -119,6 +119,11 @@ module Searchlogic #:nodoc:
         find_options
       end
       
+      def select
+        return @select if klass.connection.adapter_name == "PostgreSQL" # Postgres needs ALL of the column names here, including association columns, etc. Which is very strange, so I disable this feature for Postgres all together.
+        @select ||= "DISTINCT #{klass.connection.quote_table_name(klass.table_name)}.*" if !joins.blank? && Config.search.remove_duplicates?
+      end
+      
       def scope
         @scope ||= {}
       end

data/lib/searchlogic/search/searching.rb

@@ -22,7 +22,6 @@ module Searchlogic
               end
               args << options
               results = klass.#{method}(*args)
-              results.uniq! if #{SEARCH_METHODS.include?(method)} && results.is_a?(Array) && !joins.blank? && Config.search.remove_duplicates?
               results
             end
           end

data/lib/searchlogic/version.rb

@@ -66,8 +66,8 @@ module Searchlogic
     end
 
     MAJOR = 1
-    MINOR = 5
-    TINY  = 10
+    MINOR = 6
+    TINY  = 0
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/searchlogic.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "1.5.10"
+  s.version = "1.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]
-  s.date = %q{2008-12-07}
+  s.date = %q{2008-12-08}
   s.description = %q{Object based ActiveRecord searching, ordering, pagination, and more!}
   s.email = %q{bjohnson@binarylogic.com}
-  s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/searchlogic/active_record/associations.rb", "lib/searchlogic/active_record/base.rb", "lib/searchlogic/active_record/connection_adapters/mysql_adapter.rb", "lib/searchlogic/active_record/connection_adapters/postgresql_adapter.rb", "lib/searchlogic/active_record/connection_adapters/sqlite_adapter.rb", "lib/searchlogic/condition/base.rb", "lib/searchlogic/condition/begins_with.rb", "lib/searchlogic/condition/blank.rb", "lib/searchlogic/condition/child_of.rb", "lib/searchlogic/condition/descendant_of.rb", "lib/searchlogic/condition/ends_with.rb", "lib/searchlogic/condition/equals.rb", "lib/searchlogic/condition/greater_than.rb", "lib/searchlogic/condition/greater_than_or_equal_to.rb", "lib/searchlogic/condition/inclusive_descendant_of.rb", "lib/searchlogic/condition/keywords.rb", "lib/searchlogic/condition/less_than.rb", "lib/searchlogic/condition/less_than_or_equal_to.rb", "lib/searchlogic/condition/like.rb", "lib/searchlogic/condition/nil.rb", "lib/searchlogic/condition/not_begin_with.rb", "lib/searchlogic/condition/not_blank.rb", "lib/searchlogic/condition/not_end_with.rb", "lib/searchlogic/condition/not_equal.rb", "lib/searchlogic/condition/not_have_keywords.rb", "lib/searchlogic/condition/not_like.rb", "lib/searchlogic/condition/not_nil.rb", "lib/searchlogic/condition/sibling_of.rb", "lib/searchlogic/condition/tree.rb", "lib/searchlogic/conditions/any_or_all.rb", "lib/searchlogic/conditions/base.rb", "lib/searchlogic/conditions/groups.rb", "lib/searchlogic/conditions/magic_methods.rb", "lib/searchlogic/conditions/multiparameter_attributes.rb", "lib/searchlogic/conditions/protection.rb", "lib/searchlogic/config/helpers.rb", "lib/searchlogic/config/search.rb", "lib/searchlogic/config.rb", "lib/searchlogic/core_ext/hash.rb", "lib/searchlogic/core_ext/object.rb", "lib/searchlogic/helpers/control_types/link.rb", "lib/searchlogic/helpers/control_types/links.rb", "lib/searchlogic/helpers/control_types/remote_link.rb", "lib/searchlogic/helpers/control_types/remote_links.rb", "lib/searchlogic/helpers/control_types/remote_select.rb", "lib/searchlogic/helpers/control_types/select.rb", "lib/searchlogic/helpers/form.rb", "lib/searchlogic/helpers/utilities.rb", "lib/searchlogic/modifiers/absolute.rb", "lib/searchlogic/modifiers/acos.rb", "lib/searchlogic/modifiers/asin.rb", "lib/searchlogic/modifiers/atan.rb", "lib/searchlogic/modifiers/avg.rb", "lib/searchlogic/modifiers/base.rb", "lib/searchlogic/modifiers/ceil.rb", "lib/searchlogic/modifiers/char_length.rb", "lib/searchlogic/modifiers/cos.rb", "lib/searchlogic/modifiers/cot.rb", "lib/searchlogic/modifiers/count.rb", "lib/searchlogic/modifiers/day_of_month.rb", "lib/searchlogic/modifiers/day_of_week.rb", "lib/searchlogic/modifiers/day_of_year.rb", "lib/searchlogic/modifiers/degrees.rb", "lib/searchlogic/modifiers/exp.rb", "lib/searchlogic/modifiers/floor.rb", "lib/searchlogic/modifiers/hex.rb", "lib/searchlogic/modifiers/hour.rb", "lib/searchlogic/modifiers/log.rb", "lib/searchlogic/modifiers/log10.rb", "lib/searchlogic/modifiers/log2.rb", "lib/searchlogic/modifiers/lower.rb", "lib/searchlogic/modifiers/ltrim.rb", "lib/searchlogic/modifiers/md5.rb", "lib/searchlogic/modifiers/microseconds.rb", "lib/searchlogic/modifiers/milliseconds.rb", "lib/searchlogic/modifiers/minute.rb", "lib/searchlogic/modifiers/month.rb", "lib/searchlogic/modifiers/octal.rb", "lib/searchlogic/modifiers/radians.rb", "lib/searchlogic/modifiers/round.rb", "lib/searchlogic/modifiers/rtrim.rb", "lib/searchlogic/modifiers/second.rb", "lib/searchlogic/modifiers/sign.rb", "lib/searchlogic/modifiers/sin.rb", "lib/searchlogic/modifiers/square_root.rb", "lib/searchlogic/modifiers/sum.rb", "lib/searchlogic/modifiers/tan.rb", "lib/searchlogic/modifiers/trim.rb", "lib/searchlogic/modifiers/upper.rb", "lib/searchlogic/modifiers/week.rb", "lib/searchlogic/modifiers/year.rb", "lib/searchlogic/search/base.rb", "lib/searchlogic/search/conditions.rb", "lib/searchlogic/search/ordering.rb", "lib/searchlogic/search/pagination.rb", "lib/searchlogic/search/protection.rb", "lib/searchlogic/search/searching.rb", "lib/searchlogic/shared/utilities.rb", "lib/searchlogic/shared/virtual_classes.rb", "lib/searchlogic/version.rb", "lib/searchlogic.rb", "README.rdoc", "TODO.rdoc"]
-  s.files = ["CHANGELOG.rdoc", "init.rb", "lib/searchlogic/active_record/associations.rb", "lib/searchlogic/active_record/base.rb", "lib/searchlogic/active_record/connection_adapters/mysql_adapter.rb", "lib/searchlogic/active_record/connection_adapters/postgresql_adapter.rb", "lib/searchlogic/active_record/connection_adapters/sqlite_adapter.rb", "lib/searchlogic/condition/base.rb", "lib/searchlogic/condition/begins_with.rb", "lib/searchlogic/condition/blank.rb", "lib/searchlogic/condition/child_of.rb", "lib/searchlogic/condition/descendant_of.rb", "lib/searchlogic/condition/ends_with.rb", "lib/searchlogic/condition/equals.rb", "lib/searchlogic/condition/greater_than.rb", "lib/searchlogic/condition/greater_than_or_equal_to.rb", "lib/searchlogic/condition/inclusive_descendant_of.rb", "lib/searchlogic/condition/keywords.rb", "lib/searchlogic/condition/less_than.rb", "lib/searchlogic/condition/less_than_or_equal_to.rb", "lib/searchlogic/condition/like.rb", "lib/searchlogic/condition/nil.rb", "lib/searchlogic/condition/not_begin_with.rb", "lib/searchlogic/condition/not_blank.rb", "lib/searchlogic/condition/not_end_with.rb", "lib/searchlogic/condition/not_equal.rb", "lib/searchlogic/condition/not_have_keywords.rb", "lib/searchlogic/condition/not_like.rb", "lib/searchlogic/condition/not_nil.rb", "lib/searchlogic/condition/sibling_of.rb", "lib/searchlogic/condition/tree.rb", "lib/searchlogic/conditions/any_or_all.rb", "lib/searchlogic/conditions/base.rb", "lib/searchlogic/conditions/groups.rb", "lib/searchlogic/conditions/magic_methods.rb", "lib/searchlogic/conditions/multiparameter_attributes.rb", "lib/searchlogic/conditions/protection.rb", "lib/searchlogic/config/helpers.rb", "lib/searchlogic/config/search.rb", "lib/searchlogic/config.rb", "lib/searchlogic/core_ext/hash.rb", "lib/searchlogic/core_ext/object.rb", "lib/searchlogic/helpers/control_types/link.rb", "lib/searchlogic/helpers/control_types/links.rb", "lib/searchlogic/helpers/control_types/remote_link.rb", "lib/searchlogic/helpers/control_types/remote_links.rb", "lib/searchlogic/helpers/control_types/remote_select.rb", "lib/searchlogic/helpers/control_types/select.rb", "lib/searchlogic/helpers/form.rb", "lib/searchlogic/helpers/utilities.rb", "lib/searchlogic/modifiers/absolute.rb", "lib/searchlogic/modifiers/acos.rb", "lib/searchlogic/modifiers/asin.rb", "lib/searchlogic/modifiers/atan.rb", "lib/searchlogic/modifiers/avg.rb", "lib/searchlogic/modifiers/base.rb", "lib/searchlogic/modifiers/ceil.rb", "lib/searchlogic/modifiers/char_length.rb", "lib/searchlogic/modifiers/cos.rb", "lib/searchlogic/modifiers/cot.rb", "lib/searchlogic/modifiers/count.rb", "lib/searchlogic/modifiers/day_of_month.rb", "lib/searchlogic/modifiers/day_of_week.rb", "lib/searchlogic/modifiers/day_of_year.rb", "lib/searchlogic/modifiers/degrees.rb", "lib/searchlogic/modifiers/exp.rb", "lib/searchlogic/modifiers/floor.rb", "lib/searchlogic/modifiers/hex.rb", "lib/searchlogic/modifiers/hour.rb", "lib/searchlogic/modifiers/log.rb", "lib/searchlogic/modifiers/log10.rb", "lib/searchlogic/modifiers/log2.rb", "lib/searchlogic/modifiers/lower.rb", "lib/searchlogic/modifiers/ltrim.rb", "lib/searchlogic/modifiers/md5.rb", "lib/searchlogic/modifiers/microseconds.rb", "lib/searchlogic/modifiers/milliseconds.rb", "lib/searchlogic/modifiers/minute.rb", "lib/searchlogic/modifiers/month.rb", "lib/searchlogic/modifiers/octal.rb", "lib/searchlogic/modifiers/radians.rb", "lib/searchlogic/modifiers/round.rb", "lib/searchlogic/modifiers/rtrim.rb", "lib/searchlogic/modifiers/second.rb", "lib/searchlogic/modifiers/sign.rb", "lib/searchlogic/modifiers/sin.rb", "lib/searchlogic/modifiers/square_root.rb", "lib/searchlogic/modifiers/sum.rb", "lib/searchlogic/modifiers/tan.rb", "lib/searchlogic/modifiers/trim.rb", "lib/searchlogic/modifiers/upper.rb", "lib/searchlogic/modifiers/week.rb", "lib/searchlogic/modifiers/year.rb", "lib/searchlogic/search/base.rb", "lib/searchlogic/search/conditions.rb", "lib/searchlogic/search/ordering.rb", "lib/searchlogic/search/pagination.rb", "lib/searchlogic/search/protection.rb", "lib/searchlogic/search/searching.rb", "lib/searchlogic/shared/utilities.rb", "lib/searchlogic/shared/virtual_classes.rb", "lib/searchlogic/version.rb", "lib/searchlogic.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README.rdoc", "test/active_record_tests/associations_test.rb", "test/active_record_tests/base_test.rb", "test/condition_tests/base_test.rb", "test/condition_tests/begins_with_test.rb", "test/condition_tests/blank_test.rb", "test/condition_tests/child_of_test.rb", "test/condition_tests/descendant_of_test.rb", "test/condition_tests/ends_with_test.rb", "test/condition_tests/equals_test.rb", "test/condition_tests/greater_than_or_equal_to_test.rb", "test/condition_tests/greater_than_test.rb", "test/condition_tests/inclusive_descendant_of_test.rb", "test/condition_tests/keywords_test.rb", "test/condition_tests/less_than_or_equal_to_test.rb", "test/condition_tests/less_than_test.rb", "test/condition_tests/like_test.rb", "test/condition_tests/nil_test.rb", "test/condition_tests/not_begin_with_test.rb", "test/condition_tests/not_blank_test.rb", "test/condition_tests/not_end_with_test.rb", "test/condition_tests/not_equal_test.rb", "test/condition_tests/not_have_keywords_test.rb", "test/condition_tests/not_like_test.rb", "test/condition_tests/not_nil_test.rb", "test/condition_tests/sibling_of_test.rb", "test/conditions_tests/any_or_all_test.rb", "test/conditions_tests/base_test.rb", "test/conditions_tests/groups_test.rb", "test/conditions_tests/magic_methods_test.rb", "test/conditions_tests/multiparameter_attributes_test.rb", "test/conditions_tests/protection_test.rb", "test/config_test.rb", "test/fixtures/accounts.yml", "test/fixtures/animals.yml", "test/fixtures/orders.yml", "test/fixtures/user_groups.yml", "test/fixtures/users.yml", "test/libs/acts_as_tree.rb", "test/libs/rexml_fix.rb", "test/modifier_tests/day_of_month_test.rb", "test/search_tests/base_test.rb", "test/search_tests/conditions_test.rb", "test/search_tests/ordering_test.rb", "test/search_tests/pagination_test.rb", "test/search_tests/protection_test.rb", "test/test_helper.rb", "TODO.rdoc", "searchlogic.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/searchlogic/active_record/associations.rb", "lib/searchlogic/active_record/base.rb", "lib/searchlogic/active_record/connection_adapters/mysql_adapter.rb", "lib/searchlogic/active_record/connection_adapters/postgresql_adapter.rb", "lib/searchlogic/active_record/connection_adapters/sqlite_adapter.rb", "lib/searchlogic/condition/base.rb", "lib/searchlogic/condition/begins_with.rb", "lib/searchlogic/condition/blank.rb", "lib/searchlogic/condition/child_of.rb", "lib/searchlogic/condition/descendant_of.rb", "lib/searchlogic/condition/ends_with.rb", "lib/searchlogic/condition/equals.rb", "lib/searchlogic/condition/greater_than.rb", "lib/searchlogic/condition/greater_than_or_equal_to.rb", "lib/searchlogic/condition/inclusive_descendant_of.rb", "lib/searchlogic/condition/keywords.rb", "lib/searchlogic/condition/less_than.rb", "lib/searchlogic/condition/less_than_or_equal_to.rb", "lib/searchlogic/condition/like.rb", "lib/searchlogic/condition/nested_set.rb", "lib/searchlogic/condition/nil.rb", "lib/searchlogic/condition/not_begin_with.rb", "lib/searchlogic/condition/not_blank.rb", "lib/searchlogic/condition/not_end_with.rb", "lib/searchlogic/condition/not_equal.rb", "lib/searchlogic/condition/not_have_keywords.rb", "lib/searchlogic/condition/not_like.rb", "lib/searchlogic/condition/not_nil.rb", "lib/searchlogic/condition/sibling_of.rb", "lib/searchlogic/conditions/any_or_all.rb", "lib/searchlogic/conditions/base.rb", "lib/searchlogic/conditions/groups.rb", "lib/searchlogic/conditions/magic_methods.rb", "lib/searchlogic/conditions/multiparameter_attributes.rb", "lib/searchlogic/conditions/protection.rb", "lib/searchlogic/config/helpers.rb", "lib/searchlogic/config/search.rb", "lib/searchlogic/config.rb", "lib/searchlogic/core_ext/hash.rb", "lib/searchlogic/core_ext/object.rb", "lib/searchlogic/helpers/control_types/link.rb", "lib/searchlogic/helpers/control_types/links.rb", "lib/searchlogic/helpers/control_types/remote_link.rb", "lib/searchlogic/helpers/control_types/remote_links.rb", "lib/searchlogic/helpers/control_types/remote_select.rb", "lib/searchlogic/helpers/control_types/select.rb", "lib/searchlogic/helpers/form.rb", "lib/searchlogic/helpers/utilities.rb", "lib/searchlogic/modifiers/absolute.rb", "lib/searchlogic/modifiers/acos.rb", "lib/searchlogic/modifiers/asin.rb", "lib/searchlogic/modifiers/atan.rb", "lib/searchlogic/modifiers/avg.rb", "lib/searchlogic/modifiers/base.rb", "lib/searchlogic/modifiers/ceil.rb", "lib/searchlogic/modifiers/char_length.rb", "lib/searchlogic/modifiers/cos.rb", "lib/searchlogic/modifiers/cot.rb", "lib/searchlogic/modifiers/count.rb", "lib/searchlogic/modifiers/day_of_month.rb", "lib/searchlogic/modifiers/day_of_week.rb", "lib/searchlogic/modifiers/day_of_year.rb", "lib/searchlogic/modifiers/degrees.rb", "lib/searchlogic/modifiers/exp.rb", "lib/searchlogic/modifiers/floor.rb", "lib/searchlogic/modifiers/hex.rb", "lib/searchlogic/modifiers/hour.rb", "lib/searchlogic/modifiers/log.rb", "lib/searchlogic/modifiers/log10.rb", "lib/searchlogic/modifiers/log2.rb", "lib/searchlogic/modifiers/lower.rb", "lib/searchlogic/modifiers/ltrim.rb", "lib/searchlogic/modifiers/md5.rb", "lib/searchlogic/modifiers/microseconds.rb", "lib/searchlogic/modifiers/milliseconds.rb", "lib/searchlogic/modifiers/minute.rb", "lib/searchlogic/modifiers/month.rb", "lib/searchlogic/modifiers/octal.rb", "lib/searchlogic/modifiers/radians.rb", "lib/searchlogic/modifiers/round.rb", "lib/searchlogic/modifiers/rtrim.rb", "lib/searchlogic/modifiers/second.rb", "lib/searchlogic/modifiers/sign.rb", "lib/searchlogic/modifiers/sin.rb", "lib/searchlogic/modifiers/square_root.rb", "lib/searchlogic/modifiers/sum.rb", "lib/searchlogic/modifiers/tan.rb", "lib/searchlogic/modifiers/trim.rb", "lib/searchlogic/modifiers/upper.rb", "lib/searchlogic/modifiers/week.rb", "lib/searchlogic/modifiers/year.rb", "lib/searchlogic/search/base.rb", "lib/searchlogic/search/conditions.rb", "lib/searchlogic/search/ordering.rb", "lib/searchlogic/search/pagination.rb", "lib/searchlogic/search/protection.rb", "lib/searchlogic/search/searching.rb", "lib/searchlogic/shared/utilities.rb", "lib/searchlogic/shared/virtual_classes.rb", "lib/searchlogic/version.rb", "lib/searchlogic.rb", "README.rdoc", "TODO.rdoc"]
+  s.files = ["CHANGELOG.rdoc", "init.rb", "lib/searchlogic/active_record/associations.rb", "lib/searchlogic/active_record/base.rb", "lib/searchlogic/active_record/connection_adapters/mysql_adapter.rb", "lib/searchlogic/active_record/connection_adapters/postgresql_adapter.rb", "lib/searchlogic/active_record/connection_adapters/sqlite_adapter.rb", "lib/searchlogic/condition/base.rb", "lib/searchlogic/condition/begins_with.rb", "lib/searchlogic/condition/blank.rb", "lib/searchlogic/condition/child_of.rb", "lib/searchlogic/condition/descendant_of.rb", "lib/searchlogic/condition/ends_with.rb", "lib/searchlogic/condition/equals.rb", "lib/searchlogic/condition/greater_than.rb", "lib/searchlogic/condition/greater_than_or_equal_to.rb", "lib/searchlogic/condition/inclusive_descendant_of.rb", "lib/searchlogic/condition/keywords.rb", "lib/searchlogic/condition/less_than.rb", "lib/searchlogic/condition/less_than_or_equal_to.rb", "lib/searchlogic/condition/like.rb", "lib/searchlogic/condition/nested_set.rb", "lib/searchlogic/condition/nil.rb", "lib/searchlogic/condition/not_begin_with.rb", "lib/searchlogic/condition/not_blank.rb", "lib/searchlogic/condition/not_end_with.rb", "lib/searchlogic/condition/not_equal.rb", "lib/searchlogic/condition/not_have_keywords.rb", "lib/searchlogic/condition/not_like.rb", "lib/searchlogic/condition/not_nil.rb", "lib/searchlogic/condition/sibling_of.rb", "lib/searchlogic/conditions/any_or_all.rb", "lib/searchlogic/conditions/base.rb", "lib/searchlogic/conditions/groups.rb", "lib/searchlogic/conditions/magic_methods.rb", "lib/searchlogic/conditions/multiparameter_attributes.rb", "lib/searchlogic/conditions/protection.rb", "lib/searchlogic/config/helpers.rb", "lib/searchlogic/config/search.rb", "lib/searchlogic/config.rb", "lib/searchlogic/core_ext/hash.rb", "lib/searchlogic/core_ext/object.rb", "lib/searchlogic/helpers/control_types/link.rb", "lib/searchlogic/helpers/control_types/links.rb", "lib/searchlogic/helpers/control_types/remote_link.rb", "lib/searchlogic/helpers/control_types/remote_links.rb", "lib/searchlogic/helpers/control_types/remote_select.rb", "lib/searchlogic/helpers/control_types/select.rb", "lib/searchlogic/helpers/form.rb", "lib/searchlogic/helpers/utilities.rb", "lib/searchlogic/modifiers/absolute.rb", "lib/searchlogic/modifiers/acos.rb", "lib/searchlogic/modifiers/asin.rb", "lib/searchlogic/modifiers/atan.rb", "lib/searchlogic/modifiers/avg.rb", "lib/searchlogic/modifiers/base.rb", "lib/searchlogic/modifiers/ceil.rb", "lib/searchlogic/modifiers/char_length.rb", "lib/searchlogic/modifiers/cos.rb", "lib/searchlogic/modifiers/cot.rb", "lib/searchlogic/modifiers/count.rb", "lib/searchlogic/modifiers/day_of_month.rb", "lib/searchlogic/modifiers/day_of_week.rb", "lib/searchlogic/modifiers/day_of_year.rb", "lib/searchlogic/modifiers/degrees.rb", "lib/searchlogic/modifiers/exp.rb", "lib/searchlogic/modifiers/floor.rb", "lib/searchlogic/modifiers/hex.rb", "lib/searchlogic/modifiers/hour.rb", "lib/searchlogic/modifiers/log.rb", "lib/searchlogic/modifiers/log10.rb", "lib/searchlogic/modifiers/log2.rb", "lib/searchlogic/modifiers/lower.rb", "lib/searchlogic/modifiers/ltrim.rb", "lib/searchlogic/modifiers/md5.rb", "lib/searchlogic/modifiers/microseconds.rb", "lib/searchlogic/modifiers/milliseconds.rb", "lib/searchlogic/modifiers/minute.rb", "lib/searchlogic/modifiers/month.rb", "lib/searchlogic/modifiers/octal.rb", "lib/searchlogic/modifiers/radians.rb", "lib/searchlogic/modifiers/round.rb", "lib/searchlogic/modifiers/rtrim.rb", "lib/searchlogic/modifiers/second.rb", "lib/searchlogic/modifiers/sign.rb", "lib/searchlogic/modifiers/sin.rb", "lib/searchlogic/modifiers/square_root.rb", "lib/searchlogic/modifiers/sum.rb", "lib/searchlogic/modifiers/tan.rb", "lib/searchlogic/modifiers/trim.rb", "lib/searchlogic/modifiers/upper.rb", "lib/searchlogic/modifiers/week.rb", "lib/searchlogic/modifiers/year.rb", "lib/searchlogic/search/base.rb", "lib/searchlogic/search/conditions.rb", "lib/searchlogic/search/ordering.rb", "lib/searchlogic/search/pagination.rb", "lib/searchlogic/search/protection.rb", "lib/searchlogic/search/searching.rb", "lib/searchlogic/shared/utilities.rb", "lib/searchlogic/shared/virtual_classes.rb", "lib/searchlogic/version.rb", "lib/searchlogic.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README.rdoc", "test/active_record_tests/associations_test.rb", "test/active_record_tests/base_test.rb", "test/condition_tests/base_test.rb", "test/condition_tests/begins_with_test.rb", "test/condition_tests/blank_test.rb", "test/condition_tests/child_of_test.rb", "test/condition_tests/descendant_of_test.rb", "test/condition_tests/ends_with_test.rb", "test/condition_tests/equals_test.rb", "test/condition_tests/greater_than_or_equal_to_test.rb", "test/condition_tests/greater_than_test.rb", "test/condition_tests/inclusive_descendant_of_test.rb", "test/condition_tests/keywords_test.rb", "test/condition_tests/less_than_or_equal_to_test.rb", "test/condition_tests/less_than_test.rb", "test/condition_tests/like_test.rb", "test/condition_tests/nil_test.rb", "test/condition_tests/not_begin_with_test.rb", "test/condition_tests/not_blank_test.rb", "test/condition_tests/not_end_with_test.rb", "test/condition_tests/not_equal_test.rb", "test/condition_tests/not_have_keywords_test.rb", "test/condition_tests/not_like_test.rb", "test/condition_tests/not_nil_test.rb", "test/condition_tests/sibling_of_test.rb", "test/conditions_tests/any_or_all_test.rb", "test/conditions_tests/base_test.rb", "test/conditions_tests/groups_test.rb", "test/conditions_tests/magic_methods_test.rb", "test/conditions_tests/multiparameter_attributes_test.rb", "test/conditions_tests/protection_test.rb", "test/config_test.rb", "test/fixtures/accounts.yml", "test/fixtures/animals.yml", "test/fixtures/orders.yml", "test/fixtures/user_groups.yml", "test/fixtures/users.yml", "test/libs/awesome_nested_set/compatability.rb", "test/libs/awesome_nested_set/helper.rb", "test/libs/awesome_nested_set/named_scope.rb", "test/libs/awesome_nested_set.rb", "test/libs/rexml_fix.rb", "test/modifier_tests/day_of_month_test.rb", "test/search_tests/base_test.rb", "test/search_tests/conditions_test.rb", "test/search_tests/ordering_test.rb", "test/search_tests/pagination_test.rb", "test/search_tests/protection_test.rb", "test/test_helper.rb", "TODO.rdoc", "searchlogic.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/binarylogic/searchlogic}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Searchlogic", "--main", "README.rdoc"]

data/test/active_record_tests/associations_test.rb

@@ -12,8 +12,8 @@ module ActiveRecordTests
       assert_equal User, search.klass
       assert_equal({:conditions => "\"users\".account_id = #{binary_logic.id}"}, search.scope)
       
-      assert_equal [jennifer, ben], search.all
-      assert_equal jennifer, search.first
+      assert_equal [ben, jennifer], search.all
+      assert_equal ben, search.first
       assert_equal ((ben.id + jennifer.id) / 2.0), search.average("id")
       assert_equal 2, search.count
     
@@ -70,10 +70,9 @@ module ActiveRecordTests
       assert_kind_of Searchlogic::Search::Base, search
       assert_equal User, search.klass
       assert_equal({:conditions => "\"user_groups_users\".user_group_id = #{neco.id} ", :joins => "INNER JOIN \"user_groups_users\" ON \"users\".id = \"user_groups_users\".user_id"}, search.scope)
+      assert_equal [drew, ben], search.all
       
-      assert_equal [ben, drew], search.all
-      
-      assert_equal ben, search.first
+      assert_equal drew, search.first
       assert_equal ((ben.id + drew.id) / 2.0).to_s, search.average("id").to_s
       assert_equal 2, search.count
     

data/test/condition_tests/descendant_of_test.rb

@@ -4,13 +4,9 @@ module ConditionTests
   class DescendantOfTest < ActiveSupport::TestCase
     def test_sanitize
       ben = users(:ben)
-      drew = users(:drew)
-      jennifer = users(:jennifer)
-      tren = users(:tren)
-      
       condition = Searchlogic::Condition::DescendantOf.new(User)
       condition.value = ben
-      assert_equal ["\"users\".\"id\" = ? OR \"users\".\"id\" = ? OR \"users\".\"id\" = ?", drew.id, tren.id, jennifer.id], condition.sanitize
+      assert_equal ["\"users\".\"id\" != ? AND \"users\".\"lft\" >= ? AND \"users\".\"rgt\" <= ?", ben.id, ben.left, ben.right], condition.sanitize
     end
   end
 end

data/test/condition_tests/inclusive_descendant_of_test.rb

@@ -4,13 +4,9 @@ module ConditionTests
   class InclusiveDescendantOfTest < ActiveSupport::TestCase
     def test_sanitize
       ben = users(:ben)
-      drew = users(:drew)
-      jennifer = users(:jennifer)
-      tren = users(:tren)
-      
       condition = Searchlogic::Condition::InclusiveDescendantOf.new(User)
       condition.value = ben
-      assert_equal ["\"users\".\"id\" = ? OR \"users\".\"id\" = ? OR \"users\".\"id\" = ? OR \"users\".\"id\" = ?", ben.id, drew.id, tren.id, jennifer.id], condition.sanitize
+      assert_equal ["\"users\".\"lft\" >= ? AND \"users\".\"rgt\" <= ?", ben.left, ben.right], condition.sanitize
     end
   end
 end

data/test/conditions_tests/magic_methods_test.rb

@@ -4,13 +4,14 @@ module ConditionsTests
   class MagicMethodsTest < ActiveSupport::TestCase
     def test_class_level_conditions
       ben = users(:ben)
-      drew = users(:drew)
-      jennifer = users(:jennifer)
-      tren = users(:tren)
       
       conditions = Searchlogic::Cache::UserConditions.new
+      conditions.descendant_of = "21"
+      assert_equal 21, conditions.descendant_of
+      conditions.descendant_of = ["21", "22"]
+      assert_equal [21, 22], conditions.descendant_of
       conditions.descendant_of = ben
-      assert_equal ["\"users\".\"id\" = ? OR \"users\".\"id\" = ? OR \"users\".\"id\" = ?", drew.id, tren.id, jennifer.id], conditions.sanitize
+      assert_equal ["\"users\".\"id\" != ? AND \"users\".\"lft\" >= ? AND \"users\".\"rgt\" <= ?", ben.id, ben.left, ben.right], conditions.sanitize
     end
     
     def test_virtual_columns

data/test/fixtures/orders.yml

@@ -1,11 +1,11 @@
 bens_order:
-  user: ben
+  user_id: 1
   total: 500.23
   description: A bunch of apple products, etc.
   receipt: some binary text
   
 drews_order:
-  user: drew
+  user_id: 2
   total: 2.12
   description: Some more apple projects, ipod, etc
   receipt: some more binary text

data/test/fixtures/user_groups.yml

@@ -1,7 +1,5 @@
 neco:
   name: NECO
-  users: ben, drew
 
 johnsons:
-  name: Johnsons
-  users: ben, jennifer
+  name: Johnsons

data/test/fixtures/users.yml

@@ -1,28 +1,43 @@
 ben:
+  id: 1
   account: binary_logic
+  lft: 1
+  rgt: 8
   first_name: Ben
   last_name: Johnson
   active: true
   bio: Totally awesome!
+  user_groups: neco, johnsons
   
 drew:
+  id: 2
   account: neco
-  parent: ben
+  parent_id: 1
+  lft: 2
+  rgt: 5
   first_name: Drew
   last_name: Mills
   active: false
   bio: Totally not awesome!
+  user_groups: neco
   
 jennifer:
+  id: 3
   account: binary_logic
-  parent: drew
+  parent_id: 2
+  lft: 3
+  rgt: 4
   first_name: Jennifer
   last_name: Hopkins
   active: false
   bio: Totally not awesome at all!
+  user_groups: johnsons
   
 tren:
-  parent: ben
+  id: 4
+  parent_id: 1
+  lft: 6
+  rgt: 7
   first_name: Tren
   last_name: Garfield
   active: false

data/test/libs/awesome_nested_set.rb

@@ -0,0 +1,545 @@
+module CollectiveIdea #:nodoc:
+  module Acts #:nodoc:
+    module NestedSet #:nodoc:
+      def self.included(base)
+        base.extend(SingletonMethods)
+      end
+
+      # This acts provides Nested Set functionality. Nested Set is a smart way to implement
+      # an _ordered_ tree, with the added feature that you can select the children and all of their
+      # descendants with a single query. The drawback is that insertion or move need some complex
+      # sql queries. But everything is done here by this module!
+      #
+      # Nested sets are appropriate each time you want either an orderd tree (menus,
+      # commercial categories) or an efficient way of querying big trees (threaded posts).
+      #
+      # == API
+      #
+      # Methods names are aligned with acts_as_tree as much as possible, to make replacment from one
+      # by another easier, except for the creation:
+      #
+      # in acts_as_tree:
+      #   item.children.create(:name => "child1")
+      #
+      # in acts_as_nested_set:
+      #   # adds a new item at the "end" of the tree, i.e. with child.left = max(tree.right)+1
+      #   child = MyClass.new(:name => "child1")
+      #   child.save
+      #   # now move the item to its right place
+      #   child.move_to_child_of my_item
+      #
+      # You can pass an id or an object to:
+      # * <tt>#move_to_child_of</tt>
+      # * <tt>#move_to_right_of</tt>
+      # * <tt>#move_to_left_of</tt>
+      #
+      module SingletonMethods
+        # Configuration options are:
+        #
+        # * +:parent_column+ - specifies the column name to use for keeping the position integer (default: parent_id)
+        # * +:left_column+ - column name for left boundry data, default "lft"
+        # * +:right_column+ - column name for right boundry data, default "rgt"
+        # * +:scope+ - restricts what is to be considered a list. Given a symbol, it'll attach "_id"
+        #   (if it hasn't been already) and use that as the foreign key restriction. You
+        #   can also pass an array to scope by multiple attributes.
+        #   Example: <tt>acts_as_nested_set :scope => [:notable_id, :notable_type]</tt>
+        # * +:dependent+ - behavior for cascading destroy. If set to :destroy, all the
+        #   child objects are destroyed alongside this object by calling their destroy
+        #   method. If set to :delete_all (default), all the child objects are deleted
+        #   without calling their destroy method.
+        #
+        # See CollectiveIdea::Acts::NestedSet::ClassMethods for a list of class methods and
+        # CollectiveIdea::Acts::NestedSet::InstanceMethods for a list of instance methods added 
+        # to acts_as_nested_set models
+        def acts_as_nested_set(options = {})
+          options = {
+            :parent_column => 'parent_id',
+            :left_column => 'lft',
+            :right_column => 'rgt',
+            :dependent => :delete_all, # or :destroy
+          }.merge(options)
+          
+          if options[:scope].is_a?(Symbol) && options[:scope].to_s !~ /_id$/
+            options[:scope] = "#{options[:scope]}_id".intern
+          end
+
+          write_inheritable_attribute :acts_as_nested_set_options, options
+          class_inheritable_reader :acts_as_nested_set_options
+          
+          include InstanceMethods
+          include Comparable
+          include Columns
+          extend Columns
+          extend ClassMethods
+
+          # no bulk assignment
+          attr_protected  left_column_name.intern,
+                          right_column_name.intern, 
+                          parent_column_name.intern
+                          
+          before_create :set_default_left_and_right
+          before_destroy :prune_from_tree
+                          
+          # no assignment to structure fields
+          [left_column_name, right_column_name, parent_column_name].each do |column|
+            module_eval <<-"end_eval", __FILE__, __LINE__
+              def #{column}=(x)
+                raise ActiveRecord::ActiveRecordError, "Unauthorized assignment to #{column}: it's an internal field handled by acts_as_nested_set code, use move_to_* methods instead."
+              end
+            end_eval
+          end
+          
+          named_scope :roots, :conditions => {parent_column_name => nil}, :order => quoted_left_column_name
+          named_scope :leaves, :conditions => "#{quoted_right_column_name} - #{quoted_left_column_name} = 1", :order => quoted_left_column_name
+          if self.respond_to?(:define_callbacks)
+            define_callbacks("before_move", "after_move")              
+          end
+
+          
+        end
+        
+      end
+      
+      module ClassMethods
+        
+        # Returns the first root
+        def root
+          roots.find(:first)
+        end
+        
+        def valid?
+          left_and_rights_valid? && no_duplicates_for_columns? && all_roots_valid?
+        end
+        
+        def left_and_rights_valid?
+          count(
+            :joins => "LEFT OUTER JOIN #{quoted_table_name} AS parent ON " +
+              "#{quoted_table_name}.#{quoted_parent_column_name} = parent.#{primary_key}",
+            :conditions =>
+              "#{quoted_table_name}.#{quoted_left_column_name} IS NULL OR " +
+              "#{quoted_table_name}.#{quoted_right_column_name} IS NULL OR " +
+              "#{quoted_table_name}.#{quoted_left_column_name} >= " +
+                "#{quoted_table_name}.#{quoted_right_column_name} OR " +
+              "(#{quoted_table_name}.#{quoted_parent_column_name} IS NOT NULL AND " +
+                "(#{quoted_table_name}.#{quoted_left_column_name} <= parent.#{quoted_left_column_name} OR " +
+                "#{quoted_table_name}.#{quoted_right_column_name} >= parent.#{quoted_right_column_name}))"
+          ) == 0
+        end
+        
+        def no_duplicates_for_columns?
+          scope_string = Array(acts_as_nested_set_options[:scope]).map do |c|
+            connection.quote_column_name(c)
+          end.push(nil).join(", ")
+          [quoted_left_column_name, quoted_right_column_name].all? do |column|
+            # No duplicates
+            find(:first, 
+              :select => "#{scope_string}#{column}, COUNT(#{column})", 
+              :group => "#{scope_string}#{column} 
+                HAVING COUNT(#{column}) > 1").nil?
+          end
+        end
+        
+        # Wrapper for each_root_valid? that can deal with scope.
+        def all_roots_valid?
+          if acts_as_nested_set_options[:scope]
+            roots(:group => scope_column_names).group_by{|record| scope_column_names.collect{|col| record.send(col.to_sym)}}.all? do |scope, grouped_roots|
+              each_root_valid?(grouped_roots)
+            end
+          else
+            each_root_valid?(roots)
+          end
+        end
+        
+        def each_root_valid?(roots_to_validate)
+          left = right = 0
+          roots_to_validate.all? do |root|
+            returning(root.left > left && root.right > right) do
+              left = root.left
+              right = root.right
+            end
+          end
+        end
+                
+        # Rebuilds the left & rights if unset or invalid.  Also very useful for converting from acts_as_tree.
+        def rebuild!
+          # Don't rebuild a valid tree.
+          return true if valid?
+          
+          scope = lambda{}
+          if acts_as_nested_set_options[:scope]
+            scope = lambda{|node| 
+              scope_column_names.inject(""){|str, column_name|
+                str << "AND #{connection.quote_column_name(column_name)} = #{connection.quote(node.send(column_name.to_sym))} "
+              }
+            }
+          end
+          indices = {}
+          
+          set_left_and_rights = lambda do |node|
+            # set left
+            node[left_column_name] = indices[scope.call(node)] += 1
+            # find
+            find(:all, :conditions => ["#{quoted_parent_column_name} = ? #{scope.call(node)}", node], :order => "#{quoted_left_column_name}, #{quoted_right_column_name}, id").each{|n| set_left_and_rights.call(n) }
+            # set right
+            node[right_column_name] = indices[scope.call(node)] += 1    
+            node.save!    
+          end
+                              
+          # Find root node(s)
+          root_nodes = find(:all, :conditions => "#{quoted_parent_column_name} IS NULL", :order => "#{quoted_left_column_name}, #{quoted_right_column_name}, id").each do |root_node|
+            # setup index for this scope
+            indices[scope.call(root_node)] ||= 0
+            set_left_and_rights.call(root_node)
+          end
+        end
+      end
+      
+      # Mixed into both classes and instances to provide easy access to the column names
+      module Columns
+        def left_column_name
+          acts_as_nested_set_options[:left_column]
+        end
+        
+        def right_column_name
+          acts_as_nested_set_options[:right_column]
+        end
+        
+        def parent_column_name
+          acts_as_nested_set_options[:parent_column]
+        end
+        
+        def scope_column_names
+          Array(acts_as_nested_set_options[:scope])
+        end
+        
+        def quoted_left_column_name
+          connection.quote_column_name(left_column_name)
+        end
+        
+        def quoted_right_column_name
+          connection.quote_column_name(right_column_name)
+        end
+        
+        def quoted_parent_column_name
+          connection.quote_column_name(parent_column_name)
+        end
+        
+        def quoted_scope_column_names
+          scope_column_names.collect {|column_name| connection.quote_column_name(column_name) }
+        end
+      end
+
+      # Any instance method that returns a collection makes use of Rails 2.1's named_scope (which is bundled for Rails 2.0), so it can be treated as a finder.
+      #
+      #   category.self_and_descendants.count
+      #   category.ancestors.find(:all, :conditions => "name like '%foo%'")
+      module InstanceMethods
+        # Value of the parent column
+        def parent_id
+          self[parent_column_name]
+        end
+        
+        # Value of the left column
+        def left
+          self[left_column_name]
+        end
+        
+        # Value of the right column
+        def right
+          self[right_column_name]
+        end
+
+        # Returns true if this is a root node.
+        def root?
+          parent_id.nil?
+        end
+        
+        def leaf?
+          right - left == 1
+        end
+
+        # Returns true is this is a child node
+        def child?
+          !parent_id.nil?
+        end
+
+        # order by left column
+        def <=>(x)
+          left <=> x.left
+        end
+
+        # Returns root
+        def root
+          self_and_ancestors.find(:first)
+        end
+
+        # Returns the immediate parent
+        def parent
+          nested_set_scope.find_by_id(parent_id) if parent_id
+        end
+
+        # Returns the array of all parents and self
+        def self_and_ancestors
+          nested_set_scope.scoped :conditions => [
+            "#{self.class.table_name}.#{quoted_left_column_name} <= ? AND #{self.class.table_name}.#{quoted_right_column_name} >= ?", left, right
+          ]
+        end
+
+        # Returns an array of all parents
+        def ancestors
+          without_self self_and_ancestors
+        end
+
+        # Returns the array of all children of the parent, including self
+        def self_and_siblings
+          nested_set_scope.scoped :conditions => {parent_column_name => parent_id}
+        end
+
+        # Returns the array of all children of the parent, except self
+        def siblings
+          without_self self_and_siblings
+        end
+
+        # Returns a set of all of its nested children which do not have children  
+        def leaves
+          descendants.scoped :conditions => "#{self.class.table_name}.#{quoted_right_column_name} - #{self.class.table_name}.#{quoted_left_column_name} = 1"
+        end    
+
+        # Returns the level of this object in the tree
+        # root level is 0
+        def level
+          parent_id.nil? ? 0 : ancestors.count
+        end
+
+        # Returns a set of itself and all of its nested children
+        def self_and_descendants
+          nested_set_scope.scoped :conditions => [
+            "#{self.class.table_name}.#{quoted_left_column_name} >= ? AND #{self.class.table_name}.#{quoted_right_column_name} <= ?", left, right
+          ]
+        end
+
+        # Returns a set of all of its children and nested children
+        def descendants
+          without_self self_and_descendants
+        end
+
+        # Returns a set of only this entry's immediate children
+        def children
+          nested_set_scope.scoped :conditions => {parent_column_name => self}
+        end
+
+        def is_descendant_of?(other)
+          other.left < self.left && self.left < other.right && same_scope?(other)
+        end
+        
+        def is_or_is_descendant_of?(other)
+          other.left <= self.left && self.left < other.right && same_scope?(other)
+        end
+
+        def is_ancestor_of?(other)
+          self.left < other.left && other.left < self.right && same_scope?(other)
+        end
+        
+        def is_or_is_ancestor_of?(other)
+          self.left <= other.left && other.left < self.right && same_scope?(other)
+        end
+        
+        # Check if other model is in the same scope
+        def same_scope?(other)
+          Array(acts_as_nested_set_options[:scope]).all? do |attr|
+            self.send(attr) == other.send(attr)
+          end
+        end
+
+        # Find the first sibling to the left
+        def left_sibling
+          siblings.find(:first, :conditions => ["#{self.class.table_name}.#{quoted_left_column_name} < ?", left],
+            :order => "#{self.class.table_name}.#{quoted_left_column_name} DESC")
+        end
+
+        # Find the first sibling to the right
+        def right_sibling
+          siblings.find(:first, :conditions => ["#{self.class.table_name}.#{quoted_left_column_name} > ?", left])
+        end
+
+        # Shorthand method for finding the left sibling and moving to the left of it.
+        def move_left
+          move_to_left_of left_sibling
+        end
+
+        # Shorthand method for finding the right sibling and moving to the right of it.
+        def move_right
+          move_to_right_of right_sibling
+        end
+
+        # Move the node to the left of another node (you can pass id only)
+        def move_to_left_of(node)
+          move_to node, :left
+        end
+
+        # Move the node to the left of another node (you can pass id only)
+        def move_to_right_of(node)
+          move_to node, :right
+        end
+
+        # Move the node to the child of another node (you can pass id only)
+        def move_to_child_of(node)
+          move_to node, :child
+        end
+        
+        # Move the node to root nodes
+        def move_to_root
+          move_to nil, :root
+        end
+        
+        def move_possible?(target)
+          self != target && # Can't target self
+          same_scope?(target) && # can't be in different scopes
+          # !(left..right).include?(target.left..target.right) # this needs tested more
+          # detect impossible move
+          !((left <= target.left && right >= target.left) or (left <= target.right && right >= target.right))
+        end
+        
+        def to_text
+          self_and_descendants.map do |node|
+            "#{'*'*(node.level+1)} #{node.id} #{node.to_s} (#{node.parent_id}, #{node.left}, #{node.right})"
+          end.join("\n")
+        end
+        
+      protected
+      
+        def without_self(scope)
+          scope.scoped :conditions => ["#{self.class.table_name}.#{self.class.primary_key} != ?", self]
+        end
+        
+        # All nested set queries should use this nested_set_scope, which performs finds on
+        # the base ActiveRecord class, using the :scope declared in the acts_as_nested_set
+        # declaration.
+        def nested_set_scope
+          options = {:order => quoted_left_column_name}
+          scopes = Array(acts_as_nested_set_options[:scope])
+          options[:conditions] = scopes.inject({}) do |conditions,attr|
+            conditions.merge attr => self[attr]
+          end unless scopes.empty?
+          self.class.base_class.scoped options
+        end
+        
+        # on creation, set automatically lft and rgt to the end of the tree
+        def set_default_left_and_right
+          maxright = nested_set_scope.maximum(right_column_name) || 0
+          # adds the new node to the right of all existing nodes
+          self[left_column_name] = maxright + 1
+          self[right_column_name] = maxright + 2
+        end
+      
+        # Prunes a branch off of the tree, shifting all of the elements on the right
+        # back to the left so the counts still work.
+        def prune_from_tree
+          return if right.nil? || left.nil?
+          diff = right - left + 1
+
+          delete_method = acts_as_nested_set_options[:dependent] == :destroy ?
+            :destroy_all : :delete_all
+
+          self.class.base_class.transaction do
+            nested_set_scope.send(delete_method,
+              ["#{quoted_left_column_name} > ? AND #{quoted_right_column_name} < ?",
+                left, right]
+            )
+            nested_set_scope.update_all(
+              ["#{quoted_left_column_name} = (#{quoted_left_column_name} - ?)", diff],
+              ["#{quoted_left_column_name} >= ?", right]
+            )
+            nested_set_scope.update_all(
+              ["#{quoted_right_column_name} = (#{quoted_right_column_name} - ?)", diff],
+              ["#{quoted_right_column_name} >= ?", right]
+            )
+          end
+        end
+
+        # reload left, right, and parent
+        def reload_nested_set
+          reload(:select => "#{quoted_left_column_name}, " +
+            "#{quoted_right_column_name}, #{quoted_parent_column_name}")
+        end
+        
+        def move_to(target, position)
+          raise ActiveRecord::ActiveRecordError, "You cannot move a new node" if self.new_record?
+          return if callback(:before_move) == false
+          transaction do
+            if target.is_a? self.class.base_class
+              target.reload_nested_set
+            elsif position != :root
+              # load object if node is not an object
+              target = nested_set_scope.find(target)
+            end
+            self.reload_nested_set
+          
+            unless position == :root || move_possible?(target)
+              raise ActiveRecord::ActiveRecordError, "Impossible move, target node cannot be inside moved tree."
+            end
+            
+            bound = case position
+              when :child;  target[right_column_name]
+              when :left;   target[left_column_name]
+              when :right;  target[right_column_name] + 1
+              when :root;   1
+              else raise ActiveRecord::ActiveRecordError, "Position should be :child, :left, :right or :root ('#{position}' received)."
+            end
+          
+            if bound > self[right_column_name]
+              bound = bound - 1
+              other_bound = self[right_column_name] + 1
+            else
+              other_bound = self[left_column_name] - 1
+            end
+
+            # there would be no change
+            return if bound == self[right_column_name] || bound == self[left_column_name]
+          
+            # we have defined the boundaries of two non-overlapping intervals, 
+            # so sorting puts both the intervals and their boundaries in order
+            a, b, c, d = [self[left_column_name], self[right_column_name], bound, other_bound].sort
+
+            new_parent = case position
+              when :child;  target.id
+              when :root;   nil
+              else          target[parent_column_name]
+            end
+
+            self.class.base_class.update_all([
+              "#{quoted_left_column_name} = CASE " +
+                "WHEN #{quoted_left_column_name} BETWEEN :a AND :b " +
+                  "THEN #{quoted_left_column_name} + :d - :b " +
+                "WHEN #{quoted_left_column_name} BETWEEN :c AND :d " +
+                  "THEN #{quoted_left_column_name} + :a - :c " +
+                "ELSE #{quoted_left_column_name} END, " +
+              "#{quoted_right_column_name} = CASE " +
+                "WHEN #{quoted_right_column_name} BETWEEN :a AND :b " +
+                  "THEN #{quoted_right_column_name} + :d - :b " +
+                "WHEN #{quoted_right_column_name} BETWEEN :c AND :d " +
+                  "THEN #{quoted_right_column_name} + :a - :c " +
+                "ELSE #{quoted_right_column_name} END, " +
+              "#{quoted_parent_column_name} = CASE " +
+                "WHEN #{self.class.base_class.primary_key} = :id THEN :new_parent " +
+                "ELSE #{quoted_parent_column_name} END",
+              {:a => a, :b => b, :c => c, :d => d, :id => self.id, :new_parent => new_parent}
+            ], nested_set_scope.proxy_options[:conditions])
+          end
+          target.reload_nested_set if target
+          self.reload_nested_set
+          callback(:after_move)
+        end
+
+      end
+      
+    end
+  end
+end
+
+
+require File.dirname(__FILE__) + '/awesome_nested_set/compatability'
+ 
+ActiveRecord::Base.class_eval do
+  include CollectiveIdea::Acts::NestedSet
+end