dor-services 6.1.12 → 6.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dddb5f9dca0484c2a3fdc2e70baf034f9bd944b3c9aa633fbd9ec2a5ca14a5c
-  data.tar.gz: af9c8137cda9a4accd45708ada0f8860f81e4b180cda7c111b5d5b5a19ed1f50
+  metadata.gz: bb09163ebcee46966592628dd44eabc78126d5ca5e720b1c798f68e3f9dd7521
+  data.tar.gz: a3c14829d0ea6ee884e2f78a636b90380299ab77aed7f23be401e1b4cfe5ca2c
 SHA512:
-  metadata.gz: 28c1a31b613718d15b366d1c7d6c9834784295794044511ac75d8265dbfddaeebed384c2adf3eab441bfe613b82a4309eb546f48d3ac62a75c05af60a97c355e
-  data.tar.gz: 44793812fa22d163a39fdda26c68df84075cc537f6e62a3df435b8046d55810b66caf9d1a026a6d69df8e123420e65675fd66b9ca290302906c239c778c494ae
+  metadata.gz: 4a6eafdb2aef57dfbdb0e669f68ebf1fb0932144aad24c85fdba61ddf629815e2ef900cbb91485b9f0ee6aebef54fba22d17109a276269c427d437edbcc1fdb7
+  data.tar.gz: e5795abc37dcd1255c603e31ec7e45180a5590a97f7eeeac8cc1eb6a68be0f37825f55f140739c8a2f26274aa746172716cc8321a2247a16037d38626a4bb21d

data/lib/dor/config.rb

@@ -99,7 +99,7 @@ module Dor
     end
 
     set_callback :configure, :after do |config|
-      Dor::Services::Client.configure(url: config.dor_services.url) if config.dor_services
+      configure_client!(config)
 
       if config.solrizer.present?
         stack = Kernel.caller.dup
@@ -117,8 +117,20 @@ module Dor
       end
     end
 
-    # Act like an ActiveFedora.configurator
+    def configure_client!(config)
+      # Do not configure client if URL not specified
+      return if config.dor_services&.url.blank?
+
+      params = {
+        url: config.dor_services.url
+      }
+      params[:username] = config.dor_services.user if config.dor_services&.user.present?
+      params[:password] = config.dor_services.pass if config.dor_services&.pass.present?
 
+      Dor::Services::Client.configure(params)
+    end
+
+    # Act like an ActiveFedora.configurator
     def init(*args); end
 
     def fedora_config

data/lib/dor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dor
-  VERSION = '6.1.12'
+  VERSION = '6.1.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 6.1.12
+  version: 6.1.13
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora