Moved acts_as_tree to gemfile.

Gemfile

@@ -34,6 +34,7 @@ gem 'simple-navigation'
 gem 'simple-navigation-bootstrap'
 gem 'meta_search'
 gem 'acts_as_versioned', git: 'git://github.com/technoweenie/acts_as_versioned.git' # Use this instead of rubygem
+gem 'acts_as_tree'
 
 group :production do
   gem 'exception_notification', :require => 'exception_notifier'

Gemfile.lock

@@ -42,6 +42,8 @@ GEM
     activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    acts_as_tree (1.2.0)
+      activerecord (>= 3.0.0)
     arel (3.0.2)
     builder (3.0.4)
     client_side_validations (3.1.4)
@@ -187,6 +189,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  acts_as_tree
   acts_as_versioned!
   client_side_validations
   coffee-rails (~> 3.2.1)

app/models/page.rb

@@ -1,9 +1,11 @@
 class Page < ActiveRecord::Base
+  include ActsAsTree
   
   belongs_to :user, :foreign_key => 'updated_by'
 
   acts_as_versioned version_column: :lock_version, limit: 20
   self.non_versioned_columns += %w(permalink created_at title)
+
   acts_as_tree :order => "title"
 
   attr_accessor :old_title # Save title to create redirect page when editing title

vendor/plugins/acts_as_tree/README

@@ -1,26 +0,0 @@
-acts_as_tree
-============
-
-Specify this +acts_as+ extension if you want to model a tree structure by providing a parent association and a children
-association. This requires that you have a foreign key column, which by default is called +parent_id+.
-
-  class Category < ActiveRecord::Base
-    acts_as_tree :order => "name"
-  end
-
-  Example:
-  root
-   \_ child1
-        \_ subchild1
-        \_ subchild2
-
-  root      = Category.create("name" => "root")
-  child1    = root.children.create("name" => "child1")
-  subchild1 = child1.children.create("name" => "subchild1")
-
-  root.parent   # => nil
-  child1.parent # => root
-  root.children # => [child1]
-  root.children.first.children.first # => subchild1
-
-Copyright (c) 2007 David Heinemeier Hansson, released under the MIT license  

vendor/plugins/acts_as_tree/Rakefile

@@ -1,22 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test acts_as_tree plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for acts_as_tree plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'acts_as_tree'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

vendor/plugins/acts_as_tree/init.rb

@@ -1 +0,0 @@
-ActiveRecord::Base.send :include, ActiveRecord::Acts::Tree

vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb

@@ -1,96 +0,0 @@
-module ActiveRecord
-  module Acts
-    module Tree
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      # Specify this +acts_as+ extension if you want to model a tree structure by providing a parent association and a children
-      # association. This requires that you have a foreign key column, which by default is called +parent_id+.
-      #
-      #   class Category < ActiveRecord::Base
-      #     acts_as_tree :order => "name"
-      #   end
-      #
-      #   Example:
-      #   root
-      #    \_ child1
-      #         \_ subchild1
-      #         \_ subchild2
-      #
-      #   root      = Category.create("name" => "root")
-      #   child1    = root.children.create("name" => "child1")
-      #   subchild1 = child1.children.create("name" => "subchild1")
-      #
-      #   root.parent   # => nil
-      #   child1.parent # => root
-      #   root.children # => [child1]
-      #   root.children.first.children.first # => subchild1
-      #
-      # In addition to the parent and children associations, the following instance methods are added to the class
-      # after calling <tt>acts_as_tree</tt>:
-      # * <tt>siblings</tt> - Returns all the children of the parent, excluding the current node (<tt>[subchild2]</tt> when called on <tt>subchild1</tt>)
-      # * <tt>self_and_siblings</tt> - Returns all the children of the parent, including the current node (<tt>[subchild1, subchild2]</tt> when called on <tt>subchild1</tt>)
-      # * <tt>ancestors</tt> - Returns all the ancestors of the current node (<tt>[child1, root]</tt> when called on <tt>subchild2</tt>)
-      # * <tt>root</tt> - Returns the root of the current node (<tt>root</tt> when called on <tt>subchild2</tt>)
-      module ClassMethods
-        # Configuration options are:
-        #
-        # * <tt>foreign_key</tt> - specifies the column name to use for tracking of the tree (default: +parent_id+)
-        # * <tt>order</tt> - makes it possible to sort the children according to this SQL snippet.
-        # * <tt>counter_cache</tt> - keeps a count in a +children_count+ column if set to +true+ (default: +false+).
-        def acts_as_tree(options = {})
-          configuration = { :foreign_key => "parent_id", :order => nil, :counter_cache => nil }
-          configuration.update(options) if options.is_a?(Hash)
-
-          belongs_to :parent, :class_name => name, :foreign_key => configuration[:foreign_key], :counter_cache => configuration[:counter_cache]
-          has_many :children, :class_name => name, :foreign_key => configuration[:foreign_key], :order => configuration[:order], :dependent => :destroy
-
-          class_eval <<-EOV
-            include ActiveRecord::Acts::Tree::InstanceMethods
-
-            def self.roots
-              find(:all, :conditions => "#{configuration[:foreign_key]} IS NULL", :order => #{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}})
-            end
-
-            def self.root
-              find(:first, :conditions => "#{configuration[:foreign_key]} IS NULL", :order => #{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}})
-            end
-          EOV
-        end
-      end
-
-      module InstanceMethods
-        # Returns list of ancestors, starting from parent until root.
-        #
-        #   subchild1.ancestors # => [child1, root]
-        def ancestors
-          node, nodes = self, []
-          nodes << node = node.parent while node.parent
-          nodes
-        end
-
-        # Returns the root node of the tree.
-        def root
-          node = self
-          node = node.parent while node.parent
-          node
-        end
-
-        # Returns all siblings of the current node.
-        #
-        #   subchild1.siblings # => [subchild2]
-        def siblings
-          self_and_siblings - [self]
-        end
-
-        # Returns all siblings and a reference to the current node.
-        #
-        #   subchild1.self_and_siblings # => [subchild1, subchild2]
-        def self_and_siblings
-          parent ? parent.children : self.class.roots
-        end
-      end
-    end
-  end
-end

vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb

@@ -1,219 +0,0 @@
-require 'test/unit'
-
-require 'rubygems'
-require 'active_record'
-
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require File.dirname(__FILE__) + '/../init'
-
-class Test::Unit::TestCase
-  def assert_queries(num = 1)
-    $query_count = 0
-    yield
-  ensure
-    assert_equal num, $query_count, "#{$query_count} instead of #{num} queries were executed."
-  end
-
-  def assert_no_queries(&block)
-    assert_queries(0, &block)
-  end
-end
-
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
-
-# AR keeps printing annoying schema statements
-$stdout = StringIO.new
-
-def setup_db
-  ActiveRecord::Base.logger
-  ActiveRecord::Schema.define(:version => 1) do
-    create_table :mixins do |t|
-      t.column :type, :string
-      t.column :parent_id, :integer
-    end
-  end
-end
-
-def teardown_db
-  ActiveRecord::Base.connection.tables.each do |table|
-    ActiveRecord::Base.connection.drop_table(table)
-  end
-end
-
-class Mixin < ActiveRecord::Base
-end
-
-class TreeMixin < Mixin 
-  acts_as_tree :foreign_key => "parent_id", :order => "id"
-end
-
-class TreeMixinWithoutOrder < Mixin
-  acts_as_tree :foreign_key => "parent_id"
-end
-
-class RecursivelyCascadedTreeMixin < Mixin
-  acts_as_tree :foreign_key => "parent_id"
-  has_one :first_child, :class_name => 'RecursivelyCascadedTreeMixin', :foreign_key => :parent_id
-end
-
-class TreeTest < Test::Unit::TestCase
-  
-  def setup
-    setup_db
-    @root1 = TreeMixin.create!
-    @root_child1 = TreeMixin.create! :parent_id => @root1.id
-    @child1_child = TreeMixin.create! :parent_id => @root_child1.id
-    @root_child2 = TreeMixin.create! :parent_id => @root1.id
-    @root2 = TreeMixin.create!
-    @root3 = TreeMixin.create!
-  end
-
-  def teardown
-    teardown_db
-  end
-
-  def test_children
-    assert_equal @root1.children, [@root_child1, @root_child2]
-    assert_equal @root_child1.children, [@child1_child]
-    assert_equal @child1_child.children, []
-    assert_equal @root_child2.children, []
-  end
-
-  def test_parent
-    assert_equal @root_child1.parent, @root1
-    assert_equal @root_child1.parent, @root_child2.parent
-    assert_nil @root1.parent
-  end
-
-  def test_delete
-    assert_equal 6, TreeMixin.count
-    @root1.destroy
-    assert_equal 2, TreeMixin.count
-    @root2.destroy
-    @root3.destroy
-    assert_equal 0, TreeMixin.count
-  end
-
-  def test_insert
-    @extra = @root1.children.create
-
-    assert @extra
-
-    assert_equal @extra.parent, @root1
-
-    assert_equal 3, @root1.children.size
-    assert @root1.children.include?(@extra)
-    assert @root1.children.include?(@root_child1)
-    assert @root1.children.include?(@root_child2)
-  end
-
-  def test_ancestors
-    assert_equal [], @root1.ancestors
-    assert_equal [@root1], @root_child1.ancestors
-    assert_equal [@root_child1, @root1], @child1_child.ancestors
-    assert_equal [@root1], @root_child2.ancestors
-    assert_equal [], @root2.ancestors
-    assert_equal [], @root3.ancestors
-  end
-
-  def test_root
-    assert_equal @root1, TreeMixin.root
-    assert_equal @root1, @root1.root
-    assert_equal @root1, @root_child1.root
-    assert_equal @root1, @child1_child.root
-    assert_equal @root1, @root_child2.root
-    assert_equal @root2, @root2.root
-    assert_equal @root3, @root3.root
-  end
-
-  def test_roots
-    assert_equal [@root1, @root2, @root3], TreeMixin.roots
-  end
-
-  def test_siblings
-    assert_equal [@root2, @root3], @root1.siblings
-    assert_equal [@root_child2], @root_child1.siblings
-    assert_equal [], @child1_child.siblings
-    assert_equal [@root_child1], @root_child2.siblings
-    assert_equal [@root1, @root3], @root2.siblings
-    assert_equal [@root1, @root2], @root3.siblings
-  end
-
-  def test_self_and_siblings
-    assert_equal [@root1, @root2, @root3], @root1.self_and_siblings
-    assert_equal [@root_child1, @root_child2], @root_child1.self_and_siblings
-    assert_equal [@child1_child], @child1_child.self_and_siblings
-    assert_equal [@root_child1, @root_child2], @root_child2.self_and_siblings
-    assert_equal [@root1, @root2, @root3], @root2.self_and_siblings
-    assert_equal [@root1, @root2, @root3], @root3.self_and_siblings
-  end           
-end
-
-class TreeTestWithEagerLoading < Test::Unit::TestCase
-  
-  def setup 
-    teardown_db
-    setup_db
-    @root1 = TreeMixin.create!
-    @root_child1 = TreeMixin.create! :parent_id => @root1.id
-    @child1_child = TreeMixin.create! :parent_id => @root_child1.id
-    @root_child2 = TreeMixin.create! :parent_id => @root1.id
-    @root2 = TreeMixin.create!
-    @root3 = TreeMixin.create!
-    
-    @rc1 = RecursivelyCascadedTreeMixin.create!
-    @rc2 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc1.id 
-    @rc3 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc2.id
-    @rc4 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc3.id
-  end
-
-  def teardown
-    teardown_db
-  end
-    
-  def test_eager_association_loading
-    roots = TreeMixin.find(:all, :include => :children, :conditions => "mixins.parent_id IS NULL", :order => "mixins.id")
-    assert_equal [@root1, @root2, @root3], roots                     
-    assert_no_queries do
-      assert_equal 2, roots[0].children.size
-      assert_equal 0, roots[1].children.size
-      assert_equal 0, roots[2].children.size
-    end   
-  end
-  
-  def test_eager_association_loading_with_recursive_cascading_three_levels_has_many
-    root_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :children => { :children => :children } }, :order => 'mixins.id')
-    assert_equal @rc4, assert_no_queries { root_node.children.first.children.first.children.first }
-  end
-  
-  def test_eager_association_loading_with_recursive_cascading_three_levels_has_one
-    root_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :first_child => { :first_child => :first_child } }, :order => 'mixins.id')
-    assert_equal @rc4, assert_no_queries { root_node.first_child.first_child.first_child }
-  end
-  
-  def test_eager_association_loading_with_recursive_cascading_three_levels_belongs_to
-    leaf_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :parent => { :parent => :parent } }, :order => 'mixins.id DESC')
-    assert_equal @rc1, assert_no_queries { leaf_node.parent.parent.parent }
-  end 
-end
-
-class TreeTestWithoutOrder < Test::Unit::TestCase
-  
-  def setup                               
-    setup_db
-    @root1 = TreeMixinWithoutOrder.create!
-    @root2 = TreeMixinWithoutOrder.create!
-  end
-
-  def teardown
-    teardown_db
-  end
-
-  def test_root
-    assert [@root1, @root2].include?(TreeMixinWithoutOrder.root)
-  end
-  
-  def test_roots
-    assert_equal [], [@root1, @root2] - TreeMixinWithoutOrder.roots
-  end
-end