dor-services 5.14.2 → 5.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be30d76033b050011082caadf9ec5a3da75e412f
-  data.tar.gz: 6778987396c62b992630663176f239f68bec053a
+  metadata.gz: 78095de3ddf6f320e3de915092a37794f10f93b3
+  data.tar.gz: e3acad6df212a6c702317a40ee59828add2a68ce
 SHA512:
-  metadata.gz: 7f641683e2dbcbe2fda8bb56a8102907795445b0be294ef5340671154b46db9954c342aad32b559e0e32631516ef9d9325c025d3393482a34056505f340dc9b7
-  data.tar.gz: 052a81775ef955913deca327821321e6abbb215894e6420fcc0e05440e12775c454d48eefffe171abdd3839148dedb71fe6f67591af72e6096723927cd971b62
+  metadata.gz: 65eb517399834470be6daea7a7122dc2a20da5dc8439635f54130012e71c77202cddb42a3739458db1ff19272624b38f87b07c5d6798cf8887066c54dd841d6d
+  data.tar.gz: a26b1d0b4a22d1f3c3417c6b5485713ac64788c8bda10db432dce6b18864792fe82977a4526cc017f90a39221094b954ea9d130eb718ea6794340429a659f129

data/lib/dor-services.rb

@@ -4,6 +4,7 @@ require 'modsulator'
 require 'dor/utils/sdr_client'
 
 module Dor
+  extend ActiveSupport::Autoload
   @@registered_classes = {}
   mattr_reader :registered_classes
   INDEX_VERSION_FIELD = 'dor_services_version_ssi'.freeze
@@ -19,12 +20,9 @@ module Dor
     # index is missing the objectType property.
     # @param [String] pid The object's PID
     def load_instance(pid)
-      ensure_models_loaded!
       obj = Dor::Abstract.find pid, cast: false
       return nil if obj.new_record?
-      object_type = obj.identityMetadata.objectType.first
-      object_class = registered_classes[object_type] || Dor::Item
-      obj.adapt_to(object_class)
+      obj.adapt_to_cmodel
     end
 
     # Get objectType information from solr and load the correct class the first time,
@@ -40,7 +38,6 @@ module Dor
     # TODO: return enumerable and lazy load_instance
     # TODO: restrict fieldlist (fl) for non-:lightweight queries
     def find_all(query, opts = {})
-      ensure_models_loaded!
       resp = SearchService.query query, opts
       resp.docs.collect do |solr_doc|
         doc_version = solr_doc[INDEX_VERSION_FIELD].first rescue '0.0.0'
@@ -60,8 +57,10 @@ module Dor
       end
     end
 
+    # @deprecated
     def ensure_models_loaded!
-      [Item, Set, Collection, AdminPolicyObject, WorkflowObject]
+      ActiveSupport::Deprecation.warn 'Dor.ensure_models_loaded! is unnecessary and has been deprecated.'
+      eager_load!
     end
 
     def root
@@ -132,13 +131,16 @@ module Dor
   autoload :Releaseable,  'dor/models/releaseable'
   autoload :Rightsable,   'dor/models/rightsable'
 
-  # ActiveFedora Classes
-  autoload :Abstract,          'dor/models/item'
-  autoload :Item,              'dor/models/item'
-  autoload :Set,               'dor/models/set'
-  autoload :Collection,        'dor/models/collection'
-  autoload :AdminPolicyObject, 'dor/models/admin_policy_object'
-  autoload :WorkflowObject,    'dor/models/workflow_object'
+  eager_autoload do
+    # ActiveFedora Classes
+    autoload :Abstract,          'dor/models/item'
+    autoload :Agreement,         'dor/models/agreement'
+    autoload :Item,              'dor/models/item'
+    autoload :Set,               'dor/models/set'
+    autoload :Collection,        'dor/models/collection'
+    autoload :AdminPolicyObject, 'dor/models/admin_policy_object'
+    autoload :WorkflowObject,    'dor/models/workflow_object'
+  end
 
   # Services
   autoload :SearchService,             'dor/services/search_service'
@@ -167,4 +169,6 @@ module Dor
     autoload :Process,  'dor/workflow/process'
     autoload :Document, 'dor/workflow/document'
   end
+
+  eager_load!
 end

data/lib/dor/models/agreement.rb

@@ -0,0 +1,3 @@
+class Dor::Agreement < ::Dor::Item
+  has_object_type 'agreement'
+end

data/lib/dor/models/identifiable.rb

@@ -224,6 +224,19 @@ module Dor
       result.nil? ? druid : result[0]  # if no matches, return the string passed in, otherwise return the match 
     end
 
+    # Override ActiveFedora::Core#adapt_to_cmodel (used with associations, among other places) to
+    # preferentially use the objectType asserted in the identityMetadata.
+    def adapt_to_cmodel
+      object_type = identityMetadata.objectType.first
+      object_class = Dor.registered_classes[object_type]
+
+      if object_class
+        self.instance_of?(object_class) ? self : self.adapt_to(object_class)
+      else
+        super
+      end
+    end
+
     private
 
     def solrize_related_obj_titles(solr_doc, relationships, title_hash, union_field_name, nonhydrus_field_name, hydrus_field_name)

data/lib/dor/services/registration_service.rb

@@ -46,7 +46,6 @@ module Dor
       # @option params [Array<String>] :initiate_workflow workflow_ids
       # @option params [Array] :tags
       def register_object(params = {})
-        Dor.ensure_models_loaded!
         [:object_type, :label].each do |required_param|
           raise Dor::ParameterError, "#{required_param.inspect} must be specified in call to #{name}.register_object" unless params[required_param]
         end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.14.2'.freeze
+  VERSION = '5.15.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.14.2
+  version: 5.15.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -614,6 +614,7 @@ files:
 - lib/dor/migrations/processable/unify_workflows.rb
 - lib/dor/migrations/versionable/add_missing_version_md.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
@@ -682,9 +683,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library
 test_files: []
-has_rdoc: