ezcater_rubocop 0.49.7 → 0.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 01b8ae39e587051553ed1979e7410bebe28b49255fed22ab2f172309062de15c
-  data.tar.gz: 47f5fe4870214a610c829a34d5e24f0d2a82465a1ff87fb2afe29318f51cdf4b
+SHA1:
+  metadata.gz: 506db29e071d65b4cdb7f397b5b5d4a9251ec56f
+  data.tar.gz: ae1917de476959e962b786408bf788bae33ad31d
 SHA512:
-  metadata.gz: 554df818dd198c62de1b9e24484b01f79da68b1a1df53fdfe33f655391ffb3bd913cd67ec7264e44fc0fff1a65bee7aa997a2b64b6133b8ae8f43fb10c3d7584
-  data.tar.gz: 32441e5bd8a5352e79acdeb7167855c026cde646ebb820ec2a2b9762fc091aa6dcb89c4bdecc31b08b7f77d1ec74fb905d05283e683c309e6292f9e26a099d31
+  metadata.gz: 02aed155f78cda26fdf898a66aae1e798bb77dca7b6aa29ab975d855ff1dbab87baacf20509dd234bbe8be7e7e87a60c68ef31d559bfd14a88e5766b60e80917
+  data.tar.gz: 1b5e49ff7b0cf8c3f66d597b02f26bc85dedbbe7a8e7e02bcf7f30c1dc746c2534f43f0c4beea6cf2bbcb361273afec8622a6044bdb833a71e459d26de34c0ed

data/.circleci/config.yml

@@ -4,15 +4,15 @@ jobs:
     parallelism: 1
     working_directory: ~/ezcater
     docker:
-      - image: circleci/ruby:2.3.3
+      - image: circleci/ruby:2.4.1
     steps:
       - checkout
 
       # Restore bundle cache
       - restore_cache:
           keys:
-            - ruby-cache-{{ .Branch }}-{{ checksum "Gemfile" }}-{{ checksum "ezcater_rubocop.gemspec" }}
-            - ruby-cache-{{ .Branch }}-
+            - ruby-cache-{{ arch }}-{{ .Branch }}-{{ checksum "Gemfile" }}-{{ checksum "ezcater_rubocop.gemspec" }}
+            - ruby-cache-{{ arch }}-{{ .Branch }}-
             - ruby-cache-
 
       # Bundle install dependencies

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.4.1

data/CHANGELOG.md

@@ -1,27 +1,13 @@
 # ezcater_rubocop
 
-## v0.49.7
-- Fix `Ezcater/RspecRequireHttpStatusMatcher` cop.
+# v0.50.0
+- Update to rubocop v0.50.0 and rubocop-rspec v1.18.0.
+- Do not apply `Ezcater/StyleDig` to assignments with nested access.
 
-## v0.49.6
-- Rename `Ezcater/RspecRequireGqlErrorHelpers` cop to `Ezcater/RequireGqlErrorHelpers`.
-
-## v0.49.5
-- Add `Ezcater/RailsConfiguration` cop.
-
-## v0.49.4
-- Add `Ezcater/RspecRequireGqlErrorHelpers` cop.
-
-## v0.49.3
-- Do not apply `Ezcater/StyleDig` to access using a range.
-
-## v0.49.2
-- Do not apply `Ezcater/StyleDig` to assignments to with nested access.
-
-## v0.49.1
+# v0.49.1
 - Add `Ezcater/RspecRequireBrowserMock` cop.
 
-## v0.49.0
+# v0.49.0
 - Initial release.
 - Add `Ezcater/RspecRequireFeatureFlagMock` cop.
 - Add `Ezcater/RspecDotNotSelfDot` cop.

data/README.md

@@ -47,12 +47,9 @@ the latest compatible version each time that the MAJOR.MINOR version of `rubocop
 is updated.
 
 ## Custom Cops
-1. [RailsConfiguration](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/rails_configuration.rb) - Enforce use of `Rails.configuration` instead of `Rails.application.config`.
-1. [RequireGqlErrorHelpers](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/require_gql_error_helpers.rb) - Use the helpers provided by `GQLErrors` instead of raising `GraphQL::ExecutionError` directly.
 1. [RspecDotNotSelfDot](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/rspec_dot_not_self_dot.rb) - Enforce ".<class method>" instead of "self.<class method>" for example group description.
 1. [RspecRequireBrowserMock](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/rspec_require_browser_mock.rb) - Enforce use of `mock_ezcater_app`, `mock_chrome_browser` & `mock_custom_browser` helpers instead of mocking `Browser` or `EzBrowser` directly.
 1. [RspecRequireFeatureFlagMock](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/rspec_require_feature_flag_mock.rb) - Enforce use of `mock_feature_flag` helper instead of mocking `FeatureFlag.is_active?` directly.
-1. [RspecRequireHttpStatusMatcher](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/rspec_require_http_status_matcher.rb) - Use the HTTP status code matcher, like `expect(response).to have_http_status :bad_request`, rather than `expect(response.code).to eq 400`
 1. [StyleDig](https://github.com/ezcater/ezcater_rubocop/blob/master/lib/rubocop/cop/ezcater/style_dig.rb) - Recommend `dig` for deeply nested access.
 
 ## Development

data/config/default.yml

@@ -1,7 +1,3 @@
-Ezcater/RailsConfiguration:
-  Description: 'Enforce the use of `Rails.configuration` instead of `Rails.application.config`.'
-  Enabled: true
-
 Ezcater/RspecDotNotSelfDot:
   Description: 'Enforce ".<class method>" instead of "self.<class method>" for example group description.'
   Enabled: true
@@ -20,16 +16,6 @@ Ezcater/RspecRequireFeatureFlagMock:
   Include:
     - '**/*_spec.rb'
 
-Ezcater/RspecRequireHttpStatusMatcher:
-  Description: 'Use the HTTP status code matcher, like `expect(response).to have_http_status :bad_request`, rather than `expect(response.code).to eq 400`'
-  Enabled: true
-  Include:
-    - '**/*_spec.rb'
-
-Ezcater/RequireGqlErrorHelpers:
-  Description: 'Use the helpers provided by `GQLErrors` instead of raising `GraphQL::ExecutionError` directly.'
-  Enabled: true
-
 Ezcater/StyleDig:
   Description: 'Recommend `dig` for deeply nested access.'
   Enabled: true

data/ezcater_rubocop.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "ezcater_rubocop/version"
@@ -37,6 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec_junit_formatter"
   spec.add_development_dependency "pry-byebug"
 
-  spec.add_runtime_dependency "rubocop", "~> 0.49.1"
-  spec.add_runtime_dependency "rubocop-rspec", "~> 1.15.1"
+  spec.add_runtime_dependency "rubocop", "~> 0.50.0"
+  spec.add_runtime_dependency "rubocop-rspec", "~> 1.18.0"
 end

data/lib/ezcater_rubocop.rb

@@ -12,10 +12,7 @@ puts "configuration from #{DEFAULT_FILES}" if RuboCop::ConfigLoader.debug?
 config = RuboCop::ConfigLoader.merge_with_default(config, path)
 RuboCop::ConfigLoader.instance_variable_set(:@default_configuration, config)
 
-require "rubocop/cop/ezcater/rails_configuration"
-require "rubocop/cop/ezcater/require_gql_error_helpers"
 require "rubocop/cop/ezcater/rspec_require_browser_mock"
 require "rubocop/cop/ezcater/rspec_require_feature_flag_mock"
-require "rubocop/cop/ezcater/rspec_require_http_status_matcher"
 require "rubocop/cop/ezcater/rspec_dot_not_self_dot"
 require "rubocop/cop/ezcater/style_dig"

data/lib/ezcater_rubocop/version.rb

@@ -1,3 +1,3 @@
 module EzcaterRubocop
-  VERSION = "0.49.7".freeze
+  VERSION = "0.50.0".freeze
 end

data/lib/rubocop/cop/ezcater/rspec_dot_not_self_dot.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module RuboCop
   module Cop
     module Ezcater
@@ -27,7 +25,7 @@ module RuboCop
 
         def on_send(node)
           example_group_match(node) do |doc|
-            add_offense(doc, :expression, MSG) if SELF_DOT_REGEXP =~ doc.source
+            add_offense(doc, :expression, MSG) if doc.source.match?(SELF_DOT_REGEXP)
           end
         end
 

data/lib/rubocop/cop/ezcater/rspec_require_browser_mock.rb

@@ -21,7 +21,7 @@ module RuboCop
         MSG = "Use the mocks provided by `BrowserHelpers` instead of mocking `%s`".freeze
 
         def_node_matcher :browser_const?, <<~PATTERN
-          (const _ {:Browser, :EzBrowser})
+          (const _ {:Browser :EzBrowser})
         PATTERN
 
         def on_const(node)
@@ -47,7 +47,7 @@ module RuboCop
         end
 
         def allow_send_node?(node)
-          node && node.send_type? && node.method_name == :allow
+          node&.send_type? && node.method_name == :allow
         end
       end
     end

data/lib/rubocop/cop/ezcater/rspec_require_feature_flag_mock.rb

@@ -43,7 +43,7 @@ module RuboCop
         end
 
         def allow_send_node?(node)
-          node && node.send_type? && node.method_name == :allow
+          node&.send_type? && node.method_name == :allow
         end
       end
     end

data/lib/rubocop/cop/ezcater/style_dig.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module RuboCop
   module Cop
     module Ezcater
@@ -24,7 +22,7 @@ module RuboCop
         MSG = "Use `dig` for nested access.".freeze
 
         def_node_matcher :nested_access_match, <<-PATTERN
-          (send (send (send _receiver !:[]) :[] !{irange erange}) :[] !{irange erange})
+          (send (send (send _receiver !:[]) :[] _) :[] _)
         PATTERN
 
         def on_send(node)
@@ -37,10 +35,10 @@ module RuboCop
 
         def autocorrect(node)
           access_node = node
-          source_args = [access_node.method_args.first.source]
+          source_args = [access_node.first_argument.source]
           while access_node?(access_node.children.first)
             access_node = access_node.children.first
-            source_args << access_node.method_args.first.source
+            source_args << access_node.first_argument.source
           end
           root_node = access_node.children.first
 
@@ -59,11 +57,7 @@ module RuboCop
         end
 
         def access_node?(node)
-          node && node.send_type? && node.method_name == :[] && !range?(node.method_args.first)
-        end
-
-        def range?(node)
-          node.irange_type? || node.erange_type?
+          node&.send_type? && node.method_name == :[]
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ezcater_rubocop
 version: !ruby/object:Gem::Version
-  version: 0.49.7
+  version: 0.50.0
 platform: ruby
 authors:
 - ezCater, Inc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-06 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.50.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.1
+        version: 1.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.1
+        version: 1.18.0
 description: ezCater custom cops and shared configuration
 email:
 - engineering@ezcater.com
@@ -133,12 +133,9 @@ files:
 - ezcater_rubocop.gemspec
 - lib/ezcater_rubocop.rb
 - lib/ezcater_rubocop/version.rb
-- lib/rubocop/cop/ezcater/rails_configuration.rb
-- lib/rubocop/cop/ezcater/require_gql_error_helpers.rb
 - lib/rubocop/cop/ezcater/rspec_dot_not_self_dot.rb
 - lib/rubocop/cop/ezcater/rspec_require_browser_mock.rb
 - lib/rubocop/cop/ezcater/rspec_require_feature_flag_mock.rb
-- lib/rubocop/cop/ezcater/rspec_require_http_status_matcher.rb
 - lib/rubocop/cop/ezcater/style_dig.rb
 - lib/rubocop/rspec/language/each_selector.rb
 homepage: https://github.com/ezcater/ezcater_rubocop
@@ -162,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: ezCater custom cops and shared configuration

data/lib/rubocop/cop/ezcater/rails_configuration.rb

@@ -1,26 +0,0 @@
-module RuboCop
-  module Cop
-    module Ezcater
-      class RailsConfiguration < Cop
-        MSG = "Use `Rails.configuration` instead of `Rails.application.config`.".freeze
-        RAILS_CONFIGURATION = "Rails.configuration".freeze
-
-        def_node_matcher "rails_application_config", <<-PATTERN
-          (send (send (const _ :Rails) :application) :config)
-        PATTERN
-
-        def on_send(node)
-          rails_application_config(node) do
-            add_offense(node, :expression, MSG)
-          end
-        end
-
-        def autocorrect(node)
-          lambda do |corrector|
-            corrector.replace(node.source_range, RAILS_CONFIGURATION)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rubocop/cop/ezcater/require_gql_error_helpers.rb

@@ -1,35 +0,0 @@
-module RuboCop
-  module Cop
-    module Ezcater
-      # Enforce use of GQLErrors helpers instead of throwing
-      # GraphQL::ExecutionErrors directly
-      #
-      # @example
-      #
-      #   # good
-      #   GQLErrors.summary_error("An error occurred")
-      #   GQLErrors.request_error("You can't access this", 401)
-      #   GQLErrors.field_error("is invalid", :first_name, "First Name")
-      #   GQLErrors.field_errors_for(my_model, context)
-      #   GQLErrors.field_errors_for(my_model, context, summary_error: "An error occurred")
-      #   GQLErrors.field_errors_for(my_model, context, field_mapping: { first: :first_name })
-      #
-      #   # bad
-      #   GraphQL::ExecutionError.new("An error occurred")
-      #   GraphQL::ExecutionError.new("You can't access this", options: { status_code: 401 })
-      class RequireGqlErrorHelpers < Cop
-        MSG = "Use the helpers provided by `GQLErrors` instead of raising `GraphQL::ExecutionError` directly.".freeze
-
-        def_node_matcher :graphql_const?, <<~PATTERN
-          (const (const _ :GraphQL) :ExecutionError)
-        PATTERN
-
-        def on_const(node)
-          return unless graphql_const?(node)
-
-          add_offense(node, :expression, MSG)
-        end
-      end
-    end
-  end
-end

data/lib/rubocop/cop/ezcater/rspec_require_http_status_matcher.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module RuboCop
-  module Cop
-    module Ezcater
-      # Enforce use of HTTP status code matchers rather than asserting on on random numbers.
-      #
-      # @example
-      #
-      #   # good
-      #   expect(response).to have_http_status :created
-      #   expect(response).to have_http_status :bad_request
-      #
-      #   # bad
-      #   expect(response.code).to eq 201
-      #   expect(response.code).to eq 400
-      class RspecRequireHttpStatusMatcher < Cop
-        MSG = "Use the `have_http_status` matcher, like `expect(response).to have_http_status :bad_request`, "\
-          "rather than `%<node_source>s`"
-
-        def_node_matcher :response_status_assertion, <<~PATTERN
-          (send (send _ :expect (send (send _ :response) :status)) :to (send _ :eq (int _)))
-        PATTERN
-
-        def_node_matcher :response_code_assertion, <<~PATTERN
-          (send (send _ :expect (send (send _ :response) :code)) :to (send _ :eq (str _)))
-        PATTERN
-
-        def on_send(node)
-          return if !response_status_assertion(node) && !response_code_assertion(node)
-
-          add_offense(node, :expression, format(MSG, node_source: node.source))
-        end
-      end
-    end
-  end
-end