dor-services 5.4.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9a88f0d0bd7ef08c38ddb485d4207398f9c9d82
-  data.tar.gz: 0908b1eaf6a8b92e1f3e66c8fb91ae0f38d5fcfe
+  metadata.gz: 35cb1a44d9afd35558a54871f7af46dc84ae6edc
+  data.tar.gz: b3164b45e0cf6715f59658de8b49eb85e1563d47
 SHA512:
-  metadata.gz: 899c1855ff906efcac21cccf89af369e88faaac71ac6b53e21ee2dd224252331d903135cd61d30ecdaba32ca138baf28b4b2f17f213a858b7235eb7256851bf7
-  data.tar.gz: d2a357095da5f7e320844f3f7f069e62d8f616a38d68229a4128d0ba1f1f093aaa8b91d1b9b3f9ba4da15a43f53646905b20997bac67309710090c44d12359eb
+  metadata.gz: f9be737b2a4309a040db2ec25d6fe63938212de57275914a78e29e8672fc24f2a1e3bff9432032e2a6b6ee1cd60cd66a24ecad5a029f19a75255a2fece62538f
+  data.tar.gz: 347762c2217189fe6db553f1f140eee4800405aad4dc73a45465ffa696bbf16468fb432081419c019fc636ad94de36359199df2ade3a855ff7564489bec67aba

data/config/config_defaults.yml

@@ -19,6 +19,7 @@
 :solr:
   :url:
   :opts: {}
+:solrizer: {} # deprecated
 :metadata:
   :catalog:
     :url:

data/lib/dor/config.rb

@@ -55,10 +55,8 @@ module Dor
     end
 
     def make_solr_connection(add_opts = {})
-      c = Dor::Config.solr || Dor::Config.solrizer
-
-      opts = c.opts.merge(add_opts).merge(
-        :url => c.url
+      opts = Dor::Config.solr.opts.merge(add_opts).merge(
+        :url => Dor::Config.solr.url
       )
       ::RSolr::Ext.connect(opts)
     end
@@ -107,9 +105,13 @@ module Dor
         stack = Kernel.caller.dup
         stack.shift while stack[0] =~ %r{(active_support/callbacks|dor/config|dor-services)\.rb}
         ActiveSupport::Deprecation.warn "Dor::Config -- solrizer configuration is deprecated. Please use solr instead.", stack
+
+        config.solrizer.each do |k, v|
+          config.solr[k] ||= v
+        end
       end
 
-      if (config.solr || config.solrizer).url.present?
+      if config.solr.url.present?
         ActiveFedora::SolrService.register
         ActiveFedora::SolrService.instance.instance_variable_set :@conn, make_solr_connection
       end
@@ -129,7 +131,7 @@ module Dor
     end
 
     def solr_config
-      { :url => (solr || solrizer).url }
+      { :url => solr.url }
     end
 
     def predicate_config

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.4.0'
+  VERSION = '5.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora