gitlab-styles 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88825b6aaa4961f16a29bfc14cdb1d590700a74e81fe68e072fccd2046506c6b
-  data.tar.gz: 5634afcb51a117e54f4760c43f12d3b2564d08b62bbcd49d97b7cde7c88014d6
+  metadata.gz: 7ffdef3ce888f639822f2931093c590fa0ef9979fc38ec290f4a7b4a18393b55
+  data.tar.gz: d22d5faa3fbcafe4a899ad1f8315813a5b8dd0d2e9c0baa2aa80cfcf2c56f12a
 SHA512:
-  metadata.gz: 99652ceb45ae8e31ac3105bd7913a2c85e0a5a22cd97ad5d30081fd1b55b4d1734671d9cdbfdf1875dbdbc314efb9fe433b8859a18761ebea1d1054f58aa88d1
-  data.tar.gz: 2b16d7dc347ec66fd1656d735bc6427c485c88e27d7fb3030e0a852d76fb338705a976e85fb949b25b3994035134251da3771a9f3c914767d6d7158ecf5137e4
+  metadata.gz: 31dc65dd2a632d76307e85f9350babbda6032e9934fa9a6a363a5aecab344ef744a741f5f69c185eea7826391cfea4ad5f02ccda540f35b3b0baf9cecf331e65
+  data.tar.gz: b39f7fead8a619e687543a451a31870b9f3c05f7c06e88b16e2d120c5ae28e71e33edbc333660ce5e8560daee737870f7049f7f2cde776ad21bfd092efab52b6

data/gitlab-styles.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rubocop', '~> 0.91.1'
+  spec.add_dependency 'rubocop', '~> 0.91', '>= 0.91.1'
   spec.add_dependency 'rubocop-gitlab-security', '~> 0.1.1'
   spec.add_dependency 'rubocop-performance', '~> 1.9.2'
   spec.add_dependency 'rubocop-rails', '~> 2.9'

data/lib/gitlab/styles/rubocop/cop/code_reuse/active_record.rb

@@ -44,7 +44,6 @@ module Gitlab
               ids: false,
               includes: true,
               joins: true,
-              limit: true,
               lock: false,
               many?: false,
               offset: true,

data/lib/gitlab/styles/rubocop/cop/style/hash_transformation.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Styles
+    module Rubocop
+      module Cop
+        module Style
+          # This cop identifies places where `map { ... }.to_h` or
+          # `Hash[map { ... }]` can be replaced with `to_h { ... }`,
+          # saving an intermediate array allocation.
+          #
+          # @example
+          #   # bad
+          #   hash.map { |k, v| [v.upcase, k.downcase] }.to_h
+          #   hash.collect { |k, v| [v.upcase, k.downcase] }.to_h
+          #   Hash[hash.map { |k, v| [v.upcase, k.downcase] }]
+          #   Hash[hash.collect { |k, v| [v.upcase, k.downcase] }]
+          #   array.map { |x| [x, x + 1] }.to_h
+          #
+          #   # good
+          #   hash.to_h { |k, v| [v.upcase, k.downcase] }
+          #   array.to_h { |x| [x, x + 1] }
+          #
+          # Full credit: https://github.com/eugeneius/rubocop-performance/blob/hash_transformation/lib/rubocop/cop/performance/hash_transformation.rb
+          class HashTransformation < RuboCop::Cop::Cop
+            include RuboCop::Cop::RangeHelp
+
+            MSG = 'Use `to_h { ... }` instead of `%<current>s`.'
+
+            def_node_matcher :to_h_candidate?, <<~PATTERN
+              {
+                [(send
+                  $(block $(send _ {:map :collect}) ...) :to_h) !block_literal?]
+                (send (const nil? :Hash) :[]
+                  $(block $(send _ {:map :collect}) ...))
+              }
+            PATTERN
+
+            def on_send(node)
+              to_h_candidate?(node) do |_block, call|
+                range = offense_range(node, call)
+                message = message(node, call)
+                add_offense(node, location: range, message: message)
+              end
+            end
+
+            def autocorrect(node)
+              block, call = to_h_candidate?(node)
+
+              lambda do |corrector|
+                corrector.remove(after_block(node, block))
+                corrector.replace(call.loc.selector, 'to_h')
+                corrector.remove(before_block(node, block))
+              end
+            end
+
+            private
+
+            def offense_range(node, call)
+              return node.source_range if node.children.first.const_type?
+
+              range_between(call.loc.selector.begin_pos, node.loc.selector.end_pos)
+            end
+
+            def message(node, call)
+              current = if node.children.first.const_type?
+                          "Hash[#{call.method_name} { ... }]"
+                        else
+                          "#{call.method_name} { ... }.to_h"
+                        end
+
+              format(MSG, current: current)
+            end
+
+            def after_block(node, block)
+              block.source_range.end.join(node.source_range.end)
+            end
+
+            def before_block(node, block)
+              node.source_range.begin.join(block.source_range.begin)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/styles/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Styles
-    VERSION = '6.0.0'
+    VERSION = '6.1.0'
   end
 end

data/rubocop-style.yml

@@ -187,6 +187,13 @@ Style/HashTransformKeys:
 Style/HashTransformValues:
   Enabled: true
 
+
+# This cop identifies places where `map { ... }.to_h` or
+# `Hash[map { ... }]` can be replaced with `to_h { ... }`,
+# saving an intermediate array allocation.
+Style/HashTransformation:
+  Enabled: true
+
 # Checks that conditional statements do not have an identical line at the
 # end of each branch, which can validly be moved out of the conditional.
 Style/IdenticalConditionalBranches:

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-styles
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.91'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.91.1
   type: :runtime
@@ -22,6 +25,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.91'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.91.1
 - !ruby/object:Gem::Dependency
@@ -166,6 +172,7 @@ files:
 - lib/gitlab/styles/rubocop/cop/rspec/have_link_parameters.rb
 - lib/gitlab/styles/rubocop/cop/rspec/single_line_hook.rb
 - lib/gitlab/styles/rubocop/cop/rspec/verbose_include_metadata.rb
+- lib/gitlab/styles/rubocop/cop/style/hash_transformation.rb
 - lib/gitlab/styles/rubocop/cop/without_reactive_cache.rb
 - lib/gitlab/styles/rubocop/migration_helpers.rb
 - lib/gitlab/styles/rubocop/model_helpers.rb