(MAINT) Rubocop: Fix Style/SafeNavigation

Author: scotje

lib/puppet-strings/markdown/base.rb

@@ -70,7 +70,7 @@ def initialize(registry, component_type)
 
     # @return [String] top-level name
     def name
-      @registry[:name].to_s unless @registry[:name].nil?
+      @registry[:name]&.to_s
     end
 
     # @return [String] 'Overview' text (untagged text)

lib/puppet-strings/yard/code_objects/class.rb

@@ -55,7 +55,7 @@ def to_hash
     hash[:docstring] = PuppetStrings::Yard::Util.docstring_to_hash(docstring)
     defaults = Hash[*parameters.reject{ |p| p[1].nil? }.flatten]
     hash[:defaults] = defaults unless defaults.empty?
-    hash[:source] = source unless source && source.empty?
+    hash[:source] = source unless source&.empty?
     hash
   end
 end

lib/puppet-strings/yard/code_objects/data_type.rb

@@ -89,7 +89,7 @@ def to_hash
     hash[:line] = line
     hash[:docstring] = PuppetStrings::Yard::Util.docstring_to_hash(docstring, %i[param option enum return example])
     hash[:defaults] = defaults unless defaults.empty?
-    hash[:source] = source unless source && source.empty?
+    hash[:source] = source unless source&.empty?
     hash[:functions] = functions.map do |func|
       {
         name: func.name,

lib/puppet-strings/yard/code_objects/defined_type.rb

@@ -54,7 +54,7 @@ def to_hash
     hash[:docstring] = PuppetStrings::Yard::Util.docstring_to_hash(docstring)
     defaults = Hash[*parameters.reject{ |p| p[1].nil? }.flatten]
     hash[:defaults] = defaults unless defaults.empty?
-    hash[:source] = source unless source && source.empty?
+    hash[:source] = source unless source&.empty?
     hash
   end
 end

lib/puppet-strings/yard/code_objects/function.rb

@@ -68,7 +68,7 @@ def signature
     args = @parameters.map do |parameter|
       name, default = parameter
       tag = tags.find { |t| t.name == name } if tags
-      type = tag && tag.types ? "#{tag.type} " : 'Any '
+      type = tag&.types ? "#{tag.type} " : 'Any '
       prefix = "#{name[0]}" if name.start_with?('*', '&')
       name = name[1..-1] if prefix
       default = " = #{default}" if default
@@ -100,7 +100,7 @@ def to_hash
     hash[:docstring] = PuppetStrings::Yard::Util.docstring_to_hash(docstring)
     defaults = Hash[*parameters.reject{ |p| p[1].nil? }.flatten]
     hash[:defaults] = defaults unless defaults.empty?
-    hash[:source] = source unless source && source.empty?
+    hash[:source] = source unless source&.empty?
     hash
   end
 end

lib/puppet-strings/yard/code_objects/plan.rb

@@ -52,7 +52,7 @@ def to_hash
     hash[:docstring] = PuppetStrings::Yard::Util.docstring_to_hash(docstring)
     defaults = Hash[*parameters.reject{ |p| p[1].nil? }.flatten]
     hash[:defaults] = defaults unless defaults.empty?
-    hash[:source] = source unless source && source.empty?
+    hash[:source] = source unless source&.empty?
     hash
   end
 end

lib/puppet-strings/yard/handlers/ruby/function_handler.rb

@@ -222,8 +222,7 @@ def add_method_overload(object, node)
 
     # Populate the required parameters
     params = parameters.unnamed_required_params
-    if params
-      params.each do |parameter|
+    params&.each do |parameter|
         add_param_tag(
           overload_tag,
           param_tags,
@@ -232,12 +231,10 @@ def add_method_overload(object, node)
           parameter.line
         )
       end
-    end
 
     # Populate the optional parameters
     params = parameters.unnamed_optional_params
-    if params
-      params.each do |parameter|
+    params&.each do |parameter|
         add_param_tag(
           overload_tag,
           param_tags,
@@ -249,7 +246,6 @@ def add_method_overload(object, node)
           true
         )
       end
-    end
 
     # Populate the splat parameter
     param = parameters.splat_param
@@ -304,7 +300,7 @@ def add_param_tag(object, tags, name, file, line, type = nil, default = nil, opt
       name = '&' + name
     end
 
-    type ||= tag && tag.types ? tag.type : 'Any'
+    type ||= tag&.types ? tag.type : 'Any'
     type = optional ? "Optional[#{type}]" : type
 
     object.parameters << [name, to_puppet_literal(default)]

lib/puppet-strings/yard/handlers/ruby/type_base.rb

@@ -128,20 +128,16 @@ def set_default_namevar(object)
     return unless object.properties || object.parameters
 
     default = nil
-    if object.properties
-      object.properties.each do |property|
+    object.properties&.each do |property|
         return nil if property.isnamevar
 
         default = property if property.name == 'name'
       end
-    end
-    if object.parameters
-      object.parameters.each do |parameter|
+    object.parameters&.each do |parameter|
         return nil if parameter.isnamevar
 
         default ||= parameter if parameter.name == 'name'
       end
-    end
     default.isnamevar = true if default
   end
 end

lib/puppet-strings/yard/tags/overload_tag.rb

@@ -24,7 +24,7 @@ def signature
     args = @parameters.map do |parameter|
       name, default = parameter
       tag = tags.find { |t| t.name == name } if tags
-      type = tag && tag.types ? "#{tag.type} " : 'Any '
+      type = tag&.types ? "#{tag.type} " : 'Any '
       prefix = "#{name[0]}" if name.start_with?('*', '&')
       name = name[1..-1] if prefix
       default = " = #{default}" if default

lib/puppet-strings/yard/tags/parameter_directive.rb

@@ -7,15 +7,13 @@ class PuppetStrings::Yard::Tags::ParameterDirective < YARD::Tags::Directive
   # Called to invoke the directive.
   # @return [void]
   def call
-    return unless object && object.respond_to?(:add_parameter)
+    return unless object&.respond_to?(:add_parameter)
 
     # Add a parameter to the resource
     parameter = PuppetStrings::Yard::CodeObjects::Type::Parameter.new(tag.name, tag.text)
-    if tag.types
-      tag.types.each do |value|
+    tag.types&.each do |value|
         parameter.add(value)
       end
-    end
     object.add_parameter parameter
   end