acts_as_tree 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1348043cad77cbacfb197eb2d96ff6e1ac84be3
-  data.tar.gz: 305512fe8ce041f273a65fe951343e8a37555a93
+  metadata.gz: 12616559e89eeee23f6e37d97779cc5e1f3c50de
+  data.tar.gz: 32344222affc6cd7746e14fe4a0d218e0fca5e35
 SHA512:
-  metadata.gz: 81a7871c4c36509e001435e8161415fe067768bf8080b1ef824e7d95ec2a710075a3974fc141eb7d15f3d87c3b6d5dbe4a4d9b858d1f32a66555b26cd7885b83
-  data.tar.gz: 033de96f25e5a03f3e605a6c7940ce440819bf0754154ac24dfac1568c34880107647e7d4164ef102d3ad2b07e7f50d6ea634a997b4de10fd65ffdbf5bc7de94
+  metadata.gz: 484644c639c9dceda0c847ac3e57e861ed3429316116ae5d1f34547f8109a0d99811a3a98a205a5e7b6bc50b25348104bb8e03da1043d8b4cc0e8f34d870408f
+  data.tar.gz: 75cf6219da3b6d5a87c46246b16431d81dd5966df06e82d23996e474078afa1d734ab02e0a1afbd544393421ee0f305beff914b29e76cfbe551b3f25438892b3

data/README.md

@@ -74,6 +74,9 @@ 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
+* 2.6.1 - January 18, 2017
+	* Avoid conflicts of `#level` method with existing column, see #57, #58, #60 -- markhgbrewster
+	* Fix tests on rails 4.2 with ruby < 2.1 -- felixbuenemann
 * 2.6.0 - October 9, 2016
 	* Add generations methods, see #56 -- markhgbrewster
 * 2.5.1 - September 8, 2016
@@ -146,7 +149,7 @@ Moving forward we will do our best to support the latest versions of ActiveRecor
    people know that 1101.1.1 has breaking differences from 1100.0. If you're
    adding new features, but not changing existing functionality bump the minor
    version, if you're shipping a bugfix, just bump the patch.
-2. Following the above rules, change the version found in lib/acts_as_tree/version.rb.
+2. Following the above rules, change the version found in lib/acts\_as\_tree/version.rb.
 3. Make sure the Change log in the README includes a brief summary of the versions
    changes, with credit to the contributors.
 4. Commit these changes in one "release-prep" commit (on the master branch).

data/gemfiles/rails-4.2.gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gem "rails", "~> 4.2.0"
 gem "mime-types", "< 3"
+gem "nokogiri", "< 1.7"
 
 gemspec path: "../"

data/lib/acts_as_tree.rb

@@ -127,11 +127,12 @@ module ActsAsTree
 
       # Returns a hash of all nodes grouped by their level in the tree structure.
       #
-      # Class.generations { 0=> [root1, root2], 1=> [root1child1, root1child2, root2child1, root2child2] }
+      # Class.generations # => { 0=> [root1, root2], 1=> [root1child1, root1child2, root2child1, root2child2] }
       def self.generations
-        all.group_by{ |node| node.level }
+        all.group_by{ |node| node.tree_level }
       end
 
+
       if configuration[:counter_cache]
         after_update :update_parents_counter_cache
 
@@ -290,25 +291,38 @@ module ActsAsTree
 
     # Returns all the nodes at the same level in the tree as the current node.
     #
-    #  root1child1.generation [root1child2, root2child1, root2child2]
+    #  root1child1.generation # => [root1child2, root2child1, root2child2]
     def generation
       self_and_generation - [self]
     end
 
     # Returns a reference to the current node and all the nodes at the same level as it in the tree.
     #
-    #  root1child1.generation [root1child1, root1child2, root2child1, root2child2]
+    #  root1child1.self_and_generation # => [root1child1, root1child2, root2child1, root2child2]
     def self_and_generation
-      self.class.select {|node| node.level == self.level }
+      self.class.select {|node| node.tree_level == self.tree_level }
     end
 
-    # Returns the level (depth) of the current node
+    # Returns the level (depth) of the current node 
     #
-    #  root1child1.level 1
-    def level
+    #  root1child1.tree_level # => 1
+    def tree_level
       self.ancestors.size
     end
 
+    # Returns the level (depth) of the current node unless level is a column on the node. 
+    # Allows backwards compatibility with older versions of the gem.  
+    # Allows integration with apps using level as a column name.
+    #
+    #  root1child1.level # => 1
+    def level
+      if self.class.column_names.include?('level')
+        super
+      else
+        tree_level
+      end
+    end
+
     # Returns children (without subchildren) and current node itself.
     #
     #   root.self_and_children # => [root, child1]

data/lib/acts_as_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTree
-  VERSION = "2.6.0"
+  VERSION = "2.6.1"
 end

data/test/acts_as_tree_test.rb

@@ -60,6 +60,12 @@ def setup_db(options = {})
         t.column :children_count, :integer, default: 0 if options[:counter_cache]
         t.timestamps null: false
       end
+
+      create_table :level_mixins, force: true do |t|
+        t.column :level, :string
+        t.column :parent_id, :integer
+        t.timestamps null: false
+      end
     end
 
     # Fix broken reset_column_information in some activerecord versions.
@@ -75,10 +81,23 @@ class Mixin < ActiveRecord::Base
   include ActsAsTree
 end
 
+class LevelMixin < ActiveRecord::Base
+  include ActsAsTree
+  acts_as_tree foreign_key: "parent_id", order: "id"
+end
+
 class TreeMixin < Mixin
   acts_as_tree foreign_key: "parent_id", order: "id"
 end
 
+class TreeMixinWithLevelMethod < Mixin
+  acts_as_tree foreign_key: "parent_id", order: "id"
+
+  def level
+    'Has Level Method'
+  end
+end
+
 class TreeMixinWithoutOrder < Mixin
   acts_as_tree foreign_key: "parent_id"
 end
@@ -541,7 +560,7 @@ class ExternalTreeTest < TreeTest
   end
 end
 
-class GenertaionMethods < ActsAsTreeTestCase
+class GenerationMethods < ActsAsTreeTestCase
   def setup
     setup_db
 
@@ -555,6 +574,8 @@ class GenertaionMethods < ActsAsTreeTestCase
     @root2_child2       = TreeMixin.create! parent_id: @root2.id
     @root2_child1_child = TreeMixin.create! parent_id: @root2_child1.id
     @root3              = TreeMixin.create!
+    @level_column       = LevelMixin.create! level: 'Has Level Column'
+    @level_method       = TreeMixinWithLevelMethod.create!
   end
 
   def test_generations
@@ -586,11 +607,23 @@ class GenertaionMethods < ActsAsTreeTestCase
     assert_equal [@child1_child_child], @child1_child_child.self_and_generation
   end
 
+  def test_tree_level
+    assert_equal 0, @root1.tree_level
+    assert_equal 1, @root_child1.tree_level
+    assert_equal 2, @child1_child.tree_level
+    assert_equal 3, @child1_child_child.tree_level
+  end
+
   def test_level
     assert_equal 0, @root1.level
     assert_equal 1, @root_child1.level
     assert_equal 2, @child1_child.level
     assert_equal 3, @child1_child_child.level
   end
+
+  def test_alias_tree_level
+    assert_equal 'Has Level Method', @level_method.level
+    assert_equal 'Has Level Column', @level_column.level
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tree
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Erik Dahlstrand
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-09 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord