acts_as_tree 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4b7ecba20760317473e4fe15ae47804ad57ff68
-  data.tar.gz: cface22965a3e581aded8ba0976226c11bcbcece
+  metadata.gz: 1c41a4e1bb7566bed286be2b6d709d809d1efab1
+  data.tar.gz: 4c3136bd0e036383541e9b28260918c8bcabd99e
 SHA512:
-  metadata.gz: 10c6e09214046e11b68883211e46ddc1c8879771bb80ddd534eeba0466620f0d5c827f52378514af1db77add3464ca2c32b1207ab5b333a5062b015bd33e706f
-  data.tar.gz: 9cbf66c8158e7037a77167c9279d91c6978129b93c7ff47e65a67e01bd771e2973a50ebf3434e7bfb83fe9cdfde4ed0edce5d2b9c29ce7b01b5cfc0d7bf68298
+  metadata.gz: da1d685d61ea99d02e4293ccca0e48630730b972b72d391b4b8669d27ab50aebbb3b07b9d8de57d1c415f2d52f4605f79c0045c77f9c4039b29ab186d5440b6a
+  data.tar.gz: 8a93205c2921f71a909dc6c16e651e47a4c2c4c5ab7dd9cd80f517b7413f7675c04b9e1eaff12289cd7b784c3c581056c8045cb70253380a90bacf3e3cdb648f

data/README.md

@@ -8,8 +8,6 @@ ActsAsTree extends ActiveRecord to add simple support for organizing items into
 
 ```ruby
 class Category < ActiveRecord::Base
-  include ActsAsTree
-
   acts_as_tree order: "name"
 end
 
@@ -27,7 +25,6 @@ We also have a convenient `Presentation` module you can mixin if you want a litt
 
 ```ruby
 class Category < ActiveRecord::Base
-  include ActsAsTree
   extend ActsAsTree::Presentation
 
   acts_as_tree order: "name"
@@ -51,6 +48,8 @@ We no longer support Ruby 1.8 or versions of 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.5.1 - March 28, 2014
+	* Fixing descendants modification bug. See #20 -- amerine, tmuerell
 * 1.5.0 - December 16th, 2013
 	* `Added new descendants method` -- adamkleingit
 	* Fixed warning message -- akicho8
@@ -86,6 +85,9 @@ Moving forward we will do our best to support the latest versions of ActiveRecor
    your own version, that is fine but bump version in a commit by itself so we can
    ignore when we pull)
 5. Send us a pull request. Bonus points for topic branches.
+6. All contributors to this project, after their first accepted patch, are given push
+   access to the repository and are welcome as full contributors to ActsAsTree. All
+   we ask is that all changes go through CI and a Pull Request before merging.
 
 ## License (MIT)
 

data/acts_as_tree.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   # Dependencies (installed via 'bundle install')...
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rdoc"
+  s.add_development_dependency "minitest", "~> 4.7.5"
 end

data/lib/acts_as_tree.rb

@@ -152,7 +152,7 @@ module ActsAsTree
     #
     #   root.descendants # => [child1, child2, subchild1, subchild2, subchild3, subchild4]
     def descendants
-      children.each_with_object(children) {|child, arr|
+      children.each_with_object(children.to_a) {|child, arr|
         arr.concat child.descendants
       }.uniq
     end

data/lib/acts_as_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTree
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/test/acts_as_tree_test.rb

@@ -1,8 +1,9 @@
-require 'test/unit'
+require 'minitest/autorun'
+require 'minitest/benchmark'
 require 'active_record'
 require 'acts_as_tree'
 
-class Test::Unit::TestCase
+class MiniTest::Unit::TestCase
   def assert_queries(num = 1)
     $query_count = 0
     yield
@@ -62,7 +63,7 @@ class RecursivelyCascadedTreeMixin < Mixin
   has_one :first_child, class_name: 'RecursivelyCascadedTreeMixin', foreign_key: :parent_id
 end
 
-class TreeTest < Test::Unit::TestCase
+class TreeTest < MiniTest::Unit::TestCase
 
   def setup
     setup_db
@@ -230,10 +231,58 @@ class TreeTest < Test::Unit::TestCase
     TreeMixin.tree_view(:id)
     assert_equal tree_view_outputs, $stdout.string
   end
+end
+
+class TestDeepDescendantsPerformance < MiniTest::Unit::TestCase
+  def setup
+    teardown_db
+    setup_db
+    @root1 = TreeMixin.create!
+    create_cascade_children @root1, "root1", 10
+
+    @root2        = TreeMixin.create!
+    create_cascade_children @root2, "root2", 20
+
+    @root3        = TreeMixin.create!
+    create_cascade_children @root3, "root3", 30
+
+    @root4        = TreeMixin.create!
+    create_cascade_children @root4, "root4", 40
+
+    @root5        = TreeMixin.create!
+    create_cascade_children @root5, "root5", 50
+  end
 
+  def teardown
+    teardown_db
+  end
+
+  def self.bench_range
+    [1, 2, 3, 4, 5]
+  end
+
+  def bench_descendants
+    assert_performance_linear 0.99 do |x|
+      obj = instance_variable_get "@root#{x}"
+      obj.descendants
+    end
+  end
+
+  def create_cascade_children parent, parent_name, count
+    first_child_name = "@#{parent_name}_child1"
+    first_record = TreeMixin.create! parent_id: parent.id
+    instance_variable_set first_child_name, first_record
+
+    (2...count).each do |child_count|
+      name       = "@#{parent_name}_child#{child_count}"
+      prev       = instance_variable_get "@#{parent_name}_child#{child_count - 1}"
+      new_record = TreeMixin.create! parent_id: prev.id
+      instance_variable_set name, new_record
+    end
+  end
 end
 
-class TreeTestWithEagerLoading < Test::Unit::TestCase
+class TreeTestWithEagerLoading < MiniTest::Unit::TestCase
 
   def setup
     teardown_db
@@ -294,7 +343,7 @@ class TreeTestWithEagerLoading < Test::Unit::TestCase
   end
 end
 
-class TreeTestWithoutOrder < Test::Unit::TestCase
+class TreeTestWithoutOrder < MiniTest::Unit::TestCase
 
   def setup
     setup_db
@@ -315,7 +364,7 @@ class TreeTestWithoutOrder < Test::Unit::TestCase
   end
 end
 
-class UnsavedTreeTest < Test::Unit::TestCase
+class UnsavedTreeTest < MiniTest::Unit::TestCase
   def setup
     setup_db
     @root       = TreeMixin.new
@@ -333,7 +382,7 @@ class UnsavedTreeTest < Test::Unit::TestCase
 end
 
 
-class TreeTestWithCounterCache < Test::Unit::TestCase
+class TreeTestWithCounterCache < MiniTest::Unit::TestCase
   def setup
     teardown_db
     setup_db

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tree
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Erik Dahlstrand
@@ -11,50 +11,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.7.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.7.5
 description: A gem that adds simple support for organizing ActiveRecord models into
   parent–children relationships.
 email:
@@ -65,8 +79,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -85,22 +99,22 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provides a simple tree behaviour to active_record models.