Skip to content

Refactor AnnotateModels::Helpers #723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 18, 2020
+2 −5
Merged

Refactor AnnotateModels::Helpers #723

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
805b603
Refactor Annotate::Helpers.true?
nard-tech Jan 17, 2020
4dcd9e0
Refactor Annotate::Helpers.fallback
nard-tech Jan 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions lib/annotate/helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,11 @@ def include_models?
end

def true?(val)
return false if val.blank?
return false unless val =~ Constants::TRUE_RE

true
val.present? && Constants::TRUE_RE.match?(val)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

def true?(val)
  return false if val.blank?
  return false unless val =~ Constants::TRUE_RE
  true

can be refactored to

def true?(val)
  if val.blank?
    false
  else
    if val =~ Constants::TRUE_RE
      true
    else
      false
    end
  end
end

So we can easily replace them to a one liner method.

I used Regexp#match? instead of String#=~ because String#=~ returns nil or an integer.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 nice

end

def fallback(*args)
args.detect { |arg| !arg.blank? }
args.detect(&:present?)
end

def reset_options(options)
Expand Down