Merge b2091bc into 811b090

sul-dlss-deprecated · Apr 12, 2019 · 164553d · 164553d
2 parents 811b090 + b2091bc
commit 164553d
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 924 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-04-11 09:11:29 -0500 using RuboCop version 0.65.0.
+# on 2019-04-12 15:02:20 -0500 using RuboCop version 0.65.0.
 # 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
@@ -54,7 +54,7 @@ Lint/Void:
   Exclude:
     - 'lib/dor/models/concerns/identifiable.rb'
 
-# Offense count: 69
+# Offense count: 63
 Metrics/AbcSize:
   Max: 106
 
@@ -63,26 +63,26 @@ Metrics/AbcSize:
 Metrics/ClassLength:
   Max: 253
 
-# Offense count: 15
+# Offense count: 13
 Metrics/CyclomaticComplexity:
   Max: 25
 
-# Offense count: 62
+# Offense count: 61
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 52
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 128
+  Max: 121
 
 # Offense count: 1
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 15
+# Offense count: 13
 Metrics/PerceivedComplexity:
   Max: 25
 
@@ -161,46 +161,41 @@ Naming/VariableName:
     - 'spec/datastreams/content_metadata_ds_spec.rb'
     - 'spec/indexers/processable_indexer_spec.rb'
 
-# Offense count: 11
+# Offense count: 1
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: snake_case, normalcase, non_integer
 Naming/VariableNumber:
   Exclude:
-    - 'spec/services/cleanup_reset_service_spec.rb'
     - 'spec/services/cleanup_service_filesystem_spec.rb'
 
-# Offense count: 24
+# Offense count: 6
 RSpec/AnyInstance:
   Exclude:
     - 'spec/indexers/indexer_spec.rb'
     - 'spec/indexers/processable_indexer_spec.rb'
     - 'spec/models/concerns/embargoable_spec.rb'
-    - 'spec/models/concerns/versionable_spec.rb'
     - 'spec/models/workflow_object_spec.rb'
-    - 'spec/services/datastream_builder_spec.rb'
     - 'spec/services/public_xml_service_spec.rb'
-    - 'spec/services/publish_metadata_service_spec.rb'
 
 # Offense count: 22
 RSpec/Be:
   Exclude:
     - 'spec/datastreams/embargo_metadata_spec.rb'
     - 'spec/services/public_xml_service_spec.rb'
 
-# Offense count: 9
+# Offense count: 8
 RSpec/BeforeAfterAll:
   Exclude:
     - 'spec/spec_helper.rb'
     - 'spec/rails_helper.rb'
     - 'spec/support/**/*.rb'
-    - 'spec/services/cleanup_reset_service_spec.rb'
     - 'spec/services/cleanup_service_spec.rb'
     - 'spec/services/digital_stacks_service_spec.rb'
     - 'spec/services/metadata_service_spec.rb'
     - 'spec/services/suri_service_spec.rb'
     - 'spec/services/technical_metadata_service_spec.rb'
 
-# Offense count: 43
+# Offense count: 33
 # Configuration parameters: Prefixes.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -222,29 +217,27 @@ RSpec/DescribedClass:
   Exclude:
     - 'spec/utils/sdr_client_spec.rb'
 
-# Offense count: 178
+# Offense count: 159
 # Configuration parameters: Max.
 RSpec/ExampleLength:
   Enabled: false
 
-# Offense count: 28
+# Offense count: 11
 RSpec/ExpectInHook:
   Exclude:
     - 'spec/datastreams/content_metadata_ds_spec.rb'
     - 'spec/services/metadata_service_spec.rb'
     - 'spec/services/public_desc_metadata_service_spec.rb'
     - 'spec/services/public_xml_service_spec.rb'
-    - 'spec/services/publish_metadata_service_spec.rb'
     - 'spec/services/sdr_ingest_service_spec.rb'
-    - 'spec/services/shelving_service_spec.rb'
     - 'spec/services/status_service_spec.rb'
 
-# Offense count: 64
+# Offense count: 58
 # Configuration parameters: CustomTransform, IgnoreMethods.
 RSpec/FilePath:
   Enabled: false
 
-# Offense count: 709
+# Offense count: 539
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Enabled: false
@@ -254,35 +247,34 @@ RSpec/MessageChain:
   Exclude:
     - 'spec/services/suri_service_spec.rb'
 
-# Offense count: 134
-# Configuration parameters: EnforcedStyle.
+# Offense count: 100
+# Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
-  Enabled: false
+  EnforcedStyle: receive
 
 # Offense count: 1
 RSpec/MultipleDescribes:
   Exclude:
     - 'spec/services/digital_stacks_service_spec.rb'
 
-# Offense count: 247
+# Offense count: 210
 # Configuration parameters: AggregateFailuresByDefault.
 RSpec/MultipleExpectations:
   Max: 14
 
-# Offense count: 54
+# Offense count: 53
 # Configuration parameters: IgnoreSharedExamples.
 RSpec/NamedSubject:
   Exclude:
     - 'spec/datastreams/default_object_rights_ds_spec.rb'
     - 'spec/models/admin_policy_object_spec.rb'
     - 'spec/models/collection_spec.rb'
-    - 'spec/services/shelving_service_spec.rb'
     - 'spec/services/thumbnail_service_spec.rb'
 
-# Offense count: 26
+# Offense count: 17
 RSpec/NestedGroups:
-  Max: 5
+  Max: 4
 
 # Offense count: 22
 RSpec/RepeatedDescription:
@@ -291,7 +283,7 @@ RSpec/RepeatedDescription:
     - 'spec/services/abiltiy_spec.rb'
     - 'spec/services/release_tag_service_spec.rb'
 
-# Offense count: 21
+# Offense count: 19
 RSpec/ScatteredLet:
   Exclude:
     - 'spec/indexers/describable_indexer_spec.rb'
@@ -304,9 +296,8 @@ RSpec/ScatteredLet:
     - 'spec/models/workflow_document_spec.rb'
     - 'spec/services/public_desc_metadata_service_spec.rb'
     - 'spec/services/public_xml_service_spec.rb'
-    - 'spec/services/shelving_service_spec.rb'
 
-# Offense count: 20
+# Offense count: 16
 RSpec/ScatteredSetup:
   Exclude:
     - 'spec/datastreams/content_metadata_ds_spec.rb'
@@ -315,12 +306,10 @@ RSpec/ScatteredSetup:
     - 'spec/models/concerns/governable_spec.rb'
     - 'spec/models/workflow_object_spec.rb'
     - 'spec/services/public_desc_metadata_service_spec.rb'
-    - 'spec/services/publish_metadata_service_spec.rb'
-    - 'spec/services/reset_workspace_service_spec.rb'
     - 'spec/services/search_service_spec.rb'
     - 'spec/services/suri_service_spec.rb'
 
-# Offense count: 39
+# Offense count: 36
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Enabled: false
@@ -352,12 +341,11 @@ Style/ClassVars:
     - 'lib/dor/services/search_service.rb'
     - 'lib/dor/workflow/document.rb'
 
-# Offense count: 3
+# Offense count: 2
 Style/CommentedKeyword:
   Exclude:
     - 'lib/dor/datastreams/identity_metadata_ds.rb'
     - 'lib/dor/datastreams/rights_metadata_ds.rb'
-    - 'lib/dor/services/reset_workspace_service.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -371,14 +359,13 @@ Style/ConditionalAssignment:
 Style/Documentation:
   Enabled: false
 
-# Offense count: 9
+# Offense count: 8
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Exclude:
     - 'lib/dor/datastreams/geo_metadata_ds.rb'
     - 'lib/dor/datastreams/version_metadata_ds.rb'
     - 'lib/dor/models/concerns/governable.rb'
-    - 'lib/dor/services/reset_workspace_service.rb'
     - 'lib/dor/services/sdr_ingest_service.rb'
     - 'lib/dor/services/technical_metadata_service.rb'
     - 'lib/dor/utils/predicate_patch.rb'
@@ -400,7 +387,7 @@ Style/MultilineBlockChain:
 Style/NumericPredicate:
   Enabled: false
 
-# Offense count: 28
+# Offense count: 27
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -410,7 +397,6 @@ Style/PercentLiteralDelimiters:
     - 'lib/dor/indexers/describable_indexer.rb'
     - 'lib/dor/services/cleanup_service.rb'
     - 'lib/dor/services/metadata_handlers/catalog_handler.rb'
-    - 'lib/dor/services/publish_metadata_service.rb'
     - 'spec/datastreams/events_ds_spec.rb'
     - 'spec/datastreams/geo_metadata_spec.rb'
     - 'spec/indexers/indexer_spec.rb'

diff --git a/lib/dor-services.rb b/lib/dor-services.rb
@@ -127,7 +127,6 @@ def logger
     autoload :CreateWorkflowService
     autoload :CreativeCommonsLicenseService
     autoload :DecommissionService
-    autoload :DigitalStacksService
     autoload :DublinCoreService
     autoload :IndexingService
     autoload :MetadataService
@@ -139,7 +138,6 @@ def logger
     autoload :SdrIngestService
     autoload :SearchService
     autoload :SecondaryFileNameService
-    autoload :ShelvingService
     autoload :StatusService
     autoload :SuriService
     autoload :TagService

diff --git a/lib/dor/services/digital_stacks_service.rb b/lib/dor/services/digital_stacks_service.rb