rubocop-graphql 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5be7099abfc014351e097467d9dfe7c687d4a0323241f7ce592e0abe25f6b0cb
-  data.tar.gz: da4e69f7810f416873d3f3f0742b70758a3c66c343bbd0d2572c223605156c77
+  metadata.gz: 67638fefeb268ea870db034bc46363245b644ec8df5f620878e8e1c90b681975
+  data.tar.gz: b378c1830557ccbf00b7be144b6ac6141c7246e60b848d91b14a5cc8eee86a2a
 SHA512:
-  metadata.gz: ea0737a86c403dbd57b5777c221ce80ec86e97c6fce499d00f573ef7adeb15f37e2db7b2c8f6275ff7aa58e1a17b12472a748cdf06f26c0411cb9943075386fd
-  data.tar.gz: c0b0235d1035b9b77ffaaac3ee419b4e240c9eb7363033f37f9396a028930e33f6d11d3145f95c708e68a0b2f7566de0e1cf96264619eb1da0c3626e99304a0b
+  metadata.gz: e9dbfcab7cdb4820b9ab7d1a9425bb1378bcc279aebb82116058398f9b66b97d90c6af5edf38dd0c94d079f57395ffc7055936e00d89ec98c72e606b4c4d955a
+  data.tar.gz: 0dd262d908e7de3cbb2fc8b57aab421a7e32214f42322c1bdeab03f43b96072e349e2d0165158df123e78cf0700b9bebc95acb4876a7b5ba655c0fa44eb566f6

data/lib/rubocop/cop/graphql/cop.rb

@@ -12,8 +12,7 @@ module RuboCop
       # class will invoke the inherited hook instead
       class << self
         undef inherited
-        def inherited(*)
-        end
+        def inherited(*); end
       end
 
       # Special case `Module#<` so that the rspec support rubocop exports

data/lib/rubocop/cop/graphql/extract_type.rb

@@ -45,7 +45,8 @@ module RuboCop
 
         private
 
-        MSG = "Consider moving %<field_names>s to a new type and adding the `%<prefix>s` field instead"
+        MSG = "Consider moving %<field_names>s to a new type and " \
+              "adding the `%<prefix>s` field instead"
 
         def check_fields_prefixes(body)
           sorted_prefixes = fractured(body).sort_by { |k, _| k.size }.reverse

data/lib/rubocop/cop/graphql/field_definitions.rb

@@ -105,9 +105,9 @@ module RuboCop
         def group_field_declarations(corrector, node)
           field = RuboCop::GraphQL::Field.new(node)
 
-          first_field = field.schema_member.body.find { |node|
+          first_field = field.schema_member.body.find do |node|
             field_definition?(node) || field_definition_with_body?(node)
-          }
+          end
 
           source_to_insert = "\n" + indent(node) + node.source
           corrector.insert_after(first_field.loc.expression, source_to_insert)
@@ -124,11 +124,12 @@ module RuboCop
           method_definition = field.schema_member.find_method_definition(field.resolver_method_name)
           return unless method_definition
 
-          field_sibling_index = if field_definition_with_body?(field.parent)
-            field.parent.sibling_index
-          else
-            field.sibling_index
-          end
+          field_sibling_index =
+            if field_definition_with_body?(field.parent)
+              field.parent.sibling_index
+            else
+              field.sibling_index
+            end
 
           return if method_definition.sibling_index - field_sibling_index == 1
 
@@ -146,7 +147,9 @@ module RuboCop
           method_range = range_by_whole_lines(method_definition.loc.expression)
           corrector.insert_before(method_range, source_to_insert)
 
-          range_to_remove = range_with_surrounding_space(range: field_definition.loc.expression, side: :left)
+          range_to_remove = range_with_surrounding_space(
+            range: field_definition.loc.expression, side: :left
+          )
           corrector.remove(range_to_remove)
         end
 

data/lib/rubocop/cop/graphql/field_hash_key.rb

@@ -57,9 +57,14 @@ module RuboCop
             method_definition = resolver_method_definition_for(field)
             suggested_hash_key_name = hash_key_to_use(method_definition)
 
-            corrector.insert_after(node.loc.expression, ", hash_key: #{suggested_hash_key_name.inspect}")
+            corrector.insert_after(
+              node.loc.expression, ", hash_key: #{suggested_hash_key_name.inspect}"
+            )
+
+            range = range_with_surrounding_space(
+              range: method_definition.loc.expression, side: :left
+            )
 
-            range = range_with_surrounding_space(range: method_definition.loc.expression, side: :left)
             corrector.remove(range)
           end
         end

data/lib/rubocop/cop/graphql/field_method.rb

@@ -58,7 +58,9 @@ module RuboCop
 
             corrector.insert_after(node.loc.expression, ", method: :#{suggested_method_name}")
 
-            range = range_with_surrounding_space(range: method_definition.loc.expression, side: :left)
+            range = range_with_surrounding_space(
+              range: method_definition.loc.expression, side: :left
+            )
             corrector.remove(range)
           end
         end

data/lib/rubocop/cop/graphql/object_description.rb

@@ -3,7 +3,8 @@
 module RuboCop
   module Cop
     module GraphQL
-      #  This cop checks if a type (object, input, interface, scalar, union, mutation, subscription, and resolver) has a description.
+      #  This cop checks if a type (object, input, interface, scalar, union,
+      #  mutation, subscription, and resolver) has a description.
       #
       # @example
       #   # good
@@ -45,7 +46,9 @@ module RuboCop
         def on_module(node)
           return if child_nodes(node).none? { |child_node| interface?(child_node) }
 
-          add_offense(node.identifier) if child_nodes(node).none? { |child_node| has_description?(child_node) }
+          if child_nodes(node).none? { |child_node| has_description?(child_node) }
+            add_offense(node.identifier)
+          end
         end
 
         private

data/lib/rubocop/cop/graphql/resolver_method_length.rb

@@ -9,9 +9,9 @@ module RuboCop
       # The maximum allowed length is configurable using the Max option.
       class ResolverMethodLength < Cop
         include RuboCop::Cop::ConfigurableMax
-        include RuboCop::Cop::TooManyLines
+        include RuboCop::Cop::CodeLength
 
-        LABEL = "ResolverMethod"
+        MSG = "ResolverMethod has too many lines. [%<total>d/%<max>d]"
 
         def_node_matcher :field_definition, <<~PATTERN
           (send nil? :field (sym $...) ...)
@@ -21,18 +21,31 @@ module RuboCop
           excluded_methods = cop_config["ExcludedMethods"]
           return if excluded_methods.include?(String(node.method_name))
 
-          check_code_length(node) if field_is_defined?(node)
+          if field_is_defined?(node)
+            length = code_length(node)
+
+            return unless length > max_length
+
+            add_offense(node, message: message(length))
+          end
         end
         alias on_defs on_def
 
         private
 
+        def code_length(node)
+          node.source.lines[1..-2].count { |line| !irrelevant_line(line) }
+        end
+
         def field_is_defined?(node)
-          node.parent.children.flat_map { |child| field_definition(child) }.include?(node.method_name)
+          node.parent
+              .children
+              .flat_map { |child| field_definition(child) }
+              .include?(node.method_name)
         end
 
-        def cop_label
-          LABEL
+        def message(length)
+          format(MSG, total: length, max: max_length)
         end
       end
     end

data/lib/rubocop/graphql/ext/snake_case.rb

@@ -4,7 +4,7 @@ module RuboCop
   module GraphQL
     module Ext
       module SnakeCase
-        SNAKE_CASE = /^[\da-z_]+[!?=]?$/
+        SNAKE_CASE = /^[\da-z_]+[!?=]?$/.freeze
 
         refine Symbol do
           def snake_case?

data/lib/rubocop/graphql/field/kwargs.rb

@@ -56,7 +56,8 @@ module RuboCop
         end
 
         def resolver_method_name
-          @resolver_method_name ||= @nodes.flat_map { |kwarg| resolver_method_option(kwarg) }.compact.first
+          @resolver_method_name ||=
+            @nodes.flat_map { |kwarg| resolver_method_option(kwarg) }.compact.first
         end
       end
     end

data/lib/rubocop/graphql/version.rb

@@ -1,5 +1,5 @@
 module RuboCop
   module GraphQL
-    VERSION = "0.4.0"
+    VERSION = "0.4.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-graphql
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Dmitry Tsepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2020-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,33 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: standard
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: '0.87'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.71.0
+        version: '0.87'
 description: A collection of RuboCop cops to improve GraphQL-related code
 email:
 - dmitry.a.tsepelev@gmail.com
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="