dor-services 5.15.0 → 5.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78095de3ddf6f320e3de915092a37794f10f93b3
-  data.tar.gz: e3acad6df212a6c702317a40ee59828add2a68ce
+  metadata.gz: ee2e3a30df6e10c8613e8ca4bb85a1b333f3ebe3
+  data.tar.gz: 09c691788a6ea4638c79043c7bfd8c247d0fde05
 SHA512:
-  metadata.gz: 65eb517399834470be6daea7a7122dc2a20da5dc8439635f54130012e71c77202cddb42a3739458db1ff19272624b38f87b07c5d6798cf8887066c54dd841d6d
-  data.tar.gz: a26b1d0b4a22d1f3c3417c6b5485713ac64788c8bda10db432dce6b18864792fe82977a4526cc017f90a39221094b954ea9d130eb718ea6794340429a659f129
+  metadata.gz: 6353ffe9a29cc00e13aab8cec082809f23f0fab7cf612853b33f7e3004f3847bd24186c5e1a6accf34fd391e99b00a2f2bc972aeb25d4d654724e8ec0ddb1252
+  data.tar.gz: 897831d91a6a4e283442032263186c5a6eaeb6a18e00b9d398ecb247f674f69619c872350759e4efc24735ee0827e31359072e7752234bbc1d199f5b73fb1075

data/lib/dor-services.rb

@@ -1,4 +1,5 @@
 require 'active_fedora'
+require 'active_fedora/version'
 require 'active_support/core_ext/module/attribute_accessors'
 require 'modsulator'
 require 'dor/utils/sdr_client'
@@ -133,7 +134,7 @@ module Dor
 
   eager_autoload do
     # ActiveFedora Classes
-    autoload :Abstract,          'dor/models/item'
+    autoload :Abstract,          'dor/models/abstract'
     autoload :Agreement,         'dor/models/agreement'
     autoload :Item,              'dor/models/item'
     autoload :Set,               'dor/models/set'

data/lib/dor/models/abstract.rb

@@ -0,0 +1,5 @@
+module Dor
+  class Abstract < ::ActiveFedora::Base
+    include Identifiable
+  end
+end

data/lib/dor/models/identifiable.rb

@@ -233,7 +233,20 @@ module Dor
       if object_class
         self.instance_of?(object_class) ? self : self.adapt_to(object_class)
       else
-        super
+        if ActiveFedora::VERSION < '8'
+          result = super
+          if result.class == Dor::Abstract
+            self.adapt_to(Dor::Item)
+          else
+            result
+          end
+        else
+          begin
+            super
+          rescue ActiveFedora::ModelNotAsserted
+            self.adapt_to(Dor::Item)
+          end
+        end
       end
     end
 

data/lib/dor/models/item.rb

@@ -1,7 +1,5 @@
 module Dor
-  module BasicItem
-    extend ActiveSupport::Concern
-
+  class Item < ::ActiveFedora::Base
     include Processable
     include Shelvable
     include Embargoable # implies Publishable implies Identifiable, Describable, Governable, Rightsable ...
@@ -11,14 +9,7 @@ module Dor
     include Contentable
     include Geoable
     include Releaseable
-  end
 
-  class Abstract < ::ActiveFedora::Base
-    include Identifiable
-  end
-
-  class Item < ::ActiveFedora::Base
-    include BasicItem
     has_object_type 'item'
   end
 end

data/lib/dor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.15.0
+  version: 5.15.1
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -613,6 +613,7 @@ files:
 - lib/dor/migrations/identifiable/uriify_contentlocation_refs.rb
 - lib/dor/migrations/processable/unify_workflows.rb
 - lib/dor/migrations/versionable/add_missing_version_md.rb
+- lib/dor/models/abstract.rb
 - lib/dor/models/admin_policy_object.rb
 - lib/dor/models/agreement.rb
 - lib/dor/models/assembleable.rb