Automatically fixed the 'safe' rubocop issues.

Author: evolve75

Rakefile

@@ -55,9 +55,9 @@ task :version do
 end
 
 require 'rake/clean'
-task :clean => 'gem:clobber_package'
+task clean: 'gem:clobber_package'
 CLEAN.include('coverage')
-task :clobber => [:clean, 'doc:clobber_rdoc', 'doc:clobber_yard']
+task clobber: [:clean, 'doc:clobber_rdoc', 'doc:clobber_yard']
 
 desc 'Open an irb session preloaded with this library'
 task :console do
@@ -83,7 +83,7 @@ namespace :doc do # ................................ Documentation
     require 'yard'
     YARD::Rake::YardocTask.new do |t|
       t.files   = ['lib/**/*.rb', '-', GEM_SPEC.extra_rdoc_files]
-      t.options = %w(--no-private --embed-mixins)
+      t.options = %w[--no-private --embed-mixins]
     end
   rescue LoadError
     # Oh well.
@@ -96,7 +96,7 @@ namespace :doc do # ................................ Documentation
 end
 
 desc 'Run the test cases'
-task :test => 'test:unit'
+task test: 'test:unit'
 
 namespace :test do # ................................ Test related
   require 'rake/testtask'
@@ -144,15 +144,13 @@ rescue LoadError
 end
 
 namespace :tag do # ................................ Emacs Tags
-  begin
-    require 'rtagstask'
-    RTagsTask.new(:tags) do |rd|
-      rd.vi = false
-      CLEAN.include('TAGS')
-    end
-  rescue LoadError
-    # Oh well. Can't have everything.
+  require 'rtagstask'
+  RTagsTask.new(:tags) do |rd|
+    rd.vi = false
+    CLEAN.include('TAGS')
   end
+rescue LoadError
+  # Oh well. Can't have everything.
 end
 
 namespace :gem do               # ................................ Gem related
@@ -163,7 +161,7 @@ namespace :gem do               # ................................ Gem related
   end
 
   desc 'Push the gem into the Rubygems repository'
-  task :push => :gem do
+  task push: :gem do
     sh "gem push pkg/#{GEM_NAME}"
   end
 end

gemfiles/Gemfile.rbx

@@ -1,15 +1,15 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rubytree.gemspec
-gemspec :path => '..'
+gemspec path: '..'
 
 platforms :rbx do
-  gem "rubysl"
-  gem "rubysl-test-unit"
+  gem 'rubysl'
+  gem 'rubysl-test-unit'
 end
 
 group :development, :test do
-  gem "rake", "~> 10.1"
+  gem 'rake', '~> 10.1'
 end
 
 # Local Variables:

lib/rubytree.rb

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

lib/tree.rb

@@ -108,11 +108,11 @@ class TreeNode
     # +content+ attribute for any non-unique node requirements.
     #
     # If you want to change the name, you probably want to call +rename+
-    # instead.
+    # instead. Note that +name=+ is a protected method.
     #
     # @see content
     # @see rename
-    attr_reader   :name
+    attr_accessor :name
 
     # @!attribute [rw] content
     # Content of this node.  Can be +nil+.  Note that there is no
@@ -217,7 +217,8 @@ def has_children?
     def initialize(name, content = nil)
       raise ArgumentError, 'Node name HAS to be provided!' if name.nil?
 
-      @name, @content = name, content
+      @name = name
+      @content = content
 
       if name.is_a?(Integer)
         warn StructuredWarnings::StandardWarning,
@@ -308,7 +309,7 @@ def marshal_load(dumped_tree_array)
     #
     # @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
@@ -445,14 +446,6 @@ def rename_child(old_name, new_name)
       @children_hash[new_name].name = new_name
     end
 
-    # Protected method to set the name of this node.
-    # This method should *NOT* be invoked by client code.
-    #
-    # @param [Object] new_name The node Name to set.
-    #
-    # @return [Object] The new name.
-    attr_writer :name
-
     # Replaces the specified child node with another child node on this node.
     #
     # @param [Tree::TreeNode] old_child The child node to be replaced.
@@ -625,18 +618,18 @@ def [](name_or_index, num_as_name = false)
     # @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
+    def each # :yields: node
       return to_enum unless block_given?
 
       node_stack = [self] # Start with this node
 
       until node_stack.empty?
-        current = node_stack.shift    # Pop the top-most node
-        if current                    # Might be 'nil' (esp. for binary trees)
-          yield current               # and process it
-          # Stack children of the current node at top of the stack
-          node_stack = current.children.concat(node_stack)
-        end
+        current = node_stack.shift # Pop the top-most node
+        next unless current # Might be 'nil' (esp. for binary trees)
+
+        yield current # and process it
+        # Stack children of the current node at top of the stack
+        node_stack = current.children.concat(node_stack)
       end
 
       self if block_given?
@@ -666,7 +659,7 @@ def preordered_each(&block) # :yields: node
     # @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)
+    def postordered_each
       return to_enum(:postordered_each) unless block_given?
 
       # Using a marked node in order to skip adding the children of nodes that
@@ -705,7 +698,7 @@ def postordered_each(&block)
     # @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)
+    def breadth_each
       return to_enum(:breadth_each) unless block_given?
 
       node_queue = [self] # Create a queue with self as the initial entry
@@ -733,9 +726,9 @@ def breadth_each(&block)
     #
     # @return [Array<Tree::TreeNode>] An array of the child nodes, if no block
     #                                 is given.
-    def children
+    def children(&block)
       if block_given?
-        @children.each { |child| yield child }
+        @children.each(&block)
         self
       else
         @children.clone
@@ -757,7 +750,7 @@ def children
     # @return [Tree::TreeNode] this node, if a block if given
     # @return [Array<Tree::TreeNode>] An array of the leaf nodes
     # noinspection RubyUnusedLocalVariable
-    def each_leaf(&block)
+    def each_leaf
       if block_given?
         each { |node| yield(node) if node.is_leaf? }
         self
@@ -775,7 +768,7 @@ def each_leaf(&block)
     #
     # @return [Tree::TreeNode] this node, if a block if given
     # @return [Enumerator] an enumerator on this tree, if a block is *not* given
-    def each_level &block
+    def each_level
       if block_given?
         level = [self]
         until level.empty?
@@ -884,9 +877,9 @@ def siblings
         return [] if is_root?
 
         siblings = []
-        parent.children { |my_sibling|
+        parent.children do |my_sibling|
           siblings << my_sibling if my_sibling != self
-        }
+        end
         siblings
       end
     end
@@ -980,10 +973,11 @@ def print_tree(level = node_depth, max_depth = nil,
       # Exit if the max level is defined, and reached.
       return unless max_depth.nil? || level < max_depth
 
-      children { |child|
+      # Child might be 'nil'
+      children do |child|
         child&.print_tree(level + 1,
                           max_depth, block)
-      }       # Child might be 'nil'
+      end
     end
   end
 end

lib/tree/binarytree.rb

@@ -170,13 +170,13 @@ def add_from_hash(hashed_subtree)
     # @see #preordered_each
     # @see #postordered_each
     # noinspection RubyUnusedLocalVariable
-    def inordered_each(&block)
-      return self.to_enum unless block_given?
+    def inordered_each
+      return to_enum unless block_given?
 
       node_stack = []
       current_node = self
 
-      until node_stack.empty? and current_node == nil
+      until node_stack.empty? and current_node.nil?
         if current_node
           node_stack.push(current_node)
           current_node = current_node.left_child
@@ -243,7 +243,7 @@ def right_child=(child)
 
     # Swaps the left and right child nodes of the receiver node with each other.
     def swap_children
-      self.left_child, self.right_child = self.right_child, self.left_child
+      self.left_child, self.right_child = right_child, left_child
     end
   end
 end

lib/tree/utils/camel_case_method_handler.rb

@@ -43,12 +43,12 @@ module Tree::Utils
   # Provides utility functions to handle CamelCase methods, and redirect
   # invocation of such methods to the snake_case equivalents.
   module CamelCaseMethodHandler
-    def self.included(base)
+    def self.included(_base)
       # @!visibility private
       # Allow the deprecated CamelCase method names.  Display a warning.
       # :nodoc:
       def method_missing(meth, *args, &blk)
-        if self.respond_to?((new_method_name = to_snake_case(meth)))
+        if respond_to?((new_method_name = to_snake_case(meth)))
           warn StructuredWarnings::DeprecatedMethodWarning,
                'The camelCased methods are deprecated. ' +
                "Please use #{new_method_name} instead of #{meth}"

lib/tree/utils/hash_converter.rb

@@ -100,11 +100,9 @@ def from_hash(hash)
 
       root, children = hash.first
 
-      unless [Hash, NilClass].include?(children.class)
-        raise ArgumentError, 'Invalid child. Must be nil or hash.'
-      end
+      raise ArgumentError, 'Invalid child. Must be nil or hash.' unless [Hash, NilClass].include?(children.class)
 
-      node = self.new(*root)
+      node = new(*root)
       node.add_from_hash(children) unless children.nil?
       node
     end

lib/tree/utils/json_converter.rb

@@ -62,16 +62,14 @@ def self.included(base)
   # @see #to_json
   # @see http://stackoverflow.com/a/6880638/273808
   # noinspection RubyUnusedLocalVariable
-  def as_json(options = {})
+  def as_json(_options = {})
     json_hash = {
       name: name,
       content: content,
       JSON.create_id => self.class.name
     }
 
-    if has_children?
-      json_hash['children'] = children
-    end
+    json_hash['children'] = children if has_children?
 
     json_hash
   end
@@ -116,9 +114,11 @@ module ClassMethods
     def json_create(json_hash)
       node = new(json_hash['name'], json_hash['content'])
 
-      json_hash['children'].each do |child|
-        node << child
-      end if json_hash['children']
+      if json_hash['children']
+        json_hash['children'].each do |child|
+          node << child
+        end
+      end
 
       node
     end

lib/tree/utils/metrics_methods.rb

@@ -43,7 +43,7 @@ module Tree::Utils
   # Provides utility functions to measure various tree metrics.
   module TreeMetricsHandler
     # noinspection RubyUnusedLocalVariable
-    def self.included(base)
+    def self.included(_base)
       # @!group Metrics and Measures
 
       # @!attribute [r] size
@@ -67,7 +67,7 @@ def size
       # @return [Integer] The total number of nodes in this (sub)tree.
       # @see #size
       def length
-        self.size
+        size
       end
 
       # @!attribute [r] node_height

lib/tree/utils/path_methods.rb

@@ -42,7 +42,7 @@ module Tree::Utils
   # Provides utility methods for path extraction
   module TreePathHandler
     # noinspection RubyUnusedLocalVariable
-    def self.included(base)
+    def self.included(_base)
       # @!group Node Path
 
       # Returns the path of this node from the root as a string, with the node