acts_as_tree 1.1.0 → 1.2.0

data/README.md

@@ -30,6 +30,9 @@ We no longer support Ruby 1.8 or versions if Rails/ActiveRecord older than 3.0.
 Moving forward we will do our best to support the latest versions of ActiveRecord and Ruby.
 
 ## Change Log
+* 1.2.0 - October 29th, 2012
+	* Adding new `self_with_ancestors` accessor -- fbuenemann
+	* `roots` is now a scope.
 * 1.1.0 - April 24th, 2012
 	* Deprecate the ActiveRecord::Acts::Tree module in favor of ActsAsTree
 * 1.0.1 - April 18th, 2012

data/lib/acts_as_tree/railtie.rb

@@ -0,0 +1,11 @@
+module ActsAsTree
+
+  class Railtie < Rails::Railtie
+    initializer 'acts_as_tree.insert_into_active_record' do
+      ActiveSupport.on_load :active_record do
+        ActiveRecord::Base.send(:include, ActsAsTree)
+      end
+    end
+  end
+
+end

data/lib/acts_as_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTree
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/acts_as_tree.rb

@@ -3,22 +3,9 @@ require 'acts_as_tree/version'
 module ActsAsTree
 
   if defined? Rails::Railtie
-    require 'rails'
-    class Railtie < Rails::Railtie
-      initializer 'acts_as_tree.insert_into_active_record' do
-        ActiveSupport.on_load :active_record do
-          ActsAsTree::Railtie.insert
-        end
-      end
-    end
-  end
-
-  class Railtie
-    def self.insert
-      if defined?(ActiveRecord)
-        ActiveRecord::Base.send(:include, ActsAsTree)
-      end
-    end
+    require 'acts_as_tree/railtie'
+  elsif defined? Rails::Initializer
+    raise "acts_as_tree 1.0 is not compatible with Rails 2.3 or older"
   end
 
   def self.included(base)
@@ -31,7 +18,7 @@ module ActsAsTree
   # +parent_id+.
   #
   #   class Category < ActiveRecord::Base
-  #     include ActiveRecord::Acts:Tree
+  #     include ActsAsTree
   #
   #     acts_as_tree :order => "name"
   #   end
@@ -95,23 +82,19 @@ module ActsAsTree
         inverse_of:  :parent
 
       class_eval <<-EOV
-            include ActsAsTree::InstanceMethods
+        include ActsAsTree::InstanceMethods
 
-            after_update :update_parents_counter_cache
+        after_update :update_parents_counter_cache
 
-            def self.roots
-              order_option = %Q{#{configuration.fetch :order, "nil"}}
-
-              find(:all, conditions: "#{configuration[:foreign_key]} IS NULL",
-                         order:      order_option)
-            end
-
-            def self.root
-              order_option = %Q{#{configuration.fetch :order, "nil"}}
+        def self.roots
+          order_option = %Q{#{configuration.fetch :order, "nil"}}
+          where(:#{configuration[:foreign_key]} => nil).order(order_option)
+        end
 
-              find(:first, conditions: "#{configuration[:foreign_key]} IS NULL",
-                           order:      order_option)
-            end
+        def self.root
+          order_option = %Q{#{configuration.fetch :order, "nil"}}
+          self.roots.first
+        end
       EOV
     end
   end
@@ -154,6 +137,13 @@ module ActsAsTree
       [self] + self.children
     end
 
+    # Returns ancestors and current node itself.
+    #
+    #   subchild1.self_and_ancestors # => [subchild1, child1, root]
+    def self_and_ancestors
+      [self] + self.ancestors
+    end
+
     private
 
     def update_parents_counter_cache

data/test/acts_as_tree_test.rb

@@ -161,6 +161,11 @@ class TreeTest < Test::Unit::TestCase
     assert_equal [@root2], @root2.self_and_children
   end
 
+  def test_self_and_ancestors
+    assert_equal [@child1_child, @root_child1, @root1], @child1_child.self_and_ancestors
+    assert_equal [@root2], @root2.self_and_ancestors
+  end
+
   def test_nullify
     root4       = TreeMixinNullify.create!
     root4_child = TreeMixinNullify.create! parent_id: root4.id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tree
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70112110455280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70112110455280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70112110454840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +40,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112110454840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70112110454380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,7 +56,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112110454380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A gem that adds simple support for organizing ActiveRecord models into
   parent–children relationships.
 email:
@@ -65,6 +80,7 @@ files:
 - acts_as_tree.gemspec
 - lib/acts_as_tree.rb
 - lib/acts_as_tree/active_record/acts/tree.rb
+- lib/acts_as_tree/railtie.rb
 - lib/acts_as_tree/version.rb
 - test/acts_as_tree_test.rb
 homepage: https://github.com/amerine/acts_as_tree
@@ -88,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Provides a simple tree behaviour to active_record models.