From d95319267e7d3ebeb0c6d4b31562908ca30f2602 Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Mon, 6 Jul 2020 21:45:36 -0500
Subject: [PATCH 1/2] Upgrade to latest version of rubocop

---
 .rubocop.yml                         | 2 +-
 cocina-models.gemspec                | 2 +-
 lib/cocina/generator/schema_value.rb | 4 ++--
 lib/cocina/models.rb                 | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 3f8ac1d0..6e547ebb 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,7 +4,7 @@ inherit_from: .rubocop_todo.yml
 require:
   - rubocop-rspec
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 114
   Exclude:
     - lib/cocina/models/*
diff --git a/cocina-models.gemspec b/cocina-models.gemspec
index b1ab2635..96a6485e 100644
--- a/cocina-models.gemspec
+++ b/cocina-models.gemspec
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'committee'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.74.0'
+  spec.add_development_dependency 'rubocop', '~> 0.87'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'simplecov', '~> 0.17.0'
 end
diff --git a/lib/cocina/generator/schema_value.rb b/lib/cocina/generator/schema_value.rb
index ee437a9c..6ed16cd5 100644
--- a/lib/cocina/generator/schema_value.rb
+++ b/lib/cocina/generator/schema_value.rb
@@ -4,11 +4,11 @@ module Cocina
   module Generator
     # Class for generating from an openapi value
     class SchemaValue < SchemaBase
-      # rubocop:disable Metrics/LineLength
+      # rubocop:disable Layout/LineLength
       def generate
         "#{description}#{example}attribute :#{name.camelize(:lower)}, Types::#{dry_datatype(schema_doc)}#{default}#{enum}#{omittable}"
       end
-      # rubocop:enable Metrics/LineLength
+      # rubocop:enable Layout/LineLength
 
       private
 
diff --git a/lib/cocina/models.rb b/lib/cocina/models.rb
index 7f391ff2..d55bf3bf 100644
--- a/lib/cocina/models.rb
+++ b/lib/cocina/models.rb
@@ -14,7 +14,6 @@
 
 # Help Zeitwerk find some of our classes
 class CocinaModelsInflector < Zeitwerk::Inflector
-  # rubocop:disable Metrics/CyclomaticComplexity
   # rubocop:disable Metrics/MethodLength
   def camelize(basename, _abspath)
     case basename
@@ -34,7 +33,7 @@ def camelize(basename, _abspath)
       super
     end
   end
-  # rubocop:enable Metrics/CyclomaticComplexity
+
   # rubocop:enable Metrics/MethodLength
 end
 

From a0d67dd487d05af64f6a1b3699bebc939dbc62e2 Mon Sep 17 00:00:00 2001
From: Justin Coyne <jcoyne@justincoyne.com>
Date: Mon, 6 Jul 2020 21:47:54 -0500
Subject: [PATCH 2/2] Enable new rubocops

---
 .rubocop.yml                      | 53 ++++++++++++++++++++++++++++++-
 lib/cocina/generator/generator.rb |  2 +-
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 6e547ebb..6606e8b5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -26,7 +26,58 @@ RSpec/ExampleLength:
     - spec/cocina/models/description_spec.rb
     - spec/cocina/models/dro_shared_examples.rb
 
-
 Style/Documentation:
   Exclude:
     - lib/cocina/models/*
+
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/AccessorGrouping:
+  Enabled: true
+
+Style/BisectedAttrAccessor:
+  Enabled: true
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Style/RedundantAssignment:
+  Enabled: true
+
+Style/RedundantFetchBlock:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true
+  
diff --git a/lib/cocina/generator/generator.rb b/lib/cocina/generator/generator.rb
index e79c425b..36fd66be 100644
--- a/lib/cocina/generator/generator.rb
+++ b/lib/cocina/generator/generator.rb
@@ -17,7 +17,7 @@ def self.source_root
       def generate
         clean_output
 
-        schemas.keys.each do |schema_name|
+        schemas.each_key do |schema_name|
           schema = schema_for(schema_name)
           generate_for(schema) if schema
         end