dor-services 5.17.1 → 5.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64af1946ede8a667403407ffbcc4fb150c9926bc
-  data.tar.gz: cd676eaee2571de373db7e780b1da2e0f5c18892
+  metadata.gz: 2234a9ff5b7764c9e97c23c8152b78bf88db5ff3
+  data.tar.gz: 6845778c33f43081a8bbe3472553789a53d6691a
 SHA512:
-  metadata.gz: 33733ccfdc025b1ccf0eee580ac4c1f73e3a9a17ecb0e1ecd9ab5755d755609ab02546629723e0831d3d920945338ac1a928608fc9de477a09b313c8f9acab6a
-  data.tar.gz: 8c8f067f129b21bf9cdd3fa59a3110748b9b057408a7f3dc2feb0c1276b1e47037ae53751b29f909c297dbef0c6fe0af910f97c7dfe8e623ac722b2b80d060b2
+  metadata.gz: c1eb99ae9d310d37b6f6c7997eb0715f08821b2d507c99a9ac0876f5be7e4f09457f884837261acd03ec5bd706bd50fdb2f1cad6c0140cb2843da57f54db95f5
+  data.tar.gz: 664d9cc741815a78c6bbc8190c82e5a45e607c965c839914856f2f79b58a2a4f0fe7f9795f2b303df303fe1eed996b78668e198c75ff83e98d48f43e83f7f2ba

data/lib/dor-services.rb

@@ -98,24 +98,24 @@ module Dor
   autoload :SimpleDublinCoreDs,       'dor/datastreams/simple_dublin_core_ds'
 
   # DOR Concerns
-  autoload :Identifiable, 'dor/models/identifiable'
-  autoload :Itemizable,   'dor/models/itemizable'
-  autoload :Processable,  'dor/models/processable'
-  autoload :Governable,   'dor/models/governable'
-  autoload :Describable,  'dor/models/describable'
-  autoload :Publishable,  'dor/models/publishable'
-  autoload :Shelvable,    'dor/models/shelvable'
-  autoload :Embargoable,  'dor/models/embargoable'
-  autoload :Preservable,  'dor/models/preservable'
-  autoload :Assembleable, 'dor/models/assembleable'
-  autoload :Eventable,    'dor/models/eventable'
-  autoload :Versionable,  'dor/models/versionable'
-  autoload :Contentable,  'dor/models/contentable'
-  autoload :Editable,     'dor/models/editable'
-  autoload :Discoverable, 'dor/models/discoverable'
-  autoload :Geoable,      'dor/models/geoable'
-  autoload :Releaseable,  'dor/models/releaseable'
-  autoload :Rightsable,   'dor/models/rightsable'
+  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'
 
   eager_autoload do
     # ActiveFedora Classes

data/lib/dor/config.rb

@@ -131,6 +131,7 @@ module Dor
       connection_opts = { :url => fedora.safeurl, :user => fedora_uri.user, :password => fedora_uri.password }
       connection_opts[:ssl_client_cert] = OpenSSL::X509::Certificate.new(File.read(ssl.cert_file)) if ssl.cert_file.present?
       connection_opts[:ssl_client_key] = OpenSSL::PKey::RSA.new(File.read(ssl.key_file), ssl.key_pass) if ssl.key_file.present?
+      connection_opts[:ssl_cert_store] = default_ssl_cert_store
       connection_opts
     end
 
@@ -141,6 +142,10 @@ module Dor
     def predicate_config
       YAML.load(File.read(File.expand_path('../../../config/predicate_mappings.yml', __FILE__)))
     end
+
+    def default_ssl_cert_store
+      @default_ssl_cert_store ||= RestClient::Request.default_ssl_cert_store
+    end
   end
 
   Config = Configuration.new(YAML.load(File.read(File.expand_path('../../../config/config_defaults.yml', __FILE__))))

data/lib/dor/services/indexing_service.rb

@@ -39,7 +39,7 @@ module Dor
       pid = "druid:#{pid}" unless pid =~ /^druid:/
       realtime = Benchmark.realtime do
         with_retries(max_tries: 3, rescue: [ RestClient::Exception, Errno::ECONNREFUSED ]) do
-          RestClient.post(URI.join(Config.dor_indexing_app.url, "reindex/#{pid}"), '')
+          RestClient.post("#{Config.dor_indexing_app.url}/reindex/#{pid}", '')
         end
       end
       default_index_logger.info "successfully updated index for #{pid} in #{'%.3f' % realtime}s"

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.17.1'.freeze
+  VERSION = '5.17.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.17.1
+  version: 5.17.2
 platform: ruby
 authors:
 - Michael Klein
@@ -614,27 +614,27 @@ files:
 - lib/dor/models/abstract.rb
 - lib/dor/models/admin_policy_object.rb
 - lib/dor/models/agreement.rb
-- lib/dor/models/assembleable.rb
 - lib/dor/models/collection.rb
-- lib/dor/models/contentable.rb
-- lib/dor/models/describable.rb
-- lib/dor/models/editable.rb
-- lib/dor/models/embargoable.rb
-- lib/dor/models/eventable.rb
-- lib/dor/models/geoable.rb
-- lib/dor/models/governable.rb
-- lib/dor/models/identifiable.rb
+- lib/dor/models/concerns/assembleable.rb
+- lib/dor/models/concerns/contentable.rb
+- lib/dor/models/concerns/describable.rb
+- lib/dor/models/concerns/editable.rb
+- lib/dor/models/concerns/embargoable.rb
+- lib/dor/models/concerns/eventable.rb
+- lib/dor/models/concerns/geoable.rb
+- lib/dor/models/concerns/governable.rb
+- lib/dor/models/concerns/identifiable.rb
+- lib/dor/models/concerns/itemizable.rb
+- lib/dor/models/concerns/mods2dc.xslt
+- lib/dor/models/concerns/preservable.rb
+- lib/dor/models/concerns/processable.rb
+- lib/dor/models/concerns/publishable.rb
+- lib/dor/models/concerns/releaseable.rb
+- lib/dor/models/concerns/rightsable.rb
+- lib/dor/models/concerns/shelvable.rb
+- lib/dor/models/concerns/versionable.rb
 - lib/dor/models/item.rb
-- lib/dor/models/itemizable.rb
-- lib/dor/models/mods2dc.xslt
-- lib/dor/models/preservable.rb
-- lib/dor/models/processable.rb
-- lib/dor/models/publishable.rb
-- lib/dor/models/releaseable.rb
-- lib/dor/models/rightsable.rb
 - lib/dor/models/set.rb
-- lib/dor/models/shelvable.rb
-- lib/dor/models/versionable.rb
 - lib/dor/models/workflow_object.rb
 - lib/dor/services/cleanup_reset_service.rb
 - lib/dor/services/cleanup_service.rb