dor-services 5.30.0 → 5.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 89a45fc0d4d2b861d2a63f35501cab481ac19886
-  data.tar.gz: 4a2814c6b8dbabb5b8d9e08ff99f3a7e13ae2498
+SHA256:
+  metadata.gz: e2b680b722ba81687a35e34ccd3909d16f291fd428bc41474b5fa218bf75fe00
+  data.tar.gz: 4fe0371790370cdc116c9a8f47d86ea9e2398cb5807fbeb3dd74ddb49309c0cb
 SHA512:
-  metadata.gz: a47c637d3a5f2b02b36385e9bf9f632b15fe1f36c498fe2c73d84ec904c973deafca8738b7c3df77c8ede4156cb73b486d5704906b5ea563ac2ae55cb3798941
-  data.tar.gz: 542ff047ac905c08258ab5c5ce676cbdc68ff9b7e7113ec8c15d7f8e3f9183199a2a5773094e8a5cdb923aaf5b86a0b0adeb6a3ab85c98da5d59456b924caea0
+  metadata.gz: e192129ec8641cc2f83139d24cfafb18bc0a5408211254fea586d6f0d43d775892e07c9eefce7a8f2582b10fbaf1634cf5802a68a3117a6f12dab0d01a8d8ee4
+  data.tar.gz: 311ee3bde8c795f29bb4c95cee5ed943376ddeb276353fd0294e9789e6f9ee0372102ee417f363cf8edf9e97f832290cdefe8be653d73cc0f01aa149bf110afd

data/lib/dor/config.rb

@@ -73,6 +73,9 @@ module Dor
         :dor_services => {
           :rest_client => Confstruct.deferred { |c| RestResourceFactory.create(:dor_services) }
         },
+        :purl_services => {
+          :rest_client => Confstruct.deferred { |c| RestResourceFactory.create(:purl_services) }
+        },
         :sdr => {
           :rest_client => Confstruct.deferred { |c| RestResourceFactory.create(:sdr) }
         },

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

@@ -102,6 +102,7 @@ module Dor
       else
         # Clear out the document cache for this item
         DigitalStacksService.prune_purl_dir pid
+        publish_delete_on_success
       end
     end
 
@@ -114,19 +115,37 @@ module Dor
     end
 
     ##
-    # When publishing a PURL, we drop a `aa11bb2222` file into the `local_recent_changes` folder
+    # When publishing a PURL, we notify purl-fetcher of changes.
+    # If the purl service isn't configured, instead we drop a `aa11bb2222` file into the `local_recent_changes` folder
     # to notify other applications watching the filesystem (i.e., purl-fetcher).
     # We also remove any .deletes entry that may have left over from a previous removal
-    # @param [String] local_recent_changes usually `/purl/recent_changes`
-    def publish_notify_on_success(local_recent_changes = Config.stacks.local_recent_changes)
-      raise ArgumentError, "Missing local_recent_changes directory: #{local_recent_changes}" unless File.directory?(local_recent_changes)
+    def publish_notify_on_success
       id = pid.gsub(/^druid:/, '')
-      FileUtils.touch(File.join(local_recent_changes, id))
-      begin
-        DruidTools::Druid.new(id, Dor::Config.stacks.local_document_cache_root).deletes_delete_record
-      rescue Errno::EACCES
-        Dor.logger.warn "Access denied while trying to remove .deletes file for druid:#{id}"
+
+      if Dor::Config.purl_services.url
+        purl_services = Dor::Config.purl_services.rest_client
+        purl_services["purls/#{id}"].post ''
+      else
+        local_recent_changes = Config.stacks.local_recent_changes
+        raise ArgumentError, "Missing local_recent_changes directory: #{local_recent_changes}" unless File.directory?(local_recent_changes)
+
+        FileUtils.touch(File.join(local_recent_changes, id))
+        begin
+          DruidTools::Druid.new(id, Dor::Config.stacks.local_document_cache_root).deletes_delete_record
+        rescue Errno::EACCES
+          Dor.logger.warn "Access denied while trying to remove .deletes file for druid:#{id}"
+        end
       end
     end
+
+    ##
+    # When publishing a PURL, we notify purl-fetcher of changes.
+    def publish_delete_on_success
+      return unless Dor::Config.purl_services.url
+      id = pid.gsub(/^druid:/, '')
+
+      purl_services = Dor::Config.purl_services.rest_client
+      purl_services["purls/#{id}"].delete
+    end
   end
 end

data/lib/dor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.30.0
+  version: 5.31.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -562,10 +562,7 @@ 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
@@ -661,7 +658,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library

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

@@ -1,29 +0,0 @@
------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

@@ -1,27 +0,0 @@
------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/dev_console_env.rb

@@ -1,80 +0,0 @@
-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')