Merge pull request #38 from projectblacklight/rubocop2

Fix warnings for latest version of rubocop

Author: jcoyne

.rubocop.yml

@@ -19,7 +19,7 @@ Metrics/BlockLength:
 Metrics/LineLength:
   Max: 185
 
-Style/FileName:
+Naming/FileName:
   Exclude:
     - 'Gemfile'
     - 'blacklight-access_controls.gemspec'

.rubocop_todo.yml

@@ -15,6 +15,12 @@ Metrics/AbcSize:
 Metrics/ModuleLength:
   Max: 120
 
+RSpec/ContextWording:
+  Exclude:
+    - 'spec/unit/ability_spec.rb'
+    - 'spec/unit/enforcement_spec.rb'
+    - 'spec/unit/blacklight/access_controls/search_builder_spec.rb'
+
 # Offense count: 1
 # Configuration parameters: Max.
 RSpec/ExampleLength:

Rakefile

@@ -17,7 +17,7 @@ RSpec::Core::RakeTask.new(:spec)
 task default: 'ci'
 
 def solr_config_dir
-  File.join(File.expand_path(File.dirname(__FILE__)), 'solr_conf', 'conf')
+  File.join(__dir__, 'solr_conf', 'conf')
 end
 
 namespace :solr do

blacklight-access_controls.gemspec

@@ -15,18 +15,18 @@ Gem::Specification.new do |gem|
   gem.version       = version
   gem.license       = 'APACHE2'
 
-  gem.required_ruby_version = '>= 1.9.3'
+  gem.required_ruby_version = '>= 2.1.0'
 
-  gem.add_dependency 'cancancan', '~> 1.8'
   gem.add_dependency 'blacklight', '~> 6.0'
+  gem.add_dependency 'cancancan', '~> 1.8'
   gem.add_dependency 'deprecation', '~> 1.0'
 
+  gem.add_development_dependency 'database_cleaner'
+  gem.add_development_dependency 'engine_cart', '~> 1.0'
+  gem.add_development_dependency 'factory_girl_rails', '~> 4.0'
   gem.add_development_dependency 'rake', '~> 11.3'
   gem.add_development_dependency 'rspec', '~> 3.1'
-  gem.add_development_dependency 'engine_cart', '~> 1.0'
+  gem.add_development_dependency 'rubocop', '~> 0.52.1'
+  gem.add_development_dependency 'rubocop-rspec'
   gem.add_development_dependency 'solr_wrapper'
-  gem.add_development_dependency 'factory_girl_rails', '~> 4.0'
-  gem.add_development_dependency 'database_cleaner'
-  gem.add_development_dependency 'rubocop', '~> 0.49.0'
-  gem.add_development_dependency 'rubocop-rspec', '~> 1.14.0'
 end

lib/generators/blacklight/access_controls_generator.rb

@@ -3,7 +3,6 @@
 module Blacklight
   class AccessControlsGenerator < Rails::Generators::Base
     desc "This generator makes the following changes to your application:
-
 1. Includes Blacklight::AccessControls::User in the User class.
 2. Includes Blacklight::AccessControls::Enforcement in the SearchBuilder class.
 3. Adds access controls to CatalogController.
@@ -29,13 +28,13 @@ def add_access_controls_to_user
     def add_access_controls_to_catalog_controller
       say_status('status', 'ADDING ACCESS CONTROLS TO CATALOG CONTROLLER', :yellow)
 
-      string_to_insert = <<-EOS
+      string_to_insert = <<-ADDITIONS
   include Blacklight::AccessControls::Catalog
 
   # Apply the blacklight-access_controls
   before_action :enforce_show_permissions, only: :show
 
-      EOS
+      ADDITIONS
 
       insert_into_file 'app/controllers/catalog_controller.rb',
                        string_to_insert, after: "include Blacklight::Catalog\n"

spec/spec_helper.rb

@@ -21,12 +21,12 @@
     DatabaseCleaner.clean_with :truncation
   end
 
-  config.before(:each) do
+  config.before do
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.start
   end
 
-  config.after(:each) do
+  config.after do
     DatabaseCleaner.clean
   end
 end

spec/unit/ability_spec.rb

@@ -261,7 +261,7 @@
 
     it 'is a new user' do
       expect(subject).to be_a User
-      expect(subject.new_record?).to be_truthy
+      expect(subject).to be_new_record
     end
   end
 

spec/unit/enforcement_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class MyController # < ApplicationController
+class MyController
   include Blacklight::AccessControls::Enforcement
 end