rubocop-graphql 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c68112dd907111859f0c8ca78ad31c6bea918c11411d9d89a4a4ae289fc3630d
-  data.tar.gz: cfeed828552dcdc4509b476f4d6a9672c111ef2e11001fad01f52b3699d26bc9
+  metadata.gz: 62d96a424a721e274ada4265af5482248fd8786a07c9d533dadf368d39b0e142
+  data.tar.gz: b0e1877a97532a0190036b71c5068d95b3572a728b7eb2e2c51ee9b3c35869ce
 SHA512:
-  metadata.gz: 7a20bb455185e7eb0ceeffb6da3f33438a416f003ce6fd7287483a34aab61301051a72e0b6b13967ead0c2b14c5ce31d28f4c9c864ed24ab627b34e7f322e40c
-  data.tar.gz: e3badf19ec0a0ec03fe7be4d71324cb65e70f64c2ed3919334836f5d532e10fd16b3f54f58f2e909c987b72957027a13fa27fedf35f1bba2d2cceb6c9e66ca69
+  metadata.gz: 7cbf14cb18196ed2ec0cbf75299f867674c2ac47a716f55b335cfb258377e4fd0d00968d51d28890fdb81d07211d2e4d6192efabf56bd349d0436c58c3c1e8e0
+  data.tar.gz: 4fb8ff31d9f3a500ed58118945c41451fa1178d3ace5635242861e176ec2fae4f1b31512dca2135d639a7d74e61d9c98d6fca4912fcd3609e033fc8241efba56

data/lib/rubocop-graphql.rb

@@ -7,6 +7,7 @@ require_relative "rubocop/graphql/ext/snake_case"
 require_relative "rubocop/graphql"
 require_relative "rubocop/graphql/version"
 require_relative "rubocop/graphql/inject"
+require_relative "rubocop/graphql/description_method"
 require_relative "rubocop/graphql/node_pattern"
 
 require_relative "rubocop/graphql/argument"

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

@@ -22,6 +22,7 @@ module RuboCop
       #
       class ObjectDescription < Cop
         include RuboCop::GraphQL::NodePattern
+        include RuboCop::GraphQL::DescriptionMethod
 
         MSG = "Missing type description"
 
@@ -29,14 +30,6 @@ module RuboCop
           (send nil? :description (send (const nil? :I18n) :t ...))
         PATTERN
 
-        def_node_matcher :has_string_description?, <<~PATTERN
-          (send nil? :description (:str $_))
-        PATTERN
-
-        def_node_matcher :has_multiline_string_description?, <<~PATTERN
-          (send nil? :description (:dstr ...))
-        PATTERN
-
         def_node_matcher :interface?, <<~PATTERN
           (send nil? :include (const ...))
         PATTERN
@@ -59,8 +52,7 @@ module RuboCop
 
         def has_description?(node)
           has_i18n_description?(node) ||
-            has_string_description?(node) ||
-            has_multiline_string_description?(node)
+            description_kwarg?(node)
         end
 
         def child_nodes(node)

data/lib/rubocop/graphql/argument/block.rb

@@ -5,6 +5,7 @@ module RuboCop
     class Argument
       class Block
         extend RuboCop::NodePattern::Macros
+        include DescriptionMethod
 
         def_node_matcher :argument_block, <<~PATTERN
           (block
@@ -14,16 +15,12 @@ module RuboCop
           )
         PATTERN
 
-        def_node_matcher :description_kwarg?, <<~PATTERN
-          (send nil? :description (str ...))
-        PATTERN
-
         def initialize(argument_node)
           @nodes = argument_block(argument_node) || []
         end
 
         def description
-          @nodes.find { |kwarg| description_kwarg?(kwarg) }
+          find_description_method(@nodes)
         end
       end
     end

data/lib/rubocop/graphql/description_method.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module GraphQL
+    # Matches a variety of description formats commonly seen in Rails applications
+    #
+    #   description 'blah'
+    #
+    #   description "blah"
+    #
+    #   description <<~EOT
+    #      blah
+    #      bloop
+    #   EOT
+    #
+    #   description <<-EOT.squish
+    #      blah
+    #      bloop
+    #   EOT
+    module DescriptionMethod
+      extend RuboCop::NodePattern::Macros
+
+      def_node_matcher :description_kwarg?, <<~PATTERN
+        (send nil? :description {({str|dstr} ...)|(send ({str|dstr} ...) _)})
+      PATTERN
+
+      def find_description_method(nodes)
+        nodes.find { |kwarg| description_kwarg?(kwarg) }
+      end
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ module RuboCop
     class Field
       class Block
         extend RuboCop::NodePattern::Macros
+        include DescriptionMethod
 
         def_node_matcher :field_block, <<~PATTERN
           (block
@@ -14,16 +15,12 @@ module RuboCop
           )
         PATTERN
 
-        def_node_matcher :description_kwarg?, <<~PATTERN
-          (send nil? :description (str ...))
-        PATTERN
-
         def initialize(field_node)
           @nodes = field_block(field_node) || []
         end
 
         def description
-          @nodes.find { |kwarg| description_kwarg?(kwarg) }
+          find_description_method(@nodes)
         end
       end
     end

data/lib/rubocop/graphql/version.rb

@@ -1,5 +1,5 @@
 module RuboCop
   module GraphQL
-    VERSION = "0.8.0".freeze
+    VERSION = "0.8.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-graphql
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Dmitry Tsepelev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,6 +102,7 @@ files:
 - lib/rubocop/graphql/argument.rb
 - lib/rubocop/graphql/argument/block.rb
 - lib/rubocop/graphql/argument/kwargs.rb
+- lib/rubocop/graphql/description_method.rb
 - lib/rubocop/graphql/ext/snake_case.rb
 - lib/rubocop/graphql/field.rb
 - lib/rubocop/graphql/field/block.rb