dor-services 5.24.1 → 5.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 911bc3ab6c029401d511e7c7949081ee9d7f2b5c
-  data.tar.gz: dcfdc0f768e0925c03ea99b4e19225baf4a209ac
+  metadata.gz: 46e3ff972a83b4179a404ade467d7faeb01d853a
+  data.tar.gz: 18ae1967c9357b69c59cd095070856eb8914b9b0
 SHA512:
-  metadata.gz: 2c2dede193800aadd17de371ed0a5d57263cf6c8a41aeaf5103b9930c24948f3703fbb7aec1c523dc849a46d3e550eb167539144ac4e8df3786a89dcf073b063
-  data.tar.gz: 65924bf68c308ae475f4b1842be6f668c51cc96d3df12ef203b7e822195c55fb705a19cdda8b562a522653fd7479258919f076f0ceaa87c0c0d53d114f3943f7
+  metadata.gz: a444e2762bf1be1c121a3745ad625be500fdc5b05b01e90ed243795a9fabfd02652a4f8e1cff95ea3b0c30acf5b51eff79bb49363469293ca4f071af985e3f2f
+  data.tar.gz: 6276d8db063539fc266a972ba7f01a050fd1469dc45da97e8186f7320db1b7735eb98f413fe87a914d323f16e49d6770c9f5fc5bb975e962b93b4cd5d7143151

data/lib/dor/certificate_authenticated_rest_resource_factory.rb

@@ -0,0 +1,37 @@
+require 'dor/rest_resource_factory'
+# Creates RestClient::Resources with client ssl keys for various connections
+module Dor
+  class CertificateAuthenticatedRestResourceFactory < RestResourceFactory
+
+    private
+
+    # @return [Hash] options for creating a RestClient::Resource
+    def connection_options
+      params = super
+      params[:ssl_client_cert] = cert if cert
+      params[:ssl_client_key]  = key if key
+    end
+
+    # @return [OpenSSL::X509::Certificate]
+    def cert
+      @cert ||= OpenSSL::X509::Certificate.new(File.read(cert_file)) if cert_file
+    end
+
+    def cert_file
+      Dor::Config.ssl.cert_file
+    end
+
+    def key_file
+      Dor::Config.ssl.key_file
+    end
+
+    def key_pass
+      Dor::Config.ssl.key_pass
+    end
+
+    # @return [OpenSSL::PKey::RSA]
+    def key
+      @key ||= OpenSSL::PKey::RSA.new(File.read(key_file), key_pass) if key_file
+    end
+  end
+end

data/lib/dor/config.rb

@@ -1,6 +1,7 @@
 require 'confstruct/configuration'
 require 'rsolr'
 require 'yaml'
+require 'dor/certificate_authenticated_rest_resource_factory'
 
 module Dor
   class Configuration < Confstruct::Configuration
@@ -13,16 +14,17 @@ module Dor
       run_callbacks(:initialize) { }
     end
 
+    # Call the super method with callbacks and with $VERBOSE temporarily disabled
     def configure(*args)
       result = self
-      temp_v = $-v
-      $-v = nil
+      temp_verbose = $VERBOSE
+      $VERBOSE = nil
       begin
         run_callbacks :configure do
           result = super(*args)
         end
       ensure
-        $-v = temp_v
+        $VERBOSE = temp_verbose
       end
       result
     end
@@ -32,6 +34,7 @@ module Dor
       config = Confstruct::Configuration.symbolize_hash JSON.parse(client.get(accept: 'application/json'))
       configure(config)
     end
+    deprecation_deprecate :autoconfigure
 
     def sanitize
       dup
@@ -43,6 +46,8 @@ module Dor
       params[:ssl_client_key]  = OpenSSL::PKey::RSA.new(File.read(key), pass) if key
       RestClient::Resource.new(url, params)
     end
+    deprecation_deprecate :make_rest_client
+
 
     def make_solr_connection(add_opts = {})
       opts = Dor::Config.solr.opts.merge(add_opts).merge(
@@ -54,7 +59,7 @@ module Dor
     set_callback :initialize, :after do |config|
       config.deep_merge!({
         :fedora => {
-          :client => Confstruct.deferred { |c| config.make_rest_client c.url },
+          :client => Confstruct.deferred { |c| CertificateAuthenticatedRestResourceFactory.create(:fedora) },
           :safeurl => Confstruct.deferred { |c|
             begin
               fedora_uri = URI.parse(config.fedora.url)
@@ -66,10 +71,10 @@ module Dor
           }
         },
         :dor_services => {
-          :rest_client => Confstruct.deferred { |c| config.make_rest_client c.url, c.cert_file, c.key_file, c.key_pass }
+          :rest_client => Confstruct.deferred { |c| RestResourceFactory.create(:dor_services) }
         },
         :sdr => {
-          :rest_client => Confstruct.deferred { |c| config.make_rest_client c.url, c.cert_file, c.key_file, c.key_pass }
+          :rest_client => Confstruct.deferred { |c| RestResourceFactory.create(:sdr) }
         },
         :workflow => {
           :client => Confstruct.deferred do |c|
@@ -89,6 +94,7 @@ module Dor
     end
 
     set_callback :configure, :after do |config|
+      # Deprecate fedora.cert_file, fedora.key_file, fedora.key_pass
       [:cert_file, :key_file, :key_pass].each do |key|
         next unless config.fedora[key].present?
         stack = Kernel.caller.dup
@@ -112,7 +118,6 @@ module Dor
         ActiveFedora::SolrService.register
         ActiveFedora::SolrService.instance.instance_variable_set :@conn, make_solr_connection
       end
-
     end
 
     # Act like an ActiveFedora.configurator

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -82,6 +82,7 @@ module Dor
       return solr_doc unless doc.root['type']
 
       preserved_size = 0
+      shelved_size = 0
       counts = Hash.new(0)                # default count is zero
       resource_type_counts = Hash.new(0)  # default count is zero
       mime_types = ::Set.new
@@ -93,6 +94,7 @@ module Dor
         resource.xpath('file').each do |file|
           counts['content_file'] += 1
           preserved_size += file['size'].to_i if file['preserve'] == 'yes'
+          shelved_size += file['size'].to_i if file['shelve'] == 'yes'
           next unless file['shelve'] == 'yes'
           counts['shelved_file'] += 1
           first_shelved_image ||= file['id'] if file['id'] =~ /jp2$/
@@ -105,6 +107,7 @@ module Dor
       solr_doc['shelved_content_file_count_itsi'] = counts['shelved_file']
       solr_doc['resource_count_itsi'            ] = counts['resource']
       solr_doc['preserved_size_dbtsi'           ] = preserved_size # double (trie) to support very large sizes
+      solr_doc['shelved_size_dbtsi'             ] = shelved_size # double (trie) to support very large sizes
       solr_doc['resource_types_ssim'            ] = resource_type_counts.keys if resource_type_counts.size > 0
       resource_type_counts.each do |key, count|
         solr_doc["#{key}_resource_count_itsi"] = count

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

@@ -32,6 +32,20 @@ module Dor
 
     def set_read_rights(rights)
       rightsMetadata.set_read_rights(rights)
+      unshelve_and_unpublish if rights == 'dark'
+    end
+
+    def unshelve_and_unpublish
+      if self.respond_to? :contentMetadata
+        content_ds = datastreams['contentMetadata']
+        unless content_ds.nil?
+          content_ds.ng_xml.xpath('/contentMetadata/resource//file').each_with_index do |file_node, index|
+            content_ds.ng_xml_will_change! if index == 0
+            file_node['publish'] = 'no'
+            file_node['shelve'] = 'no'
+          end
+        end
+      end
     end
 
     def add_collection(collection_or_druid)

data/lib/dor/rest_resource_factory.rb

@@ -0,0 +1,39 @@
+# Creates RestClient::Resources for various connections
+module Dor
+  class RestResourceFactory
+    include Singleton
+
+    # @param type [Symbol] the type of connection to create (e.g. :fedora)
+    # @return [RestClient::Resource]
+    def self.create(type)
+      instance.create(type)
+    end
+
+    # @param type [Symbol] the type of connection to create (e.g. :fedora)
+    # @return [RestClient::Resource]
+    def create(type)
+      RestClient::Resource.new(url_for(type), connection_options)
+    end
+
+    private
+
+    # @param type [Symbol] the type of connection to create (e.g. :fedora)
+    # @return [String] the url to connect to.
+    def url_for(type)
+      connection_configuration(type).url
+    end
+
+    # @param type [Symbol] the type of connection to create (e.g. :fedora)
+    # @return [#url] the configuration for the connection
+    def connection_configuration(type)
+      Dor::Config.fetch(type)
+    rescue KeyError
+      raise "ERROR: Unable to find a configuration for #{type}"
+    end
+
+    # @return [Hash] options for creating a RestClient::Resource
+    def connection_options
+      {}
+    end
+  end
+end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.24.1'.freeze
+  VERSION = '5.25.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.24.1
+  version: 5.25.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -592,6 +592,7 @@ files:
 - config/dev_console_env.rb.example
 - config/predicate_mappings.yml
 - lib/dor-services.rb
+- lib/dor/certificate_authenticated_rest_resource_factory.rb
 - lib/dor/config.rb
 - lib/dor/datastreams/administrative_metadata_ds.rb
 - lib/dor/datastreams/content_metadata_ds.rb
@@ -636,6 +637,7 @@ files:
 - lib/dor/models/item.rb
 - lib/dor/models/set.rb
 - lib/dor/models/workflow_object.rb
+- lib/dor/rest_resource_factory.rb
 - lib/dor/services/cleanup_reset_service.rb
 - lib/dor/services/cleanup_service.rb
 - lib/dor/services/digital_stacks_service.rb
@@ -682,7 +684,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library