sevencop 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2be2d44c67e1057b48a80a65e3bcdaaf1663d00b4cfd40a780e5524279be89e8
-  data.tar.gz: 577fe7a5e296a27b002814584a2716b6a445b6013d8759233a8ca1bb31183a32
+  metadata.gz: 3d3ab099568a85aea228ce2fcf282f4e0bc7a2e2c6f3315191c2e9e14367a173
+  data.tar.gz: aeba9572d3eeb74d5d4da5473b30b62d291b0e01d8f5644f041ca41ecd43994f
 SHA512:
-  metadata.gz: c0acba59ece08f76e4c937542c5579e2352582d32dffd6e07f584466f8d386cfe863af58c6b480c0e9db675584b4a6a977c9babb18b7c83676b5f8112c63a885
-  data.tar.gz: 5bb840ce34348e557cc9512b9f4ffcb6f8da0cf680e35cb77f11a2858aa68fc2a51b4229e8feadafda21507f699d5977d5ec9906e109652d29d9333ba0522adc
+  metadata.gz: 643b778e5c44256e590b1a7344825f46c1057a18d3e424076583b522a21f957ca1acf37e2ba6f59d58b72a66e929e2aada551c627cf039d065dbea2646d4e485
+  data.tar.gz: 723e43f5d54dab22c1be3d02bb1074d6899783aec74c64c1fa6ead9294b01ffde02d5aae1b1792e483082d5d297f784de393a20285d34a303e892febc2522ae6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sevencop (0.9.2)
+    sevencop (0.9.3)
       rubocop
 
 GEM

data/lib/rubocop/cop/sevencop/hash_literal_order.rb

@@ -55,13 +55,13 @@ module RuboCop
         # @param [RuboCop::AST::HashNode] node
         # @return [String]
         def autocorrect(node)
-          [
-            '{',
+          parts = [
             whitespace_leading(node),
             sort(node.pairs).map(&:source).join(",#{whitespace_between(node)}"),
-            whitespace_trailing(node),
-            '}'
-          ].join
+            whitespace_trailing(node)
+          ]
+          parts = ['{', *parts, '}'] if node.braces?
+          parts.join
         end
 
         # @param [Array<RuboCop::AST::PairNode>] pairs
@@ -84,7 +84,9 @@ module RuboCop
         #             ^^^
         def whitespace_between(node)
           if node.pairs.length >= 2
-            node.source[node.pairs[0].location.expression.end_pos + 1...node.pairs[1].location.expression.begin_pos]
+            processed_source.raw_source[
+              node.pairs[0].location.expression.end_pos + 1...node.pairs[1].location.expression.begin_pos
+            ]
           else
             ' '
           end
@@ -95,7 +97,9 @@ module RuboCop
         #   {    a: 1,   b: 1  }
         #                    ^^
         def whitespace_trailing(node)
-          node.source[node.pairs[-1].location.expression.end_pos...node.location.end.begin_pos]
+          processed_source.raw_source[
+            node.pairs[-1].location.expression.end_pos...node.location.expression.end.begin_pos - offset_for(node)
+          ]
         end
 
         # @param [RuboCop::AST::HashNode] node
@@ -103,7 +107,19 @@ module RuboCop
         #   {    a: 1,   b: 1  }
         #    ^^^^
         def whitespace_leading(node)
-          node.source[node.location.begin.end_pos...node.pairs[0].location.expression.begin_pos]
+          processed_source.raw_source[
+            node.location.expression.begin.end_pos + offset_for(node)...node.pairs[0].location.expression.begin_pos
+          ]
+        end
+
+        # @param [RuboCop::AST::HashNode] node
+        # @return [Integer]
+        def offset_for(node)
+          if node.braces?
+            1
+          else
+            0
+          end
         end
       end
     end

data/lib/sevencop/config_loader.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'rubocop'
+
+module Sevencop
+  # Merge default RuboCop config with plugin config.
+  class ConfigLoader
+    PLUGIN_CONFIG_PATH = ::File.expand_path(
+      '../../config/default.yml',
+      __dir__
+    )
+
+    class << self
+      # @return [RuboCop::Config]
+      def call
+        new.call
+      end
+    end
+
+    # @return [RuboCop::Config]
+    def call
+      ::RuboCop::ConfigLoader.merge_with_default(
+        plugin_config,
+        PLUGIN_CONFIG_PATH
+      )
+    end
+
+    private
+
+    # @return [RuboCop::Config]
+    def plugin_config
+      config = ::RuboCop::Config.new(
+        plugin_config_hash,
+        PLUGIN_CONFIG_PATH
+      )
+      config.make_excludes_absolute
+      config
+    end
+
+    # @return [Hash]
+    def plugin_config_hash
+      ::RuboCop::ConfigLoader.send(
+        :load_yaml_configuration,
+        PLUGIN_CONFIG_PATH
+      )
+    end
+  end
+end

data/lib/sevencop/rubocop_extension.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'rubocop'
+
+require_relative 'config_loader'
+
+RuboCop::ConfigLoader.instance_variable_set(
+  :@default_configuration,
+  Sevencop::ConfigLoader.call
+)

data/lib/sevencop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sevencop
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

data/lib/sevencop.rb

@@ -3,7 +3,7 @@
 require 'pathname'
 require 'yaml'
 
-require_relative 'sevencop/inject'
+require_relative 'sevencop/rubocop_extension'
 require_relative 'sevencop/version'
 
 require_relative 'rubocop/cop/sevencop/belongs_to_optional'
@@ -14,15 +14,3 @@ require_relative 'rubocop/cop/sevencop/redundant_existence_check'
 require_relative 'rubocop/cop/sevencop/to_s_with_argument'
 require_relative 'rubocop/cop/sevencop/uniqueness_validator_explicit_case_sensitivity'
 require_relative 'rubocop/cop/sevencop/where_not'
-
-module Sevencop
-  PROJECT_ROOT = ::Pathname.new(__dir__).parent.expand_path.freeze
-
-  CONFIG_DEFAULT = PROJECT_ROOT.join('config', 'default.yml').freeze
-
-  CONFIG = ::YAML.safe_load(CONFIG_DEFAULT.read).freeze
-
-  private_constant(:CONFIG_DEFAULT, :PROJECT_ROOT)
-end
-
-Sevencop::Inject.defaults!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sevencop
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-19 00:00:00.000000000 Z
+date: 2022-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -50,7 +50,8 @@ files:
 - lib/rubocop/cop/sevencop/uniqueness_validator_explicit_case_sensitivity.rb
 - lib/rubocop/cop/sevencop/where_not.rb
 - lib/sevencop.rb
-- lib/sevencop/inject.rb
+- lib/sevencop/config_loader.rb
+- lib/sevencop/rubocop_extension.rb
 - lib/sevencop/version.rb
 - sevencop.gemspec
 homepage: https://github.com/r7kamura/sevencop

data/lib/sevencop/inject.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubocop'
-
-# The original code is from https://github.com/rubocop/rubocop-rspec/blob/main/lib/rubocop/rspec/inject.rb
-# See https://github.com/rubocop/rubocop-rspec/blob/main/MIT-LICENSE.md
-module Sevencop
-  module Inject
-    def self.defaults!
-      path = CONFIG_DEFAULT.to_s
-      hash = ::RuboCop::ConfigLoader.send(:load_yaml_configuration, path)
-      config = ::RuboCop::Config.new(hash, path).tap(&:make_excludes_absolute)
-      puts "configuration from #{path}" if ::RuboCop::ConfigLoader.debug?
-      config = ::RuboCop::ConfigLoader.merge_with_default(config, path)
-      ::RuboCop::ConfigLoader.instance_variable_set(:@default_configuration, config)
-    end
-  end
-end