acts_as_tree 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0010c309598e23c144cafccabd21527bcd4b52e0
-  data.tar.gz: dd8825aff3d508e09c8d5f28240e010af7d19716
+  metadata.gz: 1195db0f542f5b2a66b53ed35a6a3d0e821f282f
+  data.tar.gz: 4564ce6846efa1aeb4f03dc632a1e8f151273757
 SHA512:
-  metadata.gz: 2fed1a5bf286379948f3b11797f46d03b4db877b648f9a28221495e6cde387d75fe6905db99ea84a947c9df72560cc3d1de718cce269e491fd50f6daf195262e
-  data.tar.gz: 0b08f66b4c2ff06faaa9129c662ad4e55f1286dc357bfe435ffe720ee760cd289d482c4dca5b27d5e1cbc173cbb1eb8b46b60ac759eb492d35c8692fa94c6692
+  metadata.gz: 4fd0449d5a36b43d11738b6a3d7097a69977e08464530d374b55dd6120bd65f4baeaae3f4122726e609cab2168383def9be5e8c9f6be3f42760e665032105e54
+  data.tar.gz: aec46f7ee97a3731221c21f625efea8bbf7fc86f5ded9e8e7abe77305722711171beaf61d61b412a62ee4e2640980a5c8956a604ef62160ae44830b89a0c165f

data/README.md

@@ -59,6 +59,14 @@ In your view you could traverse the tree using
 <% end %>
 ```
 
+You also could use walk\_tree as an instance method such as:
+
+```erb
+<% Page.first.walk_tree do |page, level| %>
+  <%= link_to "#{'-'*level}#{page.name}", page_path(page) %><br />
+<% end %>
+```
+
 ## Compatibility
 
 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.
@@ -66,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.2.0 - June 15, 2015
+	* Added TreeWalker.walk\_tree instance method. See #32, #37, #38 -- felixbuenemann, genewoo
+	* Fix tests on rails 3.x. See #36 -- marshall-lee
 * 2.1.0 - September 25, 2014
 	* Added TreeWalker. See #30 -- 545ch4
 * 2.0.0 - July 3, 2014

data/gemfiles/rails-3.0.gemfile

@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 3.0"
+gem "rails", "~> 3.0.0"
 gem "acts_as_tree", path: "../"
+gem "i18n", "< 0.7"
 
 gemspec path: "../"

data/gemfiles/rails-3.1.gemfile

@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 3.1"
+gem "rails", "~> 3.1.0"
 gem "acts_as_tree", path: "../"
+gem "i18n", "< 0.7"
 
 gemspec path: "../"

data/gemfiles/rails-3.2.gemfile

@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 3.2"
+gem "rails", "~> 3.2.0"
 gem "acts_as_tree", path: "../"
+gem "i18n", "< 0.7"
 
 gemspec path: "../"

data/gemfiles/rails-4.0.gemfile

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

data/lib/acts_as_tree.rb

@@ -185,30 +185,39 @@ module ActsAsTree
     #   <%= link_to "#{' '*level}#{page.name}", page_path(page) %><br />
     # <% end %>
     #
-    def walk_tree(_options = {}, level = 0, node = nil, &block)
-      options = {:algorithm => :dfs, :where => {}}.update(_options)
-      case options[:algorithm]
-      when :bfs
-        nodes = (node.nil? ? roots : node.children).where(options[:where])
-        nodes.each do |child|
-          block.call child, level
-        end
-        nodes.each do |child|
-          walk_tree options, level + 1, child, &block
-        end
-      else
-        if node.nil?
-          roots.where(options[:where]).each do |root_node|
-            walk_tree options, level, root_node, &block
-          end
-        else
-          block.call node, level
-          node.children.where(options[:where]).each do |child|
-            walk_tree options, level + 1, child, &block
-          end
+    # There is also a walk_tree instance method that starts walking from
+    # the node it is called on.
+    #
+    def walk_tree(options = {}, &block)
+      algorithm = options.fetch :algorithm, :dfs
+      where = options.fetch :where, {}
+      send("walk_tree_#{algorithm}", where, &block)
+    end
+
+    def self.extended(mod)
+      mod.class_eval do
+        def walk_tree(options = {}, &block)
+          algorithm = options.fetch :algorithm, :dfs
+          where = options.fetch :where, {}
+          self.class.send("walk_tree_#{algorithm}", where, self, &block)
         end
       end
     end
+
+    private
+
+    def walk_tree_bfs(where = {}, node = nil, level = -1, &block)
+      nodes = (node.nil? ? roots : node.children).where(where)
+      nodes.each { |child| block.call child, level + 1 }
+      nodes.each { |child| walk_tree_bfs where, child, level + 1, &block }
+    end
+
+    def walk_tree_dfs(where = {}, node = nil, level = -1, &block)
+      block.call node, level unless level == -1
+      nodes = (node.nil? ? roots : node.children).where(where)
+      nodes.each { |child| walk_tree_dfs where, child, level + 1, &block }
+    end
+
   end
 
   module InstanceMethods

data/lib/acts_as_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTree
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/test/acts_as_tree_test.rb

@@ -24,7 +24,12 @@ class MiniTest::Unit::TestCase
       end
     }
 
-    result = ActiveSupport::Notifications.subscribed(counter_f, "sql.active_record", &block)
+    begin
+      subscribed = ActiveSupport::Notifications.subscribe("sql.active_record", &counter_f)
+      result = block.call
+    ensure
+      ActiveSupport::Notifications.unsubscribe subscribed
+    end
 
     [count, result]
   end
@@ -267,8 +272,10 @@ class TreeTest < MiniTest::Unit::TestCase
 
   def test_tree_walker
     assert_equal false, TreeMixin.respond_to?(:walk_tree)
+    assert_equal false, TreeMixin.new.respond_to?(:walk_tree)
     TreeMixin.extend ActsAsTree::TreeWalker
     assert_equal true,  TreeMixin.respond_to?(:walk_tree)
+    assert_equal true,  TreeMixin.new.respond_to?(:walk_tree)
 
     walk_tree_dfs_output = <<-END.gsub(/^\s+/, '')
       1
@@ -281,6 +288,14 @@ class TreeTest < MiniTest::Unit::TestCase
       END
     assert_equal walk_tree_dfs_output, capture_stdout { TreeMixin.walk_tree{|elem, level| puts "#{'-'*level}#{elem.id}"} }
 
+    walk_tree_dfs_sub_output = <<-END.gsub(/^\s+/, '')
+      2
+      -3
+      --4
+      5
+      END
+    assert_equal walk_tree_dfs_sub_output, capture_stdout { @root1.walk_tree{|elem, level| puts "#{'-'*level}#{elem.id}"} }
+
     walk_tree_bfs_output = <<-END.gsub(/^\s+/, '')
       1
       6
@@ -291,6 +306,14 @@ class TreeTest < MiniTest::Unit::TestCase
       ---4
       END
     assert_equal walk_tree_bfs_output, capture_stdout { TreeMixin.walk_tree(:algorithm => :bfs){|elem, level| puts "#{'-'*level}#{elem.id}"} }
+
+    walk_tree_bfs_sub_output = <<-END.gsub(/^\s+/, '')
+      2
+      5
+      -3
+      --4
+      END
+    assert_equal walk_tree_bfs_sub_output, capture_stdout { @root1.walk_tree(:algorithm => :bfs){|elem, level| puts "#{'-'*level}#{elem.id}"} }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tree
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Erik Dahlstrand
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Provides a simple tree behaviour to active_record models.