config/initializers/active_fedora_base.rb in ddr-models-1.11.8 vs config/initializers/active_fedora_base.rb in ddr-models-1.12.0

@@ -23,14 +23,10 @@
     
     def has_content?
       can_have_content? && content.has_content?
     end
 
-    def has_content_metadata?
-      self.is_a?(DulHydra::HasContentMetadata) && self.datastreams[Ddr::Datastreams::CONTENT_METADATA].has_content?
-    end
-
     def describable?
       self.is_a? Ddr::Models::Describable
     end
 
     def governable?
@@ -43,10 +39,18 @@
 
     def has_rights_metadata?
       ds = self.datastreams[Ddr::Datastreams::RIGHTS_METADATA]
       ds && ds.size && ds.size > 0
     end
-    
+
+    def can_have_struct_metadata?
+      datastreams.include? Ddr::Datastreams::STRUCT_METADATA
+    end
+
+    def has_struct_metadata?
+      can_have_struct_metadata? && structMetadata.has_content?
+    end
+
     def can_have_thumbnail?
       datastreams.include? "thumbnail"
     end
 
     def has_thumbnail?