rubocop-ipepe 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88e1adbe08b2ef30c8afacb029a5240dcb26fb73cb7462951a5e48b42a2c011e
-  data.tar.gz: f09e9d131d92b567b163af95a17399ea251d0c04cb73de37bacf763b5762c305
+  metadata.gz: de4eaca3e90e2d725150dfd73f2ac1f7fe2ded6cd6e74fbc655bda32271aff06
+  data.tar.gz: ed69c79e05e846fcb7ba3dbcbad84fd79a166038a1a62dfd51ed7510a16f1865
 SHA512:
-  metadata.gz: b43f6237752ad1a9f250c9645c1fbdcbb547c2b5c2f76ed12246d8c3bdc83a8df660f6980ba0b59caa69dd87be9b61c5d56e3fc47f8c85b721eb618231c57863
-  data.tar.gz: f4ea5b113609baa4371c244272c00daa21d912436fb4d474c51ef1a1977370a9935222b62e534c1d306153ff01bd571e4459761e6e2143ce617cb3df67103568
+  metadata.gz: 70334cad11275adc26a93458415d56bc61782bd12ba25055d62dec895c2dd4cc37d6bec273e2ddd596d4b794ed30a9dd5d1c736980a66f721b31e2434ad78d8e
+  data.tar.gz: 401005de826accbc78ddeb851d09202a67d22b073760178f31128977c280f32496b0e74419f2416989f34d21b77695d364594c3e673ec599d15bef75d1180bb4

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    rubocop-ipepe (0.2.0)
-      rubocop (~> 1.41)
+    rubocop-ipepe (0.2.5)
+      rubocop (>= 1.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/rubocop/cop/ipepe/alphabetical_hash_keys.rb

@@ -5,9 +5,15 @@ module RuboCop
         extend AutoCorrector
         MSG = "Ensure that keys in hash are in alphabetical order".freeze
 
-        def on_hash(node)
+        def on_hash(node) # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
           keys = node.children.select(&:pair_type?).map(&:key)
-          sorted_keys = keys.sort_by(&:value)
+          sorted_keys = keys.sort_by do |k|
+            if k.respond_to?(:value)
+              k.value.to_s
+            elsif k.respond_to?(:const_name)
+              k.const_name.to_s
+            end
+          end
           return if cop_not_applicable?(keys, sorted_keys)
 
           add_offense(node) do |corrector|
@@ -17,30 +23,30 @@ module RuboCop
             corrector.replace(
               node,
               [
-                "{",
+                ("{" if node.source.start_with?("{")),
                 sorted_keypairs(node, sorted_keys).join(",#{join_keys_with}"),
-                "}"
-              ].join(join_keys_with)
+                ("}" if node.source.end_with?("}"))
+              ].compact.join(join_keys_with)
             )
           end
         end
 
         private
 
-        def cop_not_applicable?(keys, sorted_keys)
+        def cop_not_applicable?(keys, sorted_keys) # rubocop:disable Metrics/PerceivedComplexity
           keys.empty? ||
             keys.one? ||
-            (keys.none?(&:str_type?) && keys.none?(&:sym_type?)) ||
+            (keys.none?(&:str_type?) && keys.none?(&:sym_type?) && keys.none?(&:const_type?)) ||
             keys == sorted_keys
         end
 
         def sorted_keypairs(node, sorted_keys)
           sorted_keys.map do |k|
             keypair = node.children.find { |n| n.key == k }
-            if keypair.key.str_type?
-              "#{keypair.key.source} => #{keypair.value.source}"
-            elsif keypair.key.sym_type?
+            if keypair.key.sym_type?
               "#{keypair.key.source}: #{keypair.value.source}"
+            else
+              "#{keypair.key.source} => #{keypair.value.source}"
             end
           end
         end

data/lib/rubocop/ipepe/version.rb

@@ -1,5 +1,5 @@
 module RuboCop
   module Ipepe
-    VERSION = "0.2.0".freeze
+    VERSION = "0.2.5".freeze
   end
 end

data/rubocop-ipepe.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "rubocop", "~> 1.41"
+  spec.add_runtime_dependency "rubocop", ">= 1.0"
   spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-ipepe
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Patryk Ptasinski
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2024-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.41'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.41'
+        version: '1.0'
 description: This gem is a collection of RuboCop cops used by ipepe.
 email:
 - patryk@ipepe.pl