Update to latest rubocop and rubocop-rspec

.rubocop.yml

@@ -59,3 +59,9 @@ RSpec/DescribeClass:
 RSpec/FilePath:
   Exclude:
     - 'spec/routing/**/*'
+
+RSpec/VerifiedDoubles:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Max: 16

Gemfile

@@ -45,8 +45,8 @@ group :development, :test do
   gem 'solr_wrapper', '~> 0.10'
   gem 'fcrepo_wrapper', '~> 0.4'
 
-  gem 'rubocop', '~> 0.39.0'
-  gem 'rubocop-rspec', '~> 1.4.1'
+  gem 'rubocop', '~> 0.40'
+  gem 'rubocop-rspec', '~> 1.5'
 end
 
 group :development do

Gemfile.lock

@@ -626,14 +626,14 @@ GEM
       rspec-mocks (~> 3.4.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubocop (0.39.0)
-      parser (>= 2.3.0.7, < 3.0)
+    rubocop (0.40.0)
+      parser (>= 2.3.1.0, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.4.1)
-      rubocop (= 0.39.0)
+    rubocop-rspec (1.5.0)
+      rubocop (>= 0.40.0)
     ruby-box (1.15.0)
       addressable
       json
@@ -789,8 +789,8 @@ DEPENDENCIES
   rsolr (~> 1.0.6)
   rspec
   rspec-rails
-  rubocop (~> 0.39.0)
-  rubocop-rspec (~> 1.4.1)
+  rubocop (~> 0.40)
+  rubocop-rspec (~> 1.5)
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
   sidekiq

app/controllers/admin/features_controller.rb

@@ -1,5 +1,7 @@
-class Admin::FeaturesController < Flip::FeaturesController
-  before_action do
-    authorize! :manage, Feature
+module Admin
+  class FeaturesController < Flip::FeaturesController
+    before_action do
+      authorize! :manage, Feature
+    end
   end
 end

app/controllers/admin/strategies_controller.rb

@@ -1,5 +1,7 @@
-class Admin::StrategiesController < Flip::StrategiesController
-  before_action do
-    authorize! :manage, Feature
+module Admin
+  class StrategiesController < Flip::StrategiesController
+    before_action do
+      authorize! :manage, Feature
+    end
   end
 end

app/presenters/curation_concerns/generic_work_show_presenter.rb

@@ -1,13 +1,15 @@
-class CurationConcerns::GenericWorkShowPresenter < Sufia::WorkShowPresenter
-  self.file_presenter_class = Hybox::FileSetPresenter
+module CurationConcerns
+  class GenericWorkShowPresenter < Sufia::WorkShowPresenter
+    self.file_presenter_class = Hybox::FileSetPresenter
 
-  def manifest_url
-    manifest_helper.polymorphic_url([:manifest, self])
-  end
+    def manifest_url
+      manifest_helper.polymorphic_url([:manifest, self])
+    end
 
-  private
+    private
 
-    def manifest_helper
-      @manifest_helper ||= ManifestHelper.new(request.base_url)
-    end
+      def manifest_helper
+        @manifest_helper ||= ManifestHelper.new(request.base_url)
+      end
+  end
 end

lib/importer/factory/object_factory.rb

@@ -105,12 +105,14 @@ def create
 
       def log_created(obj)
         Rails.logger.info(
-          "Created #{klass.model_name.human} #{obj.id} (#{Array(attributes[system_identifier_field]).first})")
+          "Created #{klass.model_name.human} #{obj.id} (#{Array(attributes[system_identifier_field]).first})"
+        )
       end
 
       def log_updated(obj)
         Rails.logger.info(
-          "Updated #{klass.model_name.human} #{obj.id} (#{Array(attributes[system_identifier_field]).first})")
+          "Updated #{klass.model_name.human} #{obj.id} (#{Array(attributes[system_identifier_field]).first})"
+        )
       end
 
       private

lib/importer/mods_parser.rb

@@ -253,8 +253,7 @@ def build_date(node)
         finish = finish_point(node)
         start = start_point(node)
         dates = [{ start: start.map(&:text), finish: finish.map(&:text), label: date_label(node),
-                   start_qualifier: qualifier(start), finish_qualifier: qualifier(finish)
-        }]
+                   start_qualifier: qualifier(start), finish_qualifier: qualifier(finish) }]
         dates.delete_if { |date| date.values.all?(&:blank?) }
         dates
       end

lib/stanford/importer/purl_parser.rb

@@ -118,8 +118,7 @@ def dates
 
       def identifiers
         { identifiers: oai.xpath('./dc:identifier', DC_NS).map(&:text),
-          id: xml.xpath('//identityMetadata/objectId').text.sub('druid:', '')
-        }
+          id: xml.xpath('//identityMetadata/objectId').text.sub('druid:', '') }
       end
 
       def record_origin

spec/features/accounts_spec.rb

@@ -5,8 +5,7 @@
     let(:user) { FactoryGirl.create(:superadmin) }
     let(:account) do
       FactoryGirl.create(:account, solr_endpoint_attributes: { url: 'http://localhost:8080/solr' },
-                                   fcrepo_endpoint_attributes: { url: 'http://localhost:8080/fcrepo' }
-                        )
+                                   fcrepo_endpoint_attributes: { url: 'http://localhost:8080/fcrepo' })
     end
 
     before do

spec/lib/importer/factory/string_literal_processor_spec.rb

@@ -4,8 +4,7 @@
 RSpec.describe Importer::Factory::StringLiteralProcessor do
   let(:input) do
     { title: ["Stanford residences"],
-      contributor: [{ name: name, type: "corporate" }]
-              }
+      contributor: [{ name: name, type: "corporate" }] }
   end
   subject { described_class.process(input) }
 

spec/lib/importer/mods_parser_spec.rb

@@ -46,14 +46,16 @@
       expect(attributes[:series_name]).to eq []
       expect(attributes[:restrictions]).to eq []
       expect(attributes[:institution]).to eq [
-        "Stanford University. Libraries. Dept. of Special Collections & University Archives."]
+        "Stanford University. Libraries. Dept. of Special Collections & University Archives."
+      ]
     end
 
     context 'with a file that has a general (untyped) note' do
       let(:file) { 'spec/fixtures/mods/shpc/druid_xv169dn4538.mods' }
       it 'imports notes' do
         expect(attributes[:notes_attributes].first[:value]).to start_with(
-          "\"Left to right: Anna Maria Lathrop")
+          "\"Left to right: Anna Maria Lathrop"
+        )
       end
     end
 
@@ -112,7 +114,8 @@
             finish: ['1919'],
             label: ['circa 1910s'],
             start_qualifier: ['approximate'],
-            finish_qualifier: ['approximate'] }]
+            finish_qualifier: ['approximate'] }
+        ]
       end
     end
 
@@ -137,7 +140,8 @@
             finish: ['1959'],
             label: ['circa 1900s-1950s'],
             start_qualifier: ['approximate'],
-            finish_qualifier: ['approximate'] }]
+            finish_qualifier: ['approximate'] }
+        ]
       end
     end
 
@@ -149,7 +153,8 @@
             finish: [],
             label: [],
             start_qualifier: [],
-            finish_qualifier: [] }]
+            finish_qualifier: [] }
+        ]
       end
     end
 
@@ -165,7 +170,8 @@
             finish: [],
             label: [],
             start_qualifier: [],
-            finish_qualifier: [] }]
+            finish_qualifier: [] }
+        ]
       end
     end
 
@@ -181,7 +187,8 @@
             finish: [],
             label: [],
             start_qualifier: [],
-            finish_qualifier: [] }]
+            finish_qualifier: [] }
+        ]
       end
     end
 
@@ -213,7 +220,8 @@
       expect(attributes[:language]).to eq ['eng']
       expect(attributes[:work_type]).to eq ['still image']
       expect(attributes[:institution]).to eq [
-        'Dept. of Special Collections & University Archives Stanford Univeristy Libraries']
+        'Dept. of Special Collections & University Archives Stanford Univeristy Libraries'
+      ]
     end
   end
 end