Skip to content

Commit

Permalink
Rubcopping
Browse files Browse the repository at this point in the history
- Fixes ABC offense
- Deletes stray commented out code
  • Loading branch information
JoeCohen committed Jan 12, 2024
1 parent d00ad52 commit 8da9f60
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions app/controllers/observations_controller/validators.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,10 @@ def validate_params(params)
end

def validate_name(params)
given_name = params.dig(:naming, :name).to_s
chosen_name = params.dig(:chosen_name, :name_id).to_s
@resolver = Naming::NameResolver.new(
given_name, params[:approved_name], chosen_name
)
# NOTE: views could be refactored to access properties of the @resolver,
# e.g. `@resolver.valid_names`, instead of these ivars.
# All but success, @what, @name are only used by form_name_feedback.
(success, @what, @name, @names, @valid_names,
@parent_deprecated, @suggest_corrections) = @resolver.ivar_array
@parent_deprecated, @suggest_corrections) = resolve_name_ivars(params)
if @name
@naming.name = @name
# else
elsif !success
@naming.errors.add(:name,
:form_observations_there_is_a_problem_with_name.t)
Expand All @@ -44,6 +35,18 @@ def validate_name(params)
success
end

def resolve_name_ivars(params)
given_name = params.dig(:naming, :name).to_s
chosen_name = params.dig(:chosen_name, :name_id).to_s
@resolver = Naming::NameResolver.new(
given_name, params[:approved_name], chosen_name
)
# NOTE: views could be refactored to access properties of the @resolver,
# e.g. `@resolver.valid_names`, instead of these ivars.
# All but success, @what, @name are only used by form_name_feedback.
@resolver.ivar_array
end

def validate_place_name(params)
success = true
@place_name = @observation.place_name
Expand Down

0 comments on commit 8da9f60

Please sign in to comment.