Merge pull request #47 from curationexperts/update_rubocop

Update rubocop

.rubocop.yml

@@ -1,4 +1,12 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  TargetRubyVersion: 2.1
+  DisplayCopNames: true
+
 Style/IndentationConsistency:
   EnforcedStyle: rails
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*

.rubocop_todo.yml

@@ -28,11 +28,6 @@ Lint/UselessAssignment:
 Metrics/AbcSize:
   Max: 38
 
-# Offense count: 12
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 143
-
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
@@ -46,7 +41,7 @@ Metrics/CyclomaticComplexity:
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 160
+  Max: 120
 
 # Offense count: 7
 # Configuration parameters: CountComments.

lib/riiif/routes.rb

@@ -22,7 +22,9 @@ def draw
           defaults: { format: 'jpg', rotation: '0', region: 'full', quality: 'default', model: resource },
           as: options[:as] || 'image'
 
-        get "#{route_prefix}/:id/info.json" => 'riiif/images#info', defaults: { format: 'json', model: resource  }, as: [options[:as], 'info'].compact.join('_')
+        get "#{route_prefix}/:id/info.json" => 'riiif/images#info',
+            defaults: { format: 'json', model: resource  },
+            as: [options[:as], 'info'].compact.join('_')
 
         # This doesn't work presently
         # get "#{route_prefix}/:id", to: redirect("#{route_prefix}/%{id}/info.json")

riiif.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'engine_cart', '~> 0.8'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'rubocop', '~> 0.41.2'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.5'
+  spec.add_development_dependency 'rubocop', '~> 0.47.1'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.13'
 end

spec/models/riiif/akubra_system_file_resolver_spec.rb

@@ -7,6 +7,7 @@
   end
 
   it 'gets the jpeg2000 file' do
-    expect(subject.find('demo:1').path).to eq Riiif::File.new(Dir.glob(subject.pathroot + '22/7e/9/info%3Afedora%2Fdemo%3A1%2Fjp2%2Fjp2.0').first).path
+    file = Dir.glob(subject.pathroot + '22/7e/9/info%3Afedora%2Fdemo%3A1%2Fjp2%2Fjp2.0').first
+    expect(subject.find('demo:1').path).to eq Riiif::File.new(file).path
   end
 end

spec/models/riiif/image_spec.rb

@@ -125,7 +125,8 @@
         subject.render(rotation: '0', format: 'png')
       end
       it 'handles floats' do
-        expect(subject.image).to receive(:execute).with("convert -virtual-pixel white +distort srt 22.5 #{filename} png:-")
+        expect(subject.image).to receive(:execute)
+          .with("convert -virtual-pixel white +distort srt 22.5 #{filename} png:-")
         subject.render(rotation: '22.5', format: 'png')
       end
       it 'raises an error for invalid angle' do