ddr-models 2.9.2 → 2.10.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3024e1a5c4b9c8b8ff641f6005db555818f10f7
-  data.tar.gz: 5b1e4a3a72f8af8d2e4a99fd9194953d46e3153a
+  metadata.gz: cb52395b49775aa484605d3eccc046d52a97226a
+  data.tar.gz: a3d47a19af939cb42b2b20c1341fb3be1b9f04d8
 SHA512:
-  metadata.gz: 9d8cfee5e32a4617204cb5dd7bcfa062b6cb51b5c7fd761768efb32a45f917af66736cdb9cc4cac7d4028e11c16578ad7a729cffad76ab3c4e71b3dd95f52486
-  data.tar.gz: 99bd90c593985fa393a8f0b165b28132b4fca0de2c19109cf14dd42573422992374c2d066c5bbc937f154afa30ea8fea4b862e13a3cef3d78c0980ae1acd5e76
+  metadata.gz: 9335f431776f65227f2ab87585e89c401a9b8a62cad9885900d59ce909ce6be00b942a509465bf14138d9283db2cd57a2e229caa0ff34d8c92bf8f6fcc8921bc
+  data.tar.gz: 6dc0228d4831aaa17604a9eb4b71197acee77c3738798688edfb59804f58d4f887bbcdce5e359f53e07ba8f5c2e318f912918d39c9a7a570c6706a4fa72a6451

data/.gitignore

@@ -6,3 +6,4 @@ spec/dummy/db/*.sqlite3
 spec/dummy/db/*.sqlite3-journal
 spec/dummy/log/*
 tmp
+.byebug_history

data/app/models/item.rb

@@ -11,8 +11,6 @@ class Item < Ddr::Models::Base
   has_many :children, property: :is_part_of, class_name: 'Component'
   belongs_to :parent, property: :is_member_of_collection, class_name: 'Collection'
 
-  has_attributes :nested_path, datastream: Ddr::Datastreams::ADMIN_METADATA, multiple: false
-
   alias_method :components, :children
   alias_method :component_ids, :child_ids
 
@@ -57,12 +55,31 @@ class Item < Ddr::Models::Base
   end
 
   def add_components_to_structure(structure, structmap)
-    count = 0
+    component_structure_types(sorted_children).each do |type_term, children|
+      div = structure.add_div(parent: structmap, type: type_term)
+      children.each_with_index do |child, index|
+        sub_div = structure.add_div(parent: div, order: index + 1)
+        structure.add_mptr(parent: sub_div, href: child[Ddr::Index::Fields::PERMANENT_ID])
+      end
+    end
+  end
+
+  def component_structure_types(sorted_children)
+    type_divs = {}
     sorted_children.each do |child|
-      count += 1
-      div = structure.add_div(parent: structmap, order: count)
-      structure.add_mptr(parent: div, href: child[Ddr::Index::Fields::PERMANENT_ID])
+      term = type_term(child) || "Other"
+      if type_divs.has_key?(term)
+        type_divs[term] << child
+      else
+        type_divs[term] = [ child ]
+      end
     end
+    type_divs
+  end
+
+  def type_term(component_doc)
+    media_type = component_doc[Ddr::Index::Fields::MEDIA_TYPE].first
+    Ddr::Models::Structures::ComponentTypeTerm.term(media_type)
   end
 
 end

data/ddr-models.gemspec

@@ -45,4 +45,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "factory_girl_rails", "~> 4.4"
   s.add_development_dependency "jettywrapper", "~> 1.8"
   s.add_development_dependency "database_cleaner"
+  s.add_development_dependency "byebug"
 end

data/lib/ddr/actions/fixity_check.rb

@@ -12,7 +12,7 @@ module Ddr
       # Return result of fixity check
       def self._execute(object)
         Result.new(pid: object.pid).tap do |r|
-          object.datastreams_to_validate.each do |dsid, ds|
+          object.datastreams_having_content.each do |dsid, ds|
             r.success &&= ds.dsChecksumValid
             r.results[dsid] = ds.profile
           end

data/lib/ddr/datastreams/content_datastream.rb

@@ -1,5 +1,17 @@
 module Ddr::Datastreams
   class ContentDatastream < ExternalFileDatastream
 
+    CONTENT_CHANGED = "content_changed.content.repo_file"
+
+    around_save :notify_content_changed, if: [:external?, :dsLocation_changed?]
+
+    private
+
+    def notify_content_changed
+      ActiveSupport::Notifications.instrument(CONTENT_CHANGED, pid: pid) do |payload|
+        yield
+      end
+    end
+
   end
 end

data/lib/ddr/datastreams/metadata_datastream.rb

@@ -15,8 +15,8 @@ module Ddr
       # Note that empty values (nil or "") are rejected from values array
       def set_values(term, values)
         vals = Array(values)
-               .map { |v| v.to_s.strip }
-               .reject { |v| v.blank? }
+               .map    { |v| sanitize_value(v) }
+               .reject { |v| reject_value?(v)  }
         begin
           self.send("#{term}=", vals)
         rescue NoMethodError
@@ -37,6 +37,19 @@ module Ddr
         super && !empty?
       end
 
+      private
+
+      def sanitize_value(value)
+        value
+          .to_s
+          .strip
+          .gsub(/[[:cntrl:]]/, "")
+      end
+
+      def reject_value?(value)
+        value.blank?
+      end
+
     end
   end
 end

data/lib/ddr/events/update_event.rb

@@ -1,16 +1,22 @@
 module Ddr::Events
   class UpdateEvent < Event
+
     self.description = "Object updated"
 
     def self.call(*args)
       super do |event, notification|
         attrs_changed = notification.payload[:attributes_changed]
         ds_changed = notification.payload[:datastreams_changed]
-        event.detail = ["Attributes changed: #{attrs_changed}",
-                        "Datastreams changed: #{ds_changed.join(', ')}",
-                        event.detail,
-                       ].compact.join("\n\n")
+        detail = [
+          "Datastreams changed: #{ds_changed.join(', ')}",
+          event.detail,
+        ]
+        if attrs_changed.present?
+          detail << "Attributes changed: #{attrs_changed}"
+        end
+        event.detail = detail.compact.join("\n\n")
       end
     end
+
   end
 end

data/lib/ddr/index/connection.rb

@@ -10,14 +10,14 @@ module Ddr::Index
     module Methods
       extend Forwardable
 
-      delegate [:get, :paginate] => :solr
+      delegate [:get, :post, :paginate] => :solr
 
       def solr
         RSolr.connect(ActiveFedora.solr_config)
       end
 
       def select(params, extra={})
-        Response.new get("select", params: params.merge(extra))
+        Response.new post("select", params: params.merge(extra))
       end
 
       def page(*args)

data/lib/ddr/index/fields.rb

@@ -80,6 +80,7 @@ module Ddr::Index
     OBJECT_STATE                = Field.new :object_state, :stored_sortable
     OBJECT_CREATE_DATE          = Field.new :system_create, :stored_sortable, type: :date
     OBJECT_MODIFIED_DATE        = Field.new :system_modified, :stored_sortable, type: :date
+    ORIGINAL_FILENAME           = Field.new :original_filename, solr_name: "admin_metadata__original_filename_ssi"
     PERFORMER_FACET             = Field.new :performer_facet, :facetable
     PERMANENT_ID                = Field.new :permanent_id, :stored_sortable, type: :string
     PERMANENT_URL               = Field.new :permanent_url, :stored_sortable, type: :string
@@ -141,6 +142,16 @@ module Ddr::Index
       end.freeze
     end
 
+    def self.adminmd
+      @adminmd ||= Ddr::Datastreams::AdministrativeMetadataDatastream.properties.map do |base, config|
+        begin
+          get(base)
+        rescue NameError
+          Field.new base, *(config.behaviors)
+        end
+      end.freeze
+    end
+
     def self.const_missing(name)
       if name == :PID
         Deprecation.warn(Ddr::Index::Fields,

data/lib/ddr/models.rb

@@ -82,6 +82,7 @@ module Ddr
       autoload :MetsHdr
       autoload :Mptr
       autoload :StructMap
+      autoload :ComponentTypeTerm
     end
 
     # Image server URL

data/lib/ddr/models/base.rb

@@ -31,10 +31,10 @@ module Ddr
       before_create :set_ingested_by, if: :performed_by, unless: :ingested_by
       before_create :grant_default_roles
 
-      after_create :assign_permanent_id!, if: :assign_permanent_id?
-      after_create :notify_ingest
-
       around_save :notify_update, unless: :new_record?
+      around_save :assign_permanent_id!, if: :assign_permanent_id?, on: :create
+
+      after_create :notify_ingest
 
       around_deaccession :notify_deaccession
       around_destroy :notify_delete
@@ -202,6 +202,7 @@ module Ddr
       end
 
       def assign_permanent_id!
+        yield
         PermanentId.assign!(self)
       end
 

data/lib/ddr/models/has_admin_metadata.rb

@@ -16,6 +16,7 @@ module Ddr::Models
                      :display_format,
                      :license,
                      :local_id,
+                     :nested_path,
                      :permanent_id,
                      :permanent_url,
                      :research_help_contact,

data/lib/ddr/models/has_struct_metadata.rb

@@ -9,12 +9,9 @@ module Ddr
       end
 
       def structure
-        unless @structure
-          if datastreams[Ddr::Datastreams::STRUCT_METADATA].content
-            @structure = Ddr::Models::Structure.new(Nokogiri::XML(datastreams[Ddr::Datastreams::STRUCT_METADATA].content))
-          end
+        if datastreams[Ddr::Datastreams::STRUCT_METADATA].has_content?
+          Ddr::Models::Structure.new(Nokogiri::XML(datastreams[Ddr::Datastreams::STRUCT_METADATA].content))
         end
-        @structure
       end
 
       def multires_image_file_paths

data/lib/ddr/models/structures/component_type_term.rb

@@ -0,0 +1,29 @@
+module Ddr::Models::Structures
+  class ComponentTypeTerm
+
+    CONFIG_FILE = ::File.join(Rails.root, 'config', 'structure_component_type.yml')
+
+    @@lookup = {}
+
+    def self.term(media_type)
+      hit = lookup_table.detect { |k,v| media_type =~ k }
+      hit.last if hit
+    end
+
+    def self.lookup_table
+      load_lookup if @@lookup.empty?
+      @@lookup
+    end
+
+    def self.load_lookup
+      config = YAML::load(::File.read(CONFIG_FILE))
+      config.each do |type_term, media_types|
+        media_types.each do |media_type|
+          lookup_key = Regexp.new("\\A#{media_type.gsub('*', '.*')}\\Z")
+          @@lookup[lookup_key] = type_term
+        end
+      end
+    end
+
+  end
+end

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.9.2"
+    VERSION = "2.10.0.rc1"
   end
 end

data/spec/dummy/config/structure_component_type.yml

@@ -0,0 +1,18 @@
+# NOTE: This configuration and the associated application functionality does not
+# account for precedence among the media types and associated type designations.
+# In practical terms, this means that the media type for any given Component is
+# to match no more than one of the indicated media type values.  If the media type
+# for a Component matches more than one media type value, the type designation
+# that is used is arbitrary.
+Documents:
+  - application/pdf
+  - application/msword
+  - application/vnd.openxmlformats-officedocument.wordprocessingml*
+  - application/vnd.ms-word*
+  - application/rtf
+  - text/*
+Images:
+  - image/*
+Media:
+  - audio/*
+  - video/*

data/spec/fixtures/fits/document.xml

@@ -1,65 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="0.8.5" timestamp="7/3/15 8:29 PM">
+<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="1.2.0" timestamp="10/17/17 5:48 PM">
   <identification>
-    <identity format="Portable Document Format" mimetype="application/pdf" toolname="FITS" toolversion="0.8.5">
-      <tool toolname="Jhove" toolversion="1.5" />
-      <tool toolname="file utility" toolversion="5.04" />
-      <tool toolname="Exiftool" toolversion="9.13" />
-      <tool toolname="Droid" toolversion="6.1.3" />
-      <tool toolname="NLNZ Metadata Extractor" toolversion="3.4GA" />
+    <identity format="Portable Document Format" mimetype="application/pdf" toolname="FITS" toolversion="1.2.0">
+      <tool toolname="Droid" toolversion="6.3" />
+      <tool toolname="Jhove" toolversion="1.16" />
+      <tool toolname="file utility" toolversion="5.25" />
+      <tool toolname="Exiftool" toolversion="10.00" />
+      <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" />
       <tool toolname="ffident" toolversion="0.2" />
-      <tool toolname="Tika" toolversion="1.3" />
-      <version toolname="Jhove" toolversion="1.5">1.6</version>
-      <externalIdentifier toolname="Droid" toolversion="6.1.3" type="puid">fmt/20</externalIdentifier>
+      <tool toolname="Tika" toolversion="1.10" />
+      <version toolname="Droid" toolversion="6.3">1.6</version>
+      <externalIdentifier toolname="Droid" toolversion="6.3" type="puid">fmt/20</externalIdentifier>
     </identity>
   </identification>
   <fileinfo>
-    <size toolname="Jhove" toolversion="1.5">3786205</size>
-    <creatingApplicationName toolname="Exiftool" toolversion="9.13" status="CONFLICT">Adobe Acrobat Pro 11.0.3 Paper Capture Plug-in/PREMIS Editorial Committee</creatingApplicationName>
-    <creatingApplicationName toolname="NLNZ Metadata Extractor" toolversion="3.4GA" status="CONFLICT">Adobe Acrobat Pro 11.0.3 Paper Capture Plug-in/Acrobat PDFMaker 11 for Word</creatingApplicationName>
-    <lastmodified toolname="Exiftool" toolversion="9.13" status="CONFLICT">2015:06:25 21:45:24-04:00</lastmodified>
-    <lastmodified toolname="Tika" toolversion="1.3" status="CONFLICT">2015-06-08T21:22:35Z</lastmodified>
-    <created toolname="Exiftool" toolversion="9.13" status="SINGLE_RESULT">2015:06:05 15:16:23-04:00</created>
+    <size toolname="Jhove" toolversion="1.16">2176353</size>
+    <creatingApplicationName toolname="Exiftool" toolversion="10.00">Adobe PDF Library 11.0/Acrobat PDFMaker 11 for Word</creatingApplicationName>
+    <lastmodified toolname="Exiftool" toolversion="10.00" status="CONFLICT">2016:01:07 09:49:50-05:00</lastmodified>
+    <lastmodified toolname="Tika" toolversion="1.10" status="CONFLICT">2016-01-07T14:49:50Z</lastmodified>
+    <created toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">2015:12:09 13:23:09-05:00</created>
     <filepath toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">/Users/dc/Downloads/premis-3-0-final.pdf</filepath>
     <filename toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">premis-3-0-final.pdf</filename>
-    <md5checksum toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">432ab76d650bfdc8f8d4a98cea9634bb</md5checksum>
-    <fslastmodified toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">1435283124000</fslastmodified>
+    <md5checksum toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">58fee04df34490ee7ecf3cdd5ddafc72</md5checksum>
+    <fslastmodified toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">1508276630000</fslastmodified>
   </fileinfo>
   <filestatus>
-    <well-formed toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">true</well-formed>
-    <valid toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">false</valid>
-    <message toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">Invalid page tree node offset=390028</message>
-    <message toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">Outlines contain recursive references.</message>
+    <well-formed toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">true</well-formed>
+    <valid toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">true</valid>
   </filestatus>
   <metadata>
     <document>
-      <title toolname="Jhove" toolversion="1.5" status="CONFLICT">CONTENTS</title>
-      <title toolname="Exiftool" toolversion="9.13" status="CONFLICT">PREMIS Data Dictionary for Preservation Metadata, Version 3.0</title>
-      <author toolname="Exiftool" toolversion="9.13">PREMIS Editorial Committee</author>
-      <language toolname="Jhove" toolversion="1.5">en</language>
-      <pageCount toolname="Exiftool" toolversion="9.13">282</pageCount>
-      <isTagged toolname="Jhove" toolversion="1.5" status="CONFLICT">no</isTagged>
-      <isTagged toolname="NLNZ Metadata Extractor" toolversion="3.4GA" status="CONFLICT">yes</isTagged>
-      <hasOutline toolname="Jhove" toolversion="1.5">yes</hasOutline>
-      <hasAnnotations toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">no</hasAnnotations>
-      <isRightsManaged toolname="Exiftool" toolversion="9.13" status="SINGLE_RESULT">no</isRightsManaged>
-      <isProtected toolname="Exiftool" toolversion="9.13">no</isProtected>
-      <hasForms toolname="NLNZ Metadata Extractor" toolversion="3.4GA" status="SINGLE_RESULT">yes</hasForms>
-      <subject toolname="Tika" toolversion="1.3" status="SINGLE_RESULT">PREMIS</subject>
+      <title toolname="Exiftool" toolversion="10.00">PREMIS Data Dictionary for Preservation Metadata, Version 3.0</title>
+      <author toolname="Exiftool" toolversion="10.00">PREMIS Editorial Committee</author>
+      <language toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">en</language>
+      <pageCount toolname="Exiftool" toolversion="10.00">283</pageCount>
+      <isTagged toolname="Exiftool" toolversion="10.00" status="CONFLICT">yes</isTagged>
+      <isTagged toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="CONFLICT">no</isTagged>
+      <hasOutline toolname="Jhove" toolversion="1.16">no</hasOutline>
+      <hasAnnotations toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">no</hasAnnotations>
+      <subject toolname="Exiftool" toolversion="10.00" status="CONFLICT">PREMIS, Data Dictionary, Version 3.0, preservation metadata, library of congress</subject>
+      <subject toolname="Tika" toolversion="1.10" status="CONFLICT">PREMIS Data Dictionary, Version 3.0</subject>
+      <description toolname="Exiftool" toolversion="10.00">PREMIS Data Dictionary, Version 3.0</description>
+      <hasForms toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="SINGLE_RESULT">no</hasForms>
     </document>
   </metadata>
-  <statistics fitsExecutionTime="2977">
+  <statistics fitsExecutionTime="1373">
+    <tool toolname="MediaInfo" toolversion="0.7.75" status="did not run" />
     <tool toolname="OIS Audio Information" toolversion="0.1" status="did not run" />
     <tool toolname="ADL Tool" toolversion="0.1" status="did not run" />
-    <tool toolname="Jhove" toolversion="1.5" executionTime="1034" />
-    <tool toolname="file utility" toolversion="5.04" executionTime="912" />
-    <tool toolname="Exiftool" toolversion="9.13" executionTime="842" />
-    <tool toolname="Droid" toolversion="6.1.3" executionTime="336" />
-    <tool toolname="NLNZ Metadata Extractor" toolversion="3.4GA" executionTime="2192" />
-    <tool toolname="OIS File Information" toolversion="0.2" executionTime="351" />
+    <tool toolname="VTT Tool" toolversion="0.1" status="did not run" />
+    <tool toolname="Droid" toolversion="6.3" executionTime="144" />
+    <tool toolname="Jhove" toolversion="1.16" executionTime="488" />
+    <tool toolname="file utility" toolversion="5.25" executionTime="471" />
+    <tool toolname="Exiftool" toolversion="10.00" executionTime="479" />
+    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" executionTime="454" />
+    <tool toolname="OIS File Information" toolversion="0.2" executionTime="141" />
     <tool toolname="OIS XML Metadata" toolversion="0.2" status="did not run" />
-    <tool toolname="ffident" toolversion="0.2" executionTime="410" />
-    <tool toolname="Tika" toolversion="1.3" executionTime="2911" />
+    <tool toolname="ffident" toolversion="0.2" executionTime="449" />
+    <tool toolname="Tika" toolversion="1.10" executionTime="1337" />
   </statistics>
 </fits>
 

data/spec/fixtures/fits/image.xml

@@ -1,59 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="0.8.5" timestamp="7/28/15 4:34 PM">
+<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="1.2.0" timestamp="10/17/17 5:47 PM">
   <identification>
-    <identity format="JPEG File Interchange Format" mimetype="image/jpeg" toolname="FITS" toolversion="0.8.5">
-      <tool toolname="Jhove" toolversion="1.5" />
-      <tool toolname="file utility" toolversion="5.04" />
-      <tool toolname="Exiftool" toolversion="9.13" />
-      <tool toolname="Droid" toolversion="6.1.3" />
-      <tool toolname="NLNZ Metadata Extractor" toolversion="3.4GA" />
-      <version toolname="Jhove" toolversion="1.5">1.01</version>
-      <externalIdentifier toolname="Droid" toolversion="6.1.3" type="puid">fmt/43</externalIdentifier>
+    <identity format="JPEG File Interchange Format" mimetype="image/jpeg" toolname="FITS" toolversion="1.2.0">
+      <tool toolname="Droid" toolversion="6.3" />
+      <tool toolname="Jhove" toolversion="1.16" />
+      <tool toolname="file utility" toolversion="5.25" />
+      <tool toolname="Exiftool" toolversion="10.00" />
+      <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" />
+      <version toolname="Droid" toolversion="6.3">1.01</version>
+      <externalIdentifier toolname="Droid" toolversion="6.3" type="puid">fmt/43</externalIdentifier>
     </identity>
   </identification>
   <fileinfo>
-    <size toolname="Jhove" toolversion="1.5">94497</size>
-    <creatingApplicationName toolname="Jhove" toolversion="1.5">File source: https://commons.wikimedia.org/wiki/File:Dante_Gabriel_Rossetti_-_Joan_of_Arc_(1882).jpg</creatingApplicationName>
-    <lastmodified toolname="Exiftool" toolversion="9.13" status="SINGLE_RESULT">2015:07:28 10:19:55-04:00</lastmodified>
-    <filepath toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">/Users/dc/Downloads/Joan_of_Arc.jpg</filepath>
-    <filename toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">Joan_of_Arc.jpg</filename>
-    <md5checksum toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">bc575fbcbffff0248f5da3dddf8afd69</md5checksum>
-    <fslastmodified toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">1438093195000</fslastmodified>
+    <size toolname="Jhove" toolversion="1.16">97220</size>
+    <creatingApplicationName toolname="Jhove" toolversion="1.16">File source: https://commons.wikimedia.org/wiki/File:Dante_Gabriel_Rossetti_-_Joan_of_Arc_(1882).jpg</creatingApplicationName>
+    <filepath toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">/Users/dc/Downloads/Dante_Gabriel_Rossetti_-_Joan_of_Arc_(1882).jpg</filepath>
+    <filename toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">Dante_Gabriel_Rossetti_-_Joan_of_Arc_(1882).jpg</filename>
+    <md5checksum toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">c21d5fecf9d0310858d2bfe44e5436ce</md5checksum>
+    <fslastmodified toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">1508276690000</fslastmodified>
   </fileinfo>
   <filestatus>
-    <well-formed toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">true</well-formed>
-    <valid toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">true</valid>
+    <well-formed toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">true</well-formed>
+    <valid toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">true</valid>
   </filestatus>
   <metadata>
     <image>
-      <byteOrder toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">big endian</byteOrder>
-      <compressionScheme toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">JPEG (old-style)</compressionScheme>
-      <imageWidth toolname="Jhove" toolversion="1.5">500</imageWidth>
-      <imageHeight toolname="Jhove" toolversion="1.5">569</imageHeight>
-      <colorSpace toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">YCbCr</colorSpace>
-      <iccProfileName toolname="Exiftool" toolversion="9.13" status="SINGLE_RESULT">c2</iccProfileName>
-      <YCbCrSubSampling toolname="Exiftool" toolversion="9.13" status="SINGLE_RESULT">1 1</YCbCrSubSampling>
-      <samplingFrequencyUnit toolname="Jhove" toolversion="1.5">in.</samplingFrequencyUnit>
-      <xSamplingFrequency toolname="Jhove" toolversion="1.5">128</xSamplingFrequency>
-      <ySamplingFrequency toolname="Jhove" toolversion="1.5">128</ySamplingFrequency>
-      <bitsPerSample toolname="Jhove" toolversion="1.5">8 8 8</bitsPerSample>
-      <samplesPerPixel toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">3</samplesPerPixel>
-      <lightSource toolname="NLNZ Metadata Extractor" toolversion="3.4GA" status="SINGLE_RESULT">unknown</lightSource>
-      <iccProfileVersion toolname="Exiftool" toolversion="9.13" status="SINGLE_RESULT">2.1.0</iccProfileVersion>
+      <byteOrder toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">big endian</byteOrder>
+      <compressionScheme toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">JPEG</compressionScheme>
+      <imageWidth toolname="Jhove" toolversion="1.16">512</imageWidth>
+      <imageHeight toolname="Exiftool" toolversion="10.00">583</imageHeight>
+      <colorSpace toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">YCbCr</colorSpace>
+      <iccProfileName toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">c2</iccProfileName>
+      <YCbCrSubSampling toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">1 1</YCbCrSubSampling>
+      <samplingFrequencyUnit toolname="Jhove" toolversion="1.16">in.</samplingFrequencyUnit>
+      <xSamplingFrequency toolname="Exiftool" toolversion="10.00">128</xSamplingFrequency>
+      <ySamplingFrequency toolname="Exiftool" toolversion="10.00">128</ySamplingFrequency>
+      <bitsPerSample toolname="Jhove" toolversion="1.16">8 8 8</bitsPerSample>
+      <samplesPerPixel toolname="Jhove" toolversion="1.16" status="SINGLE_RESULT">3</samplesPerPixel>
+      <lightSource toolname="NLNZ Metadata Extractor" toolversion="3.6GA" status="SINGLE_RESULT">unknown</lightSource>
+      <iccProfileVersion toolname="Exiftool" toolversion="10.00" status="SINGLE_RESULT">2.1.0</iccProfileVersion>
     </image>
   </metadata>
-  <statistics fitsExecutionTime="897">
+  <statistics fitsExecutionTime="722">
+    <tool toolname="MediaInfo" toolversion="0.7.75" status="did not run" />
     <tool toolname="OIS Audio Information" toolversion="0.1" status="did not run" />
     <tool toolname="ADL Tool" toolversion="0.1" status="did not run" />
-    <tool toolname="Jhove" toolversion="1.5" executionTime="728" />
-    <tool toolname="file utility" toolversion="5.04" executionTime="662" />
-    <tool toolname="Exiftool" toolversion="9.13" executionTime="718" />
-    <tool toolname="Droid" toolversion="6.1.3" executionTime="85" />
-    <tool toolname="NLNZ Metadata Extractor" toolversion="3.4GA" executionTime="664" />
-    <tool toolname="OIS File Information" toolversion="0.2" executionTime="82" />
+    <tool toolname="VTT Tool" toolversion="0.1" status="did not run" />
+    <tool toolname="Droid" toolversion="6.3" executionTime="151" />
+    <tool toolname="Jhove" toolversion="1.16" executionTime="644" />
+    <tool toolname="file utility" toolversion="5.25" executionTime="545" />
+    <tool toolname="Exiftool" toolversion="10.00" executionTime="629" />
+    <tool toolname="NLNZ Metadata Extractor" toolversion="3.6GA" executionTime="592" />
+    <tool toolname="OIS File Information" toolversion="0.2" executionTime="148" />
     <tool toolname="OIS XML Metadata" toolversion="0.2" status="did not run" />
-    <tool toolname="ffident" toolversion="0.2" executionTime="315" />
-    <tool toolname="Tika" toolversion="1.3" executionTime="240" />
+    <tool toolname="ffident" toolversion="0.2" executionTime="537" />
+    <tool toolname="Tika" toolversion="1.10" executionTime="635" />
   </statistics>
 </fits>
 

data/spec/managers/technical_metadata_manager_spec.rb

@@ -39,23 +39,23 @@ module Ddr::Managers
 
       its(:fits?) { is_expected.to be true }
 
-      its(:created) { is_expected.to eq(["2015:06:05 15:16:23-04:00"]) }
-      its(:creating_application) { is_expected.to contain_exactly("Adobe Acrobat Pro 11.0.3 Paper Capture Plug-in/PREMIS Editorial Committee", "Adobe Acrobat Pro 11.0.3 Paper Capture Plug-in/Acrobat PDFMaker 11 for Word") }
-      its(:extent) { is_expected.to eq(["3786205"]) }
-      its(:file_size) { is_expected.to eq([3786205]) }
-      its(:fits_version) { is_expected.to eq("0.8.5") }
+      its(:created) { is_expected.to eq(["2015:12:09 13:23:09-05:00"]) }
+      its(:creating_application) { is_expected.to contain_exactly("Adobe PDF Library 11.0/Acrobat PDFMaker 11 for Word") }
+      its(:extent) { is_expected.to eq(["2176353"]) }
+      its(:file_size) { is_expected.to eq([2176353]) }
+      its(:fits_version) { is_expected.to eq("1.2.0") }
       its(:format_label) { is_expected.to eq(["Portable Document Format"]) }
       its(:format_version) { is_expected.to eq(["1.6"]) }
-      its(:last_modified) { is_expected.to eq(["2015-06-08T21:22:35Z"]) }
-      its(:md5) { is_expected.to eq("432ab76d650bfdc8f8d4a98cea9634bb") }
+      its(:last_modified) { is_expected.to eq(["2016-01-07T14:49:50Z"]) }
+      its(:md5) { is_expected.to eq("58fee04df34490ee7ecf3cdd5ddafc72") }
       its(:media_type) { is_expected.to eq(["application/pdf"]) }
       its(:pronom_identifier) { is_expected.to eq(["fmt/20"]) }
-      its(:valid) { is_expected.to eq(["false"]) }
+      its(:valid) { is_expected.to eq(["true"]) }
       its(:well_formed) { is_expected.to eq(["true"]) }
 
       describe "datetime fields" do
-        its(:creation_time) { is_expected.to contain_exactly(DateTime.parse("2015-06-05 15:16:23-04:00").to_time.utc) }
-        its(:modification_time) { is_expected.to contain_exactly(DateTime.parse("2015-06-08T21:22:35Z").to_time.utc) }
+        its(:creation_time) { is_expected.to contain_exactly(DateTime.parse("2015-12-09 13:23:09-05:00").to_time.utc) }
+        its(:modification_time) { is_expected.to contain_exactly(DateTime.parse("2016-01-07T14:49:50Z").to_time.utc) }
       end
     end
 
@@ -73,8 +73,8 @@ module Ddr::Managers
       before do
         obj.fits.content = fixture_file_upload(File.join("fits", "image.xml"))
       end
-      its(:image_width) { is_expected.to eq(["500"]) }
-      its(:image_height) { is_expected.to eq(["569"]) }
+      its(:image_width) { is_expected.to eq(["512"]) }
+      its(:image_height) { is_expected.to eq(["583"]) }
       its(:color_space) { is_expected.to eq(["YCbCr"]) }
       its(:icc_profile_name) { is_expected.to eq(["c2"]) }
       its(:icc_profile_version) { is_expected.to eq(["2.1.0"]) }

data/spec/models/descriptive_metadata_datastream_spec.rb

@@ -91,6 +91,10 @@ module Ddr::Datastreams
           subject.set_values :type, [ "Image", "Still Image " ]
           expect(subject.type).to eq([ "Image", "Still Image" ])
         end
+        it "strips controls characters from values" do
+          subject.set_values :type, [ "Image", "Still\f Image" ]
+          expect(subject.type).to eq([ "Image", "Still Image" ])
+        end
       end
       describe "#add_value" do
         it "should add the supplied value to those of the term" do

data/spec/models/item_spec.rb

@@ -66,8 +66,10 @@ RSpec.describe Item, type: :model do
       end
     end
     describe "when the item has components" do
-      let(:comp1) { FactoryGirl.create(:component) }
-      let(:comp2) { FactoryGirl.create(:component) }
+      let(:comp1) { Component.new }
+      let(:comp2) { Component.new }
+      let(:comp3) { Component.new }
+      let(:comp4) { Component.new }
       let(:expected) do
         xml = <<-EOS
             <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -77,11 +79,23 @@ RSpec.describe Item, type: :model do
                 </agent>
               </metsHdr>
               <structMap TYPE="#{Ddr::Models::Structure::TYPE_DEFAULT}">
-                <div ORDER="1">
-                  <mptr LOCTYPE="ARK" xlink:href="ark:/99999/fk4bbb" />
+                <div TYPE="Documents">
+                  <div ORDER="1">
+                    <mptr LOCTYPE="ARK" xlink:href="ark:/99999/fk4ccc" />
+                  </div>
                 </div>
-                <div ORDER="2">
-                  <mptr LOCTYPE="ARK" xlink:href="ark:/99999/fk4aaa" />
+                <div TYPE="Images">
+                  <div ORDER="1">
+                    <mptr LOCTYPE="ARK" xlink:href="ark:/99999/fk4bbb" />
+                  </div>
+                  <div ORDER="2">
+                    <mptr LOCTYPE="ARK" xlink:href="ark:/99999/fk4aaa" />
+                  </div>
+                </div>
+                <div TYPE="Other">
+                  <div ORDER="1">
+                    <mptr LOCTYPE="ARK" xlink:href="ark:/99999/fk4ddd" />
+                  </div>
                 </div>
               </structMap>
             </mets>
@@ -89,20 +103,32 @@ RSpec.describe Item, type: :model do
         xml
       end
       before do
-        comp1.local_id = "test002"
+        comp1.local_id = "test001002"
         comp1.permanent_id = "ark:/99999/fk4aaa"
+        comp1.upload fixture_file_upload("imageB.tif", "image/tiff")
         comp1.save!
-        comp2.local_id = "test001"
+        comp2.local_id = "test001001"
         comp2.permanent_id = "ark:/99999/fk4bbb"
+        comp2.upload fixture_file_upload("imageA.tif", "image/tiff")
         comp2.save!
+        comp3.local_id = "test001"
+        comp3.permanent_id = "ark:/99999/fk4ccc"
+        comp3.upload fixture_file_upload("sample.pdf", "application/pdf")
+        comp3.save!
+        comp4.local_id = "test123"
+        comp4.permanent_id = "ark:/99999/fk4ddd"
+        comp4.upload fixture_file_upload("abcd1234.vtt", "application/octet-stream")
+        comp4.save!
         subject.children << comp1
         subject.children << comp2
+        subject.children << comp3
+        subject.children << comp4
         subject.save!
-        allow(SecureRandom).to receive(:uuid).and_return("abc-def", "ghi-jkl")
       end
       after do
         comp1.destroy
         comp2.destroy
+        comp3.destroy
       end
       it "should be the appropriate structure" do
         expect(subject.default_structure.to_xml).to be_equivalent_to(expected)

data/spec/models/permanent_id_spec.rb

@@ -11,10 +11,6 @@ module Ddr::Models
           allow(described_class.identifier_class).to receive(:find).with("foo") { id }
           allow(Ddr::Models).to receive(:auto_assign_permanent_id) { true }
         end
-        after do
-          obj.permanent_id = nil
-          obj.save!
-        end
         it "assigns a permanent id to the object" do
           obj.reload
           expect(obj.permanent_id).to eq("foo")

data/spec/models/structures/component_type_term_spec.rb

@@ -0,0 +1,14 @@
+module Ddr::Models::Structures
+  RSpec.describe ComponentTypeTerm do
+
+    it "should return the correct term" do
+      expect(described_class.term('image/tiff')).to eq("Images")
+      expect(described_class.term('audio/x-wav')).to eq("Media")
+      expect(described_class.term('video/quicktime')).to eq("Media")
+      expect(described_class.term('text/plain')).to eq("Documents")
+      expect(described_class.term('application/pdf')).to eq("Documents")
+      expect(described_class.term('application/vnd.openxmlformats-officedocument.wordprocessingml.document')).to eq("Documents")
+      expect(described_class.term('application/vnd.ms-access')).to be nil
+    end
+  end
+end

data/spec/support/shared_examples_for_has_content.rb

@@ -69,6 +69,13 @@ RSpec.shared_examples "an object that can have content" do
           expect_any_instance_of(Ddr::Managers::DerivativesManager).to receive(:update_derivatives)
           subject.save
         end
+        it "should notify that content has changed" do
+          callback = lambda { |*args| args }
+          ActiveSupport::Notifications.subscribed(callback, "content_changed.content.repo_file") do
+            expect(callback).to receive(:call) { nil }
+            subject.save
+          end
+        end
       end
 
       context "and it's an existing object with content" do
@@ -78,6 +85,13 @@ RSpec.shared_examples "an object that can have content" do
           expect_any_instance_of(Ddr::Managers::DerivativesManager).to receive(:update_derivatives)
           subject.upload! file
         end
+        it "should notify that content has changed" do
+          callback = lambda { |*args| args }
+          ActiveSupport::Notifications.subscribed(callback, "content_changed.content.repo_file") do
+            expect(callback).to receive(:call) { nil }
+            subject.upload! file
+          end
+        end
         context "and it is saved with :skip_update_derivatives=>true" do
           it "does not generate derivatives" do
             expect_any_instance_of(Ddr::Managers::DerivativesManager).not_to receive(:update_derivatives)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.10.0.rc1
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -393,6 +393,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Models used in the Duke Digital Repository
 email:
 - lib-drs@duke.edu
@@ -580,6 +594,7 @@ files:
 - lib/ddr/models/streamable.rb
 - lib/ddr/models/structure.rb
 - lib/ddr/models/structures/agent.rb
+- lib/ddr/models/structures/component_type_term.rb
 - lib/ddr/models/structures/div.rb
 - lib/ddr/models/structures/f_locat.rb
 - lib/ddr/models/structures/file.rb
@@ -664,6 +679,7 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/config/structure_component_type.yml
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
@@ -734,6 +750,7 @@ files:
 - spec/models/solr_document_spec.rb
 - spec/models/structure_spec.rb
 - spec/models/structures/agent_spec.rb
+- spec/models/structures/component_type_term_spec.rb
 - spec/models/structures/div_spec.rb
 - spec/models/structures/f_locat_spec.rb
 - spec/models/structures/file_grp_spec.rb
@@ -757,7 +774,7 @@ files:
 - spec/support/shared_examples_for_events.rb
 - spec/support/shared_examples_for_governables.rb
 - spec/support/shared_examples_for_has_content.rb
-- spec/support/shared_examples_for_has_intermediate_spec.rb
+- spec/support/shared_examples_for_has_intermediate_file.rb
 - spec/support/shared_examples_for_indexing.rb
 - spec/support/shared_examples_for_non_collection_models.rb
 - spec/support/shared_examples_for_publication.rb
@@ -781,9 +798,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11
@@ -852,6 +869,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/config/structure_component_type.yml
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
@@ -922,6 +940,7 @@ test_files:
 - spec/models/solr_document_spec.rb
 - spec/models/structure_spec.rb
 - spec/models/structures/agent_spec.rb
+- spec/models/structures/component_type_term_spec.rb
 - spec/models/structures/div_spec.rb
 - spec/models/structures/f_locat_spec.rb
 - spec/models/structures/file_grp_spec.rb
@@ -945,7 +964,7 @@ test_files:
 - spec/support/shared_examples_for_events.rb
 - spec/support/shared_examples_for_governables.rb
 - spec/support/shared_examples_for_has_content.rb
-- spec/support/shared_examples_for_has_intermediate_spec.rb
+- spec/support/shared_examples_for_has_intermediate_file.rb
 - spec/support/shared_examples_for_indexing.rb
 - spec/support/shared_examples_for_non_collection_models.rb
 - spec/support/shared_examples_for_publication.rb