rubocop 0.70.0 → 0.75.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +6 -10
- data/bin/console +1 -0
- data/config/default.yml +91 -494
- data/lib/rubocop.rb +16 -54
- data/lib/rubocop/ast/builder.rb +2 -0
- data/lib/rubocop/ast/node.rb +9 -15
- data/lib/rubocop/ast/node/float_node.rb +12 -0
- data/lib/rubocop/ast/node/int_node.rb +12 -0
- data/lib/rubocop/ast/node/mixin/method_dispatch_node.rb +4 -4
- data/lib/rubocop/ast/node/mixin/numeric_node.rb +21 -0
- data/lib/rubocop/ast/node/resbody_node.rb +1 -6
- data/lib/rubocop/ast/traversal.rb +3 -3
- data/lib/rubocop/cached_data.rb +1 -1
- data/lib/rubocop/comment_config.rb +3 -2
- data/lib/rubocop/config.rb +21 -508
- data/lib/rubocop/config_loader.rb +22 -4
- data/lib/rubocop/config_loader_resolver.rb +2 -8
- data/lib/rubocop/config_obsoletion.rb +213 -0
- data/lib/rubocop/config_validator.rb +239 -0
- data/lib/rubocop/cop/autocorrect_logic.rb +71 -1
- data/lib/rubocop/cop/bundler/insecure_protocol_source.rb +1 -1
- data/lib/rubocop/cop/bundler/ordered_gems.rb +1 -1
- data/lib/rubocop/cop/commissioner.rb +3 -9
- data/lib/rubocop/cop/cop.rb +39 -12
- data/lib/rubocop/cop/corrector.rb +2 -3
- data/lib/rubocop/cop/correctors/alignment_corrector.rb +43 -17
- data/lib/rubocop/cop/correctors/empty_line_corrector.rb +2 -2
- data/lib/rubocop/cop/correctors/multiline_literal_brace_corrector.rb +2 -2
- data/lib/rubocop/cop/gemspec/duplicated_assignment.rb +2 -2
- data/lib/rubocop/cop/gemspec/ordered_dependencies.rb +1 -1
- data/lib/rubocop/cop/gemspec/required_ruby_version.rb +1 -1
- data/lib/rubocop/cop/gemspec/ruby_version_globals_usage.rb +55 -0
- data/lib/rubocop/cop/generator.rb +4 -4
- data/lib/rubocop/cop/generator/configuration_injector.rb +9 -4
- data/lib/rubocop/cop/generator/require_file_injector.rb +1 -1
- data/lib/rubocop/cop/internal_affairs/node_destructuring.rb +2 -2
- data/lib/rubocop/cop/internal_affairs/node_type_predicate.rb +1 -1
- data/lib/rubocop/cop/internal_affairs/offense_location_keyword.rb +2 -2
- data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb +1 -1
- data/lib/rubocop/cop/internal_affairs/redundant_message_argument.rb +2 -2
- data/lib/rubocop/cop/internal_affairs/useless_message_assertion.rb +2 -2
- data/lib/rubocop/cop/layout/block_alignment.rb +3 -3
- data/lib/rubocop/cop/layout/class_structure.rb +2 -2
- data/lib/rubocop/cop/layout/closing_parenthesis_indentation.rb +1 -1
- data/lib/rubocop/cop/layout/empty_lines_around_block_body.rb +3 -1
- data/lib/rubocop/cop/layout/extra_spacing.rb +14 -59
- data/lib/rubocop/cop/layout/heredoc_argument_closing_parenthesis.rb +4 -0
- data/lib/rubocop/cop/layout/indent_assignment.rb +9 -1
- data/lib/rubocop/cop/layout/indent_first_argument.rb +7 -3
- data/lib/rubocop/cop/layout/indent_first_parameter.rb +7 -3
- data/lib/rubocop/cop/layout/indent_heredoc.rb +4 -4
- data/lib/rubocop/cop/layout/indentation_consistency.rb +13 -12
- data/lib/rubocop/cop/layout/indentation_width.rb +28 -10
- data/lib/rubocop/cop/layout/leading_comment_space.rb +28 -0
- data/lib/rubocop/cop/layout/multiline_block_layout.rb +24 -2
- data/lib/rubocop/cop/layout/multiline_method_argument_line_breaks.rb +2 -0
- data/lib/rubocop/cop/layout/rescue_ensure_alignment.rb +18 -4
- data/lib/rubocop/cop/layout/space_around_block_parameters.rb +5 -1
- data/lib/rubocop/cop/layout/space_around_operators.rb +42 -23
- data/lib/rubocop/cop/layout/space_inside_array_literal_brackets.rb +1 -1
- data/lib/rubocop/cop/layout/space_inside_block_braces.rb +21 -2
- data/lib/rubocop/cop/layout/space_inside_string_interpolation.rb +24 -40
- data/lib/rubocop/cop/layout/tab.rb +10 -22
- data/lib/rubocop/cop/lint/assignment_in_condition.rb +17 -4
- data/lib/rubocop/cop/lint/big_decimal_new.rb +1 -1
- data/lib/rubocop/cop/lint/debugger.rb +4 -6
- data/lib/rubocop/cop/lint/duplicate_methods.rb +3 -3
- data/lib/rubocop/cop/lint/each_with_object_argument.rb +1 -1
- data/lib/rubocop/cop/lint/empty_interpolation.rb +4 -4
- data/lib/rubocop/cop/lint/erb_new_arguments.rb +57 -1
- data/lib/rubocop/cop/lint/format_parameter_mismatch.rb +11 -37
- data/lib/rubocop/cop/lint/ineffective_access_modifier.rb +1 -1
- data/lib/rubocop/cop/lint/inherit_exception.rb +1 -1
- data/lib/rubocop/cop/lint/literal_in_interpolation.rb +7 -8
- data/lib/rubocop/cop/lint/multiple_compare.rb +1 -1
- data/lib/rubocop/cop/lint/nested_method_definition.rb +3 -3
- data/lib/rubocop/cop/lint/next_without_accumulator.rb +1 -1
- data/lib/rubocop/cop/lint/non_local_exit_from_iterator.rb +1 -1
- data/lib/rubocop/cop/lint/number_conversion.rb +4 -4
- data/lib/rubocop/cop/lint/rand_one.rb +1 -1
- data/lib/rubocop/cop/lint/redundant_with_index.rb +1 -1
- data/lib/rubocop/cop/lint/redundant_with_object.rb +1 -1
- data/lib/rubocop/cop/lint/safe_navigation_chain.rb +5 -5
- data/lib/rubocop/cop/lint/safe_navigation_with_empty.rb +1 -1
- data/lib/rubocop/cop/lint/send_with_mixin_argument.rb +91 -0
- data/lib/rubocop/cop/lint/string_conversion_in_interpolation.rb +6 -6
- data/lib/rubocop/cop/lint/unified_integer.rb +1 -1
- data/lib/rubocop/cop/lint/unneeded_cop_disable_directive.rb +1 -1
- data/lib/rubocop/cop/lint/unneeded_require_statement.rb +1 -1
- data/lib/rubocop/cop/lint/unneeded_splat_expansion.rb +7 -2
- data/lib/rubocop/cop/lint/unreachable_code.rb +1 -1
- data/lib/rubocop/cop/lint/uri_escape_unescape.rb +1 -1
- data/lib/rubocop/cop/lint/uri_regexp.rb +2 -2
- data/lib/rubocop/cop/lint/useless_access_modifier.rb +6 -6
- data/lib/rubocop/cop/lint/useless_setter_call.rb +1 -1
- data/lib/rubocop/cop/message_annotator.rb +16 -7
- data/lib/rubocop/cop/metrics/class_length.rb +1 -1
- data/lib/rubocop/cop/metrics/line_length.rb +6 -0
- data/lib/rubocop/cop/metrics/module_length.rb +1 -1
- data/lib/rubocop/cop/metrics/parameter_lists.rb +1 -1
- data/lib/rubocop/cop/migration/department_name.rb +44 -0
- data/lib/rubocop/cop/mixin/alignment.rb +1 -1
- data/lib/rubocop/cop/mixin/def_node.rb +1 -1
- data/lib/rubocop/cop/mixin/documentation_comment.rb +0 -2
- data/lib/rubocop/cop/mixin/empty_parameter.rb +1 -1
- data/lib/rubocop/cop/mixin/enforce_superclass.rb +4 -4
- data/lib/rubocop/cop/mixin/frozen_string_literal.rb +1 -1
- data/lib/rubocop/cop/mixin/hash_alignment.rb +4 -0
- data/lib/rubocop/cop/mixin/interpolation.rb +27 -0
- data/lib/rubocop/cop/mixin/method_complexity.rb +1 -1
- data/lib/rubocop/cop/mixin/multiline_expression_indentation.rb +3 -3
- data/lib/rubocop/cop/mixin/preceding_following_alignment.rb +87 -0
- data/lib/rubocop/cop/mixin/safe_mode.rb +2 -0
- data/lib/rubocop/cop/mixin/surrounding_space.rb +7 -5
- data/lib/rubocop/cop/naming/binary_operator_parameter_name.rb +1 -1
- data/lib/rubocop/cop/naming/constant_name.rb +2 -2
- data/lib/rubocop/cop/naming/method_name.rb +12 -1
- data/lib/rubocop/cop/naming/predicate_name.rb +1 -1
- data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb +20 -22
- data/lib/rubocop/cop/naming/variable_name.rb +1 -0
- data/lib/rubocop/cop/offense.rb +18 -7
- data/lib/rubocop/cop/registry.rb +22 -1
- data/lib/rubocop/cop/security/eval.rb +1 -1
- data/lib/rubocop/cop/security/json_load.rb +1 -1
- data/lib/rubocop/cop/security/marshal_load.rb +1 -1
- data/lib/rubocop/cop/security/open.rb +1 -1
- data/lib/rubocop/cop/security/yaml_load.rb +1 -1
- data/lib/rubocop/cop/style/access_modifier_declarations.rb +1 -0
- data/lib/rubocop/cop/style/alias.rb +1 -1
- data/lib/rubocop/cop/style/block_delimiters.rb +2 -1
- data/lib/rubocop/cop/style/braces_around_hash_parameters.rb +29 -10
- data/lib/rubocop/cop/style/class_and_module_children.rb +1 -1
- data/lib/rubocop/cop/style/colon_method_call.rb +1 -1
- data/lib/rubocop/cop/style/commented_keyword.rb +16 -30
- data/lib/rubocop/cop/style/conditional_assignment.rb +8 -9
- data/lib/rubocop/cop/style/constant_visibility.rb +14 -3
- data/lib/rubocop/cop/style/date_time.rb +3 -3
- data/lib/rubocop/cop/style/dir.rb +1 -1
- data/lib/rubocop/cop/style/documentation_method.rb +1 -1
- data/lib/rubocop/cop/style/double_cop_disable_directive.rb +55 -0
- data/lib/rubocop/cop/style/each_for_simple_loop.rb +1 -1
- data/lib/rubocop/cop/style/each_with_object.rb +1 -1
- data/lib/rubocop/cop/style/eval_with_location.rb +2 -2
- data/lib/rubocop/cop/style/even_odd.rb +1 -1
- data/lib/rubocop/cop/style/expand_path_arguments.rb +3 -3
- data/lib/rubocop/cop/style/float_division.rb +94 -0
- data/lib/rubocop/cop/style/format_string.rb +13 -9
- data/lib/rubocop/cop/style/format_string_token.rb +10 -40
- data/lib/rubocop/cop/style/frozen_string_literal_comment.rb +18 -33
- data/lib/rubocop/cop/style/guard_clause.rb +39 -10
- data/lib/rubocop/cop/style/hash_syntax.rb +2 -2
- data/lib/rubocop/cop/style/if_inside_else.rb +42 -0
- data/lib/rubocop/cop/style/if_unless_modifier.rb +51 -15
- data/lib/rubocop/cop/style/infinite_loop.rb +1 -1
- data/lib/rubocop/cop/style/inverse_methods.rb +2 -2
- data/lib/rubocop/cop/style/lambda.rb +0 -2
- data/lib/rubocop/cop/style/method_call_with_args_parentheses.rb +12 -6
- data/lib/rubocop/cop/style/min_max.rb +1 -1
- data/lib/rubocop/cop/style/mixin_usage.rb +12 -2
- data/lib/rubocop/cop/style/multiline_memoization.rb +1 -1
- data/lib/rubocop/cop/style/multiline_when_then.rb +55 -0
- data/lib/rubocop/cop/style/multiple_comparison.rb +1 -1
- data/lib/rubocop/cop/style/mutable_constant.rb +3 -3
- data/lib/rubocop/cop/style/nested_modifier.rb +18 -2
- data/lib/rubocop/cop/style/numeric_predicate.rb +3 -3
- data/lib/rubocop/cop/style/option_hash.rb +1 -1
- data/lib/rubocop/cop/style/or_assignment.rb +8 -3
- data/lib/rubocop/cop/style/parentheses_around_condition.rb +15 -1
- data/lib/rubocop/cop/style/random_with_offset.rb +6 -6
- data/lib/rubocop/cop/style/redundant_conditional.rb +2 -2
- data/lib/rubocop/cop/style/redundant_exception.rb +2 -2
- data/lib/rubocop/cop/style/redundant_freeze.rb +1 -1
- data/lib/rubocop/cop/style/redundant_parentheses.rb +15 -6
- data/lib/rubocop/cop/style/redundant_self.rb +18 -1
- data/lib/rubocop/cop/style/redundant_sort_by.rb +1 -1
- data/lib/rubocop/cop/style/rescue_modifier.rb +24 -0
- data/lib/rubocop/cop/style/rescue_standard_error.rb +2 -2
- data/lib/rubocop/cop/style/return_nil.rb +1 -1
- data/lib/rubocop/cop/style/safe_navigation.rb +11 -2
- data/lib/rubocop/cop/style/sample.rb +1 -1
- data/lib/rubocop/cop/style/single_line_methods.rb +8 -1
- data/lib/rubocop/cop/style/stderr_puts.rb +1 -1
- data/lib/rubocop/cop/style/string_hash_keys.rb +2 -2
- data/lib/rubocop/cop/style/strip.rb +1 -1
- data/lib/rubocop/cop/style/struct_inheritance.rb +3 -3
- data/lib/rubocop/cop/style/symbol_proc.rb +1 -1
- data/lib/rubocop/cop/style/ternary_parentheses.rb +32 -3
- data/lib/rubocop/cop/style/trailing_comma_in_arguments.rb +4 -0
- data/lib/rubocop/cop/style/trailing_method_end_statement.rb +4 -6
- data/lib/rubocop/cop/style/trivial_accessors.rb +1 -1
- data/lib/rubocop/cop/style/unneeded_sort.rb +1 -1
- data/lib/rubocop/cop/style/unpack_first.rb +1 -1
- data/lib/rubocop/cop/style/variable_interpolation.rb +6 -16
- data/lib/rubocop/cop/style/word_array.rb +2 -2
- data/lib/rubocop/cop/style/zero_length_predicate.rb +6 -6
- data/lib/rubocop/cop/team.rb +15 -14
- data/lib/rubocop/cop/utils/format_string.rb +128 -0
- data/lib/rubocop/cop/variable_force/variable.rb +15 -2
- data/lib/rubocop/core_ext/string.rb +0 -24
- data/lib/rubocop/error.rb +23 -0
- data/lib/rubocop/formatter/emacs_style_formatter.rb +8 -5
- data/lib/rubocop/formatter/formatter_set.rb +2 -1
- data/lib/rubocop/formatter/pacman_formatter.rb +80 -0
- data/lib/rubocop/formatter/simple_text_formatter.rb +9 -1
- data/lib/rubocop/formatter/tap_formatter.rb +9 -1
- data/lib/rubocop/magic_comment.rb +4 -0
- data/lib/rubocop/node_pattern.rb +86 -7
- data/lib/rubocop/options.rb +18 -2
- data/lib/rubocop/path_util.rb +1 -1
- data/lib/rubocop/processed_source.rb +9 -1
- data/lib/rubocop/rspec/cop_helper.rb +0 -1
- data/lib/rubocop/rspec/expect_offense.rb +4 -1
- data/lib/rubocop/rspec/shared_contexts.rb +12 -17
- data/lib/rubocop/rspec/support.rb +0 -1
- data/lib/rubocop/runner.rb +20 -15
- data/lib/rubocop/target_finder.rb +6 -4
- data/lib/rubocop/version.rb +1 -1
- data/lib/rubocop/yaml_duplication_checker.rb +8 -2
- metadata +16 -70
- data/lib/rubocop/cop/mixin/ignored_method_patterns.rb +0 -19
- data/lib/rubocop/cop/mixin/target_rails_version.rb +0 -16
- data/lib/rubocop/cop/rails/action_filter.rb +0 -117
- data/lib/rubocop/cop/rails/active_record_aliases.rb +0 -48
- data/lib/rubocop/cop/rails/active_record_override.rb +0 -82
- data/lib/rubocop/cop/rails/active_support_aliases.rb +0 -69
- data/lib/rubocop/cop/rails/application_job.rb +0 -40
- data/lib/rubocop/cop/rails/application_record.rb +0 -40
- data/lib/rubocop/cop/rails/assert_not.rb +0 -44
- data/lib/rubocop/cop/rails/belongs_to.rb +0 -102
- data/lib/rubocop/cop/rails/blank.rb +0 -164
- data/lib/rubocop/cop/rails/bulk_change_table.rb +0 -289
- data/lib/rubocop/cop/rails/create_table_with_timestamps.rb +0 -91
- data/lib/rubocop/cop/rails/date.rb +0 -161
- data/lib/rubocop/cop/rails/delegate.rb +0 -132
- data/lib/rubocop/cop/rails/delegate_allow_blank.rb +0 -37
- data/lib/rubocop/cop/rails/dynamic_find_by.rb +0 -91
- data/lib/rubocop/cop/rails/enum_uniqueness.rb +0 -45
- data/lib/rubocop/cop/rails/environment_comparison.rb +0 -68
- data/lib/rubocop/cop/rails/exit.rb +0 -67
- data/lib/rubocop/cop/rails/file_path.rb +0 -108
- data/lib/rubocop/cop/rails/find_by.rb +0 -55
- data/lib/rubocop/cop/rails/find_each.rb +0 -51
- data/lib/rubocop/cop/rails/has_and_belongs_to_many.rb +0 -25
- data/lib/rubocop/cop/rails/has_many_or_has_one_dependent.rb +0 -106
- data/lib/rubocop/cop/rails/http_positional_arguments.rb +0 -117
- data/lib/rubocop/cop/rails/http_status.rb +0 -179
- data/lib/rubocop/cop/rails/ignored_skip_action_filter_option.rb +0 -94
- data/lib/rubocop/cop/rails/inverse_of.rb +0 -246
- data/lib/rubocop/cop/rails/lexically_scoped_action_filter.rb +0 -175
- data/lib/rubocop/cop/rails/link_to_blank.rb +0 -98
- data/lib/rubocop/cop/rails/not_null_column.rb +0 -67
- data/lib/rubocop/cop/rails/output.rb +0 -49
- data/lib/rubocop/cop/rails/output_safety.rb +0 -99
- data/lib/rubocop/cop/rails/pluralization_grammar.rb +0 -107
- data/lib/rubocop/cop/rails/presence.rb +0 -124
- data/lib/rubocop/cop/rails/present.rb +0 -153
- data/lib/rubocop/cop/rails/read_write_attribute.rb +0 -74
- data/lib/rubocop/cop/rails/redundant_allow_nil.rb +0 -111
- data/lib/rubocop/cop/rails/redundant_receiver_in_with_options.rb +0 -136
- data/lib/rubocop/cop/rails/reflection_class_name.rb +0 -37
- data/lib/rubocop/cop/rails/refute_methods.rb +0 -76
- data/lib/rubocop/cop/rails/relative_date_constant.rb +0 -93
- data/lib/rubocop/cop/rails/request_referer.rb +0 -56
- data/lib/rubocop/cop/rails/reversible_migration.rb +0 -286
- data/lib/rubocop/cop/rails/safe_navigation.rb +0 -87
- data/lib/rubocop/cop/rails/save_bang.rb +0 -316
- data/lib/rubocop/cop/rails/scope_args.rb +0 -29
- data/lib/rubocop/cop/rails/skips_model_validations.rb +0 -87
- data/lib/rubocop/cop/rails/time_zone.rb +0 -238
- data/lib/rubocop/cop/rails/uniq_before_pluck.rb +0 -105
- data/lib/rubocop/cop/rails/unknown_env.rb +0 -63
- data/lib/rubocop/cop/rails/validation.rb +0 -109
- data/lib/rubocop/rspec/shared_examples.rb +0 -59
@@ -1,107 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module RuboCop
|
4
|
-
module Cop
|
5
|
-
module Rails
|
6
|
-
# This cop checks for correct grammar when using ActiveSupport's
|
7
|
-
# core extensions to the numeric classes.
|
8
|
-
#
|
9
|
-
# @example
|
10
|
-
# # bad
|
11
|
-
# 3.day.ago
|
12
|
-
# 1.months.ago
|
13
|
-
#
|
14
|
-
# # good
|
15
|
-
# 3.days.ago
|
16
|
-
# 1.month.ago
|
17
|
-
class PluralizationGrammar < Cop
|
18
|
-
SINGULAR_DURATION_METHODS = { second: :seconds,
|
19
|
-
minute: :minutes,
|
20
|
-
hour: :hours,
|
21
|
-
day: :days,
|
22
|
-
week: :weeks,
|
23
|
-
fortnight: :fortnights,
|
24
|
-
month: :months,
|
25
|
-
year: :years }.freeze
|
26
|
-
|
27
|
-
PLURAL_DURATION_METHODS = SINGULAR_DURATION_METHODS.invert.freeze
|
28
|
-
|
29
|
-
MSG = 'Prefer `%<number>s.%<correct>s`.'
|
30
|
-
|
31
|
-
def on_send(node)
|
32
|
-
return unless duration_method?(node.method_name)
|
33
|
-
return unless literal_number?(node.receiver)
|
34
|
-
|
35
|
-
return unless offense?(node)
|
36
|
-
|
37
|
-
add_offense(node)
|
38
|
-
end
|
39
|
-
|
40
|
-
def autocorrect(node)
|
41
|
-
lambda do |corrector|
|
42
|
-
method_name = node.loc.selector.source
|
43
|
-
|
44
|
-
corrector.replace(node.loc.selector, correct_method(method_name))
|
45
|
-
end
|
46
|
-
end
|
47
|
-
|
48
|
-
private
|
49
|
-
|
50
|
-
def message(node)
|
51
|
-
number, = *node.receiver
|
52
|
-
|
53
|
-
format(MSG, number: number,
|
54
|
-
correct: correct_method(node.method_name.to_s))
|
55
|
-
end
|
56
|
-
|
57
|
-
def correct_method(method_name)
|
58
|
-
if plural_method?(method_name)
|
59
|
-
singularize(method_name)
|
60
|
-
else
|
61
|
-
pluralize(method_name)
|
62
|
-
end
|
63
|
-
end
|
64
|
-
|
65
|
-
def offense?(node)
|
66
|
-
number, = *node.receiver
|
67
|
-
|
68
|
-
singular_receiver?(number) && plural_method?(node.method_name) ||
|
69
|
-
plural_receiver?(number) && singular_method?(node.method_name)
|
70
|
-
end
|
71
|
-
|
72
|
-
def plural_method?(method_name)
|
73
|
-
method_name.to_s.end_with?('s')
|
74
|
-
end
|
75
|
-
|
76
|
-
def singular_method?(method_name)
|
77
|
-
!plural_method?(method_name)
|
78
|
-
end
|
79
|
-
|
80
|
-
def singular_receiver?(number)
|
81
|
-
number.abs == 1
|
82
|
-
end
|
83
|
-
|
84
|
-
def plural_receiver?(number)
|
85
|
-
!singular_receiver?(number)
|
86
|
-
end
|
87
|
-
|
88
|
-
def literal_number?(node)
|
89
|
-
node && (node.int_type? || node.float_type?)
|
90
|
-
end
|
91
|
-
|
92
|
-
def pluralize(method_name)
|
93
|
-
SINGULAR_DURATION_METHODS.fetch(method_name.to_sym).to_s
|
94
|
-
end
|
95
|
-
|
96
|
-
def singularize(method_name)
|
97
|
-
PLURAL_DURATION_METHODS.fetch(method_name.to_sym).to_s
|
98
|
-
end
|
99
|
-
|
100
|
-
def duration_method?(method_name)
|
101
|
-
SINGULAR_DURATION_METHODS.key?(method_name) ||
|
102
|
-
PLURAL_DURATION_METHODS.key?(method_name)
|
103
|
-
end
|
104
|
-
end
|
105
|
-
end
|
106
|
-
end
|
107
|
-
end
|
@@ -1,124 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module RuboCop
|
4
|
-
module Cop
|
5
|
-
module Rails
|
6
|
-
# This cop checks code that can be written more easily using
|
7
|
-
# `Object#presence` defined by Active Support.
|
8
|
-
#
|
9
|
-
# @example
|
10
|
-
# # bad
|
11
|
-
# a.present? ? a : nil
|
12
|
-
#
|
13
|
-
# # bad
|
14
|
-
# !a.present? ? nil : a
|
15
|
-
#
|
16
|
-
# # bad
|
17
|
-
# a.blank? ? nil : a
|
18
|
-
#
|
19
|
-
# # bad
|
20
|
-
# !a.blank? ? a : nil
|
21
|
-
#
|
22
|
-
# # good
|
23
|
-
# a.presence
|
24
|
-
#
|
25
|
-
# @example
|
26
|
-
# # bad
|
27
|
-
# a.present? ? a : b
|
28
|
-
#
|
29
|
-
# # bad
|
30
|
-
# !a.present? ? b : a
|
31
|
-
#
|
32
|
-
# # bad
|
33
|
-
# a.blank? ? b : a
|
34
|
-
#
|
35
|
-
# # bad
|
36
|
-
# !a.blank? ? a : b
|
37
|
-
#
|
38
|
-
# # good
|
39
|
-
# a.presence || b
|
40
|
-
class Presence < Cop
|
41
|
-
MSG = 'Use `%<prefer>s` instead of `%<current>s`.'
|
42
|
-
|
43
|
-
def_node_matcher :redundant_receiver_and_other, <<-PATTERN
|
44
|
-
{
|
45
|
-
(if
|
46
|
-
(send $_recv :present?)
|
47
|
-
_recv
|
48
|
-
$!begin
|
49
|
-
)
|
50
|
-
(if
|
51
|
-
(send $_recv :blank?)
|
52
|
-
$!begin
|
53
|
-
_recv
|
54
|
-
)
|
55
|
-
}
|
56
|
-
PATTERN
|
57
|
-
|
58
|
-
def_node_matcher :redundant_negative_receiver_and_other, <<-PATTERN
|
59
|
-
{
|
60
|
-
(if
|
61
|
-
(send (send $_recv :present?) :!)
|
62
|
-
$!begin
|
63
|
-
_recv
|
64
|
-
)
|
65
|
-
(if
|
66
|
-
(send (send $_recv :blank?) :!)
|
67
|
-
_recv
|
68
|
-
$!begin
|
69
|
-
)
|
70
|
-
}
|
71
|
-
PATTERN
|
72
|
-
|
73
|
-
def on_if(node)
|
74
|
-
return if ignore_if_node?(node)
|
75
|
-
|
76
|
-
redundant_receiver_and_other(node) do |receiver, other|
|
77
|
-
unless ignore_other_node?(other) || receiver.nil?
|
78
|
-
add_offense(node, message: message(node, receiver, other))
|
79
|
-
end
|
80
|
-
end
|
81
|
-
|
82
|
-
redundant_negative_receiver_and_other(node) do |receiver, other|
|
83
|
-
unless ignore_other_node?(other) || receiver.nil?
|
84
|
-
add_offense(node, message: message(node, receiver, other))
|
85
|
-
end
|
86
|
-
end
|
87
|
-
end
|
88
|
-
|
89
|
-
def autocorrect(node)
|
90
|
-
lambda do |corrector|
|
91
|
-
redundant_receiver_and_other(node) do |receiver, other|
|
92
|
-
corrector.replace(node.source_range, replacement(receiver, other))
|
93
|
-
end
|
94
|
-
|
95
|
-
redundant_negative_receiver_and_other(node) do |receiver, other|
|
96
|
-
corrector.replace(node.source_range, replacement(receiver, other))
|
97
|
-
end
|
98
|
-
end
|
99
|
-
end
|
100
|
-
|
101
|
-
private
|
102
|
-
|
103
|
-
def ignore_if_node?(node)
|
104
|
-
node.elsif?
|
105
|
-
end
|
106
|
-
|
107
|
-
def ignore_other_node?(node)
|
108
|
-
node && (node.if_type? || node.rescue_type? || node.while_type?)
|
109
|
-
end
|
110
|
-
|
111
|
-
def message(node, receiver, other)
|
112
|
-
format(MSG,
|
113
|
-
prefer: replacement(receiver, other),
|
114
|
-
current: node.source)
|
115
|
-
end
|
116
|
-
|
117
|
-
def replacement(receiver, other)
|
118
|
-
or_source = other.nil? || other.nil_type? ? '' : " || #{other.source}"
|
119
|
-
"#{receiver.source}.presence" + or_source
|
120
|
-
end
|
121
|
-
end
|
122
|
-
end
|
123
|
-
end
|
124
|
-
end
|
@@ -1,153 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module RuboCop
|
4
|
-
module Cop
|
5
|
-
module Rails
|
6
|
-
# This cop checks for code that can be written with simpler conditionals
|
7
|
-
# using `Object#present?` defined by Active Support.
|
8
|
-
#
|
9
|
-
# Interaction with `Style/UnlessElse`:
|
10
|
-
# The configuration of `NotBlank` will not produce an offense in the
|
11
|
-
# context of `unless else` if `Style/UnlessElse` is inabled. This is
|
12
|
-
# to prevent interference between the auto-correction of the two cops.
|
13
|
-
#
|
14
|
-
# @example NotNilAndNotEmpty: true (default)
|
15
|
-
# # Converts usages of `!nil? && !empty?` to `present?`
|
16
|
-
#
|
17
|
-
# # bad
|
18
|
-
# !foo.nil? && !foo.empty?
|
19
|
-
#
|
20
|
-
# # bad
|
21
|
-
# foo != nil && !foo.empty?
|
22
|
-
#
|
23
|
-
# # good
|
24
|
-
# foo.present?
|
25
|
-
#
|
26
|
-
# @example NotBlank: true (default)
|
27
|
-
# # Converts usages of `!blank?` to `present?`
|
28
|
-
#
|
29
|
-
# # bad
|
30
|
-
# !foo.blank?
|
31
|
-
#
|
32
|
-
# # bad
|
33
|
-
# not foo.blank?
|
34
|
-
#
|
35
|
-
# # good
|
36
|
-
# foo.present?
|
37
|
-
#
|
38
|
-
# @example UnlessBlank: true (default)
|
39
|
-
# # Converts usages of `unless blank?` to `if present?`
|
40
|
-
#
|
41
|
-
# # bad
|
42
|
-
# something unless foo.blank?
|
43
|
-
#
|
44
|
-
# # good
|
45
|
-
# something if foo.present?
|
46
|
-
class Present < Cop
|
47
|
-
MSG_NOT_BLANK = 'Use `%<prefer>s` instead of `%<current>s`.'
|
48
|
-
MSG_EXISTS_AND_NOT_EMPTY = 'Use `%<prefer>s` instead of ' \
|
49
|
-
'`%<current>s`.'
|
50
|
-
MSG_UNLESS_BLANK = 'Use `if %<prefer>s` instead of ' \
|
51
|
-
'`%<current>s`.'
|
52
|
-
|
53
|
-
def_node_matcher :exists_and_not_empty?, <<-PATTERN
|
54
|
-
(and
|
55
|
-
{
|
56
|
-
(send (send $_ :nil?) :!)
|
57
|
-
(send (send $_ :!) :!)
|
58
|
-
(send $_ :!= nil)
|
59
|
-
$_
|
60
|
-
}
|
61
|
-
{
|
62
|
-
(send (send $_ :empty?) :!)
|
63
|
-
}
|
64
|
-
)
|
65
|
-
PATTERN
|
66
|
-
|
67
|
-
def_node_matcher :not_blank?, '(send (send $_ :blank?) :!)'
|
68
|
-
|
69
|
-
def_node_matcher :unless_blank?, <<-PATTERN
|
70
|
-
(:if $(send $_ :blank?) {nil? (...)} ...)
|
71
|
-
PATTERN
|
72
|
-
|
73
|
-
def on_send(node)
|
74
|
-
return unless cop_config['NotBlank']
|
75
|
-
|
76
|
-
not_blank?(node) do |receiver|
|
77
|
-
add_offense(node,
|
78
|
-
message: format(MSG_NOT_BLANK,
|
79
|
-
prefer: replacement(receiver),
|
80
|
-
current: node.source))
|
81
|
-
end
|
82
|
-
end
|
83
|
-
|
84
|
-
def on_and(node)
|
85
|
-
return unless cop_config['NotNilAndNotEmpty']
|
86
|
-
|
87
|
-
exists_and_not_empty?(node) do |var1, var2|
|
88
|
-
return unless var1 == var2
|
89
|
-
|
90
|
-
add_offense(node,
|
91
|
-
message: format(MSG_EXISTS_AND_NOT_EMPTY,
|
92
|
-
prefer: replacement(var1),
|
93
|
-
current: node.source))
|
94
|
-
end
|
95
|
-
end
|
96
|
-
|
97
|
-
def on_or(node)
|
98
|
-
return unless cop_config['NilOrEmpty']
|
99
|
-
|
100
|
-
exists_and_not_empty?(node) do |var1, var2|
|
101
|
-
return unless var1 == var2
|
102
|
-
|
103
|
-
add_offense(node, message: MSG_EXISTS_AND_NOT_EMPTY)
|
104
|
-
end
|
105
|
-
end
|
106
|
-
|
107
|
-
def on_if(node)
|
108
|
-
return unless cop_config['UnlessBlank']
|
109
|
-
return unless node.unless?
|
110
|
-
return if node.else? && config.for_cop('Style/UnlessElse')['Enabled']
|
111
|
-
|
112
|
-
unless_blank?(node) do |method_call, receiver|
|
113
|
-
range = unless_condition(node, method_call)
|
114
|
-
msg = format(MSG_UNLESS_BLANK, prefer: replacement(receiver),
|
115
|
-
current: range.source)
|
116
|
-
add_offense(node, location: range, message: msg)
|
117
|
-
end
|
118
|
-
end
|
119
|
-
|
120
|
-
def autocorrect(node)
|
121
|
-
lambda do |corrector|
|
122
|
-
method_call, variable1 = unless_blank?(node)
|
123
|
-
|
124
|
-
if method_call
|
125
|
-
corrector.replace(node.loc.keyword, 'if')
|
126
|
-
range = method_call.loc.expression
|
127
|
-
else
|
128
|
-
variable1, _variable2 =
|
129
|
-
exists_and_not_empty?(node) || not_blank?(node)
|
130
|
-
range = node.loc.expression
|
131
|
-
end
|
132
|
-
|
133
|
-
corrector.replace(range, replacement(variable1))
|
134
|
-
end
|
135
|
-
end
|
136
|
-
|
137
|
-
private
|
138
|
-
|
139
|
-
def unless_condition(node, method_call)
|
140
|
-
if node.modifier_form?
|
141
|
-
node.loc.keyword.join(node.loc.expression.end)
|
142
|
-
else
|
143
|
-
node.loc.expression.begin.join(method_call.loc.expression)
|
144
|
-
end
|
145
|
-
end
|
146
|
-
|
147
|
-
def replacement(node)
|
148
|
-
node.respond_to?(:source) ? "#{node.source}.present?" : 'present?'
|
149
|
-
end
|
150
|
-
end
|
151
|
-
end
|
152
|
-
end
|
153
|
-
end
|
@@ -1,74 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module RuboCop
|
4
|
-
module Cop
|
5
|
-
module Rails
|
6
|
-
# This cop checks for the use of the `read_attribute` or `write_attribute`
|
7
|
-
# methods and recommends square brackets instead.
|
8
|
-
#
|
9
|
-
# If an attribute is missing from the instance (for example, when
|
10
|
-
# initialized by a partial `select`) then `read_attribute`
|
11
|
-
# will return nil, but square brackets will raise
|
12
|
-
# an `ActiveModel::MissingAttributeError`.
|
13
|
-
#
|
14
|
-
# Explicitly raising an error in this situation is preferable, and that
|
15
|
-
# is why rubocop recommends using square brackets.
|
16
|
-
#
|
17
|
-
# @example
|
18
|
-
#
|
19
|
-
# # bad
|
20
|
-
# x = read_attribute(:attr)
|
21
|
-
# write_attribute(:attr, val)
|
22
|
-
#
|
23
|
-
# # good
|
24
|
-
# x = self[:attr]
|
25
|
-
# self[:attr] = val
|
26
|
-
class ReadWriteAttribute < Cop
|
27
|
-
MSG = 'Prefer `%<prefer>s` over `%<current>s`.'
|
28
|
-
|
29
|
-
def_node_matcher :read_write_attribute?, <<-PATTERN
|
30
|
-
{
|
31
|
-
(send nil? :read_attribute _)
|
32
|
-
(send nil? :write_attribute _ _)
|
33
|
-
}
|
34
|
-
PATTERN
|
35
|
-
|
36
|
-
def on_send(node)
|
37
|
-
return unless read_write_attribute?(node)
|
38
|
-
|
39
|
-
add_offense(node, location: :selector)
|
40
|
-
end
|
41
|
-
|
42
|
-
def autocorrect(node)
|
43
|
-
case node.method_name
|
44
|
-
when :read_attribute
|
45
|
-
replacement = read_attribute_replacement(node)
|
46
|
-
when :write_attribute
|
47
|
-
replacement = write_attribute_replacement(node)
|
48
|
-
end
|
49
|
-
|
50
|
-
->(corrector) { corrector.replace(node.source_range, replacement) }
|
51
|
-
end
|
52
|
-
|
53
|
-
private
|
54
|
-
|
55
|
-
def message(node)
|
56
|
-
if node.method?(:read_attribute)
|
57
|
-
format(MSG, prefer: 'self[:attr]', current: 'read_attribute(:attr)')
|
58
|
-
else
|
59
|
-
format(MSG, prefer: 'self[:attr] = val',
|
60
|
-
current: 'write_attribute(:attr, val)')
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
def read_attribute_replacement(node)
|
65
|
-
"self[#{node.first_argument.source}]"
|
66
|
-
end
|
67
|
-
|
68
|
-
def write_attribute_replacement(node)
|
69
|
-
"self[#{node.first_argument.source}] = #{node.last_argument.source}"
|
70
|
-
end
|
71
|
-
end
|
72
|
-
end
|
73
|
-
end
|
74
|
-
end
|