rubytree 0.9.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76d30f00380e7ea4594dda970de679d6949a61b9
-  data.tar.gz: 11a9fe380940e988200f84e2f69dff3752e4e380
+  metadata.gz: e70b5e24e0c6438962d8f5efe4badb962ab27819
+  data.tar.gz: 66ea286ac3ae28957cee7fdcf41d7dd007962afa
 SHA512:
-  metadata.gz: b7e9ee7173158d02e55c29ea3122076bc164f3bc180a717bce34bf0ca29d65e9e60bd9f0d13fccb16cf4339e064a56d05e2a0bb120b2bf2a65edb83cef29b7ec
-  data.tar.gz: cf1ced56a4092931a7f8439a466c68a338a3fb86cac941862885bbdd4ac3c34abd8e2c3921e76504681bb075309112cd5b0b5b50faddb9a10e1a7a172c3c7d5f
+  metadata.gz: 4f269fac16de633c54ac933d6ec87af7530295f59c1a5f47d2130c822ce50f6560446532546ee0bed3b6171523ccb8a180dac720b41524d810f0e54a2df9dadf
+  data.tar.gz: aa174da1e492764079f63aac6cf91b4b931dcc05feb9cc0fedd765e62c57d9202372d191ee16926a977ae8836f6884231e251885fa5abb27c95058086cf64a25

data/Gemfile

@@ -4,10 +4,10 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem "rake", "~> 10.4"
-  gem "test-unit", "~> 3.0"
-  gem "coveralls", ">= 0.7", :require => false, :platforms => :mri_21
-  gem "rspec", ">= 3.4"
+  gem 'rake', '~> 10.4'
+  gem 'test-unit', '~> 3.0'
+  gem 'coveralls', '>= 0.7', :require => false, :platforms => :mri_21
+  gem 'rspec', '>= 3.4'
 end
 
 # Local Variables:

data/Gemfile.lock

@@ -1,83 +1,68 @@
 PATH
   remote: .
   specs:
-    rubytree (0.9.7)
-      json (~> 1.8)
-      structured_warnings (~> 0.2)
+    rubytree (1.0.0)
+      json (~> 2.1)
+      structured_warnings (~> 0.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coveralls (0.8.10)
-      json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.11.0)
+    coveralls (0.8.21)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.14.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (~> 1.6.0)
-    diff-lcs (1.2.5)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    diff-lcs (1.3)
     docile (1.1.5)
-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
-    json (1.8.3)
-    mime-types (2.99)
-    netrc (0.11.0)
-    power_assert (0.2.6)
-    rake (10.4.2)
-    rdoc (4.2.1)
-      json (~> 1.4)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    json (2.1.0)
+    power_assert (1.1.1)
+    rake (10.5.0)
+    rdoc (6.0.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
     rtags (0.97)
     rtagstask (0.0.4)
       rtags (> 0.0.0)
-    simplecov (0.11.1)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    structured_warnings (0.2.0)
-    term-ansicolor (1.3.2)
+    simplecov-html (0.10.2)
+    structured_warnings (0.3.0)
+    term-ansicolor (1.6.0)
       tins (~> 1.0)
-    test-unit (3.1.5)
+    test-unit (3.2.7)
       power_assert
-    thor (0.19.1)
-    tins (1.6.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
-    yard (0.8.7.6)
+    thor (0.19.4)
+    tins (1.16.3)
+    yard (0.9.12)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.7)
+  bundler (~> 1.16)
   coveralls (>= 0.7)
   rake (~> 10.4)
-  rdoc (~> 4.2)
+  rdoc (~> 6.0)
   rspec (>= 3.4)
   rtagstask (~> 0.0)
   rubytree!
   test-unit (~> 3.0)
-  yard (~> 0.8)
+  yard (~> 0.9)
 
 BUNDLED WITH
-   1.10.2
+   1.16.0

data/README.md

@@ -1,7 +1,7 @@
 <!--
   README.md
 
-  Copyright (C) 2006-2015 Anupam Sengupta (anupamsg@gmail.com)
+  Copyright (C) 2006-2017 Anupam Sengupta (anupamsg@gmail.com)
 
 -->
 # **RubyTree** #
@@ -120,7 +120,7 @@ This example can also be found at
 
 ## REQUIREMENTS: ##
 
-* [Ruby][] 1.8.x, 1.9.x, 2.0.x, or 2.1.x.
+* [Ruby][] 2.2.x, 2.3.x or 2.4.x
 
 
 * Run-time Dependencies:
@@ -244,8 +244,8 @@ A big thanks to the following contributors for helping improve **RubyTree**:
 [BSD]:                  http://opensource.org/licenses/bsd-license.php "BSD License"
 [Binary tree]:          http://en.wikipedia.org/wiki/Binary_tree "Binary Tree Data Structure"
 [Bundler]:              http://bundler.io "Bundler"
-[Comparable]:           http://ruby-doc.org/core-1.8.7/Comparable.html "Comparable mix-in"
-[Enumerable]:           http://ruby-doc.org/core-1.9.3/Enumerable.html "Enumerable mix-in"
+[Comparable]:           http://ruby-doc.org/core-2.4.2/Comparable.html "Comparable mix-in"
+[Enumerable]:           http://ruby-doc.org/core-2.4.2/Enumerable.html "Enumerable mix-in"
 [JSON]:                 http://flori.github.com/json "JSON"
 [Rake]:                 https://rubygems.org/gems/rake "Rake"
 [Ruby]:                 http://www.ruby-lang.org "Ruby Programming Language"
@@ -254,7 +254,7 @@ A big thanks to the following contributors for helping improve **RubyTree**:
 [breadth-first]:        http://en.wikipedia.org/wiki/Breadth-first_search "Breadth-first (level-first) Traversal"
 [git]:                  http://git-scm.com "Git SCM"
 [in-order]:             http://en.wikipedia.org/wiki/Tree_traversal#In-order "In-order (symmetric) Traversal"
-[marshaling]:           http://ruby-doc.org/core-1.8.7/Marshal.html "Marshaling in Ruby"
+[marshaling]:           http://ruby-doc.org/core-2.4.2/Marshal.html "Marshaling in Ruby"
 [post-order]:           http://en.wikipedia.org/wiki/Tree_traversal#Post-order "Post-ordered Traversal"
 [pre-order]:            http://en.wikipedia.org/wiki/Tree_traversal#Pre-order "Pre-ordered Traversal"
 [rt@github]:            http://github.com/evolve75/RubyTree "RubyTree Project Page on Github"

data/Rakefile

@@ -33,23 +33,23 @@
 #
 
 require 'rubygems'
-GEM_SPEC = eval(File.read("rubytree.gemspec")) # Load the gemspec.
+GEM_SPEC = eval(File.read('./rubytree.gemspec')) # Load the gemspec.
 
 PKG_NAME = GEM_SPEC.name
 PKG_VER  = GEM_SPEC.version
 GEM_NAME = "#{PKG_NAME}-#{PKG_VER}.gem"
 
-desc "Default Task (Run the tests)"
+desc 'Default Task (Run the tests)'
 task :default do
-  if ENV["COVERAGE"]
-    Rake::Task["test:coverage"].invoke
+  if ENV['COVERAGE']
+    Rake::Task['test:coverage'].invoke
   else
-    Rake::Task["test:unit"].invoke
-    Rake::Task["spec"].invoke
+    Rake::Task['test:unit'].invoke
+    Rake::Task['spec'].invoke
   end
 end
 
-desc "Display the current gem version"
+desc 'Display the current gem version'
 task :version do
   puts "Current Version: #{GEM_NAME}"
 end
@@ -59,21 +59,21 @@ task :clean => 'gem:clobber_package'
 CLEAN.include('coverage')
 task :clobber => [:clean, 'doc:clobber_rdoc', 'doc:clobber_yard']
 
-desc "Open an irb session preloaded with this library"
+desc 'Open an irb session preloaded with this library'
 task :console do
-  sh "irb -rubygems -r ./lib/tree.rb"
+  sh 'irb -rubygems -r ./lib/tree.rb'
 end
 
 namespace :doc do               # ................................ Documentation
   begin
-    gem 'rdoc', ">= 2.4.2"      # To get around a stupid bug in Ruby 1.9.2 Rake.
+    gem 'rdoc', '>= 2.4.2' # To get around a stupid bug in Ruby 1.9.2 Rake.
     require 'rdoc/task'
     Rake::RDocTask.new do |rdoc|
       rdoc.rdoc_dir = 'rdoc'
       rdoc.title    = "#{PKG_NAME}-#{PKG_VER}"
       rdoc.main     = 'README.rdoc'
       rdoc.rdoc_files.include(GEM_SPEC.extra_rdoc_files)
-      rdoc.rdoc_files.include('lib/**/*.rb')
+      rdoc.rdoc_files.include('./lib/**/*.rb')
     end
   rescue LoadError
     # Oh well.
@@ -83,19 +83,19 @@ namespace :doc do               # ................................ Documentation
     require 'yard'
     YARD::Rake::YardocTask.new do |t|
       t.files   = ['lib/**/*.rb', '-', GEM_SPEC.extra_rdoc_files]
-      t.options = ['--no-private', '--embed-mixins']
+      t.options = %w(--no-private --embed-mixins)
     end
   rescue LoadError
     # Oh well.
   end
 
-  desc "Remove YARD Documentation"
+  desc 'Remove YARD Documentation'
   task :clobber_yard do
     rm_rf 'doc'
   end
 end
 
-desc "Run the test cases"
+desc 'Run the test cases'
 task :test => 'test:unit'
 
 namespace :test do              # ................................ Test related
@@ -107,7 +107,7 @@ namespace :test do              # ................................ Test related
     test.verbose = false
   end
 
-  desc "Run the examples"
+  desc 'Run the examples'
   Rake::TestTask.new(:examples) do |example|
     example.libs << 'lib' << 'examples'
     example.pattern = 'examples/**/example_*.rb'
@@ -115,7 +115,7 @@ namespace :test do              # ................................ Test related
     example.warning = false
   end
 
-  desc "Run the code coverage"
+  desc 'Run the code coverage'
   task :coverage do
     ruby 'test/run_test.rb'
   end
@@ -123,7 +123,7 @@ namespace :test do              # ................................ Test related
   begin
     require 'rcov/rcovtask'
     Rcov::RcovTask.new(:rcov) do |t|
-      t.libs << "test"
+      t.libs << 'test'
       t.test_files = FileList['test/**/test_*.rb']
       t.verbose = true
       t.rcov_opts << '--exclude /gems/,/Library/,/usr/,spec,lib/tasks'
@@ -139,7 +139,7 @@ begin                            # ................................ rspec tests
 
   RSpec::Core::RakeTask.new(:spec) do |t|
     t.fail_on_error = false
-    t.rspec_opts = ["--color", "--format doc"]
+    t.rspec_opts = ['--color', '--format doc']
   end
 rescue LoadError
   # Cannot load rspec.
@@ -164,7 +164,7 @@ namespace :gem do               # ................................ Gem related
     pkg.need_tar = true
   end
 
-  desc "Push the gem into the Rubygems repository"
+  desc 'Push the gem into the Rubygems repository'
   task :push => :gem do
     sh "gem push pkg/#{GEM_NAME}"
   end

data/examples/example_basic.rb

@@ -26,19 +26,19 @@
 require 'tree'                 # Load the library
 
 # ..... Create the root node first.  Note that every node has a name and an optional content payload.
-root_node = Tree::TreeNode.new("ROOT", "Root Content")
+root_node = Tree::TreeNode.new('ROOT', 'Root Content')
 root_node.print_tree
 
 # ..... Now insert the child nodes.  Note that you can "chain" the child insertions for a given path to any depth.
-root_node << Tree::TreeNode.new("CHILD1", "Child1 Content") << Tree::TreeNode.new("GRANDCHILD1", "GrandChild1 Content")
-root_node << Tree::TreeNode.new("CHILD2", "Child2 Content")
+root_node << Tree::TreeNode.new('CHILD1', 'Child1 Content') << Tree::TreeNode.new('GRANDCHILD1', 'GrandChild1 Content')
+root_node << Tree::TreeNode.new('CHILD2', 'Child2 Content')
 
 # ..... Lets print the representation to stdout.  This is primarily used for debugging purposes.
 root_node.print_tree
 
 # ..... Lets directly access children and grandchildren of the root.  The can be "chained" for a given path to any depth.
-child1       = root_node["CHILD1"]
-grand_child1 = root_node["CHILD1"]["GRANDCHILD1"]
+child1       = root_node['CHILD1']
+grand_child1 = root_node['CHILD1']['GRANDCHILD1']
 
 # ..... Now lets retrieve siblings of the current node as an array.
 siblings_of_child1 = child1.siblings

data/lib/rubytree.rb

@@ -38,4 +38,4 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-require "tree.rb"
+require 'tree.rb'

data/lib/tree.rb

@@ -9,7 +9,7 @@
 # Author:: Anupam Sengupta (anupamsg@gmail.com)
 #
 
-# Copyright (c) 2006-2015 Anupam Sengupta
+# Copyright (c) 2006-2015, 2017 Anupam Sengupta
 #
 # All rights reserved.
 #
@@ -83,6 +83,7 @@ module Tree
   # {include:file:examples/example_basic.rb}
   #
   # @author Anupam Sengupta
+  # noinspection RubyTooManyMethodsInspection
   class TreeNode
     include Enumerable
     include Comparable
@@ -132,7 +133,7 @@ module Tree
     # @return [Tree::TreeNode] Root of the (sub)tree.
     def root
       root = self
-      root = root.parent while !root.is_root?
+      root = root.parent until root.is_root?
       root
     end
 
@@ -177,7 +178,7 @@ module Tree
 
       parentage_array = []
       prev_parent = self.parent
-      while (prev_parent)
+      while prev_parent
         parentage_array << prev_parent
         prev_parent = prev_parent.parent
       end
@@ -215,13 +216,13 @@ module Tree
     #
     # @see #[]
     def initialize(name, content = nil)
-      raise ArgumentError, "Node name HAS to be provided!" if name == nil
+      raise ArgumentError, 'Node name HAS to be provided!' if name == nil
       @name, @content = name, content
 
       if name.kind_of?(Integer)
-        warn StandardWarning,
-             "Using integer as node name."\
-             " Semantics of TreeNode[] may not be what you expect!"\
+        warn StructuredWarnings::StandardWarning,
+             'Using integer as node name.'\
+             ' Semantics of TreeNode[] may not be what you expect!'\
              " #{name} #{content}"
       end
 
@@ -256,7 +257,7 @@ module Tree
     alias :dup :detached_subtree_copy
 
     # Returns a {marshal-dump}[http://ruby-doc.org/core-1.8.7/Marshal.html]
-    # represention of the (sub)tree rooted at this node.
+    # representation of the (sub)tree rooted at this node.
     #
     def marshal_dump
       self.collect { |node| node.create_dump_rep }
@@ -265,15 +266,15 @@ module Tree
     # Creates a dump representation of this node and returns the same as
     # a hash.
     def create_dump_rep           # :nodoc:
-      { :name => @name,
-        :parent => (is_root? ? nil : @parent.name),
-        :content => Marshal.dump(@content)
+      {name: @name,
+       parent: (is_root? ? nil : @parent.name),
+       content: Marshal.dump(@content)
       }
     end
 
     protected :create_dump_rep
 
-    # Loads a marshalled dump of a tree and returns the root node of the
+    # Loads a marshaled dump of a tree and returns the root node of the
     # reconstructed tree. See the
     # {Marshal}[http://ruby-doc.org/core-1.8.7/Marshal.html] class for
     # additional details.
@@ -289,7 +290,7 @@ module Tree
         parent_name = node_hash[:parent]
         content     = Marshal.load(node_hash[:content])
 
-        if parent_name then
+        if parent_name
           nodes[name] = current_node = Tree::TreeNode.new(name, content)
           nodes[parent_name].add current_node
         else
@@ -308,11 +309,7 @@ module Tree
     #
     # @return [String] A string representation of the node.
     def to_s
-      "Node Name: #{@name}" +
-        " Content: " + (@content.to_s || "<Empty>") +
-        " Parent: " + (is_root?()  ? "<None>" : @parent.name.to_s) +
-        " Children: #{@children.length}" +
-        " Total Nodes: #{size()}"
+      "Node Name: #{@name} Content: #{(@content.to_s || '<Empty>')} Parent: #{(is_root? ? '<None>' : @parent.name.to_s)} Children: #{@children.length} Total Nodes: #{size}"
     end
 
     # @!group Structure Modification
@@ -354,7 +351,7 @@ module Tree
     #
     #    -children.size..children.size
     #
-    # This is to prevent +nil+ nodes being created as children if a non-existant
+    # This is to prevent +nil+ nodes being created as children if a non-existent
     # position is used.
     #
     # If the new node being added has an existing parent node, then it will be
@@ -381,11 +378,11 @@ module Tree
     def add(child, at_index = -1)
       # Only handles the immediate child scenario
       raise ArgumentError,
-            "Attempting to add a nil node" unless child
+            'Attempting to add a nil node' unless child
       raise ArgumentError,
-            "Attempting add node to itself" if self.equal?(child)
+            'Attempting add node to itself' if self.equal?(child)
       raise ArgumentError,
-            "Attempting add root as a child" if child.equal?(root)
+            'Attempting add root as a child' if child.equal?(root)
 
       # Lazy mans unique test, won't test if children of child are unique in
       # this tree too.
@@ -397,15 +394,15 @@ module Tree
       if insertion_range.include?(at_index)
         @children.insert(at_index, child)
       else
-        raise "Attempting to insert a child at a non-existent location"\
+        raise 'Attempting to insert a child at a non-existent location'\
               " (#{at_index}) "\
-              "when only positions from "\
+              'when only positions from '\
               "#{insertion_range.min} to #{insertion_range.max} exist."
       end
 
       @children_hash[child.name]  = child
       child.parent = self
-      return child
+      child
     end
 
     # Return a range of valid insertion positions.  Used in the #add method.
@@ -472,7 +469,7 @@ module Tree
       old_child = remove! old_child
       add new_child, child_index
 
-      return old_child
+      old_child
     end
 
     # Replaces the node with another node
@@ -605,14 +602,14 @@ module Tree
     # @see #initialize
     def [](name_or_index, num_as_name=false)
       raise ArgumentError,
-            "Name_or_index needs to be provided!" if name_or_index == nil
+            'Name_or_index needs to be provided!' if name_or_index == nil
 
       if name_or_index.kind_of?(Integer) and not num_as_name
         @children[name_or_index]
       else
         if num_as_name and not name_or_index.kind_of?(Integer)
-          warn StandardWarning,
-             "Redundant use of the `num_as_name` flag for non-integer node name"
+          warn StructuredWarnings::StandardWarning,
+               'Redundant use of the `num_as_name` flag for non-integer node name'
         end
         @children_hash[name_or_index]
       end
@@ -624,6 +621,7 @@ module Tree
     # The traversal is *depth-first* and from *left-to-right* in pre-ordered
     # sequence.
     #
+    # @param [Object] block
     # @yieldparam node [Tree::TreeNode] Each node.
     #
     # @see #preordered_each
@@ -631,6 +629,7 @@ module Tree
     #
     # @return [Tree::TreeNode] this node, if a block if given
     # @return [Enumerator] an enumerator on this tree, if a block is *not* given
+    # noinspection RubyUnusedLocalVariable
     def each(&block)             # :yields: node
 
      return self.to_enum unless block_given?
@@ -646,7 +645,7 @@ module Tree
         end
       end
 
-      return self if block_given?
+      self if block_given?
     end
 
     # Traverses the (sub)tree rooted at this node in pre-ordered sequence.
@@ -665,20 +664,22 @@ module Tree
 
     # Traverses the (sub)tree rooted at this node in post-ordered sequence.
     #
+    # @param [Object] block
     # @yieldparam node [Tree::TreeNode] Each node.
     #
     # @see #preordered_each
     # @see #breadth_each
     # @return [Tree::TreeNode] this node, if a block if given
     # @return [Enumerator] an enumerator on this tree, if a block is *not* given
+    # noinspection RubyUnusedLocalVariable
     def postordered_each(&block)
       return self.to_enum(:postordered_each) unless block_given?
 
       # Using a marked node in order to skip adding the children of nodes that
       # have already been visited. This allows the stack depth to be controlled,
       # and also allows stateful backtracking.
-      markednode = Struct.new(:node, :visited)
-      node_stack = [markednode.new(self, false)] # Start with self
+      marked_node = Struct.new(:node, :visited)
+      node_stack = [marked_node.new(self, false)] # Start with self
 
       until node_stack.empty?
         peek_node = node_stack[0]
@@ -686,7 +687,7 @@ module Tree
           peek_node.visited = true
           # Add the children to the stack. Use the marking structure.
           marked_children =
-            peek_node.node.children.map {|node| markednode.new(node, false)}
+            peek_node.node.children.map {|node| marked_node.new(node, false)}
           node_stack = marked_children.concat(node_stack)
           next
         else
@@ -694,13 +695,14 @@ module Tree
         end
       end
 
-      return self if block_given?
+      self if block_given?
     end
 
     # Performs breadth-first traversal of the (sub)tree rooted at this node. The
     # traversal at a given level is from *left-to-right*. this node itself is
     # the first node to be traversed.
     #
+    # @param [Object] block
     # @yieldparam node [Tree::TreeNode] Each node.
     #
     # @see #preordered_each
@@ -708,6 +710,7 @@ module Tree
     #
     # @return [Tree::TreeNode] this node, if a block if given
     # @return [Enumerator] an enumerator on this tree, if a block is *not* given
+    # noinspection RubyUnusedLocalVariable
     def breadth_each(&block)
       return self.to_enum(:breadth_each) unless block_given?
 
@@ -721,7 +724,7 @@ module Tree
         node_to_traverse.children { |child| node_queue.push child }
       end
 
-      return self if block_given?
+      self if block_given?
     end
 
     # An array of all the immediate children of this node. The child
@@ -739,9 +742,9 @@ module Tree
     def children
       if block_given?
         @children.each {|child| yield child}
-        return self
+        self
       else
-        return @children.clone
+        @children.clone
       end
     end
 
@@ -751,6 +754,7 @@ module Tree
     # May yield this node as well if this is a leaf node.
     # Leaf traversal is *depth-first* and *left-to-right*.
     #
+    # @param [Object] block
     # @yieldparam node [Tree::TreeNode] Each leaf node.
     #
     # @see #each
@@ -758,12 +762,13 @@ module Tree
     #
     # @return [Tree::TreeNode] this node, if a block if given
     # @return [Array<Tree::TreeNode>] An array of the leaf nodes
-    def each_leaf &block
+    # noinspection RubyUnusedLocalVariable
+    def each_leaf(&block)
       if block_given?
         self.each { |node| yield(node) if node.is_leaf? }
-        return self
+        self
       else
-        self.select { |node| node.is_leaf?}
+        self.select { |node| node.is_leaf? }
       end
     end
 
@@ -776,7 +781,7 @@ module Tree
     #
     # @return [Tree::TreeNode] The first child, or +nil+ if none is present.
     def first_child
-      children.first
+      @children.first
     end
 
     # Last child of this node.
@@ -784,7 +789,7 @@ module Tree
     #
     # @return [Tree::TreeNode] The last child, or +nil+ if none is present.
     def last_child
-      children.last
+      @children.last
     end
 
     # @!group Navigating the Sibling Nodes
@@ -858,7 +863,7 @@ module Tree
     def siblings
       if block_given?
         parent.children.each { |sibling| yield sibling if sibling != self }
-        return self
+        self
       else
         return [] if is_root?
         siblings = []
@@ -892,8 +897,8 @@ module Tree
     def next_sibling
       return nil if is_root?
 
-      myidx = parent.children.index(self)
-      parent.children.at(myidx + 1) if myidx
+      idx = parent.children.index(self)
+      parent.children.at(idx + 1) if idx
     end
 
     # Previous sibling of this node.
@@ -909,15 +914,15 @@ module Tree
     def previous_sibling
       return nil if is_root?
 
-      myidx = parent.children.index(self)
-      parent.children.at(myidx - 1) if myidx && myidx > 0
+      idx = parent.children.index(self)
+      parent.children.at(idx - 1) if idx && idx > 0
     end
 
     # @!endgroup
 
-    # Provides a comparision operation for the nodes.
+    # Provides a comparison operation for the nodes.
     #
-    # Comparision is based on the natural ordering of the node name objects.
+    # Comparison is based on the natural ordering of the node name objects.
     #
     # @param [Tree::TreeNode] other The other node to compare against.
     #
@@ -935,7 +940,7 @@ module Tree
     # @param [Integer] max_depth optional maximum depth at which the printing
     #                            with stop.
     # @param [Proc] block optional block to use for rendering
-    def print_tree(level = node_depth, max_depth = nil,
+    def print_tree(level = self.node_depth, max_depth = nil,
                    block = lambda { |node, prefix|
                      puts "#{prefix} #{node.name}" })
       prefix = ''