dor-services 5.29.0 → 5.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6c61cecf3d248803eae00ed5d38ff6777274637
-  data.tar.gz: a54d41fcd06b9e1ddfa27901d1b60a255b687eb3
+  metadata.gz: 89a45fc0d4d2b861d2a63f35501cab481ac19886
+  data.tar.gz: 4a2814c6b8dbabb5b8d9e08ff99f3a7e13ae2498
 SHA512:
-  metadata.gz: 73c5d62258abc20a79bc4bf1fe4eedbaa1ea6e089171ef9d62a80fd5de792d8f2e188c8fefcb3dafacc550cd40617d1fd4fefe091a5bfa857b06dca83756501c
-  data.tar.gz: bafc0afb99e3ef8186bcd6613421fd9bf48aa22c8ef1e5a57203215f0d2950cfa69d356b070331e1f2a21788d2e36bf1bf0d7c8475af726b002dab1bfe6094c8
+  metadata.gz: a47c637d3a5f2b02b36385e9bf9f632b15fe1f36c498fe2c73d84ec904c973deafca8738b7c3df77c8ede4156cb73b486d5704906b5ea563ac2ae55cb3798941
+  data.tar.gz: 542ff047ac905c08258ab5c5ce676cbdc68ff9b7e7113ec8c15d7f8e3f9183199a2a5773094e8a5cdb923aaf5b86a0b0adeb6a3ab85c98da5d59456b924caea0

data/config/certs/robots-dor-dev.crt

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE9zCCAt8CCQCcUJVDTu7rTjANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCFN0YW5mb3JkMRwwGgYD
+VQQKExNTdGFuZm9yZCBVbml2ZXJzaXR5MRIwEAYDVQQLEwlMaWJyYXJpZXMxJTAj
+BgNVBAMTHFNVTCBET1IgKGRldi90ZXN0KSBhY2Nlc3MgQ0ExLzAtBgkqhkiG9w0B
+CQEWIHN1bC13ZWJtYXN0ZXJAbGlzdHMuc3RhbmZvcmQuZWR1MB4XDTEyMDkyNjE1
+NTQzNVoXDTIyMDkyNDE1NTQzNVowgboxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpD
+YWxpZm9ybmlhMREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UEChMTU3RhbmZvcmQg
+VW5pdmVyc2l0eTEyMDAGA1UEAxQpcm9ib3RzQHN1bC1seWJlcnNlcnZpY2VzLWRl
+di5zdGFuZm9yZC5lZHUxMTAvBgkqhkiG9w0BCQEWImRsc3MtZGV2ZWxvcGVyc0Bs
+aXN0cy5zdGFuZm9yZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQC1t+PPhLTDFQBuAf4f1GOj7jHdXMN0tvSHL1OCaibe0d8iKbXCMMIE0z8lbBpZ
+1pA+8terIvxoTlly92EEvGkywZb+DIxnjyG0b9ftDJ64pARJMcnvwJMW/w3WdHCd
+5uJ5HVM8ZCbEItUfskFukS6tfNBpG8ri6cIQ2ulJzOWYxPV5R2eRneM6vtFD0xtu
+RJb/uMwiOwB79qk4QazbEQtkeZsrvomDFkIuHO/nf9wmgYG99H7q1kXplIrzDDX+
+fvD+JHvuMr5YXfmBQ9wmaZf6YIL7CXj79HUF4uG/a0SjrLZyLh262zWJQFVpjSW8
+Brl/fAyjeZvWJMyCDXRqsedjAgMBAAEwDQYJKoZIhvcNAQEFBQADggIBAG0jIfTj
+1FJsxTzcD938vtKuNo5XEIX8phqW1MA2eJ5Ojgu1hpW5Jf7fmUHKVnamm7eya5QR
+356KCJzZzwdCS4xVFq/l43gCA2j8TYrwO6/0EfM/5psUZS3ecwahzcJXfHPHvd9u
+qaXRqbjJYi+Ls70uStTC/JBIIu48atDF0DeXJ21hAbstZ1OKKNzAcYgZk14GKxCi
+ArgAzdg8UDtC4KsdqgxP6vF8Vc/gcHSu9AkVHgPVXbITjV0/kaKNgFi0bVqP7bJD
+hrUFYrS+S+hflQJCmVrDwW0JU2HnJ3EJOFX5F4FYHL4vt6ZjVsMzucraMqiLyUaO
+s6DVaWO8WMlphmFUfb3ChQjrKxFZZ6vKJPD/ExnQHa0kWwOELyMJuXw2PLk7k+qD
+rmjX+K3Ed+JiJuiDG5k8f1BDZE24lvxDwye5fQyDWPfib1yTClYYy4PRh4AI688f
+qgMyv51Qx82o0IJ1On1rNg5/iB7OEVcYSol3U5xiY9gRUd3vq637agZzMuRQnKXs
+Uj0+Vl4OrZ54F8MVsUKfi7Je1oVUEhuHqFt/tSOGlHg1XyR/ExwulCNBKIVdhhrF
+rxZCYrGDSUCF6tteJXpOBTtFT9b7hbMmBohKyS4XjfPSPRh9QHx7wepqSp3aHpmR
+4gY8Go40mS83xHCKBooqsy2/Z9vQlSb9Cr8u
+-----END CERTIFICATE-----

data/config/certs/robots-dor-dev.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAtbfjz4S0wxUAbgH+H9Rjo+4x3VzDdLb0hy9Tgmom3tHfIim1
+wjDCBNM/JWwaWdaQPvLXqyL8aE5ZcvdhBLxpMsGW/gyMZ48htG/X7QyeuKQESTHJ
+78CTFv8N1nRwnebieR1TPGQmxCLVH7JBbpEurXzQaRvK4unCENrpSczlmMT1eUdn
+kZ3jOr7RQ9MbbkSW/7jMIjsAe/apOEGs2xELZHmbK76JgxZCLhzv53/cJoGBvfR+
+6tZF6ZSK8ww1/n7w/iR77jK+WF35gUPcJmmX+mCC+wl4+/R1BeLhv2tEo6y2ci4d
+uts1iUBVaY0lvAa5f3wMo3mb1iTMgg10arHnYwIDAQABAoIBAQCmlDzsZZ2C24S6
+U29OZFc21kq1vqyaGIEOT48BFSguyDsAyTWKH0IsRC41suRxCGTQn7KeegLh5zjO
+UAGK4uCYm6g7mOs4n5fpHUHWVuRFJG2dX1vbQTBVO1fHCJSX2ygumHhN+w0ibT/r
+v2+F2ObuOGWghM62tkylQNfsRD0QjalE8ST2xp9p4xwPrAwEuURlA04qnLYNi4+6
+qexDtrLG8E6JV/dd3dY95WjKPscadR1fAKm9sebD0XO31Lu6BGCvpmBU0OmYVfrY
+BN/ofhEmJh+Xgwfxx6PicRDvu9bPnffqbGhDO4ckGDlqXp1fDBgf1I7CclXdrVMH
+Qsxunh5pAoGBAN7929V1aw0S7Rqvuf4N+o1XwBExa2DL7EYI1Oea/nuBMPqvfeNh
+SrbM0gYejEzLmeRUUKRhMMoAgXQnxcg3Kz/5pUXT3b4YtzeskX8nkJ6/2gEU3M7E
+lJj7c5wW1otqMH19+iDNR4N8vjPh98kDJW1HZUHSAcdyE+dZiFP2ofMfAoGBANCe
+AJgA9EkdwZsom+I7Ty9LSrTWx6cKmNEbLVn1iSlyJx1kHoWyTMtuZszCWBjiXx70
+84WpX2B4MuJBq6sSoEiUahNsphks82glOd6i+eoE/I+NtZehOFnkAMyGux+FbMyG
+q/9ZlQgsbWpFHxS59vX/kvlNun2RpJkaF6QPBuc9AoGBAIGdscCb5cPNsoCGkGf6
+HB84WG4l+bJkFkyHKaoOT8neSGgOxe/7R4CGAbaI3yhsWGF+GPnTfJaOQLERxUch
+ukQPil/STNwIZcc4ycHNb6S3A7MJO2f8oBtkXcjnBYI4EUOAjHmwmNb3FV/3Ax6W
+c5TXoSXnOh2CU8twIWwcufolAoGATqnFf4uckZVu05rUbNIAYcz6NoZmck5EoVSm
+HS3Asqggp6yA9djtrCfNC5icr4VsaLfku5nKJQ4t4bLxkGhNmBCejwSA/S09+x9O
+Wu0JX3zR3y+IMczQ+tRGmNiU5qXhCJ4fbQHSeGqIN3Io7h/RR6E/QlJU59RrRG/a
+SjqAV+ECgYEA2mA5VFK3jECnLde+biEaXidIOuBMcqaP0VG6sBwz2wTGSTBE1WkG
+6prCD0McWVAgDTm3MMKxeuMaoW5eEi83+G+CywLaTBpc8Hz7qgRhBpKhRirCfHMW
+EfQV5k32vEGoSI+eG8zcGb9mwDeb/EWXAMGXrx2YuYFu7txtwC2mZXc=
+-----END RSA PRIVATE KEY-----

data/config/config_defaults.yml

@@ -16,6 +16,8 @@
 :metadata:
   :catalog:
     :url:
+    :user:
+    :pass:
 :sdr:
   :local_workspace_root: /dor/workspace
   :local_export_home: /dor/export

data/config/dev_console_env.rb

@@ -0,0 +1,80 @@
+cert_dir = File.join(File.dirname(__FILE__), "..", "certs")
+
+Dor::Config.configure do
+  fedora do
+    url 'https://sul-dor-dev.stanford.edu/fedora'
+  end
+
+  ssl do
+    cert_file File.join(cert_dir,"robots-dor-dev.crt")
+    key_file File.join(cert_dir,"robots-dor-dev.key")
+    key_pass ''
+  end
+  
+  suri do
+    mint_ids true
+    id_namespace 'druid'
+    url 'https://lyberservices-dev.stanford.edu'
+    user 'labware'
+    pass 'lyberteam'
+  end
+  
+  metadata do
+    exist.url 'http://viewer:l3l%40nd@lyberapps-dev.stanford.edu/exist/rest/'
+    catalog.url 'http://lyberservices-prod.stanford.edu/catalog/mods'
+  end
+  
+  stacks do
+    document_cache_host 'purl-dev.stanford.edu'
+    local_stacks_root '/stacks'
+    local_document_cache_root '/purl/document_cache'
+    local_workspace_root '/dor/workspace'
+  end
+ 
+  solrizer.url 'http://sul-solr.stanford.edu/solr/argo_test'
+  workflow.url 'https://lyberservices-dev.stanford.edu/workflow/'
+  dor_services.url 'https://dorAdmin:dorAdmin@sul-lyberservices-dev.stanford.edu/dor'
+
+  cleanup do
+    local_workspace_root '/dor/workspace'
+    local_export_home '/dor/export'
+  end
+
+  sdr do
+    url 'https://sdrAdmin:sdrAdmin@sdr-services-test.stanford.edu/sdr/'
+    local_workspace_root '/dor/workspace'
+    local_export_home '/dor/export'
+    datastreams do
+      administrativeMetadata 'optional'
+      contentMetadata 'optional'
+      descMetadata 'required'
+      defaultObjectRights 'optional'
+      events 'optional'
+      embargoMetadata 'optional'
+      identityMetadata 'required'
+      provenanceMetadata 'required'
+      relationshipMetadata 'required'
+      rightsMetadata 'optional'
+      roleMetadata 'optional'
+      sourceMetadata 'optional'
+      technicalMetadata 'optional'
+      versionMetadata 'required'
+      workflows 'optional'
+    end
+  end
+
+  accessioning_robot_sleep_time 30
+
+end
+
+
+#WORKFLOW_URI = 'http://lyberservices-test.stanford.edu/workflow'
+
+# Constants for Dor::WorkflowService
+#module Dor
+#  CREATE_WORKFLOW = DOR_CREATE_WORKFLOW = true
+#  WF_URI = 'http://lyberservices-test.stanford.edu/workflow'
+#end
+
+# External application locations
+JHOVE_HOME = File.join(ENV['HOME'], 'jhoveToolkit')

data/lib/dor-services.rb

@@ -82,75 +82,84 @@ module Dor
   require 'druid-tools'
 
   # datastreams
-  autoload :AdministrativeMetadataDS, 'dor/datastreams/administrative_metadata_ds'
-  autoload :ContentMetadataDS,        'dor/datastreams/content_metadata_ds'
-  autoload :DescMetadataDS,           'dor/datastreams/desc_metadata_ds'
-  autoload :EmbargoMetadataDS,        'dor/datastreams/embargo_metadata_ds'
-  autoload :EventsDS,                 'dor/datastreams/events_ds'
-  autoload :GeoMetadataDS,            'dor/datastreams/geo_metadata_ds'
-  autoload :IdentityMetadataDS,       'dor/datastreams/identity_metadata_ds'
-  autoload :RightsMetadataDS,         'dor/datastreams/rights_metadata_ds'
-  autoload :RoleMetadataDS,           'dor/datastreams/role_metadata_ds'
-  autoload :WorkflowDefinitionDs,     'dor/datastreams/workflow_definition_ds'
-  autoload :WorkflowDs,               'dor/datastreams/workflow_ds'
-  autoload :VersionMetadataDS,        'dor/datastreams/version_metadata_ds'
-  autoload :DefaultObjectRightsDS,    'dor/datastreams/default_object_rights_ds'
-  autoload :SimpleDublinCoreDs,       'dor/datastreams/simple_dublin_core_ds'
+  autoload_under 'datastreams' do
+    autoload :AdministrativeMetadataDS
+    autoload :ContentMetadataDS
+    autoload :DescMetadataDS
+    autoload :EmbargoMetadataDS
+    autoload :EventsDS
+    autoload :GeoMetadataDS
+    autoload :IdentityMetadataDS
+    autoload :RightsMetadataDS
+    autoload :RoleMetadataDS
+    autoload :WorkflowDefinitionDs
+    autoload :WorkflowDs
+    autoload :VersionMetadataDS
+    autoload :DefaultObjectRightsDS
+    autoload :SimpleDublinCoreDs
+  end
 
   # DOR Concerns
-  autoload :Identifiable, 'dor/models/concerns/identifiable'
-  autoload :Itemizable,   'dor/models/concerns/itemizable'
-  autoload :Processable,  'dor/models/concerns/processable'
-  autoload :Governable,   'dor/models/concerns/governable'
-  autoload :Describable,  'dor/models/concerns/describable'
-  autoload :Publishable,  'dor/models/concerns/publishable'
-  autoload :Shelvable,    'dor/models/concerns/shelvable'
-  autoload :Embargoable,  'dor/models/concerns/embargoable'
-  autoload :Preservable,  'dor/models/concerns/preservable'
-  autoload :Assembleable, 'dor/models/concerns/assembleable'
-  autoload :Eventable,    'dor/models/concerns/eventable'
-  autoload :Versionable,  'dor/models/concerns/versionable'
-  autoload :Contentable,  'dor/models/concerns/contentable'
-  autoload :Editable,     'dor/models/concerns/editable'
-  autoload :Discoverable, 'dor/models/concerns/discoverable'
-  autoload :Geoable,      'dor/models/concerns/geoable'
-  autoload :Releaseable,  'dor/models/concerns/releaseable'
-  autoload :Rightsable,   'dor/models/concerns/rightsable'
+  autoload_under 'models/concerns' do
+    autoload :Identifiable
+    autoload :Itemizable
+    autoload :Processable
+    autoload :Governable
+    autoload :Describable
+    autoload :Publishable
+    autoload :Shelvable
+    autoload :Embargoable
+    autoload :Preservable
+    autoload :Assembleable
+    autoload :Eventable
+    autoload :Versionable
+    autoload :Contentable
+    autoload :Editable
+    autoload :Discoverable
+    autoload :Geoable
+    autoload :Releaseable
+    autoload :Rightsable
+  end
 
   eager_autoload do
     # ActiveFedora Classes
-    autoload :Abstract,          'dor/models/abstract'
-    autoload :Agreement,         'dor/models/agreement'
-    autoload :Item,              'dor/models/item'
-    autoload :Set,               'dor/models/set'
-    autoload :Collection,        'dor/models/collection'
-    autoload :AdminPolicyObject, 'dor/models/admin_policy_object'
-    autoload :WorkflowObject,    'dor/models/workflow_object'
+    autoload_under 'models' do
+      autoload :Abstract
+      autoload :Agreement
+      autoload :Item
+      autoload :Set
+      autoload :Collection
+      autoload :AdminPolicyObject
+      autoload :WorkflowObject
+    end
   end
 
   # Services
-  autoload :SearchService,             'dor/services/search_service'
-  autoload :IndexingService,           'dor/services/indexing_service'
-  autoload :MetadataService,           'dor/services/metadata_service'
-  autoload :RegistrationService,       'dor/services/registration_service'
-  autoload :SuriService,               'dor/services/suri_service'
-  autoload :WorkflowService,           'dor/services/workflow_service'
-  autoload :DigitalStacksService,      'dor/services/digital_stacks_service'
-  autoload :SdrIngestService,          'dor/services/sdr_ingest_service'
-  autoload :CleanupService,            'dor/services/cleanup_service'
-  autoload :ProvenanceMetadataService, 'dor/services/provenance_metadata_service'
-  autoload :TechnicalMetadataService,  'dor/services/technical_metadata_service'
-  autoload :MergeService,              'dor/services/merge_service'
-  autoload :ResetWorkspaceService,     'dor/services/reset_workspace_service'
-  autoload :CleanupResetService,       'dor/services/cleanup_reset_service'
-  autoload :PublicDescMetadataService, 'dor/services/public_desc_metadata_service'
-  autoload :PublicXmlService,       'dor/services/public_xml_service'
+  autoload_under 'services' do
+    autoload :SearchService
+    autoload :IndexingService
+    autoload :MetadataService
+    autoload :RegistrationService
+    autoload :SuriService
+    autoload :WorkflowService
+    autoload :DigitalStacksService
+    autoload :SdrIngestService
+    autoload :CleanupService
+    autoload :ProvenanceMetadataService
+    autoload :TechnicalMetadataService
+    autoload :MergeService
+    autoload :ResetWorkspaceService
+    autoload :CleanupResetService
+    autoload :PublicDescMetadataService
+    autoload :PublicXmlService
+  end
 
   # Workflow Classes
   module Workflow
-    autoload :Graph,    'dor/workflow/graph'
-    autoload :Process,  'dor/workflow/process'
-    autoload :Document, 'dor/workflow/document'
+    extend ActiveSupport::Autoload
+    autoload :Graph
+    autoload :Process
+    autoload :Document
   end
 
   eager_load!

data/lib/dor/models/concerns/editable.rb

@@ -93,6 +93,7 @@ module Dor
     def mods_title
       descMetadata.term_values(:title_info, :main_title).first
     end
+
     def mods_title=(val)
       descMetadata.update_values({[:title_info, :main_title] => val})
     end
@@ -102,6 +103,7 @@ module Dor
     def default_collections
       administrativeMetadata.term_values(:registration, :default_collection)
     end
+
     # Add a collection to the listing of collections for items governed by this apo.
     # @param val [String] pid of the collection, ex. druid:ab123cd4567
     def add_default_collection(val)
@@ -116,6 +118,7 @@ module Dor
       node['id'] = val
       reg.add_child(node)
     end
+
     def remove_default_collection(val)
       xml = administrativeMetadata.ng_xml
       administrativeMetadata.ng_xml_will_change!
@@ -138,6 +141,7 @@ module Dor
     def metadata_source
       administrativeMetadata.metadata_source.first
     end
+
     def metadata_source=(val)
       if administrativeMetadata.descMetadata.nil?
         administrativeMetadata.ng_xml_will_change!
@@ -149,6 +153,7 @@ module Dor
     def use_statement
       defaultObjectRights.use_statement.first
     end
+
     def use_statement=(val)
       defaultObjectRights.update_term!(:use_statement, val.nil? ? '' : val)
     end
@@ -156,6 +161,7 @@ module Dor
     def copyright_statement
       defaultObjectRights.copyright.first
     end
+
     def copyright_statement=(val)
       defaultObjectRights.update_term!(:copyright, val.nil? ? '' : val)
     end
@@ -163,6 +169,7 @@ module Dor
     def creative_commons_license
       defaultObjectRights.creative_commons.first
     end
+
     def creative_commons_license_human
       defaultObjectRights.creative_commons_human.first
     end
@@ -170,6 +177,7 @@ module Dor
     def open_data_commons_license
       defaultObjectRights.open_data_commons.first
     end
+
     def open_data_commons_license_human
       defaultObjectRights.open_data_commons_human.first
     end
@@ -179,11 +187,13 @@ module Dor
       return open_data_commons_license unless open_data_commons_license.blank?
       nil
     end
+
     def use_license_uri
       return defaultObjectRights.creative_commons.uri.first unless defaultObjectRights.creative_commons.uri.blank?
       return defaultObjectRights.open_data_commons.uri.first unless defaultObjectRights.open_data_commons.uri.blank?
       nil
     end
+
     def use_license_human
       return creative_commons_license_human unless creative_commons_license_human.blank?
       return open_data_commons_license_human unless open_data_commons_license_human.blank?
@@ -195,6 +205,7 @@ module Dor
       defaultObjectRights.creative_commons = use_license_machine
       defaultObjectRights.creative_commons.uri = CREATIVE_COMMONS_USE_LICENSES[use_license_machine][:uri]
     end
+
     def creative_commons_license_human=(use_license_human)
       defaultObjectRights.initialize_term!(:creative_commons_human)
       defaultObjectRights.creative_commons_human = use_license_human
@@ -205,6 +216,7 @@ module Dor
       defaultObjectRights.open_data_commons = use_license_machine
       defaultObjectRights.open_data_commons.uri = OPEN_DATA_COMMONS_USE_LICENSES[use_license_machine][:uri]
     end
+
     def open_data_commons_license_human=(use_license_human)
       defaultObjectRights.initialize_term!(:open_data_commons_human)
       defaultObjectRights.open_data_commons_human = use_license_human
@@ -287,6 +299,7 @@ module Dor
     def desc_metadata_format
       administrativeMetadata.metadata_format.first
     end
+
     def desc_metadata_format=(format)
       # create the node if it isnt there already
       unless administrativeMetadata.metadata_format.first
@@ -299,6 +312,7 @@ module Dor
     def desc_metadata_source
       administrativeMetadata.metadata_source.first
     end
+
     def desc_metadata_source=(source)
       # create the node if it isnt there already
       unless administrativeMetadata.metadata_source.first
@@ -313,6 +327,7 @@ module Dor
     def default_workflows
       administrativeMetadata.term_values(:registration, :workflow_id)
     end
+
     # set a single default workflow
     # @param wf [String] the name of the workflow, ex. 'digitizationWF'
     def default_workflow=(wf)
@@ -338,6 +353,7 @@ module Dor
     def agreement
       agreement_object ? agreement_object.pid : ''
     end
+
     def agreement=(val)
       fail ArgumentError, 'agreement must have a valid druid' if val.blank?
       self.agreement_object = Dor.find val.to_s, :cast => true

data/lib/dor/models/concerns/governable.rb

@@ -72,10 +72,12 @@ module Dor
       collections.delete(collection)
       sets.delete(collection)
     end
+
     # set the rights metadata datastream to the content of the APO's default object rights
     def reapplyAdminPolicyObjectDefaults
       rightsMetadata.content = admin_policy_object.datastreams['defaultObjectRights'].content
     end
+
     def rights
       return nil unless self.respond_to? :rightsMetadata
       return nil if rightsMetadata.nil?
@@ -91,54 +93,71 @@ module Dor
         'None'
       end
     end
+
     def groups_which_manage_item
       ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor']
     end
+
     def groups_which_manage_desc_metadata
       ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor', 'dor-apo-metadata']
     end
+
     def groups_which_manage_system_metadata
       ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor']
     end
+
     def groups_which_manage_content
       ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor']
     end
+
     def groups_which_manage_rights
       ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor']
     end
+
     def groups_which_manage_embargo
       ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor']
     end
+
     def groups_which_view_content
       ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor', 'dor-viewer', 'sdr-viewer']
     end
+
     def groups_which_view_metadata
       ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor', 'dor-viewer', 'sdr-viewer']
     end
+
     def intersect(arr1, arr2)
       (arr1 & arr2).length > 0
     end
+
     def can_manage_item?(roles)
       intersect roles, groups_which_manage_item
     end
+
     def can_manage_desc_metadata?(roles)
       intersect roles, groups_which_manage_desc_metadata
     end
+
     def can_manage_system_metadata?(roles)
       intersect roles, groups_which_manage_system_metadata
     end
+
     def can_manage_content?(roles)
       intersect roles, groups_which_manage_content
     end
+
     def can_manage_rights?(roles)
       intersect roles, groups_which_manage_rights
     end
+
     def can_manage_embargo?(roles)
       intersect roles, groups_which_manage_embargo
     end
+
     def can_view_content?(roles)
       intersect roles, groups_which_view_content
     end
+
     def can_view_metadata?(roles)
       intersect roles, groups_which_view_metadata
     end

data/lib/dor/models/concerns/publishable.rb

@@ -15,18 +15,26 @@ module Dor
 
        # these are the finders we will use to search for a thumb resource in contentMetadata, they will be searched in the order provided, stopping when one is reached
        thumb_xpath_finders = [
-           {image_type: 'local', finder: "/contentMetadata/resource[@type='thumb' and @thumb='yes']/file[#{mime_type_finder}]"},      # first find a file of mimetype jp2 explicitly marked as a thumb in the resource type and with a thumb=yes attribute
-           {image_type: 'external', finder: "/contentMetadata/resource[@type='thumb' and @thumb='yes']/externalFile[#{mime_type_finder}]"}, # same thing for external files
-           {image_type: 'local', finder: "/contentMetadata/resource[(@type='page' or @type='image') and @thumb='yes']/file[#{mime_type_finder}]"},# next find any image or page resource types with the thumb=yes attribute of mimetype jp2
-           {image_type: 'external', finder: "/contentMetadata/resource[(@type='page' or @type='image') and @thumb='yes']/externalFile[#{mime_type_finder}]"},# same thing for external file
-           {image_type: 'local', finder: "/contentMetadata/resource[@type='thumb']/file[#{mime_type_finder}]"}, # next find a file of mimetype jp2 and resource type=thumb but not marked with the thumb directive
-           {image_type: 'external', finder: "/contentMetadata/resource[@type='thumb']/externalFile[#{mime_type_finder}]"}, # same thing for external file
-           {image_type: 'local', finder: "/contentMetadata/resource[@type='page' or @type='image']/file[#{mime_type_finder}]"}, # finally find the first page or image resource of mimetype jp2
-           {image_type: 'external', finder: "/contentMetadata/resource[@type='page' or @type='image']/externalFile[#{mime_type_finder}]"} # same thing for external file
+           # first find a file of mimetype jp2 explicitly marked as a thumb in the resource type and with a thumb=yes attribute
+           {image_type: 'local', finder: "/contentMetadata/resource[@type='thumb' and @thumb='yes']/file[#{mime_type_finder}]"},
+           # same thing for external files
+           {image_type: 'external', finder: "/contentMetadata/resource[@type='thumb' and @thumb='yes']/externalFile[#{mime_type_finder}]"},
+           # next find any image or page resource types with the thumb=yes attribute of mimetype jp2
+           {image_type: 'local', finder: "/contentMetadata/resource[(@type='page' or @type='image') and @thumb='yes']/file[#{mime_type_finder}]"},
+           # same thing for external file
+           {image_type: 'external', finder: "/contentMetadata/resource[(@type='page' or @type='image') and @thumb='yes']/externalFile[#{mime_type_finder}]"},
+           # next find a file of mimetype jp2 and resource type=thumb but not marked with the thumb directive
+           {image_type: 'local', finder: "/contentMetadata/resource[@type='thumb']/file[#{mime_type_finder}]"},
+           # same thing for external file
+           {image_type: 'external', finder: "/contentMetadata/resource[@type='thumb']/externalFile[#{mime_type_finder}]"},
+           # finally find the first page or image resource of mimetype jp2
+           {image_type: 'local', finder: "/contentMetadata/resource[@type='page' or @type='image']/file[#{mime_type_finder}]"},
+           # same thing for external file
+           {image_type: 'external', finder: "/contentMetadata/resource[@type='page' or @type='image']/externalFile[#{mime_type_finder}]"}
          ]
-              
+
        thumb_xpath_finders.each do |search_path|
-         thumb_files = cm.xpath(search_path[:finder]) # look for a thumb  
+         thumb_files = cm.xpath(search_path[:finder]) # look for a thumb
          if thumb_files.size > 0   # if we find one, return the filename based on whether it is a local file or external file
            if search_path[:image_type] == 'local'
              thumb_image="#{remove_druid_prefix}/#{thumb_files[0]['id']}"
@@ -35,8 +43,8 @@ module Dor
            end
            break  # break out of the loop so we stop searching
          end
-       end 
-              
+       end
+
        thumb_image
     end
 
@@ -49,7 +57,7 @@ module Dor
       thumb_filename=thumb_image.split(/#{pid_regex}[\/]/).last # everything after the druid
       "#{thumb_druid}%2F#{ERB::Util.url_encode(thumb_filename)}"
     end
-    
+
     # Return a full qualified thumbnail image URL if the thumb is computable
     # @return [String] fully qualified image URL for the computed thumbnail, e.g. https://stacks.stanford.edu/image/iiif/oo000oo0001%2Ffilenamewith%20space/full
     def thumb_url
@@ -57,7 +65,9 @@ module Dor
       thumb_basename=File.basename(encoded_thumb, File.extname(encoded_thumb)) # strip the extension for URL generation
       "https://#{Dor::Config.stacks.host}/image/iiif/#{thumb_basename}/full/!400,400/0/default.jpg"
     end
-    
+
+    # strips away the relationships that should not be shown in public desc metadata
+    # @return [Nokogiri::XML]
     def public_relationships
       include_elements = ['fedora:isMemberOf', 'fedora:isMemberOfCollection', 'fedora:isConstituentOf']
       rels_doc = Nokogiri::XML(datastreams['RELS-EXT'].content)

data/lib/dor/services/metadata_handlers/catalog_handler.rb

@@ -2,7 +2,9 @@ require 'rest-client'
 
 handler = Class.new do
   def fetch(prefix, identifier)
-    client = RestClient::Resource.new(Dor::Config.metadata.catalog.url)
+    client = RestClient::Resource.new(Dor::Config.metadata.catalog.url,
+                                      Dor::Config.metadata.catalog.user,
+                                      Dor::Config.metadata.catalog.pass)
     client["?#{prefix.chomp}=#{identifier.chomp}"].get
   end
 

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.29.0'.freeze
+  VERSION = '5.30.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.29.0
+  version: 5.30.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -22,7 +22,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 9.a
@@ -32,7 +32,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: 9.a
@@ -42,14 +42,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.18
+        version: 4.2.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.18
+        version: 4.2.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: confstruct
   requirement: !ruby/object:Gem::Requirement
@@ -234,20 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: solrizer
   requirement: !ruby/object:Gem::Requirement
@@ -530,16 +530,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.56.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.56.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -562,7 +562,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - config/certs/README
+- config/certs/robots-dor-dev.crt
+- config/certs/robots-dor-dev.key
 - config/config_defaults.yml
+- config/dev_console_env.rb
 - config/dev_console_env.rb.example
 - config/predicate_mappings.yml
 - lib/dor-services.rb
@@ -658,7 +661,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library