rubocop-discourse 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6655fa53ae9c2bd93548aae8db88b78294303626031e03896131ca120c083021
-  data.tar.gz: f21f3ab9e4b3b184f7e26ab16e917ad77598c076fa3a4e0bc9a4280517b9bbcf
+  metadata.gz: d87c5bc1d76fa5c4d785017af0f514bfd836d0a35a5b3ecb35d34c3c08f311b1
+  data.tar.gz: 9469659b2155d8acb12d82ce1a7bca26771862cd16975c520f8e86028f96918d
 SHA512:
-  metadata.gz: df675e48cb73e337f4256161d8e16da66ca0c2b00c7402b983f221cc979b1594d0b8636d71672b8d16b7ea74b8be0d4d2ca94accb4dd49c2a3f7810ea13bde11
-  data.tar.gz: a2a12b9f318aa4fcb2f18adac55efc2bc8c05ffbb151085d9d1f607b0abaf623c13960fcbd18074efc92540b7feff7f1285efc3215dc8cf50615a437192b5a03
+  metadata.gz: cf4d58947738c5c37cc396579058bab0241cbd5dc7d3c654be92c74fca0b4fe51fcb892f8f590738aaa4f93a76fc431632fefa50bd1994eb82b5cab989decd83
+  data.tar.gz: 291d805bc86a3bca91c6e32d547c8ae27bcce4335a00922ed9da22bd3d0c4cbaa2df991b8ff7c2f17a222c9fea41452c5cc9ba9f736f7d910b1c677d44978b92

data/.rubocop.yml

@@ -1,20 +1,2 @@
-require:
-  - rubocop-discourse
-
 inherit_from:
-  - ./rubocop-core.yml
-  - ./rubocop-rspec.yml
-
-AllCops:
-  TargetRubyVersion: 2.6
-  DisabledByDefault: true
-  Exclude:
-    - "db/schema.rb"
-    - "bundle/**/*"
-    - "vendor/**/*"
-    - "node_modules/**/*"
-    - "public/**/*"
-    - "plugins/**/gems/**/*"
-
-Discourse:
-  Enabled: true
+  - default.yml

data/README.md

@@ -7,5 +7,5 @@ Then add the following to `.rubocop.yml`:
 
 ```yml
 inherit_gem:
-  rubocop-discourse: .rubocop.yml
+  rubocop-discourse: default.yml
 ```

data/config/default.yml

@@ -4,14 +4,28 @@ Discourse/NoChdir:
     - 'spec/**/*' # Specs are run sequentially, so chdir can be used
     - 'plugins/*/spec/**/*'
 
-Discourse/NoDirectMultisiteManipulation:
-  Enabled: true
-
 Discourse/NoTimeNewWithoutArgs:
   Enabled: true
 
 Discourse/NoUriEscapeEncode:
   Enabled: true
 
+# Specs
+
+Discourse/NoDirectMultisiteManipulation:
+  Enabled: true
+  Patterns:
+  - _spec.rb
+  - "(?:^|/)spec/"
+
 Discourse/TimeEqMatcher:
   Enabled: true
+  Patterns:
+  - _spec.rb
+  - "(?:^|/)spec/"
+
+Discourse/NoJsonParseResponse:
+  Enabled: true
+  Patterns:
+  - _spec.rb
+  - "(?:^|/)spec/"

data/default.yml

@@ -0,0 +1,20 @@
+require:
+  - rubocop-discourse
+
+inherit_from:
+  - ./rubocop-core.yml
+  - ./rubocop-rspec.yml
+
+AllCops:
+  TargetRubyVersion: 2.6
+  DisabledByDefault: true
+  Exclude:
+    - "db/schema.rb"
+    - "bundle/**/*"
+    - "vendor/**/*"
+    - "node_modules/**/*"
+    - "public/**/*"
+    - "plugins/**/gems/**/*"
+
+Discourse:
+  Enabled: true

data/lib/rubocop/cop/discourse/no_json_parse_response.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Discourse
+      # Use `response.parsed_body` instead of `JSON.parse(response.body)` in specs.
+      #
+      # @example
+      #   # bad
+      #   expect(::JSON.parse(response.body)).to eq({})
+      #
+      #   # good
+      #   expect(response.parsed_body).to eq({})
+      class NoJsonParseResponse < Cop
+        MSG = "Use `response.parsed_body` instead of `JSON.parse(response.body)` in specs."
+
+        def_node_matcher :json_parse_body?, <<-MATCHER
+          (send
+            (const {cbase nil?} :JSON) :parse
+            (send
+              (send nil? :response) :body))
+        MATCHER
+
+        def on_send(node)
+          return unless json_parse_body?(node)
+
+          add_offense(node, message: MSG)
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            corrector.replace(node.loc.expression, "response.parsed_body")
+          end
+        end
+      end
+    end
+  end
+end

data/rubocop-discourse.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "rubocop-discourse"
-  s.version     = "2.1.0"
+  s.version     = "2.1.1"
   s.summary     = "Custom rubocop cops used by Discourse"
   s.authors     = ["David Taylor"]
   s.files       = `git ls-files`.split($/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-discourse
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - David Taylor
@@ -66,9 +66,11 @@ files:
 - README.md
 - Rakefile
 - config/default.yml
+- default.yml
 - lib/rubocop-discourse.rb
 - lib/rubocop/cop/discourse/no_chdir.rb
 - lib/rubocop/cop/discourse/no_direct_multisite_manipulation.rb
+- lib/rubocop/cop/discourse/no_json_parse_response.rb
 - lib/rubocop/cop/discourse/no_time_new_without_args.rb
 - lib/rubocop/cop/discourse/no_uri_escape_encode.rb
 - lib/rubocop/cop/discourse/time_eq_matcher.rb