acts_as_tree 1.2.0 → 1.3.0

data/.travis.yml

@@ -2,4 +2,21 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
-  - ruby-head
+  - 2.0.0
+
+gemfile:
+  - gemfiles/rails-3.0.gemfile
+  - gemfiles/rails-3.1.gemfile
+  - gemfiles/rails-3.2.gemfile
+  - gemfiles/rails-4.0.gemfile
+
+matrix:
+  exclude:
+    # rails 4.0 requries ruby 1.9.3 or newer
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails-4.0.gemfile
+    # rails < 3.2 is unsupported on ruby 2.0
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails-3.0.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails-3.1.gemfile

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 

data/README.md

@@ -1,6 +1,5 @@
-# ActsAsTree [![Build Status](https://secure.travis-ci.org/amerine/acts_as_tree.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/amerine/acts_as_tree.png?travis)][gemnasium]
+# ActsAsTree [![Build Status](https://secure.travis-ci.org/amerine/acts_as_tree.png?branch=master)][travis]
 [travis]: (http://travis-ci.org/amerine/acts_as_tree)
-[gemnasium]: (https://gemnasium.com/amerine/acts_as_tree)
 
 
 ActsAsTree extends ActiveRecord to add simple support for organizing items into
@@ -8,28 +7,33 @@ parent–children relationships.
 
 ## Example
 
-    class Category < ActiveRecord::Base
-      include ActsAsTree
+```ruby
+class Category < ActiveRecord::Base
+  include ActsAsTree
 
-      acts_as_tree order: "name"
-    end
+  acts_as_tree order: "name"
+end
 
-    root      = Category.create("name" => "root")
-    child1    = root.children.create("name" => "child1")
-    subchild1 = child1.children.create("name" => "subchild1")
+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
+root.parent   # => nil
+child1.parent # => root
+root.children # => [child1]
+root.children.first.children.first # => subchild1
+```
 
 ## Compatibility
 
-We no longer support Ruby 1.8 or versions if Rails/ActiveRecord older than 3.0. If you're using a version of ActiveRecord older than 3.0 please use 0.1.1.
+We no longer support Ruby 1.8 or versions of Rails/ActiveRecord older than 3.0. If you're using a version of ActiveRecord older than 3.0 please use 0.1.1.
 
 Moving forward we will do our best to support the latest versions of ActiveRecord and Ruby.
 
 ## Change Log
+* 1.3.0 - March 29th, 2013
+  * Rails 4.0 Support! -- mischa78
+  * Readme Fixes -- mischa78 & seanhussey
 * 1.2.0 - October 29th, 2012
 	* Adding new `self_with_ancestors` accessor -- fbuenemann
 	* `roots` is now a scope.

data/gemfiles/rails-3.0.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 3.0"
+gem "acts_as_tree", path: "../"
+
+gemspec path: "../"

data/gemfiles/rails-3.1.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 3.1"
+gem "acts_as_tree", path: "../"
+
+gemspec path: "../"

data/gemfiles/rails-3.2.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 3.2"
+gem "acts_as_tree", path: "../"
+
+gemspec path: "../"

data/gemfiles/rails-4.0.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 4.0.0.beta1"
+gem "acts_as_tree", path: "../"
+
+gemspec path: "../"

data/lib/acts_as_tree.rb

@@ -75,11 +75,19 @@ module ActsAsTree
         counter_cache: configuration[:counter_cache],
         inverse_of:    :children
 
-      has_many :children, class_name:  name,
-        foreign_key: configuration[:foreign_key],
-        order:       configuration[:order],
-        dependent:   configuration[:dependent],
-        inverse_of:  :parent
+      if ActiveRecord::VERSION::MAJOR >= 4
+        has_many :children, lambda { order configuration[:order] },
+          class_name:  name,
+          foreign_key: configuration[:foreign_key],
+          dependent:   configuration[:dependent],
+          inverse_of:  :parent
+      else
+        has_many :children, class_name:  name,
+          foreign_key: configuration[:foreign_key],
+          order:       configuration[:order],
+          dependent:   configuration[:dependent],
+          inverse_of:  :parent
+      end
 
       class_eval <<-EOV
         include ActsAsTree::InstanceMethods

data/lib/acts_as_tree/version.rb

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

data/test/acts_as_tree_test.rb

@@ -204,9 +204,9 @@ class TreeTestWithEagerLoading < Test::Unit::TestCase
   end
 
   def test_eager_association_loading
-    roots = TreeMixin.find :all, include: :children,
-                                 conditions: "mixins.parent_id IS NULL",
-                                 order: "mixins.id"
+    roots = TreeMixin.includes(:children)
+                     .where('mixins.parent_id IS NULL')
+                     .order('mixins.id')
 
     assert_equal [@root1, @root2, @root3], roots
 
@@ -218,25 +218,25 @@ class TreeTestWithEagerLoading < Test::Unit::TestCase
   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'
+    root_node = RecursivelyCascadedTreeMixin.includes({children: {children: :children}})
+                                            .order('mixins.id')
+                                            .first
 
     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'
+    root_node = RecursivelyCascadedTreeMixin.includes({first_child: {first_child: :first_child}})
+                                            .order('mixins.id')
+                                            .first
 
     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'
+    leaf_node = RecursivelyCascadedTreeMixin.includes({parent: {parent: :parent}})
+                                            .order('mixins.id DESC')
+                                            .first
 
     assert_equal @rc1, assert_no_queries { leaf_node.parent.parent.parent }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tree
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -78,6 +78,10 @@ files:
 - README.md
 - Rakefile
 - acts_as_tree.gemspec
+- gemfiles/rails-3.0.gemfile
+- gemfiles/rails-3.1.gemfile
+- gemfiles/rails-3.2.gemfile
+- gemfiles/rails-4.0.gemfile
 - lib/acts_as_tree.rb
 - lib/acts_as_tree/active_record/acts/tree.rb
 - lib/acts_as_tree/railtie.rb