rubocop-performance 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab226ddbd8840eb8a3c4281e137a727b4514d9ee99c0f321de8e5d16621622cd
-  data.tar.gz: 04e64315a9ecbbb6cbef28c1dfecb953069b3282f0749caede003c00c93b981c
+  metadata.gz: 4c816f114aca2b788180d1ee5869c0a56431f9d98ff5c4d02d664ca7f90fd3e6
+  data.tar.gz: 6c7fc284ea2f60d098e53f0b9518b0ca1676e1b4659d0b30e230b044ad089316
 SHA512:
-  metadata.gz: 59f5c83e64695cb149d5babfa5e8be759fa11f23f4395810e928b627c236f0d7206f20527a1b2a96953e585f39a89c25f18ac68a44a3dd56ae2daffbc2513990
-  data.tar.gz: '0189ac9e3a329fec641134b595776cb04ba34fe13f1a3f72fc506bc95cb2021402a113090edc3be86bccd251f23768afe6cf81c6f64cfb9855ba3b32b30a0a9e'
+  metadata.gz: e2b576ba2e2d34fccfd31dbda2f34d85c9e359ed0c34195393fac93d6918070dbd64fb07d3e9a60f3f7074e09a969c5e78caaf15a231d614fc9e3d5100926c64
+  data.tar.gz: 8c9a0db760475847abcd14a41a403c294e3bbbe75a8fa7070b0047ff043a2ea840beff2a550500727aae98ec2262ebaaa2fba57b160aa1aec0b9afc0f54212b1

data/README.md

@@ -1,5 +1,6 @@
 # RuboCop Performance
 
+[![Gem Version](https://badge.fury.io/rb/rubocop-performance.svg)](https://badge.fury.io/rb/rubocop-performance)
 [![CircleCI](https://circleci.com/gh/rubocop-hq/rubocop-performance.svg?style=svg)](https://circleci.com/gh/rubocop-hq/rubocop-performance)
 
 Performance optimization analysis for your projects, as an extension to [RuboCop](https://github.com/rubocop-hq/rubocop).

data/config/default.yml

@@ -113,11 +113,6 @@ Performance/InefficientHashSearch:
   VersionAdded: '0.56'
   Safe: false
 
-Performance/LstripRstrip:
-  Description: 'Use `strip` instead of `lstrip.rstrip`.'
-  Enabled: true
-  VersionAdded: '0.36'
-
 Performance/OpenStruct:
   Description: 'Use `Struct` instead of `OpenStruct`.'
   Enabled: false
@@ -152,11 +147,6 @@ Performance/RedundantMerge:
   # Max number of key-value pairs to consider an offense
   MaxKeyValuePairs: 2
 
-Performance/RedundantSortBy:
-  Description: 'Use `sort` instead of `sort_by { |x| x }`.'
-  Enabled: true
-  VersionAdded: '0.36'
-
 Performance/RegexpMatch:
   Description: >-
                   Use `match?` instead of `Regexp#match`, `String#match`, `Symbol#match`,
@@ -171,14 +161,6 @@ Performance/ReverseEach:
   Enabled: true
   VersionAdded: '0.30'
 
-Performance/Sample:
-  Description: >-
-                  Use `sample` instead of `shuffle.first`,
-                  `shuffle.last`, and `shuffle[Integer]`.
-  Reference: 'https://github.com/JuanitoFatas/fast-ruby#arrayshufflefirst-vs-arraysample-code'
-  Enabled: true
-  VersionAdded: '0.30'
-
 Performance/Size:
   Description: >-
                   Use `size` instead of `count` for counting
@@ -221,13 +203,6 @@ Performance/UnfreezeString:
   Enabled: true
   VersionAdded: '0.50'
 
-Performance/UnneededSort:
-  Description: >-
-                  Use `min` instead of `sort.first`,
-                  `max_by` instead of `sort_by...last`, etc.
-  Enabled: true
-  VersionAdded: '0.55'
-
 Performance/UriDefaultParser:
   Description: 'Use `URI::DEFAULT_PARSER` instead of `URI::Parser.new`.'
   Enabled: true

data/lib/rubocop/cop/performance_cops.rb

@@ -19,21 +19,17 @@ require_relative 'performance/end_with'
 require_relative 'performance/fixed_size'
 require_relative 'performance/flat_map'
 require_relative 'performance/inefficient_hash_search'
-require_relative 'performance/lstrip_rstrip'
 require_relative 'performance/open_struct'
 require_relative 'performance/range_include'
 require_relative 'performance/redundant_block_call'
 require_relative 'performance/redundant_match'
 require_relative 'performance/redundant_merge'
-require_relative 'performance/redundant_sort_by'
 require_relative 'performance/regexp_match'
 require_relative 'performance/reverse_each'
-require_relative 'performance/sample'
 require_relative 'performance/size'
 require_relative 'performance/start_with'
 require_relative 'performance/string_replacement'
 require_relative 'performance/times_map'
 require_relative 'performance/unfreeze_string'
-require_relative 'performance/unneeded_sort'
 require_relative 'performance/uri_default_parser'
 require_relative 'performance/chain_array_allocation'

data/lib/rubocop/performance/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Performance
     module Version
-      STRING = '1.0.0'.freeze
+      STRING = '1.1.0'.freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-performance
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.58.0
+        version: 0.67.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.58.0
+        version: 0.67.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -66,22 +66,18 @@ files:
 - lib/rubocop/cop/performance/fixed_size.rb
 - lib/rubocop/cop/performance/flat_map.rb
 - lib/rubocop/cop/performance/inefficient_hash_search.rb
-- lib/rubocop/cop/performance/lstrip_rstrip.rb
 - lib/rubocop/cop/performance/open_struct.rb
 - lib/rubocop/cop/performance/range_include.rb
 - lib/rubocop/cop/performance/redundant_block_call.rb
 - lib/rubocop/cop/performance/redundant_match.rb
 - lib/rubocop/cop/performance/redundant_merge.rb
-- lib/rubocop/cop/performance/redundant_sort_by.rb
 - lib/rubocop/cop/performance/regexp_match.rb
 - lib/rubocop/cop/performance/reverse_each.rb
-- lib/rubocop/cop/performance/sample.rb
 - lib/rubocop/cop/performance/size.rb
 - lib/rubocop/cop/performance/start_with.rb
 - lib/rubocop/cop/performance/string_replacement.rb
 - lib/rubocop/cop/performance/times_map.rb
 - lib/rubocop/cop/performance/unfreeze_string.rb
-- lib/rubocop/cop/performance/unneeded_sort.rb
 - lib/rubocop/cop/performance/uri_default_parser.rb
 - lib/rubocop/cop/performance_cops.rb
 - lib/rubocop/performance.rb
@@ -104,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/rubocop/cop/performance/lstrip_rstrip.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    module Performance
-      # This cop identifies places where `lstrip.rstrip` can be replaced by
-      # `strip`.
-      #
-      # @example
-      #   # bad
-      #   'abc'.lstrip.rstrip
-      #   'abc'.rstrip.lstrip
-      #
-      #   # good
-      #   'abc'.strip
-      class LstripRstrip < Cop
-        include RangeHelp
-
-        MSG = 'Use `strip` instead of `%<methods>s`.'.freeze
-
-        def_node_matcher :lstrip_rstrip, <<-PATTERN
-          {(send $(send _ $:rstrip) $:lstrip)
-           (send $(send _ $:lstrip) $:rstrip)}
-        PATTERN
-
-        def on_send(node)
-          lstrip_rstrip(node) do |first_send, method_one, method_two|
-            range = range_between(first_send.loc.selector.begin_pos,
-                                  node.source_range.end_pos)
-            add_offense(node,
-                        location: range,
-                        message: format(MSG,
-                                        methods: "#{method_one}.#{method_two}"))
-          end
-        end
-
-        def autocorrect(node)
-          range = range_between(node.receiver.loc.selector.begin_pos,
-                                node.source_range.end_pos)
-
-          ->(corrector) { corrector.replace(range, 'strip') }
-        end
-      end
-    end
-  end
-end

data/lib/rubocop/cop/performance/redundant_sort_by.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    module Performance
-      # This cop identifies places where `sort_by { ... }` can be replaced by
-      # `sort`.
-      #
-      # @example
-      #   # bad
-      #   array.sort_by { |x| x }
-      #   array.sort_by do |var|
-      #     var
-      #   end
-      #
-      #   # good
-      #   array.sort
-      class RedundantSortBy < Cop
-        include RangeHelp
-
-        MSG = 'Use `sort` instead of `sort_by { |%<var>s| %<var>s }`.'.freeze
-
-        def_node_matcher :redundant_sort_by, <<-PATTERN
-          (block $(send _ :sort_by) (args (arg $_x)) (lvar _x))
-        PATTERN
-
-        def on_block(node)
-          redundant_sort_by(node) do |send, var_name|
-            range = sort_by_range(send, node)
-
-            add_offense(node,
-                        location: range,
-                        message: format(MSG, var: var_name))
-          end
-        end
-
-        def autocorrect(node)
-          send, = *node
-          ->(corrector) { corrector.replace(sort_by_range(send, node), 'sort') }
-        end
-
-        private
-
-        def sort_by_range(send, node)
-          range_between(send.loc.selector.begin_pos, node.loc.end.end_pos)
-        end
-      end
-    end
-  end
-end

data/lib/rubocop/cop/performance/sample.rb

@@ -1,145 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    module Performance
-      # This cop is used to identify usages of `shuffle.first`,
-      # `shuffle.last`, and `shuffle[]` and change them to use
-      # `sample` instead.
-      #
-      # @example
-      #   # bad
-      #   [1, 2, 3].shuffle.first
-      #   [1, 2, 3].shuffle.first(2)
-      #   [1, 2, 3].shuffle.last
-      #   [2, 1, 3].shuffle.at(0)
-      #   [2, 1, 3].shuffle.slice(0)
-      #   [1, 2, 3].shuffle[2]
-      #   [1, 2, 3].shuffle[0, 2]    # sample(2) will do the same
-      #   [1, 2, 3].shuffle[0..2]    # sample(3) will do the same
-      #   [1, 2, 3].shuffle(random: Random.new).first
-      #
-      #   # good
-      #   [1, 2, 3].shuffle
-      #   [1, 2, 3].sample
-      #   [1, 2, 3].sample(3)
-      #   [1, 2, 3].shuffle[1, 3]    # sample(3) might return a longer Array
-      #   [1, 2, 3].shuffle[1..3]    # sample(3) might return a longer Array
-      #   [1, 2, 3].shuffle[foo, bar]
-      #   [1, 2, 3].shuffle(random: Random.new)
-      class Sample < Cop
-        MSG = 'Use `%<correct>s` instead of `%<incorrect>s`.'.freeze
-
-        def_node_matcher :sample_candidate?, <<-PATTERN
-          (send $(send _ :shuffle $...) ${:first :last :[] :at :slice} $...)
-        PATTERN
-
-        def on_send(node)
-          sample_candidate?(node) do |shuffle, shuffle_arg, method, method_args|
-            return unless offensive?(method, method_args)
-
-            range = source_range(shuffle, node)
-            message = message(shuffle_arg, method, method_args, range)
-            add_offense(node, location: range, message: message)
-          end
-        end
-
-        def autocorrect(node)
-          shuffle_node, shuffle_arg, method, method_args =
-            sample_candidate?(node)
-
-          lambda do |corrector|
-            corrector.replace(source_range(shuffle_node, node),
-                              correction(shuffle_arg, method, method_args))
-          end
-        end
-
-        private
-
-        def offensive?(method, method_args)
-          case method
-          when :first, :last
-            true
-          when :[], :at, :slice
-            sample_size(method_args) != :unknown
-          else
-            false
-          end
-        end
-
-        def sample_size(method_args)
-          case method_args.size
-          when 1
-            sample_size_for_one_arg(method_args.first)
-          when 2
-            sample_size_for_two_args(*method_args)
-          end
-        end
-
-        def sample_size_for_one_arg(arg)
-          case arg.type
-          when :erange, :irange
-            range_size(arg)
-          when :int
-            [0, -1].include?(arg.to_a.first) ? nil : :unknown
-          else
-            :unknown
-          end
-        end
-
-        def sample_size_for_two_args(first, second)
-          return :unknown unless first.int_type? && first.to_a.first.zero?
-
-          second.int_type? ? second.to_a.first : :unknown
-        end
-
-        def range_size(range_node)
-          vals = range_node.to_a
-          return :unknown unless vals.all?(&:int_type?)
-
-          low, high = vals.map { |val| val.children[0] }
-          return :unknown unless low.zero? && high >= 0
-
-          case range_node.type
-          when :erange
-            (low...high).size
-          when :irange
-            (low..high).size
-          end
-        end
-
-        def source_range(shuffle_node, node)
-          Parser::Source::Range.new(shuffle_node.source_range.source_buffer,
-                                    shuffle_node.loc.selector.begin_pos,
-                                    node.source_range.end_pos)
-        end
-
-        def message(shuffle_arg, method, method_args, range)
-          format(MSG,
-                 correct: correction(shuffle_arg, method, method_args),
-                 incorrect: range.source)
-        end
-
-        def correction(shuffle_arg, method, method_args)
-          shuffle_arg = extract_source(shuffle_arg)
-          sample_arg = sample_arg(method, method_args)
-          args = [sample_arg, shuffle_arg].compact.join(', ')
-          args.empty? ? 'sample' : "sample(#{args})"
-        end
-
-        def sample_arg(method, method_args)
-          case method
-          when :first, :last
-            extract_source(method_args)
-          when :[], :slice
-            sample_size(method_args)
-          end
-        end
-
-        def extract_source(args)
-          args.empty? ? nil : args.first.source
-        end
-      end
-    end
-  end
-end

data/lib/rubocop/cop/performance/unneeded_sort.rb

@@ -1,165 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    module Performance
-      # This cop is used to identify instances of sorting and then
-      # taking only the first or last element. The same behavior can
-      # be accomplished without a relatively expensive sort by using
-      # `Enumerable#min` instead of sorting and taking the first
-      # element and `Enumerable#max` instead of sorting and taking the
-      # last element. Similarly, `Enumerable#min_by` and
-      # `Enumerable#max_by` can replace `Enumerable#sort_by` calls
-      # after which only the first or last element is used.
-      #
-      # @example
-      #   # bad
-      #   [2, 1, 3].sort.first
-      #   [2, 1, 3].sort[0]
-      #   [2, 1, 3].sort.at(0)
-      #   [2, 1, 3].sort.slice(0)
-      #
-      #   # good
-      #   [2, 1, 3].min
-      #
-      #   # bad
-      #   [2, 1, 3].sort.last
-      #   [2, 1, 3].sort[-1]
-      #   [2, 1, 3].sort.at(-1)
-      #   [2, 1, 3].sort.slice(-1)
-      #
-      #   # good
-      #   [2, 1, 3].max
-      #
-      #   # bad
-      #   arr.sort_by(&:foo).first
-      #   arr.sort_by(&:foo)[0]
-      #   arr.sort_by(&:foo).at(0)
-      #   arr.sort_by(&:foo).slice(0)
-      #
-      #   # good
-      #   arr.min_by(&:foo)
-      #
-      #   # bad
-      #   arr.sort_by(&:foo).last
-      #   arr.sort_by(&:foo)[-1]
-      #   arr.sort_by(&:foo).at(-1)
-      #   arr.sort_by(&:foo).slice(-1)
-      #
-      #   # good
-      #   arr.max_by(&:foo)
-      #
-      class UnneededSort < Cop
-        include RangeHelp
-
-        MSG = 'Use `%<suggestion>s` instead of '\
-              '`%<sorter>s...%<accessor_source>s`.'.freeze
-
-        def_node_matcher :unneeded_sort?, <<-MATCHER
-          {
-            (send $(send _ $:sort ...) ${:last :first})
-            (send $(send _ $:sort ...) ${:[] :at :slice} {(int 0) (int -1)})
-
-            (send $(send _ $:sort_by _) ${:last :first})
-            (send $(send _ $:sort_by _) ${:[] :at :slice} {(int 0) (int -1)})
-
-            (send (block $(send _ ${:sort_by :sort}) ...) ${:last :first})
-            (send
-              (block $(send _ ${:sort_by :sort}) ...)
-              ${:[] :at :slice} {(int 0) (int -1)}
-            )
-          }
-        MATCHER
-
-        def on_send(node)
-          unneeded_sort?(node) do |sort_node, sorter, accessor|
-            range = range_between(
-              sort_node.loc.selector.begin_pos,
-              node.loc.expression.end_pos
-            )
-
-            add_offense(node,
-                        location: range,
-                        message: message(node,
-                                         sorter,
-                                         accessor))
-          end
-        end
-
-        def autocorrect(node)
-          sort_node, sorter, accessor = unneeded_sort?(node)
-
-          lambda do |corrector|
-            # Remove accessor, e.g. `first` or `[-1]`.
-            corrector.remove(
-              range_between(
-                accessor_start(node),
-                node.loc.expression.end_pos
-              )
-            )
-
-            # Replace "sort" or "sort_by" with the appropriate min/max method.
-            corrector.replace(
-              sort_node.loc.selector,
-              suggestion(sorter, accessor, arg_value(node))
-            )
-          end
-        end
-
-        private
-
-        def message(node, sorter, accessor)
-          accessor_source = range_between(
-            node.loc.selector.begin_pos,
-            node.loc.expression.end_pos
-          ).source
-
-          format(MSG,
-                 suggestion: suggestion(sorter,
-                                        accessor,
-                                        arg_value(node)),
-                 sorter: sorter,
-                 accessor_source: accessor_source)
-        end
-
-        def suggestion(sorter, accessor, arg)
-          base(accessor, arg) + suffix(sorter)
-        end
-
-        def base(accessor, arg)
-          if accessor == :first || (arg && arg.zero?)
-            'min'
-          elsif accessor == :last || arg == -1
-            'max'
-          end
-        end
-
-        def suffix(sorter)
-          if sorter == :sort
-            ''
-          elsif sorter == :sort_by
-            '_by'
-          end
-        end
-
-        def arg_node(node)
-          node.arguments.first
-        end
-
-        def arg_value(node)
-          arg_node(node).nil? ? nil : arg_node(node).node_parts.first
-        end
-
-        # This gets the start of the accessor whether it has a dot
-        # (e.g. `.first`) or doesn't (e.g. `[0]`)
-        def accessor_start(node)
-          if node.loc.dot
-            node.loc.dot.begin_pos
-          else
-            node.loc.selector.begin_pos
-          end
-        end
-      end
-    end
-  end
-end