Upgrade to Bixby 3.0

.rubocop.yml

@@ -1,22 +1,29 @@
-require: rubocop-rspec
-inherit_from: .rubocop_todo.yml
 inherit_gem:
   bixby: bixby_default.yml
 
+inherit_from: .rubocop_todo.yml
+
 AllCops:
+  TargetRubyVersion: 2.6
   DisplayCopNames: true
+  Exclude:
+    - 'bin/**/*'
+    - 'vendor/**/*'
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 
-Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*.rb'
-
 Naming/MethodName:
   Exclude:
     - 'lib/iiif_manifest/manifest_builder/iiif_service.rb'
     - 'lib/iiif_manifest/v3/manifest_builder/iiif_service.rb'
 
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'
+
+RSpec/ExampleLength:
+  Enabled: false
+
 RSpec/MultipleExpectations:
   Enabled: false

.rubocop_todo.yml

@@ -1,36 +1,41 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-07-26 10:46:37 -0500 using RuboCop version 0.49.1.
+# on 2020-06-12 12:53:34 -0400 using RuboCop version 0.85.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-Metrics/AbcSize:
+# Offense count: 8
+# Cop supports --auto-correct.
+Layout/CommentIndentation:
   Exclude:
-    - 'lib/iiif_manifest/manifest_builder/resource_builder.rb'
-    - 'lib/iiif_manifest/manifest_factory.rb'
-    - 'lib/iiif_manifest/v3/manifest_builder/body_builder.rb'
-    - 'lib/iiif_manifest/v3/manifest_factory.rb'
-    - 'lib/iiif_manifest/v3/manifest_builder/content_builder.rb'
-    - 'lib/iiif_manifest/v3/manifest_builder/choice_builder.rb'
+    - 'lib/iiif_manifest/manifest_builder/record_property_builder.rb'
+    - 'lib/iiif_manifest/v3/manifest_builder/record_property_builder.rb'
 
 # Offense count: 1
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Exclude:
-    - 'iiif_manifest.gemspec'
-    - 'lib/iiif_manifest/v3/manifest_builder/canvas_builder.rb'
+# Configuration parameters: IgnoredMethods.
+Metrics/AbcSize:
+  Max: 38
 
-# Offense count: 1
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 161
+
+# Offense count: 2
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 9
+
+# Offense count: 2
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
     - 'spec/lib/iiif_manifest/manifest_factory_spec.rb'
 
-# Offense count: 8
+# Offense count: 19
+# Configuration parameters: IgnoreSharedExamples.
 RSpec/NamedSubject:
   Exclude:
     - 'spec/lib/iiif_manifest/display_image_spec.rb'
@@ -39,85 +44,35 @@ RSpec/NamedSubject:
     - 'spec/lib/iiif_manifest/v3/manifest_builder/body_builder_spec.rb'
     - 'spec/lib/iiif_manifest/v3/manifest_builder/structure_builder_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: IgnoreSymbolicNames.
+# Offense count: 17
+# Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Exclude:
     - 'spec/lib/iiif_manifest/display_image_spec.rb'
     - 'spec/lib/iiif_manifest/v3/manifest_builder/canvas_builder_spec.rb'
     - 'spec/lib/iiif_manifest/v3/manifest_builder/structure_builder_spec.rb'
 
-RSpec/ExampleLength:
-  Exclude:
-    - 'spec/lib/iiif_manifest/manifest_factory_spec.rb'
-    - 'spec/lib/iiif_manifest/v3/manifest_factory_spec.rb'
-    - 'spec/lib/iiif_manifest/v3/manifest_builder/body_builder_spec.rb'
-    - 'spec/lib/iiif_manifest/v3/manifest_builder/structure_builder_spec.rb'
-    - 'spec/lib/iiif_manifest/v3/manifest_builder/canvas_builder_spec.rb'
-
-# Offense count: 20
-Style/Documentation:
+# Offense count: 6
+# Cop supports --auto-correct.
+# Configuration parameters: NilOrEmpty, NotPresent, UnlessPresent.
+Rails/Blank:
   Exclude:
-    - 'lib/iiif_manifest/display_image.rb'
-    - 'lib/iiif_manifest/iiif_collection.rb'
-    - 'lib/iiif_manifest/iiif_endpoint.rb'
-    - 'lib/iiif_manifest/manifest_builder/canvas_builder.rb'
-    - 'lib/iiif_manifest/manifest_builder/canvas_builder.rb'
-    - 'lib/iiif_manifest/manifest_builder/canvas_builder_factory.rb'
-    - 'lib/iiif_manifest/manifest_builder/child_manifest_builder_factory.rb'
-    - 'lib/iiif_manifest/manifest_builder/composite_builder.rb'
-    - 'lib/iiif_manifest/manifest_builder/composite_builder_factory.rb'
-    - 'lib/iiif_manifest/manifest_builder/deep_canvas_builder_factory.rb'
-    - 'lib/iiif_manifest/manifest_builder/image_builder.rb'
-    - 'lib/iiif_manifest/manifest_builder/image_service_builder.rb'
-    - 'lib/iiif_manifest/manifest_builder/record_property_builder.rb'
-    - 'lib/iiif_manifest/manifest_builder/resource_builder.rb'
-    - 'lib/iiif_manifest/manifest_builder/sequence_builder.rb'
-    - 'lib/iiif_manifest/manifest_builder/structure_builder.rb'
-    - 'lib/iiif_manifest/manifest_builder.rb'
-    - 'lib/iiif_manifest/manifest_factory.rb'
-    - 'lib/iiif_manifest/manifest_service_locator.rb'
-    - 'lib/iiif_manifest.rb'
     - 'lib/iiif_manifest/manifest_builder/iiif_service.rb'
-    - 'lib/iiif_manifest/v3.rb'
-    - 'lib/iiif_manifest/v3/display_content.rb'
-    - 'lib/iiif_manifest/v3/manifest_factory.rb'
-    - 'lib/iiif_manifest/v3/manifest_builder/structure_builder.rb'
     - 'lib/iiif_manifest/v3/manifest_builder/iiif_service.rb'
-    - 'lib/iiif_manifest/v3/manifest_builder/canvas_builder.rb'
-    - 'lib/iiif_manifest/v3/manifest_builder/choice_builder.rb'
-    - 'lib/iiif_manifest/v3/manifest_builder/content_builder.rb'
-    - 'lib/iiif_manifest/v3/manifest_builder/body_builder.rb'
-    - 'lib/iiif_manifest/v3/manifest_builder/record_property_builder.rb'
-    - 'lib/iiif_manifest/v3/manifest_builder/image_service_builder.rb'
-    - 'lib/iiif_manifest/v3/manifest_builder.rb'
-    - 'lib/iiif_manifest/v3/manifest_service_locator.rb'
-    - 'spec/lib/iiif_manifest/manifest_factory_spec.rb'
-    - 'spec/lib/iiif_manifest/v3/manifest_factory_spec.rb'
+
+# Offense count: 37
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
 
 # Offense count: 1
-Style/MethodMissing:
+Style/MethodMissingSuper:
   Exclude:
     - 'lib/iiif_manifest/manifest_builder/composite_builder.rb'
 
-Metrics/ClassLength:
-  Exclude:
-    - 'lib/iiif_manifest/manifest_service_locator.rb'
-    - 'lib/iiif_manifest/v3/manifest_service_locator.rb'
-
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: MinSize, SupportedStyles.
-# SupportedStyles: percent, brackets
-Style/SymbolArray:
-  EnforcedStyle: brackets
-
-Metrics/ParameterLists:
-  Exclude:
-    - 'lib/iiif_manifest/v3/display_content.rb'
-    - 'lib/iiif_manifest/v3/manifest_builder/canvas_builder.rb'
-
-RSpec/NestedGroups:
+Style/MissingRespondToMissing:
   Exclude:
-    - 'spec/lib/iiif_manifest/v3/manifest_factory_spec.rb'
-    - 'spec/lib/iiif_manifest/v3/manifest_builder/body_builder_spec.rb'
+    - 'lib/iiif_manifest/manifest_builder/composite_builder.rb'

iiif_manifest.gemspec

@@ -19,12 +19,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '>= 4'
 
-  spec.add_development_dependency 'bixby', '~> 1.0'
+  spec.add_development_dependency 'bixby', '~> 3.0'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rspec'
 end

lib/iiif_manifest/manifest_builder.rb

@@ -35,12 +35,12 @@ def to_h
 
     private
 
-      def manifest
-        @manifest ||= manifest_builder_class
-      end
+    def manifest
+      @manifest ||= manifest_builder_class
+    end
 
-      def top_record
-        top_record_factory.new
-      end
+    def top_record
+      top_record_factory.new
+    end
   end
 end

lib/iiif_manifest/manifest_builder/canvas_builder.rb

@@ -28,18 +28,18 @@ def apply(sequence)
 
       private
 
-        def display_image
-          record.display_image if record.respond_to?(:display_image)
-        end
-
-        def apply_record_properties
-          canvas['@id'] = path
-          canvas.label = record.to_s
-        end
-
-        def attach_image
-          image_builder.new(display_image).apply(canvas)
-        end
+      def display_image
+        record.display_image if record.respond_to?(:display_image)
+      end
+
+      def apply_record_properties
+        canvas['@id'] = path
+        canvas.label = record.to_s
+      end
+
+      def attach_image
+        image_builder.new(display_image).apply(canvas)
+      end
     end
   end
 end

lib/iiif_manifest/manifest_builder/canvas_builder_factory.rb

@@ -17,9 +17,9 @@ def from(work)
 
       private
 
-        def file_set_presenters(work)
-          work.file_set_presenters
-        end
+      def file_set_presenters(work)
+        work.file_set_presenters
+      end
     end
   end
 end

lib/iiif_manifest/manifest_builder/deep_canvas_builder_factory.rb

@@ -3,9 +3,9 @@ class ManifestBuilder
     class DeepCanvasBuilderFactory < CanvasBuilderFactory
       private
 
-        def file_set_presenters(work)
-          DeepFileSetEnumerator.new(work).to_a
-        end
+      def file_set_presenters(work)
+        DeepFileSetEnumerator.new(work).to_a
+      end
     end
 
     class DeepFileSetEnumerator
@@ -26,13 +26,13 @@ def each(&block)
 
       private
 
-        def file_set_presenters
-          work.try(:file_set_presenters) || []
-        end
+      def file_set_presenters
+        work.try(:file_set_presenters) || []
+      end
 
-        def work_presenters
-          work.try(:work_presenters) || []
-        end
+      def work_presenters
+        work.try(:work_presenters) || []
+      end
     end
   end
 end

lib/iiif_manifest/manifest_builder/image_builder.rb

@@ -18,17 +18,17 @@ def apply(canvas)
 
       private
 
-        def build_resource
-          resource_builder.apply(annotation)
-        end
+      def build_resource
+        resource_builder.apply(annotation)
+      end
 
-        def resource_builder
-          resource_builder_factory.new(display_image)
-        end
+      def resource_builder
+        resource_builder_factory.new(display_image)
+      end
 
-        def annotation
-          @annotation ||= iiif_annotation_factory.new
-        end
+      def annotation
+        @annotation ||= iiif_annotation_factory.new
+      end
     end
   end
 end

lib/iiif_manifest/manifest_builder/image_service_builder.rb

@@ -16,9 +16,9 @@ def apply(resource)
 
       private
 
-        def service
-          @service ||= iiif_service_factory.new
-        end
+      def service
+        @service ||= iiif_service_factory.new
+      end
     end
   end
 end