From 4893301f2e18d5884a3f5f292205bdeb796169f0 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Tue, 28 Jul 2015 20:51:37 -0400
Subject: [PATCH 01/33] Relabeled repo create_date in object info from
 "Created" to "Ingested"

Closes #1387
Moved object info labels to i18n
---
 Gemfile                                     |  2 +-
 Gemfile.lock                                |  6 +++---
 app/views/application/_object_info.html.erb | 24 ++++++++++-----------
 config/locales/en.yml                       | 16 ++++++++++++++
 4 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index de4ee631..77bf93cf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '~> 4.1.6'
 gem 'hydra-head', '~> 7.2.0'
 gem 'ddr-alerts', '~> 1.0.0'
 
-gem 'ddr-models', '2.0.0.pre.5'
+gem 'ddr-models', '2.0.0.rc3'
 
 gem 'rubydora', '>= 1.8.1'
 gem 'devise'
diff --git a/Gemfile.lock b/Gemfile.lock
index efc4c54a..f26c86bd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,7 +82,7 @@ GEM
       rails (~> 4.1.6)
     ddr-antivirus (1.3.2)
       activesupport (~> 4.0)
-    ddr-models (2.0.0.pre.5)
+    ddr-models (2.0.0.rc3)
       active-fedora (~> 7.0)
       cancancan (~> 1.12)
       ddr-antivirus (~> 1.3.1)
@@ -427,7 +427,7 @@ DEPENDENCIES
   capybara (~> 2.0)
   database_cleaner
   ddr-alerts (~> 1.0.0)
-  ddr-models (= 2.0.0.pre.5)
+  ddr-models (= 2.0.0.rc3)
   deprecation
   devise
   equivalent-xml
@@ -455,4 +455,4 @@ DEPENDENCIES
   uglifier (~> 1.3.0)
 
 BUNDLED WITH
-   1.10.5
+   1.10.6
diff --git a/app/views/application/_object_info.html.erb b/app/views/application/_object_info.html.erb
index 921c338b..e2435315 100644
--- a/app/views/application/_object_info.html.erb
+++ b/app/views/application/_object_info.html.erb
@@ -1,55 +1,55 @@
 <ul class="list-group" id="object-info">
 
   <li class="list-group-item active">
-    Object Info
+    <%= t("dul_hydra.object_info.header") %>
   </li>
 
   <% if current_object.permanent_id %>
     <li class="list-group-item">
       <strong class="pull-right"><%= current_object.permanent_id %></strong>
-      Permanent ID
+      <%= t("dul_hydra.object_info.permanent_id.assigned") %>
     </li>
   <% else %>
     <li class="list-group-item list-group-item-warning">
-      Permanent ID Not Assigned
+      <%= t("dul_hydra.object_info.permanent_id.not_assigned") %>
     </li>
   <% end %>
 
   <% if current_object.published? %>
     <li class="list-group-item list-group-item-info">
-      Published
+      <%= t("dul_hydra.object_info.published") %>
     </li>
   <% else %>
     <li class="list-group-item list-group-item-warning">
-      Not Published
+      <%= t("dul_hydra.object_info.not_published") %>
     </li>
   <% end %>
 
 <% if current_object.can_have_content? %>
   <li class="list-group-item list-group-item-#{original_filename_info[:context]}">
     <span class="pull-right"><%= original_filename_info[:value] %></span>
-    Original Filename
+    <%= t("dul_hydra.object_info.original_filename") %>
   </li>
 <% end %>
 
   <li class="list-group-item">
     <span class="pull-right"><%= format_date current_object.create_date %></span>
-    Created
+    <%= t("dul_hydra.object_info.create_date") %>
   </li>
 
   <li class="list-group-item">
     <span class="pull-right"><%= format_date current_object.modified_date %></span>
-    Modified
+    <%= t("dul_hydra.object_info.modified_date") %>
   </li>
 
   <% if last_fixity_check = current_object.last_fixity_check %>
     <li class="list-group-item list-group-item-<%= last_fixity_check.success? ? 'success' : 'danger' %>">
       <span class="pull-right"><%= format_date last_fixity_check.event_date_time %></span>
-      Fixity Checked
+      <%= t("dul_hydra.object_info.fixity.checked") %>
     </li>
   <% else %>
     <li class="list-group-item list-group-item-warning">
-      Not Fixity Checked
+      <%= t("dul_hydra.object_info.fixity.not_checked") %>
     </li>
   <% end %>
 
@@ -57,11 +57,11 @@
   <% if last_virus_check = current_object.last_virus_check %>
     <li class="list-group-item list-group-item-<%= last_virus_check.success? ? 'success' : 'danger' %>">
       <span class="pull-right"><%= format_date last_virus_check.event_date_time %></span>
-      Virus Scanned
+      <%= t("dul_hydra.object_info.virus.scanned") %>
     </li>
   <% else %>
     <li class="list-group-item list-group-item-warning">
-      Not Virus Scanned
+      <%= t("dul_hydra.object_info.virus.not_scanned") %>
     </li>
   <% end %>
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7169f37c..2b647a02 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,6 +3,22 @@ en:
     errors:
       multiple_object_matches: "%{criteria} retrieved multiple repository objects"
   dul_hydra:
+    object_info:
+      header: "Object Info"
+      create_date: Ingested
+      modified_date: Modified
+      fixity:
+        checked: "Fixity Checked"
+        not_checked: "Not Fixity Checked"
+      published: Published
+      not_published: "Not Published"
+      original_filename: "Original Filename"
+      virus:
+        scanned: "Virus Scanned"
+        not_scanned: "Not Virus Scanned"
+      permanent_id:
+        assigned: "Permanent ID"
+        not_assigned: "Permanent ID Not Assigned"
     ingest_folder:
       new_menu: "Folder Ingest"
     metadata_file:

From 4494f906dad6634530d367b69585044dce84f994 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Thu, 30 Jul 2015 16:12:09 -0400
Subject: [PATCH 02/33] Changes "Content Info" tab to "Tech Metadata", adds
 info

Closes #1391
---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  | 36 ++++++-----
 .../controller/has_content_behavior.rb        | 30 ++++-----
 app/helpers/application_helper.rb             |  6 +-
 app/views/application/_content_info.html.erb  | 39 ------------
 app/views/application/_object_info.html.erb   | 63 ++++++-------------
 .../application/_object_info_item.html.erb    |  4 ++
 app/views/application/_tech_metadata.html.erb | 27 ++++++++
 config/locales/en.yml                         | 40 +++---------
 lib/dul_hydra/configurable.rb                 | 21 +++++++
 spec/spec_helper.rb                           |  6 ++
 11 files changed, 130 insertions(+), 144 deletions(-)
 delete mode 100644 app/views/application/_content_info.html.erb
 create mode 100644 app/views/application/_object_info_item.html.erb
 create mode 100644 app/views/application/_tech_metadata.html.erb

diff --git a/Gemfile b/Gemfile
index 77bf93cf..e30e3642 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '~> 4.1.6'
 gem 'hydra-head', '~> 7.2.0'
 gem 'ddr-alerts', '~> 1.0.0'
 
-gem 'ddr-models', '2.0.0.rc3'
+gem 'ddr-models', github: 'duke-libraries/ddr-models', branch: 'develop'
 
 gem 'rubydora', '>= 1.8.1'
 gem 'devise'
diff --git a/Gemfile.lock b/Gemfile.lock
index f26c86bd..6acf7288 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,23 @@
+GIT
+  remote: git://github.com/duke-libraries/ddr-models.git
+  revision: 94f06ea6db45e2435580f59f7820e2c411ad4fe7
+  branch: develop
+  specs:
+    ddr-models (2.0.0.post)
+      active-fedora (~> 7.0)
+      cancancan (~> 1.12)
+      ddr-antivirus (~> 1.3.1)
+      devise (~> 3.4)
+      ezid-client (~> 1.1, >= 1.1.1)
+      grouper-rest-client
+      hydra-core (~> 7.2)
+      hydra-validations (~> 0.5)
+      net-ldap (~> 0.11)
+      omniauth-shibboleth (~> 1.2.0)
+      rails (~> 4.1.6)
+      rdf-vocab (~> 0.8)
+      resque (~> 1.25)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -82,20 +102,6 @@ GEM
       rails (~> 4.1.6)
     ddr-antivirus (1.3.2)
       activesupport (~> 4.0)
-    ddr-models (2.0.0.rc3)
-      active-fedora (~> 7.0)
-      cancancan (~> 1.12)
-      ddr-antivirus (~> 1.3.1)
-      devise (~> 3.4)
-      ezid-client (~> 1.1, >= 1.1.1)
-      grouper-rest-client
-      hydra-core (~> 7.2)
-      hydra-validations (~> 0.5)
-      net-ldap (~> 0.11)
-      omniauth-shibboleth (~> 1.2.0)
-      rails (~> 4.1.6)
-      rdf-vocab (~> 0.8)
-      resque (~> 1.25)
     deprecation (0.2.2)
       activesupport
     devise (3.5.1)
@@ -427,7 +433,7 @@ DEPENDENCIES
   capybara (~> 2.0)
   database_cleaner
   ddr-alerts (~> 1.0.0)
-  ddr-models (= 2.0.0.rc3)
+  ddr-models!
   deprecation
   devise
   equivalent-xml
diff --git a/app/controllers/concerns/dul_hydra/controller/has_content_behavior.rb b/app/controllers/concerns/dul_hydra/controller/has_content_behavior.rb
index 82da742c..eb18663b 100644
--- a/app/controllers/concerns/dul_hydra/controller/has_content_behavior.rb
+++ b/app/controllers/concerns/dul_hydra/controller/has_content_behavior.rb
@@ -5,7 +5,8 @@ module HasContentBehavior
 
       included do
         before_action :upload_content, only: :create
-        self.tabs.unshift :tab_content_info
+        self.tabs.unshift :tab_tech_metadata
+        helper_method :tech_metadata_fields
       end
 
       def upload
@@ -27,6 +28,12 @@ def upload
 
       protected
 
+      def tech_metadata_fields
+        DulHydra.tech_metadata_fields.map do |field|
+          [field, Array(current_object.techmd.send(field))]
+        end.to_h
+      end
+
       def notify_upload
         notify_update(summary: "Object content was updated")
       end
@@ -57,20 +64,15 @@ def checksum_params
         content_params.values_at :checksum, :checksum_type
       end
 
-      def tab_content_info
-        Tab.new("content_info",
+      def tab_tech_metadata
+        Tab.new("tech_metadata",
                 actions: [
-                          TabAction.new("download",
-                                        url_for(controller: "downloads", action: "show", id: current_object),
-                                        current_object.has_content? && can?(:download, current_object)
-                                        ),
-                          TabAction.new("upload",
-                                        url_for(action: "upload"),
-                                        can?(:upload, current_object)
-                                        )
-                         ]
-                )
-
+                  TabAction.new("fits_xml",
+                                download_path(current_object, "fits"),
+                                show_ds_download_link?(current_object.fits)
+                               ),
+                ]
+               )
       end
 
     end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ea9ee824..8e707a26 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -60,6 +60,10 @@ def render_object_identifier
     end
   end
 
+  def object_info_item(value: nil, label:, status: nil)
+    render partial: "object_info_item", locals: {value: value, label: label, status: status}
+  end
+
   def render_tab(tab)
     content_tag :li do
       link_to(tab.label, "##{tab.css_id}", "data-toggle" => "tab")
@@ -134,7 +138,7 @@ def render_document_summary(document)
 
   def format_date(date)
     if date
-      date = Time.parse(date) if !date.respond_to?(:localtime)
+      date = Time.parse(date.to_s) if !date.respond_to?(:localtime)
       date.localtime.to_s
     end
   end
diff --git a/app/views/application/_content_info.html.erb b/app/views/application/_content_info.html.erb
deleted file mode 100644
index b8250a4d..00000000
--- a/app/views/application/_content_info.html.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-<%= render partial: 'tab_actions', locals: {tab: tab} %>
-<% if current_object.has_content? %>
-<table class="table">
-  <tr>
-	<th scope="row">Media Type</th>
-	<td><%= current_object.content_type %></td>
-  </tr>
-  <tr>
-	<th scope="row">Size</th>
-	<td>
-	  <%= current_object.content_human_size %>
-	  (<%= current_object.content_size %> bytes)
-	</td>
-  </tr>
-  <tr>
-	<th scope="row">Checksum</th>
-	<td>
-	  [<%= current_object.content.checksumType %>]
-	  <%= current_object.content.checksum %>
-	</td>
-  </tr>
-  <tr>
-	<th scope="row">Created</th>
-	<td>
-	  <%= current_object.content.dsCreateDate.localtime %>
-	</td>
-  </tr>
-  <tr>
-	<th scope="row">Versions</th>
-	<td>
-	  <%= current_object.content.versions.length %>
-	</td>
-  </tr>
-</table>
-<% else %>
-  <p class="alert alert-danger">
-	This object has no content.
-  </p>
-<% end %>
diff --git a/app/views/application/_object_info.html.erb b/app/views/application/_object_info.html.erb
index e2435315..50f6a2c9 100644
--- a/app/views/application/_object_info.html.erb
+++ b/app/views/application/_object_info.html.erb
@@ -4,69 +4,44 @@
     <%= t("dul_hydra.object_info.header") %>
   </li>
 
-  <% if current_object.permanent_id %>
-    <li class="list-group-item">
-      <strong class="pull-right"><%= current_object.permanent_id %></strong>
-      <%= t("dul_hydra.object_info.permanent_id.assigned") %>
-    </li>
+  <% if permanent_id = current_object.permanent_id %>
+    <%= object_info_item value: permanent_id, label: "permanent_id.assigned" %> 
   <% else %>
-    <li class="list-group-item list-group-item-warning">
-      <%= t("dul_hydra.object_info.permanent_id.not_assigned") %>
-    </li>
+    <%= object_info_item label: "permanent_id.not_assigned", status: "warning" %> 
   <% end %>
 
   <% if current_object.published? %>
-    <li class="list-group-item list-group-item-info">
-      <%= t("dul_hydra.object_info.published") %>
-    </li>
+    <%= object_info_item label: "published", status: "info" %>
   <% else %>
-    <li class="list-group-item list-group-item-warning">
-      <%= t("dul_hydra.object_info.not_published") %>
-    </li>
+    <%= object_info_item label: "not_published", status: "warning" %>
   <% end %>
 
-<% if current_object.can_have_content? %>
-  <li class="list-group-item list-group-item-#{original_filename_info[:context]}">
-    <span class="pull-right"><%= original_filename_info[:value] %></span>
-    <%= t("dul_hydra.object_info.original_filename") %>
-  </li>
-<% end %>
-
-  <li class="list-group-item">
-    <span class="pull-right"><%= format_date current_object.create_date %></span>
-    <%= t("dul_hydra.object_info.create_date") %>
-  </li>
+  <%= object_info_item value: format_date(current_object.create_date), label: "create_date" %>
 
-  <li class="list-group-item">
-    <span class="pull-right"><%= format_date current_object.modified_date %></span>
-    <%= t("dul_hydra.object_info.modified_date") %>
-  </li>
+  <%= object_info_item value: format_date(current_object.modified_date), label: "modified_date" %>
 
   <% if last_fixity_check = current_object.last_fixity_check %>
-    <li class="list-group-item list-group-item-<%= last_fixity_check.success? ? 'success' : 'danger' %>">
-      <span class="pull-right"><%= format_date last_fixity_check.event_date_time %></span>
-      <%= t("dul_hydra.object_info.fixity.checked") %>
-    </li>
+    <%= object_info_item value: format_date(last_fixity_check.event_date_time), label: "fixity.checked", status: (last_fixity_check.success? ? "success" : "danger") %>
   <% else %>
-    <li class="list-group-item list-group-item-warning">
-      <%= t("dul_hydra.object_info.fixity.not_checked") %>
-    </li>
+    <%= object_info_item label: "fixity.not_checked", status: "warning" %>
   <% end %>
 
 <% if current_object.can_have_content? %>
   <% if last_virus_check = current_object.last_virus_check %>
-    <li class="list-group-item list-group-item-<%= last_virus_check.success? ? 'success' : 'danger' %>">
-      <span class="pull-right"><%= format_date last_virus_check.event_date_time %></span>
-      <%= t("dul_hydra.object_info.virus.scanned") %>
-    </li>
+    <%= object_info_item value: format_date(last_virus_check.event_date_time), label: "virus.scanned", status: (last_virus_check.success? ? 'success' : 'danger') %>
   <% else %>
-    <li class="list-group-item list-group-item-warning">
-      <%= t("dul_hydra.object_info.virus.not_scanned") %>
-    </li>
+    <%= object_info_item label: "virus.not_scanned", status: "warning" %>
+  <% end %>
+
+  <% if current_object.has_content? %>
+  <li class="list-group-item">
+    <span class="badge"><%= current_object.content.versions.length %></span>
+    <%= t("dul_hydra.object_info.versions") %>
+  </li>
   <% end %>
 <% end %>
 
-<%# events %>
+<%# EVENTS %>
   <li class="list-group-item">
     <span class="badge"><%= current_object.events.count %></span>
     <%= link_to_unless_current "Events", {action: "events"} %>
diff --git a/app/views/application/_object_info_item.html.erb b/app/views/application/_object_info_item.html.erb
new file mode 100644
index 00000000..61bb3c75
--- /dev/null
+++ b/app/views/application/_object_info_item.html.erb
@@ -0,0 +1,4 @@
+<li class="list-group-item<% if status %> list-group-item-<%= status %><% end %>">
+  <% if value %><span class="pull-right"><%= value %></span><% end %>
+  <%= t("dul_hydra.object_info.#{label}") %>
+</li>
diff --git a/app/views/application/_tech_metadata.html.erb b/app/views/application/_tech_metadata.html.erb
new file mode 100644
index 00000000..e2673d78
--- /dev/null
+++ b/app/views/application/_tech_metadata.html.erb
@@ -0,0 +1,27 @@
+<%= render partial: 'tab_actions', locals: {tab: tab} %>
+<% if current_object.has_content? %>
+  <table class="table table-striped table-condensed">
+    <tbody>
+      <% tech_metadata_fields.each do |field, values| %>
+        <% values.each do |value| %>
+          <tr>
+	    <th scope="row"><%= t("dul_hydra.techmd.#{field}") %></th>
+	    <td><%= value %></td>
+	  </tr>
+	<% end %>
+      <% end %>
+    </tbody>
+  </table>
+  <% if current_object.techmd.fits? %>
+  <dl class="well well-sm">
+    <dt>FITS Version</dt>
+    <dd><%= current_object.techmd.fits_version %></dd>
+    <dt>Run at</dt>
+    <dd><%= format_date current_object.techmd.fits_datetime %></dd>
+  </dl>
+  <% end %>
+<% else %>
+  <p class="alert alert-danger">
+    This object has no content.
+  </p>
+<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2b647a02..78e14ff4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,6 +3,9 @@ en:
     errors:
       multiple_object_matches: "%{criteria} retrieved multiple repository objects"
   dul_hydra:
+    techmd:
+      file_human_size: "File Size"
+      pronom_identifier: "PRONOM Identifier"
     object_info:
       header: "Object Info"
       create_date: Ingested
@@ -19,6 +22,7 @@ en:
       permanent_id:
         assigned: "Permanent ID"
         not_assigned: "Permanent ID Not Assigned"
+      versions: Versions
     ingest_folder:
       new_menu: "Folder Ingest"
     metadata_file:
@@ -113,25 +117,13 @@ en:
         changed: "Policy successfully changed." 
       page_titles:
         edit: 'Editing Admin Policy'
-    permissions:
-      page_titles:
-        edit_default_permissions: "Modify Default Permissions"
-        edit: "Modify Permissions"
-      alerts:
-        inherited: 'This object is governed by the Collection %s. Permissions granted on this page are <strong>added to</strong> the inherited permissions (if any) shown below the select boxes.'
-        default_permissions: "These settings are <strong>inherited</strong> by objects governed by this collection."
-        permissions_will_change: "The permissions will be overwritten with your selections."
-        default_permissions_will_change: "The default permissions will be overwritten with your selections and be applied to all objects governed by this collection."
-      descriptions:
-        discover: 'Find object via search and view summary data'
-        read: 'View object and download content (includes Discover)'
-        edit: 'Modify object (includes Discover + Read)'
-    rights:
-        alerts:
-            changed: "Rights successfully changed."
     tabs:
-      content_info: 
-        label: "Content Info"
+      tech_metadata: 
+        label: "Tech Metadata"
+        actions:
+          download: "Download File"
+          upload: "Upload New Version"
+          fits_xml: "FITS XML"
       descriptive_metadata:
         label: "Descriptive Metadata"
         actions:
@@ -147,18 +139,6 @@ en:
         label: Admin Metadata
         actions:
           edit: Edit
-      permissions:
-        label: Permissions
-        actions:
-          edit: Modify
-          download: "Download XML"
-        alerts:
-          has_admin_policy: "This object is governed by the Collection %s. Permissions inherited from the collection are shown below."
-      default_permissions:
-        label: "Default Permissions"
-        actions:
-          edit: Modify
-          download: "Download XML"
       collection_info:
         label: "Collection Info"
         actions:
diff --git a/lib/dul_hydra/configurable.rb b/lib/dul_hydra/configurable.rb
index 8722482a..25369764 100644
--- a/lib/dul_hydra/configurable.rb
+++ b/lib/dul_hydra/configurable.rb
@@ -3,6 +3,27 @@ module Configurable
     extend ActiveSupport::Concern
 
     included do
+      # Technical metadata fields to display on the show page
+      # of a content object.
+      # See Ddr::Managers::TechnicalMetadataManager.
+      mattr_accessor :tech_metadata_fields do
+        [ :format_label,
+          :format_version,
+          :media_type,
+          :pronom_identifier,
+          :creating_application,
+          :valid,
+          :well_formed,
+          :file_human_size,
+          :image_width,
+          :image_height,
+          :color_space,
+          :created,
+          :last_modified,
+          :checksum_digest,
+          :checksum_value,
+        ]
+      end
 
       # Columns in the CSV report generated for a collection
       # Each column represents a *method* of a SolrDocument
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2191b804..66806234 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -18,6 +18,12 @@
 Ddr::Antivirus.scanner_adapter = :null
 Ddr::Antivirus.logger = Logger.new(File::NULL)
 
+# XXX Hack to bypass file characterization
+# See https://github.com/duke-libraries/ddr-models/issues/315
+Ddr::Jobs::FitsFileCharacterization.class_eval do
+  def self.perform(pid); end
+end
+
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}

From 449ad964ac899f2b74c187091d214db05f23a1a9 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Wed, 5 Aug 2015 13:37:24 -0400
Subject: [PATCH 03/33] Bumped version to 4.0.0.post

---
 lib/dul_hydra/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dul_hydra/version.rb b/lib/dul_hydra/version.rb
index 63f40e40..87c581e2 100644
--- a/lib/dul_hydra/version.rb
+++ b/lib/dul_hydra/version.rb
@@ -1,3 +1,3 @@
 module DulHydra
-  VERSION = "4.0.0"
+  VERSION = "4.0.0.post"
 end

From 3f78692e42693762a0df7f89930b7720650ca1a1 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Wed, 5 Aug 2015 10:36:24 -0400
Subject: [PATCH 04/33] Provides CSV technical metadata report for a collection

Currently there is no link to the report form, and no
aliasing (CanCan) of the :reports and :report permission,
so access is limited to superusers.
---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  |  4 +-
 app/controllers/collections_controller.rb     | 51 ++++---------
 .../controller/has_content_behavior.rb        |  2 +-
 app/controllers/concerns/tab.rb               |  2 +-
 .../collections/collection_info.html.erb      | 22 ------
 app/views/collections/reports.html.erb        |  8 ++
 config/locales/en.yml                         | 11 ++-
 config/routes.rb                              |  3 +-
 lib/dul_hydra.rb                              |  1 +
 lib/dul_hydra/configurable.rb                 | 20 ++++-
 lib/dul_hydra/reports.rb                      | 21 ++++++
 lib/dul_hydra/reports/collection_report.rb    |  9 +++
 lib/dul_hydra/reports/column.rb               | 16 ++++
 lib/dul_hydra/reports/columns.rb              | 25 +++++++
 .../reports/filters/dynamic_filter.rb         |  6 ++
 lib/dul_hydra/reports/filters/filter.rb       | 13 ++++
 .../reports/filters/has_content_filter.rb     |  9 +++
 .../reports/filters/is_governed_by_filter.rb  | 11 +++
 .../reports/filters/static_filter.rb          |  6 ++
 lib/dul_hydra/reports/get_results.rb          | 21 ++++++
 lib/dul_hydra/reports/get_total.rb            | 16 ++++
 lib/dul_hydra/reports/report.rb               | 73 +++++++++++++++++++
 .../collections_controller_spec.rb            | 26 -------
 spec/routing/collections_routing_spec.rb      |  9 ++-
 25 files changed, 289 insertions(+), 98 deletions(-)
 delete mode 100644 app/views/collections/collection_info.html.erb
 create mode 100644 app/views/collections/reports.html.erb
 create mode 100644 lib/dul_hydra/reports.rb
 create mode 100644 lib/dul_hydra/reports/collection_report.rb
 create mode 100644 lib/dul_hydra/reports/column.rb
 create mode 100644 lib/dul_hydra/reports/columns.rb
 create mode 100644 lib/dul_hydra/reports/filters/dynamic_filter.rb
 create mode 100644 lib/dul_hydra/reports/filters/filter.rb
 create mode 100644 lib/dul_hydra/reports/filters/has_content_filter.rb
 create mode 100644 lib/dul_hydra/reports/filters/is_governed_by_filter.rb
 create mode 100644 lib/dul_hydra/reports/filters/static_filter.rb
 create mode 100644 lib/dul_hydra/reports/get_results.rb
 create mode 100644 lib/dul_hydra/reports/get_total.rb
 create mode 100644 lib/dul_hydra/reports/report.rb

diff --git a/Gemfile b/Gemfile
index 27bd7882..247d9d92 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'rails', '~> 4.1.6'
 gem 'hydra-head', '~> 7.2.0'
 gem 'ddr-alerts', '~> 1.0.0'
-gem 'ddr-models', github: 'duke-libraries/ddr-models', branch: 'develop'
+gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: '3de9f0a78c024e07961ff042286d616f40cd4a9f'
 gem 'rubydora', '>= 1.8.1'
 gem 'devise'
 gem 'deprecation'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6acf7288..98dd05e2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: git://github.com/duke-libraries/ddr-models.git
-  revision: 94f06ea6db45e2435580f59f7820e2c411ad4fe7
-  branch: develop
+  revision: 3de9f0a78c024e07961ff042286d616f40cd4a9f
+  ref: 3de9f0a78c024e07961ff042286d616f40cd4a9f
   specs:
     ddr-models (2.0.0.post)
       active-fedora (~> 7.0)
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 68784503..b6264673 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -5,53 +5,30 @@ class CollectionsController < ApplicationController
   include DulHydra::Controller::HasAttachmentsBehavior
   include DulHydra::Controller::HasTargetsBehavior
 
-  self.tabs << :tab_collection_info
-
-  helper_method :collection_report
-
   before_action :set_desc_metadata, only: :create
 
   def items
     get_children
   end
 
-  # HTML format intended for tab content loaded via ajax
-  def collection_info
-    respond_to do |format|
-      format.html { render layout: false }
-      format.csv do
-        filename = "#{current_object.title_display.gsub(/[^\w]/, '_')}.csv"
-        send_data collection_csv_report, type: "text/csv", filename: filename
-      end
-    end
-  end
-
-  protected
-
-  def collection_report
-    return @collection_report if @collection_report
-    components = current_object.components_from_solr
-    total_file_size = components.map(&:content_size).reduce(0, :+)
-    @collection_report = {
-      components: components.size,
-      items: current_object.children.size,
-      total_file_size: total_file_size
-    }
+  def reports
   end
 
-  def collection_csv_report
-    CSV.generate do |csv|
-      csv << DulHydra.collection_report_fields.collect {|f| f.to_s.upcase}
-      current_object.components_from_solr.each do |doc|
-        csv << DulHydra.collection_report_fields.collect {|f| doc.send(f)}
+  def report
+    respond_to do |format|
+      format.csv do
+        rep = DulHydra::Reports::CollectionReport.new(params[:id])
+        basename = current_object.title_display.gsub /[^\w\.\-]/, "_"
+        case params.require(:type)
+        when "techmd"
+          rep.columns += DulHydra::Reports::Columns::TechnicalMetadata
+          basename += "__TECHMD"
+        end
+        csv = rep.run
+        filename = basename + ".csv"
+        send_data csv.read, type: "text/csv", filename: filename
       end
     end
   end
 
-  # tabs
-
-  def tab_collection_info
-    Tab.new("collection_info", href: url_for(action: "collection_info"))
-  end
-
 end
diff --git a/app/controllers/concerns/dul_hydra/controller/has_content_behavior.rb b/app/controllers/concerns/dul_hydra/controller/has_content_behavior.rb
index eb18663b..021f4dcd 100644
--- a/app/controllers/concerns/dul_hydra/controller/has_content_behavior.rb
+++ b/app/controllers/concerns/dul_hydra/controller/has_content_behavior.rb
@@ -29,7 +29,7 @@ def upload
       protected
 
       def tech_metadata_fields
-        DulHydra.tech_metadata_fields.map do |field|
+        DulHydra.techmd_show_fields.map do |field|
           [field, Array(current_object.techmd.send(field))]
         end.to_h
       end
diff --git a/app/controllers/concerns/tab.rb b/app/controllers/concerns/tab.rb
index f6e11eb5..bdf14a66 100644
--- a/app/controllers/concerns/tab.rb
+++ b/app/controllers/concerns/tab.rb
@@ -22,7 +22,7 @@ def partial
   end
 
   def label
-    I18n.t("dul_hydra.tabs.#{id}.label")
+    I18n.t("dul_hydra.tabs.#{id}.label", default: id.titleize)
   end
 
 end
diff --git a/app/views/collections/collection_info.html.erb b/app/views/collections/collection_info.html.erb
deleted file mode 100644
index 81624caa..00000000
--- a/app/views/collections/collection_info.html.erb
+++ /dev/null
@@ -1,22 +0,0 @@
-<nav class="navbar navbar-default" role="navigation">
-	<ul class="nav navbar-nav">
-	  <li>
-		<%= link_to t('dul_hydra.tabs.collection_info.actions.download'), url_for(action: 'collection_info', format: 'csv') %>
-	  </li>
-	</ul>
-</nav>
-
-<table class="table" style="width:auto">
-  <tr>
-	<th scope="row">Items</th>
-	<td><%= collection_report[:items] %></td>
-  </tr>
-  <tr>
-	<th scope="row">Components</th>
-	<td><%= collection_report[:components] %></td>
-  </tr>
-  <tr>
-	<th scope="row">Total Content</th>
-	<td><%= number_to_human_size collection_report[:total_file_size] %></td>
-  </tr>
-</table>
diff --git a/app/views/collections/reports.html.erb b/app/views/collections/reports.html.erb
new file mode 100644
index 00000000..d4abd5a4
--- /dev/null
+++ b/app/views/collections/reports.html.erb
@@ -0,0 +1,8 @@
+<h2>Reports</h2>
+
+<%= form_tag report_collection_path(id: current_object, format: "csv"), method: :get do %>
+  <div class="form-group">
+    <input type="radio" name="type" value="techmd" checked /> Technical Metadata
+  </div>
+  <input type="submit" class="btn btn-primary" value="Generate Report" />
+<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 78e14ff4..cfece1f6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2,10 +2,19 @@ en:
   ddr:
     errors:
       multiple_object_matches: "%{criteria} retrieved multiple repository objects"
-  dul_hydra:
+  dul_hydra:        
     techmd:
       file_human_size: "File Size"
       pronom_identifier: "PRONOM Identifier"
+      format_label: "Format Label"
+      format_version: "Format Version"
+      media_type: "Media Type"
+      creating_application: "Creating Application"
+      valid: "Valid"
+      well_formed: "Well-formed"
+      file_size: "File Size (Bytes)"
+      creation_time: "File Creation Time"
+      modification_time: "File Modification Time"
     object_info:
       header: "Object Info"
       create_date: Ingested
diff --git a/config/routes.rb b/config/routes.rb
index 88a03a34..326ff8fb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -81,10 +81,11 @@ def repository_content_resource name
   end
 
   repository_resource :collections do
-    get 'collection_info'
     get 'items'
     get 'attachments'
     get 'targets'
+    get 'report'
+    get 'reports'
   end
   repository_resource :items do
     get 'components'
diff --git a/lib/dul_hydra.rb b/lib/dul_hydra.rb
index 80e3ffbf..3ad13dc2 100644
--- a/lib/dul_hydra.rb
+++ b/lib/dul_hydra.rb
@@ -4,6 +4,7 @@ module DulHydra
   extend ActiveSupport::Autoload
 
   autoload :Configurable
+  autoload :Reports
   autoload :BatchError, 'dul_hydra/error'
 
   autoload_under 'ability_definitions' do
diff --git a/lib/dul_hydra/configurable.rb b/lib/dul_hydra/configurable.rb
index 25369764..e8cefe00 100644
--- a/lib/dul_hydra/configurable.rb
+++ b/lib/dul_hydra/configurable.rb
@@ -6,7 +6,7 @@ module Configurable
       # Technical metadata fields to display on the show page
       # of a content object.
       # See Ddr::Managers::TechnicalMetadataManager.
-      mattr_accessor :tech_metadata_fields do
+      mattr_accessor :techmd_show_fields do
         [ :format_label,
           :format_version,
           :media_type,
@@ -18,13 +18,27 @@ module Configurable
           :image_width,
           :image_height,
           :color_space,
-          :created,
-          :last_modified,
+          :creation_time,
+          :modification_time,
           :checksum_digest,
           :checksum_value,
         ]
       end
 
+      mattr_accessor :techmd_report_fields do
+        [ Ddr::IndexFields::TECHMD_FORMAT_LABEL,
+          Ddr::IndexFields::TECHMD_FORMAT_VERSION,
+          Ddr::IndexFields::TECHMD_MEDIA_TYPE,
+          Ddr::IndexFields::TECHMD_PRONOM_IDENTIFIER,
+          Ddr::IndexFields::TECHMD_CREATING_APPLICATION,
+          Ddr::IndexFields::TECHMD_VALID,
+          Ddr::IndexFields::TECHMD_WELL_FORMED,
+          Ddr::IndexFields::TECHMD_FILE_SIZE,
+          Ddr::IndexFields::TECHMD_CREATION_TIME,
+          Ddr::IndexFields::TECHMD_MODIFICATION_TIME,
+        ]
+      end
+
       # Columns in the CSV report generated for a collection
       # Each column represents a *method* of a SolrDocument
       # See DulHydra::SolrDocument
diff --git a/lib/dul_hydra/reports.rb b/lib/dul_hydra/reports.rb
new file mode 100644
index 00000000..8fe2be39
--- /dev/null
+++ b/lib/dul_hydra/reports.rb
@@ -0,0 +1,21 @@
+module DulHydra
+  module Reports
+    extend ActiveSupport::Autoload
+
+    autoload :CollectionReport
+    autoload :Column
+    autoload :Columns
+    autoload :GetResults
+    autoload :GetTotal
+    autoload :Report
+
+    autoload_under 'filters' do
+      autoload :DynamicFilter
+      autoload :Filter
+      autoload :HasContentFilter
+      autoload :IsGovernedByFilter
+      autoload :StaticFilter
+    end
+
+  end
+end
diff --git a/lib/dul_hydra/reports/collection_report.rb b/lib/dul_hydra/reports/collection_report.rb
new file mode 100644
index 00000000..09f45258
--- /dev/null
+++ b/lib/dul_hydra/reports/collection_report.rb
@@ -0,0 +1,9 @@
+module DulHydra::Reports
+  class CollectionReport < Report
+
+    def initialize(pid)
+      self.filters += [ IsGovernedByFilter.new(pid) ]
+    end
+
+  end
+end
diff --git a/lib/dul_hydra/reports/column.rb b/lib/dul_hydra/reports/column.rb
new file mode 100644
index 00000000..e27bb43b
--- /dev/null
+++ b/lib/dul_hydra/reports/column.rb
@@ -0,0 +1,16 @@
+module DulHydra::Reports
+  class Column
+
+    attr_reader :field, :header
+
+    def initialize(field, header: nil)
+      @field = field
+      @header = header || field
+    end
+
+    def to_s
+      field
+    end
+
+  end
+end
diff --git a/lib/dul_hydra/reports/columns.rb b/lib/dul_hydra/reports/columns.rb
new file mode 100644
index 00000000..349077b8
--- /dev/null
+++ b/lib/dul_hydra/reports/columns.rb
@@ -0,0 +1,25 @@
+module DulHydra::Reports
+  module Columns
+
+    def self.field_header(key)
+      if key =~ /\Atechmd_/
+        key.sub! /\Atechmd_/, ""
+        i18n_path = "techmd"
+      else
+        i18n_path = "reports.columns"
+      end
+      I18n.t "dul_hydra.#{i18n_path}.#{key}", default: key.titleize
+    end
+
+    PID = Column.new("id", header: "Fedora PID")
+
+    Ddr::IndexFields.constants(false).each do |field|
+      key = field.to_s.downcase
+      column = Column.new(Ddr::IndexFields.const_get(field), header: field_header(key))
+      const_set(field, column)
+    end
+
+    TechnicalMetadata = constants(false).select { |c| c.to_s =~ /\ATECHMD_/ }.map { |c| const_get(c) }
+
+  end
+end
diff --git a/lib/dul_hydra/reports/filters/dynamic_filter.rb b/lib/dul_hydra/reports/filters/dynamic_filter.rb
new file mode 100644
index 00000000..6e052341
--- /dev/null
+++ b/lib/dul_hydra/reports/filters/dynamic_filter.rb
@@ -0,0 +1,6 @@
+module DulHydra::Reports
+  class DynamicFilter
+    include Filter
+
+  end
+end
diff --git a/lib/dul_hydra/reports/filters/filter.rb b/lib/dul_hydra/reports/filters/filter.rb
new file mode 100644
index 00000000..a0e3d81a
--- /dev/null
+++ b/lib/dul_hydra/reports/filters/filter.rb
@@ -0,0 +1,13 @@
+module DulHydra::Reports
+  module Filter
+
+    attr_accessor :clauses
+
+    private
+
+    def raw_query(key, value)
+      ActiveFedora::SolrService.raw_query(key, value)
+    end
+
+  end
+end
diff --git a/lib/dul_hydra/reports/filters/has_content_filter.rb b/lib/dul_hydra/reports/filters/has_content_filter.rb
new file mode 100644
index 00000000..e9cfd06f
--- /dev/null
+++ b/lib/dul_hydra/reports/filters/has_content_filter.rb
@@ -0,0 +1,9 @@
+module DulHydra::Reports
+  class HasContentFilter < StaticFilter
+
+    self.clauses = [
+      "%s:(Component OR Attachment OR Target)" % Ddr::IndexFields::ACTIVE_FEDORA_MODEL
+    ]
+
+  end
+end
diff --git a/lib/dul_hydra/reports/filters/is_governed_by_filter.rb b/lib/dul_hydra/reports/filters/is_governed_by_filter.rb
new file mode 100644
index 00000000..49f86b63
--- /dev/null
+++ b/lib/dul_hydra/reports/filters/is_governed_by_filter.rb
@@ -0,0 +1,11 @@
+module DulHydra::Reports
+  class IsGovernedByFilter < DynamicFilter
+
+    def initialize(pid)
+      self.clauses = [
+        raw_query(Ddr::IndexFields::IS_GOVERNED_BY, "info:fedora/#{pid}")
+      ]
+    end
+
+  end
+end
diff --git a/lib/dul_hydra/reports/filters/static_filter.rb b/lib/dul_hydra/reports/filters/static_filter.rb
new file mode 100644
index 00000000..98a6f6fc
--- /dev/null
+++ b/lib/dul_hydra/reports/filters/static_filter.rb
@@ -0,0 +1,6 @@
+module DulHydra::Reports
+  class StaticFilter
+    extend Filter
+
+  end
+end
diff --git a/lib/dul_hydra/reports/get_results.rb b/lib/dul_hydra/reports/get_results.rb
new file mode 100644
index 00000000..b3734102
--- /dev/null
+++ b/lib/dul_hydra/reports/get_results.rb
@@ -0,0 +1,21 @@
+module DulHydra::Reports
+  class GetResults < SimpleDelegator
+
+    def call
+      get_solr_response(solr_params)
+    end
+
+    def total
+      GetTotal.new(self).call
+    end
+
+    def solr_params
+      solr_query_params
+        .merge(csv_opts)
+        .merge(rows: total,
+               wt: "csv",
+               fl: fields)
+    end
+
+  end
+end
diff --git a/lib/dul_hydra/reports/get_total.rb b/lib/dul_hydra/reports/get_total.rb
new file mode 100644
index 00000000..5ffbaf6b
--- /dev/null
+++ b/lib/dul_hydra/reports/get_total.rb
@@ -0,0 +1,16 @@
+module DulHydra::Reports
+  class GetTotal < SimpleDelegator
+
+    def call
+      get_solr_response(solr_params)["response"]["numFound"]
+    end
+
+    def solr_params
+      solr_query_params
+        .merge(wt: "json",
+               rows: 0,
+               facet: "false")
+    end
+
+  end
+end
diff --git a/lib/dul_hydra/reports/report.rb b/lib/dul_hydra/reports/report.rb
new file mode 100644
index 00000000..7e4c375f
--- /dev/null
+++ b/lib/dul_hydra/reports/report.rb
@@ -0,0 +1,73 @@
+require "csv"
+
+module DulHydra::Reports
+  class Report
+
+    class_attribute :csv_sep, :csv_mv_sep, :csv_quote
+    self.csv_sep    = CSV::DEFAULT_OPTIONS[:col_sep]
+    self.csv_mv_sep = "|"
+    self.csv_quote  = CSV::DEFAULT_OPTIONS[:quote_char]
+
+    class_attribute :query, :columns, :filters
+    self.query   = "*:*"
+    self.columns = [ Columns::PID ]
+    self.filters = [ ]
+
+    attr_writer :headers
+
+    def run
+      data = GetResults.new(self).call
+      CSV.new(data,
+              headers: headers,
+              return_headers: true,
+              write_headers: true,
+              col_sep: csv_sep,
+              quote_char: csv_quote
+             )
+    end
+
+    def headers
+      @headers || columns.map(&:header)
+    end
+
+    def fields
+      columns.map(&:to_s)
+    end
+
+    def csv_opts
+      { "csv.header":       "false",
+        "csv.separator":    csv_sep,
+        "csv.mv.separator": csv_mv_sep,
+        "csv.encapsulator": csv_quote,
+      }
+    end
+
+    def filter_query
+      filters.map(&:clauses).flatten
+    end
+
+    def solr_query_params
+      { q: query, fq: filter_query }
+    end
+
+    def get_solr_response(solr_params)
+      uri = URI(index_url(solr_params))
+      http_response = Net::HTTP.get_response(uri)
+      if http_response.content_type == "application/json"
+        JSON.parse http_response.body
+      else
+        http_response.body
+      end
+    end
+
+    private
+
+    def index_url(solr_params)
+      "%{base_url}/select?%{qs}" % {
+        base_url: ActiveFedora.solr_config[:url],
+        qs: URI.encode_www_form(solr_params)
+      }
+    end
+
+  end
+end
diff --git a/spec/controllers/collections_controller_spec.rb b/spec/controllers/collections_controller_spec.rb
index d9348577..a8e2fe77 100644
--- a/spec/controllers/collections_controller_spec.rb
+++ b/spec/controllers/collections_controller_spec.rb
@@ -94,30 +94,4 @@ def new_collection
     end
   end
 
-  describe "#collection_info" do
-    let(:collection) { FactoryGirl.create(:collection) }
-    context "when the user can read the collection" do
-      let(:items) { FactoryGirl.build_list(:item, 3) }
-      before do
-        allow_any_instance_of(Collection).to receive(:children).and_return(items)
-        allow_any_instance_of(Collection).to receive(:components_from_solr).and_return(component_solr_doc_array.lazy)
-        controller.current_ability.can(:read, collection)
-      end
-      it "should report the statistics" do
-        get :collection_info, id: collection
-        expect(response).to render_template(:collection_info)
-        expect(controller.send(:collection_report)[:components]).to eq(6)
-        expect(controller.send(:collection_report)[:items]).to eq(3)
-        expect(controller.send(:collection_report)[:total_file_size]).to eq(60192)
-      end
-    end
-    context "when the user cannot read the collection" do
-      before { controller.current_ability.cannot(:read, collection) }
-      it "should be unauthorized" do
-        get :collection_info, id: collection
-        expect(response.response_code).to eq(403)
-      end
-    end
-  end
-
 end
diff --git a/spec/routing/collections_routing_spec.rb b/spec/routing/collections_routing_spec.rb
index c7a39e95..6bf304b2 100644
--- a/spec/routing/collections_routing_spec.rb
+++ b/spec/routing/collections_routing_spec.rb
@@ -5,9 +5,6 @@
   it_behaves_like "a repository object router" do
     let(:controller) { "collections" }
   end
-  it "should have a collection_info route" do
-    expect(get: "/collections/duke:1/collection_info").to route_to(controller: "collections", action: "collection_info", id: "duke:1")
-  end
   it "should have an items route" do
     expect(get: "/collections/duke:1/items").to route_to(controller: "collections", action: "items", id: "duke:1")
   end
@@ -17,4 +14,10 @@
   it "should have a targets route" do
     expect(get: "/collections/duke:1/targets").to route_to(controller: "collections", action: "targets", id: "duke:1")
   end
+  it "should have a reports route" do
+    expect(get: "/collections/duke:1/reports").to route_to(controller: "collections", action: "reports", id: "duke:1")
+  end
+  it "should have a report route" do
+    expect(get: "/collections/duke:1/report.csv").to route_to(controller: "collections", action: "report", id: "duke:1", format: "csv")
+  end
 end

From 346a307d98ec993f700447aa6e741a646c8e253c Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Mon, 10 Aug 2015 11:20:05 -0400
Subject: [PATCH 05/33] Adds reports tab to collection show view

---
 app/assets/stylesheets/dul-hydra.css          | 52 +++++++++----------
 app/controllers/collections_controller.rb     | 12 +++--
 .../{reports.html.erb => _reports.html.erb}   |  3 +-
 config/routes.rb                              |  1 -
 spec/routing/collections_routing_spec.rb      |  3 --
 5 files changed, 36 insertions(+), 35 deletions(-)
 rename app/views/collections/{reports.html.erb => _reports.html.erb} (92%)

diff --git a/app/assets/stylesheets/dul-hydra.css b/app/assets/stylesheets/dul-hydra.css
index b674b36b..d3aceb3a 100644
--- a/app/assets/stylesheets/dul-hydra.css
+++ b/app/assets/stylesheets/dul-hydra.css
@@ -1,55 +1,55 @@
 /* BEGIN Blacklight */
 #header-navbar {
-	padding-top: 8px;
+    padding-top: 8px;
 }
 #header-navbar .navbar-brand { 
-	min-height: 42px;
-	min-width: 200px;
-	padding-bottom: 0;
+    min-height: 42px;
+    min-width: 200px;
+    padding-bottom: 0;
 }
 form.bookmark_toggle {
-	display: inline;
+    display: inline;
 }
 /* END Blacklight */
 
 .rights-form legend {
-	font-size: medium;
-	font-weight: bold;
+    font-size: medium;
+    font-weight: bold;
 }
 .rights-form fieldset {
-	margin-bottom: 1em;
+    margin-bottom: 1em;
 }
 .rights-form .access-level {
-	margin-bottom: 1.5em;
+    margin-bottom: 1.5em;
 }
 .rights-form .access-level label {
-	font-weight: bold;
-	text-transform: uppercase;
+    font-weight: bold;
+    text-transform: uppercase;
 }
 .rights-form .help-block {
-	font-size: smaller;
+    font-size: smaller;
 }
 
 table.access-controls {
-	width: auto;
+    width: auto;
 }
 table.access-controls .access-level-label {
-	text-transform: uppercase;
-	font-weight: bold;
+    text-transform: uppercase;
+    font-weight: bold;
 }
 table.access-controls td ul {
-	margin: 0;
+    margin: 0;
 }
 
 .field_with_errors {
-	padding: 2px;
-	background-color: red;
-	display: table;
+    padding: 2px;
+    background-color: red;
+    display: table;
 }
 
 .table .sub-header {
-	font-style: italic;
-	color: #999;
+    font-style: italic;
+    color: #999;
 }
 
 .table .mappings:empty {
@@ -61,17 +61,17 @@ table.access-controls td ul {
 }
 
 .table .mappings:empty:before {
-	content: 'will not map';
+    content: 'will not map';
 }
 
 .desc-metadata-form fieldset {
-	margin: 1em 0;
+    margin: 1em 0;
 }
 .desc-metadata-form .field-value {
-	margin-bottom: 0.5em;
-	margin-left: 1em;
+    margin-bottom: 0.5em;
+    margin-left: 1em;
 }
 
 span.label.event-outcome { /* event outcome label */
-	font-size: medium;
+    font-size: medium;
 }
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index b6264673..64c4c845 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -6,14 +6,12 @@ class CollectionsController < ApplicationController
   include DulHydra::Controller::HasTargetsBehavior
 
   before_action :set_desc_metadata, only: :create
+  self.tabs << :tab_reports
 
   def items
     get_children
   end
 
-  def reports
-  end
-
   def report
     respond_to do |format|
       format.csv do
@@ -31,4 +29,12 @@ def report
     end
   end
 
+  protected
+
+  def tab_reports
+    Tab.new("reports",
+            guard: can?(:manage, current_object)
+           )
+  end
+
 end
diff --git a/app/views/collections/reports.html.erb b/app/views/collections/_reports.html.erb
similarity index 92%
rename from app/views/collections/reports.html.erb
rename to app/views/collections/_reports.html.erb
index d4abd5a4..743ac29c 100644
--- a/app/views/collections/reports.html.erb
+++ b/app/views/collections/_reports.html.erb
@@ -1,5 +1,4 @@
-<h2>Reports</h2>
-
+<h4>Select Report</h4>
 <%= form_tag report_collection_path(id: current_object, format: "csv"), method: :get do %>
   <div class="form-group">
     <input type="radio" name="type" value="techmd" checked /> Technical Metadata
diff --git a/config/routes.rb b/config/routes.rb
index 326ff8fb..356db29c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -85,7 +85,6 @@ def repository_content_resource name
     get 'attachments'
     get 'targets'
     get 'report'
-    get 'reports'
   end
   repository_resource :items do
     get 'components'
diff --git a/spec/routing/collections_routing_spec.rb b/spec/routing/collections_routing_spec.rb
index 6bf304b2..9673a04d 100644
--- a/spec/routing/collections_routing_spec.rb
+++ b/spec/routing/collections_routing_spec.rb
@@ -14,9 +14,6 @@
   it "should have a targets route" do
     expect(get: "/collections/duke:1/targets").to route_to(controller: "collections", action: "targets", id: "duke:1")
   end
-  it "should have a reports route" do
-    expect(get: "/collections/duke:1/reports").to route_to(controller: "collections", action: "reports", id: "duke:1")
-  end
   it "should have a report route" do
     expect(get: "/collections/duke:1/report.csv").to route_to(controller: "collections", action: "report", id: "duke:1", format: "csv")
   end

From 1dd311953dd91ed4aae9163e0c41cd497d5b55f6 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Mon, 10 Aug 2015 15:31:40 -0400
Subject: [PATCH 06/33] Downgrades Hash syntax for Ruby 2.1

Closes #1400
Travis CI RVM pinned to 2.1.3
---
 .travis.yml                     | 2 +-
 lib/dul_hydra/reports/report.rb | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1c48ccb8..9a025200 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ before_install:
   - sudo apt-get install -qq libclamav6 libclamav-dev clamav clamav-data
   - sudo apt-get install -qq libvips-dev
 rvm:
-  - 2.1
+  - 2.1.3
 before_script:
   - "cp config/log4r.yml.sample config/log4r.yml"
 cache: bundler
diff --git a/lib/dul_hydra/reports/report.rb b/lib/dul_hydra/reports/report.rb
index 7e4c375f..5d91e558 100644
--- a/lib/dul_hydra/reports/report.rb
+++ b/lib/dul_hydra/reports/report.rb
@@ -35,10 +35,10 @@ def fields
     end
 
     def csv_opts
-      { "csv.header":       "false",
-        "csv.separator":    csv_sep,
-        "csv.mv.separator": csv_mv_sep,
-        "csv.encapsulator": csv_quote,
+      { :"csv.header"       => "false",
+        :"csv.separator"    => csv_sep,
+        :"csv.mv.separator" => csv_mv_sep,
+        :"csv.encapsulator" => csv_quote,
       }
     end
 

From dddbf5555ab17045e2592be8eef32a1196ea7ff7 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Mon, 10 Aug 2015 15:46:32 -0400
Subject: [PATCH 07/33] Requires :audit permission to access collection reports

Closes #1399
Aliases :report to :audit in DulHydra::AliasAbilityDefinitions.
---
 Gemfile                                                       | 2 +-
 Gemfile.lock                                                  | 4 ++--
 app/controllers/collections_controller.rb                     | 2 +-
 .../ability_definitions/alias_ability_definitions.rb          | 1 +
 spec/models/ability_spec.rb                                   | 3 +++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 247d9d92..0ac05e34 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'rails', '~> 4.1.6'
 gem 'hydra-head', '~> 7.2.0'
 gem 'ddr-alerts', '~> 1.0.0'
-gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: '3de9f0a78c024e07961ff042286d616f40cd4a9f'
+gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: '627adfdf676e2e727d2890127b27f737e5fe9e62'
 gem 'rubydora', '>= 1.8.1'
 gem 'devise'
 gem 'deprecation'
diff --git a/Gemfile.lock b/Gemfile.lock
index 98dd05e2..df6ac7b7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: git://github.com/duke-libraries/ddr-models.git
-  revision: 3de9f0a78c024e07961ff042286d616f40cd4a9f
-  ref: 3de9f0a78c024e07961ff042286d616f40cd4a9f
+  revision: 627adfdf676e2e727d2890127b27f737e5fe9e62
+  ref: 627adfdf676e2e727d2890127b27f737e5fe9e62
   specs:
     ddr-models (2.0.0.post)
       active-fedora (~> 7.0)
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 64c4c845..8a906eec 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -33,7 +33,7 @@ def report
 
   def tab_reports
     Tab.new("reports",
-            guard: can?(:manage, current_object)
+            guard: can?(:report, current_object)
            )
   end
 
diff --git a/lib/dul_hydra/ability_definitions/alias_ability_definitions.rb b/lib/dul_hydra/ability_definitions/alias_ability_definitions.rb
index ba864dbd..969014d2 100644
--- a/lib/dul_hydra/ability_definitions/alias_ability_definitions.rb
+++ b/lib/dul_hydra/ability_definitions/alias_ability_definitions.rb
@@ -5,6 +5,7 @@ def call
       alias_action :attachments, :collection_info, :components, :event, :events, :items, :targets, to: :read
       alias_action :roles, to: :grant
       alias_action :admin_metadata, to: :update
+      alias_action :report, to: :audit
     end
 
   end
diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb
index db49c16e..d624d26d 100644
--- a/spec/models/ability_spec.rb
+++ b/spec/models/ability_spec.rb
@@ -18,6 +18,9 @@
     it "should alias actions to :update" do
       expect(subject.aliased_actions[:update]).to include(:admin_metadata)
     end
+    it "should alias actions to :audit" do
+      expect(subject.aliased_actions[:audit]).to include(:report)
+    end
   end
 
   describe "Batch permissions" do

From 6f7d4308f32991809e18d9dd814646cb1dc9a326 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Mon, 10 Aug 2015 18:00:16 -0400
Subject: [PATCH 08/33] Repository technical metadata report added

Beginnings of administrative dashboard
---
 app/controllers/admin/base_controller.rb      |  8 ++++++++
 app/controllers/admin/dashboard_controller.rb |  8 ++++++++
 app/controllers/admin/reports_controller.rb   | 20 +++++++++++++++++++
 app/controllers/collections_controller.rb     |  1 +
 app/helpers/application_helper.rb             |  2 +-
 app/views/admin/dashboard/show.html.erb       |  6 ++++++
 app/views/application/_user_menu.html.erb     |  7 +++++++
 config/initializers/renderers.rb              |  6 ++++++
 config/routes.rb                              |  7 +++++--
 lib/dul_hydra/reports/report.rb               |  4 ++++
 spec/routing/admin_routing_spec.rb            | 13 ++++++++++++
 11 files changed, 79 insertions(+), 3 deletions(-)
 create mode 100644 app/controllers/admin/base_controller.rb
 create mode 100644 app/controllers/admin/dashboard_controller.rb
 create mode 100644 app/controllers/admin/reports_controller.rb
 create mode 100644 app/views/admin/dashboard/show.html.erb
 create mode 100644 config/initializers/renderers.rb
 create mode 100644 spec/routing/admin_routing_spec.rb

diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
new file mode 100644
index 00000000..f45c32a8
--- /dev/null
+++ b/app/controllers/admin/base_controller.rb
@@ -0,0 +1,8 @@
+module Admin
+  class BaseController < ::ApplicationController
+
+    devise_group :admin, contains: [:superuser]
+    before_action :authenticate_admin!
+
+  end
+end
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
new file mode 100644
index 00000000..38c8d992
--- /dev/null
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -0,0 +1,8 @@
+module Admin
+  class DashboardController < BaseController
+
+    def show
+    end
+
+  end
+end
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
new file mode 100644
index 00000000..222b4590
--- /dev/null
+++ b/app/controllers/admin/reports_controller.rb
@@ -0,0 +1,20 @@
+module Admin
+  class ReportsController < BaseController
+
+    respond_to :csv
+
+    def show
+      report = DulHydra::Reports::Report.new
+      basename = "Duke_Digital_Repository"
+      case params.require(:type)
+      when "techmd"
+        report.filters << DulHydra::Reports::HasContentFilter
+        report.columns += DulHydra::Reports::Columns::TechnicalMetadata
+        basename += "__TECHMD"
+      end
+      filename = basename + ".csv"
+      render csv: report, filename: filename
+    end
+
+  end
+end
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 64c4c845..74ab9770 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -19,6 +19,7 @@ def report
         basename = current_object.title_display.gsub /[^\w\.\-]/, "_"
         case params.require(:type)
         when "techmd"
+          rep.filters << DulHydra::Reports::HasContentFilter
           rep.columns += DulHydra::Reports::Columns::TechnicalMetadata
           basename += "__TECHMD"
         end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8e707a26..1f744916 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -159,7 +159,7 @@ def link_to_document_or_object(doc_or_obj, access = :read)
   end
 
   def link_to_create_model(model)
-    link_to I18n.t("dul_hydra.#{model.underscore}.new_menu", default: model), controller: model.tableize, action: "new"
+    link_to I18n.t("dul_hydra.#{model.underscore}.new_menu", default: model), send("new_#{model.tableize.singularize}_path")
   end
 
   def document_or_object_url(doc_or_obj)
diff --git a/app/views/admin/dashboard/show.html.erb b/app/views/admin/dashboard/show.html.erb
new file mode 100644
index 00000000..351a0917
--- /dev/null
+++ b/app/views/admin/dashboard/show.html.erb
@@ -0,0 +1,6 @@
+<h2>Administrative Dashboard</h2>
+
+<h4>Reports</h4>
+<ul>
+  <li><%= link_to "Technical Metadata", admin_report_path(type: "techmd", format: "csv") %></li>
+</ul>
diff --git a/app/views/application/_user_menu.html.erb b/app/views/application/_user_menu.html.erb
index ed87e9f6..291d90ea 100644
--- a/app/views/application/_user_menu.html.erb
+++ b/app/views/application/_user_menu.html.erb
@@ -18,6 +18,13 @@
       </li>
       <li class="divider"></li>
     <% end %>
+    <% if acting_as_superuser? %>
+    <li>
+      <%= link_to admin_dashboard_path do %>
+        <span class="glyphicon glyphicon-dashboard"></span> Dashboard
+      <% end %>
+    </li>
+    <% end %>
     <li>
       <%= link_to bookmarks_path do %>
         <span class="glyphicon glyphicon-bookmark"></span> Bookmarks
diff --git a/config/initializers/renderers.rb b/config/initializers/renderers.rb
new file mode 100644
index 00000000..90ed07f6
--- /dev/null
+++ b/config/initializers/renderers.rb
@@ -0,0 +1,6 @@
+ActionController::Renderers.add :csv do |obj, options|
+  filename = options[:filename] || 'data'
+  str = obj.respond_to?(:to_csv) ? obj.to_csv : obj.to_s
+  send_data str, type: Mime::CSV,
+            disposition: "attachment; filename=#{filename}.csv"
+end
diff --git a/config/routes.rb b/config/routes.rb
index 356db29c..963329bc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,8 +17,11 @@ def tab_constraint
     /attachments|items|components|descriptive_metadata|permissions|default_permissions/
   end
 
-  if defined?(DulHydra::ResqueAdmin)
-    namespace :admin do
+  namespace :admin do
+    get 'dashboard', to: 'dashboard#show'
+    get 'reports/:type', to: 'reports#show', as: 'report', constraints: {format: 'csv'}
+
+    if defined?(DulHydra::ResqueAdmin)
       constraints DulHydra::ResqueAdmin do
         mount Resque::Server, at: '/queues'
       end
diff --git a/lib/dul_hydra/reports/report.rb b/lib/dul_hydra/reports/report.rb
index 5d91e558..dd2bab77 100644
--- a/lib/dul_hydra/reports/report.rb
+++ b/lib/dul_hydra/reports/report.rb
@@ -26,6 +26,10 @@ def run
              )
     end
 
+    def to_csv
+      run.read
+    end
+
     def headers
       @headers || columns.map(&:header)
     end
diff --git a/spec/routing/admin_routing_spec.rb b/spec/routing/admin_routing_spec.rb
new file mode 100644
index 00000000..ad5c805a
--- /dev/null
+++ b/spec/routing/admin_routing_spec.rb
@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+RSpec.describe "admin routers", type: :routing do
+
+  it "should have a dashboard route" do
+    expect(get: "/admin/dashboard").to route_to(controller: "admin/dashboard", action: "show")
+  end
+
+  it "should have a report route" do
+    expect(get: "/admin/reports/techmd").to route_to(controller: "admin/reports", action: "show", type: "techmd")
+  end
+
+end

From d858bb3de9ff790dd800b5aef3f6396d6971cb50 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Tue, 11 Aug 2015 10:46:22 -0400
Subject: [PATCH 09/33] Bumped version to 4.0.1.post

---
 lib/dul_hydra/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dul_hydra/version.rb b/lib/dul_hydra/version.rb
index 87c581e2..75cc789c 100644
--- a/lib/dul_hydra/version.rb
+++ b/lib/dul_hydra/version.rb
@@ -1,3 +1,3 @@
 module DulHydra
-  VERSION = "4.0.0.post"
+  VERSION = "4.0.1.post"
 end

From a63c428a6e95477ec485077965fca05fee77b07b Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Tue, 11 Aug 2015 11:49:16 -0400
Subject: [PATCH 10/33] Removes extra .csv file extension from repository
 report

Fixes #1405
---
 app/controllers/admin/reports_controller.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index 222b4590..d04c4184 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -5,14 +5,13 @@ class ReportsController < BaseController
 
     def show
       report = DulHydra::Reports::Report.new
-      basename = "Duke_Digital_Repository"
+      filename = "Duke_Digital_Repository"
       case params.require(:type)
       when "techmd"
         report.filters << DulHydra::Reports::HasContentFilter
         report.columns += DulHydra::Reports::Columns::TechnicalMetadata
-        basename += "__TECHMD"
+        filename += "__TECHMD"
       end
-      filename = basename + ".csv"
       render csv: report, filename: filename
     end
 

From 44d7aa67ceadf2694e27a3661aa2d91244b1de45 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Tue, 11 Aug 2015 20:53:53 -0400
Subject: [PATCH 11/33] SuperuserController refactored

sign_out redirects to root_path (fixes #1403)
---
 app/controllers/superuser_controller.rb       | 32 +++++++++------
 app/views/application/_user_menu.html.erb     | 10 +++--
 config/routes.rb                              |  9 +++--
 spec/controllers/superuser_controller_spec.rb | 40 +++++++------------
 4 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/app/controllers/superuser_controller.rb b/app/controllers/superuser_controller.rb
index 507cbfcb..e02f6b2e 100644
--- a/app/controllers/superuser_controller.rb
+++ b/app/controllers/superuser_controller.rb
@@ -1,25 +1,27 @@
 class SuperuserController < ApplicationController
 
+  before_action :authorize_to_act_as_superuser!, only: :create
+  after_action :cleanup_session
+
   rescue_from ActionController::RedirectBackError do |exception|
     redirect_to root_path
   end
 
-  def toggle
-    if acting_as_superuser?
-      sign_out(:superuser)
-      session[:manage_menu].delete(Queue) if session.key?(:manage_menu)
-      flash[:success] = "You are no longer acting as Superuser."
-    else
-      authorize_to_act_as_superuser!
-      sign_in(:superuser, current_user)
-      session[:manage_menu] ||= []
-      session[:manage_menu] << Queue
-      flash[:alert] = "<strong>Caution!</strong> You are now acting as Superuser.".html_safe
-    end
-    session.delete(:create_menu_models)
+  def create
+    sign_in(:superuser, current_user)
+    session[:manage_menu] ||= []
+    session[:manage_menu] << Queue
+    flash[:alert] = "<strong>Caution!</strong> You are now acting as Superuser.".html_safe
     redirect_to :back
   end
 
+  def destroy
+    sign_out(:superuser)
+    session[:manage_menu].delete(Queue) if session.key?(:manage_menu)
+    flash[:success] = "You are no longer acting as Superuser."
+    redirect_to root_path
+  end
+
   protected
 
   def authorize_to_act_as_superuser!
@@ -28,4 +30,8 @@ def authorize_to_act_as_superuser!
     end
   end
 
+  def cleanup_session
+    session.delete(:create_menu_models)
+  end
+
 end
diff --git a/app/views/application/_user_menu.html.erb b/app/views/application/_user_menu.html.erb
index 291d90ea..b29b95b0 100644
--- a/app/views/application/_user_menu.html.erb
+++ b/app/views/application/_user_menu.html.erb
@@ -8,12 +8,14 @@
   <ul class="dropdown-menu" role="menu">
     <% if authorized_to_act_as_superuser? %>
       <li>
-	<%= link_to superuser_path, id: "toggle-superuser" do %>
-	  <% if acting_as_superuser? %> 
+	<% if acting_as_superuser? %>
+	  <%= link_to superuser_sign_out_path do %>
             <span class="glyphicon glyphicon-eye-close"></span> Stop acting as Superuser
-          <% else %>
+	  <% end %>
+        <% else %>
+	  <%= link_to superuser_sign_in_path do %>
             <span class="glyphicon glyphicon-eye-open"></span> Act as Superuser
-          <% end %>
+	  <% end %>
         <% end %>
       </li>
       <li class="divider"></li>
diff --git a/config/routes.rb b/config/routes.rb
index 963329bc..4085ad5c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,9 +5,12 @@
   root :to => "catalog#index"
   Blacklight.add_routes(self)
 
-  get 'superuser' => 'superuser#toggle'
+  scope 'superuser', as: 'superuser' do
+    get 'sign_in', to: 'superuser#create'
+    get 'sign_out', to: 'superuser#destroy'
+  end
 
-  get 'id/*permanent_id' => 'permanent_ids#show'
+  get 'id/*permanent_id', to: 'permanent_ids#show'
 
   def pid_constraint
     /[a-zA-Z0-9\-_]+:[a-zA-Z0-9\-_]+/
@@ -35,7 +38,7 @@ def content_routes
 
   def event_routes
     get 'events'
-    get 'events/:event_id' => :event
+    get 'events/:event_id', to: :event
   end
 
   def roles_routes
diff --git a/spec/controllers/superuser_controller_spec.rb b/spec/controllers/superuser_controller_spec.rb
index 312a1952..ddf75b3a 100644
--- a/spec/controllers/superuser_controller_spec.rb
+++ b/spec/controllers/superuser_controller_spec.rb
@@ -6,55 +6,45 @@
 
   before { sign_in :user, user }
 
-  describe "#toggle" do
-
+  describe "#create" do
     let(:previous_page) { "http://library.duke.edu" }
-
     before do
       request.env["HTTP_REFERER"] = previous_page
     end
-
     describe "when the current ability is authorized to act as superuser" do
       before do
         allow(controller).to receive(:authorized_to_act_as_superuser?) { true }
       end
-
+      it "should sign in" do
+        expect(controller).to receive(:sign_in).with(:superuser, user)
+        get :create
+      end
       it "should redirect to the previous page" do
-        get :toggle
+        get :create
         expect(response).to redirect_to(previous_page)
       end
-
       it "should delete the :create_menu_models session key" do
         expect(session).to receive(:delete).with(:create_menu_models)
-        get :toggle
-      end
-
-      describe "when the superuser scope is signed in" do
-        before { sign_in :superuser, user }
-        it "should sign out" do
-          expect(controller).to receive(:sign_out).with(:superuser)
-          get :toggle
-        end
-      end
-
-      describe "when the superuser scope is not signed in" do
-        it "should sign in" do
-          expect(controller).to receive(:sign_in).with(:superuser, user)
-          get :toggle
-        end
+        get :create
       end
     end
-
     describe "when the current ability is not authorized to act as superuser" do
       before do
         allow(controller).to receive(:authorized_to_act_as_superuser?) { false }
       end
       it "should be unauthorized" do
-        get :toggle
+        get :create
         expect(response.response_code).to eq(403)
       end
     end
+  end
 
+  describe "#destroy" do
+    before { sign_in :superuser, user }
+    it "should sign out" do
+      expect(controller).to receive(:sign_out).with(:superuser)
+      get :destroy
+    end
   end
 
 end

From fcf5ffca2075586b41a91f8fb87956d1e2accfed Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Thu, 13 Aug 2015 16:27:40 -0400
Subject: [PATCH 12/33] Adds individual fixity check job

Adds simple job factory to generate job classes that find an
object by PID and perform a task on it.
---
 lib/dul_hydra.rb                         |  3 ++-
 lib/dul_hydra/jobs.rb                    | 11 +++++++++++
 lib/dul_hydra/jobs/simple_job.rb         | 14 ++++++++++++++
 lib/dul_hydra/jobs/simple_job_factory.rb | 14 ++++++++++++++
 lib/dul_hydra/jobs/update_index.rb       | 12 ------------
 spec/jobs/fixity_check_spec.rb           | 22 ++++++++++++++++++++++
 spec/jobs/update_index_spec.rb           | 22 ++++++++++++++++++++++
 7 files changed, 85 insertions(+), 13 deletions(-)
 create mode 100644 lib/dul_hydra/jobs.rb
 create mode 100644 lib/dul_hydra/jobs/simple_job.rb
 create mode 100644 lib/dul_hydra/jobs/simple_job_factory.rb
 delete mode 100644 lib/dul_hydra/jobs/update_index.rb
 create mode 100644 spec/jobs/fixity_check_spec.rb
 create mode 100644 spec/jobs/update_index_spec.rb

diff --git a/lib/dul_hydra.rb b/lib/dul_hydra.rb
index 3ad13dc2..69b9c307 100644
--- a/lib/dul_hydra.rb
+++ b/lib/dul_hydra.rb
@@ -3,9 +3,10 @@
 module DulHydra
   extend ActiveSupport::Autoload
 
+  autoload :BatchError, 'dul_hydra/error'
   autoload :Configurable
+  autoload :Jobs
   autoload :Reports
-  autoload :BatchError, 'dul_hydra/error'
 
   autoload_under 'ability_definitions' do
     autoload :AliasAbilityDefinitions
diff --git a/lib/dul_hydra/jobs.rb b/lib/dul_hydra/jobs.rb
new file mode 100644
index 00000000..fbe3572b
--- /dev/null
+++ b/lib/dul_hydra/jobs.rb
@@ -0,0 +1,11 @@
+require_relative 'jobs/simple_job_factory'
+
+module DulHydra
+  module Jobs
+
+    FixityCheck = SimpleJobFactory.call(:fixity) { |obj| obj.fixity_check }
+
+    UpdateIndex = SimpleJobFactory.call(:index) { |obj| obj.update_index }
+
+  end
+end
diff --git a/lib/dul_hydra/jobs/simple_job.rb b/lib/dul_hydra/jobs/simple_job.rb
new file mode 100644
index 00000000..2b14e889
--- /dev/null
+++ b/lib/dul_hydra/jobs/simple_job.rb
@@ -0,0 +1,14 @@
+module DulHydra::Jobs
+  class SimpleJob
+
+    class << self
+      attr_accessor :queue, :proc
+
+      def perform(pid)
+        obj = ActiveFedora::Base.find(pid)
+        proc.call(obj)
+      end
+    end
+
+  end
+end
diff --git a/lib/dul_hydra/jobs/simple_job_factory.rb b/lib/dul_hydra/jobs/simple_job_factory.rb
new file mode 100644
index 00000000..03e5cba2
--- /dev/null
+++ b/lib/dul_hydra/jobs/simple_job_factory.rb
@@ -0,0 +1,14 @@
+require_relative 'simple_job'
+
+module DulHydra::Jobs
+  class SimpleJobFactory
+
+    def self.call(queue, &proc)
+      Class.new(SimpleJob) do
+        self.queue = queue
+        self.proc = proc
+      end
+    end
+
+  end
+end
diff --git a/lib/dul_hydra/jobs/update_index.rb b/lib/dul_hydra/jobs/update_index.rb
deleted file mode 100644
index 9f050374..00000000
--- a/lib/dul_hydra/jobs/update_index.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module DulHydra::Jobs
-  class UpdateIndex
-
-    @queue = :index
-
-    def self.perform(pid)
-      obj = ActiveFedora::Base.find(pid)
-      obj.update_index
-    end
-
-  end
-end
diff --git a/spec/jobs/fixity_check_spec.rb b/spec/jobs/fixity_check_spec.rb
new file mode 100644
index 00000000..7eb1d73a
--- /dev/null
+++ b/spec/jobs/fixity_check_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+module DulHydra::Jobs
+  RSpec.describe FixityCheck do
+
+    it "should use the :fixity queue" do
+      expect(described_class.queue).to eq(:fixity)
+    end
+
+    describe ".perform" do
+      let!(:obj) { double(fixity_check: nil) }
+      before do
+        allow(ActiveFedora::Base).to receive(:find).with("test:1") { obj }
+      end
+      it "should call `fixity_check` on the object" do
+        expect(obj).to receive(:fixity_check)
+        described_class.perform("test:1")
+      end
+    end
+
+  end
+end
diff --git a/spec/jobs/update_index_spec.rb b/spec/jobs/update_index_spec.rb
new file mode 100644
index 00000000..1eda21b3
--- /dev/null
+++ b/spec/jobs/update_index_spec.rb
@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+module DulHydra::Jobs
+  RSpec.describe UpdateIndex do
+
+    it "should use the :index queue" do
+      expect(described_class.queue).to eq(:index)
+    end
+
+    describe ".perform" do
+      let!(:obj) { double(update_index: nil) }
+      before do
+        allow(ActiveFedora::Base).to receive(:find).with("test:1") { obj }
+      end
+      it "should call `update_index` on the object" do
+        expect(obj).to receive(:update_index)
+        described_class.perform("test:1")
+      end
+    end
+
+  end
+end

From 1831700049a79ff094057b1caa510370eac18a6d Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Fri, 14 Aug 2015 09:30:01 -0400
Subject: [PATCH 13/33] Bumped version to 4.0.2.post

---
 lib/dul_hydra/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dul_hydra/version.rb b/lib/dul_hydra/version.rb
index bfdb3a5a..6c8b1a73 100644
--- a/lib/dul_hydra/version.rb
+++ b/lib/dul_hydra/version.rb
@@ -1,3 +1,3 @@
 module DulHydra
-  VERSION = "4.0.2"
+  VERSION = "4.0.2.post"
 end

From 0383293d69f59d660e297be8b823ef4834fe2783 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Tue, 25 Aug 2015 21:03:29 -0400
Subject: [PATCH 14/33] Adds rake task dul_hydra:index:reindex_all

The task reindexes all currently indexed objects.
---
 Gemfile                               |  2 +-
 Gemfile.lock                          |  4 ++--
 app/controllers/catalog_controller.rb | 30 +++++++++++++--------------
 lib/tasks/dul_hydra.rake              | 10 +++++++++
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5cfff095..906c8a10 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'rails', '~> 4.1.6'
 gem 'hydra-head', '~> 7.2.0'
 gem 'ddr-alerts', '~> 1.0.0'
-gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: '60736a57027e72da100dceefcd88fa9085575e34'
+gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: '9cfa285a6414c55746442a877397c4b734dfd689'
 gem 'rubydora', '>= 1.8.1'
 gem 'devise'
 gem 'deprecation'
diff --git a/Gemfile.lock b/Gemfile.lock
index 35b14d41..9007cfca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: git://github.com/duke-libraries/ddr-models.git
-  revision: 60736a57027e72da100dceefcd88fa9085575e34
-  ref: 60736a57027e72da100dceefcd88fa9085575e34
+  revision: 9cfa285a6414c55746442a877397c4b734dfd689
+  ref: 9cfa285a6414c55746442a877397c4b734dfd689
   specs:
     ddr-models (2.0.1.post)
       active-fedora (~> 7.0)
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index ca847a9b..5922a866 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -22,14 +22,14 @@ class CatalogController < ApplicationController
     }
 
     # solr field configuration for search results/index views
-    config.index.title_field = Ddr::IndexFields::TITLE
-    config.index.display_type_field = Ddr::IndexFields::ACTIVE_FEDORA_MODEL
+    config.index.title_field = Ddr::Index::Fields::TITLE
+    config.index.display_type_field = Ddr::Index::Fields::ACTIVE_FEDORA_MODEL
 
     config.index.thumbnail_method = :thumbnail_image_tag
 
     # solr field configuration for document/show views
-    config.show.title_field = Ddr::IndexFields::TITLE
-    config.show.display_type_field = Ddr::IndexFields::HAS_MODEL
+    config.show.title_field = Ddr::Index::Fields::TITLE
+    config.show.display_type_field = Ddr::Index::Fields::HAS_MODEL
 
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display
@@ -50,7 +50,7 @@ class CatalogController < ApplicationController
     #
     # :show may be set to false if you don't want the facet to be drawn in the
     # facet bar
-    config.add_facet_field Ddr::IndexFields::ACTIVE_FEDORA_MODEL, :label => 'Type'
+    config.add_facet_field Ddr::Index::Fields::ACTIVE_FEDORA_MODEL.to_s, :label => 'Type'
 
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request
@@ -61,16 +61,16 @@ class CatalogController < ApplicationController
 
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display
-    config.add_index_field Ddr::IndexFields::ACTIVE_FEDORA_MODEL, :label => 'Type'
-    config.add_index_field Ddr::IndexFields::PERMANENT_ID, :label => 'Permanent ID'
+    config.add_index_field Ddr::Index::Fields::ACTIVE_FEDORA_MODEL.to_s, :label => 'Type'
+    config.add_index_field Ddr::Index::Fields::PERMANENT_ID.to_s, :label => 'Permanent ID'
     config.add_index_field 'id', :label => 'Fedora PID'
-    config.add_index_field Ddr::IndexFields::IDENTIFIER_ALL, :label => 'Identifier'
+    config.add_index_field Ddr::Index::Fields::IDENTIFIER_ALL.to_s, :label => 'Identifier'
 
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display
-    config.add_show_field Ddr::IndexFields::ACTIVE_FEDORA_MODEL, :label => 'Type'
+    config.add_show_field Ddr::Index::Fields::ACTIVE_FEDORA_MODEL.to_s, :label => 'Type'
     config.add_show_field 'id', :label => 'PID'
-    config.add_show_field Ddr::IndexFields::IDENTIFIER_ALL, :label => 'Identifier'
+    config.add_show_field Ddr::Index::Fields::IDENTIFIER_ALL.to_s, :label => 'Identifier'
 
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields
@@ -91,7 +91,7 @@ class CatalogController < ApplicationController
     # since we aren't specifying it otherwise.
     config.add_search_field('all_fields', :label => 'All Fields') do |field|
       field.solr_local_parameters = {
-        :qf => "id #{Ddr::IndexFields::ACTIVE_FEDORA_MODEL} title_tesim creator_tesim subject_tesim description_tesim identifier_tesim #{Ddr::IndexFields::PERMANENT_ID}"
+        :qf => "id #{Ddr::Index::Fields::ACTIVE_FEDORA_MODEL} title_tesim creator_tesim subject_tesim description_tesim identifier_tesim #{Ddr::Index::Fields::PERMANENT_ID}"
       }
     end
 
@@ -115,13 +115,13 @@ class CatalogController < ApplicationController
 
     config.add_search_field('identifier') do |field|
       field.solr_local_parameters = {
-        :qf => Ddr::IndexFields::IDENTIFIER_ALL
+        :qf => Ddr::Index::Fields::IDENTIFIER_ALL
       }
     end
 
     config.add_search_field('permanent_id', label: 'Permanent ID') do |field|
       field.solr_local_parameters = {
-        :qf => Ddr::IndexFields::PERMANENT_ID
+        :qf => Ddr::Index::Fields::PERMANENT_ID
       }
     end
 
@@ -136,8 +136,8 @@ class CatalogController < ApplicationController
     # whether the sort is ascending or descending (it must be asc or desc
     # except in the relevancy case).
     config.add_sort_field 'score desc', :label => 'Relevance', :default_for_user_query => true
-    config.add_sort_field "#{Ddr::IndexFields::TITLE} asc", :label => 'Title', :default => true
-    config.add_sort_field "#{Ddr::IndexFields::LOCAL_ID} asc", :label => 'Local ID'
+    config.add_sort_field "#{Ddr::Index::Fields::TITLE} asc", :label => 'Title', :default => true
+    config.add_sort_field "#{Ddr::Index::Fields::LOCAL_ID} asc", :label => 'Local ID'
 
     # If there are more than this many search results, no spelling ("did you
     # mean") suggestion is offered.
diff --git a/lib/tasks/dul_hydra.rake b/lib/tasks/dul_hydra.rake
index a7f2edca..0b049e42 100644
--- a/lib/tasks/dul_hydra.rake
+++ b/lib/tasks/dul_hydra.rake
@@ -171,11 +171,21 @@ namespace :dul_hydra do
       Blacklight.solr.delete_by_query("*:*")
       Blacklight.solr.commit
     end
+
     desc "Index a single object in Solr specified by PID="
     task :update => :environment do
       raise "Must specify a pid. Ex: PID=changeme:12" unless ENV["PID"]
       ActiveFedora::Base.find(ENV["PID"]).update_index
     end
+
+    desc "Re-index all currently indexed objects"
+    task :reindex_all => :environment do
+      Ddr::Index.pids do |pid|
+        Resque.enqueue(DulHydra::Jobs::UpdateIndex, pid)
+      end
+      puts "All indexed object queued for re-indexing."
+    end
+
     desc "Index all objects in the repository (except fedora-system: objects)."
     task :update_all => :environment do
       conn = ActiveFedora::RubydoraConnection.new(ActiveFedora.config.credentials).connection

From 382c2aa84a6a1a65688e471a3b91861b7d81ed74 Mon Sep 17 00:00:00 2001
From: Jim Coble <jim.coble@duke.edu>
Date: Thu, 16 Jul 2015 13:59:18 -0400
Subject: [PATCH 15/33] Create batch update based on METS file; closes #1380.

---
 app/models/filesystem.rb                      |   6 +-
 app/models/mets_file.rb                       | 106 ++++++++
 app/models/mets_file_display_format.rb        |  13 +
 app/services/build_batch_from_mets_folder.rb  |  35 +++
 .../build_batch_object_from_mets_file.rb      | 133 ++++++++++
 app/services/inspect_mets_folder.rb           |  53 ++++
 app/services/inspect_simple_ingest.rb         |  15 +-
 app/services/scan_filesystem.rb               |   1 +
 app/services/validate_mets_file.rb            | 137 ++++++++++
 config/mets_folder.yml.sample                 |   6 +
 lib/dul_hydra/batch/models/batch.rb           |   2 +-
 lib/dul_hydra/batch/models/batch_object.rb    |   5 +
 .../batch/models/batch_object_datastream.rb   |   5 +-
 .../batch/models/update_batch_object.rb       |   4 +-
 .../scripts/create_pending_batch_script.rb    |  47 ++++
 .../scripts/metadata_folder_processor.rb      | 246 ------------------
 .../batch/scripts/process_mets_folder.rb      |  58 +++++
 lib/tasks/dul_hydra.rake                      |  50 +---
 spec/factories/batch_factories.rb             |   6 +
 .../batch_object_attributes_factories.rb      |   9 +
 spec/factories/batch_object_factories.rb      |  11 +
 spec/models/filesystem_spec.rb                |  27 +-
 spec/models/mets_file_display_format_spec.rb  |  41 +++
 spec/models/mets_file_spec.rb                 |  31 +++
 spec/models/update_batch_object_spec.rb       |   7 +
 .../scripts/metadata_folder_processor_spec.rb | 195 --------------
 .../build_batch_object_from_mets_file_spec.rb |  96 +++++++
 spec/services/validate_mets_file_spec.rb      | 131 ++++++++++
 spec/support/ingest_folder_helper.rb          |  16 +-
 spec/support/metadata_helper.rb               | 122 ++++++++-
 30 files changed, 1084 insertions(+), 530 deletions(-)
 create mode 100644 app/models/mets_file.rb
 create mode 100644 app/models/mets_file_display_format.rb
 create mode 100644 app/services/build_batch_from_mets_folder.rb
 create mode 100644 app/services/build_batch_object_from_mets_file.rb
 create mode 100644 app/services/inspect_mets_folder.rb
 create mode 100644 app/services/validate_mets_file.rb
 create mode 100644 config/mets_folder.yml.sample
 create mode 100644 lib/dul_hydra/batch/scripts/create_pending_batch_script.rb
 delete mode 100644 lib/dul_hydra/batch/scripts/metadata_folder_processor.rb
 create mode 100644 lib/dul_hydra/batch/scripts/process_mets_folder.rb
 create mode 100644 spec/models/mets_file_display_format_spec.rb
 create mode 100644 spec/models/mets_file_spec.rb
 delete mode 100644 spec/scripts/metadata_folder_processor_spec.rb
 create mode 100644 spec/services/build_batch_object_from_mets_file_spec.rb
 create mode 100644 spec/services/validate_mets_file_spec.rb

diff --git a/app/models/filesystem.rb b/app/models/filesystem.rb
index 5487b3e7..dd336e90 100644
--- a/app/models/filesystem.rb
+++ b/app/models/filesystem.rb
@@ -24,8 +24,10 @@ def self.node_locator(node)
     path_to_node(node, 'relative')
   end
 
-  def simple_ingest_filesystem?
-    !tree.each_leaf.any? { |leaf| leaf.node_depth != 2 }
+  def file_count
+    count = 0
+    each_leaf { |leaf| count += 1 }
+    count
   end
 
 end
\ No newline at end of file
diff --git a/app/models/mets_file.rb b/app/models/mets_file.rb
new file mode 100644
index 00000000..de2b0e76
--- /dev/null
+++ b/app/models/mets_file.rb
@@ -0,0 +1,106 @@
+class METSFile
+
+  attr_reader :filepath
+
+  COLLECTION_ID_SEPARATOR = '_'
+  DISPLAY_FORMAT_TYPE_SEPARATOR = ':'
+
+  def initialize(filepath, collection=nil)
+    @filepath = filepath
+    @collection = collection
+  end
+
+  def local_id
+    @local_id ||= id_attr.split(COLLECTION_ID_SEPARATOR).last
+  end
+
+  def collection_id
+    @collection_id ||= id_attr.split(COLLECTION_ID_SEPARATOR).first
+  end
+
+  def collection
+    @collection ||= ActiveFedora::Base.find(Ddr::Utils.pid_for_identifier(collection_id), model: 'Collection')
+  end
+
+  def repo_pid
+    @repo_pid ||= Ddr::Utils.pid_for_identifier(local_id, collection: collection)
+  end
+
+  def repo_model
+    @repo_model ||= model(repo_pid)
+  end
+
+  def root_type_attr
+    @root_type_attr ||= mets_doc.root.attr('TYPE')
+  end
+
+  def header_agent_id
+    @header_agent_id ||= mets_hdr_agent_id_attr.value if mets_hdr_agent_id_attr
+  end
+
+  def dmd_secs
+    @dmd_secs ||= mets_doc.xpath('//dmdSec')
+  end
+
+  def dmd_sec
+    dmd_secs.first
+  end
+
+  def desc_metadata
+    @desc_metadata ||= dmd_sec.xpath('mdWrap/xmlData').children
+  end
+
+  def desc_metadata_attributes_values
+    desc_metadata.map { |node| { node.name => node.content } }
+  end
+
+  def struct_maps
+    @struct_maps ||= mets_doc.xpath('//structMap')
+  end
+
+  def struct_map
+    struct_maps.first
+  end
+
+  def struct_metadata
+    @struct_metadata ||= struct_map.xpath('div')
+  end
+
+  private
+
+  def mets_doc
+    @mets_doc ||= file_xml_doc
+  end
+
+  def file_xml_doc
+    raw = File.read(filepath)
+    Nokogiri::XML(clean_namespace(raw)) { |config| config.noblanks }
+  end
+
+  def clean_namespace(source)
+    source.gsub(%q[xmlns:dcterms="http://purl.org/dc/terms"], %q[xmlns:dcterms="http://purl.org/dc/terms/"])
+  end
+
+  def id_attr
+    @id_attr ||= mets_doc.root.attr('ID')
+  end
+
+  def model(pid)
+    q = ActiveFedora::SolrService.construct_query_for_pids([ pid ])
+    r = ActiveFedora::SolrService.query(q)
+    r.first[Ddr::IndexFields::ACTIVE_FEDORA_MODEL] unless r.empty?
+  end
+
+  def mets_hdr
+    @mets_hdr ||= mets_doc.xpath('//metsHdr')
+  end
+
+  def mets_hdr_agent
+    @mets_hdr_agent ||= mets_hdr.xpath('agent') if mets_hdr
+  end
+
+  def mets_hdr_agent_id_attr
+    @mets_hdr_agent_id_attr ||= mets_hdr_agent.attr('ID') if mets_hdr_agent
+  end
+
+end
\ No newline at end of file
diff --git a/app/models/mets_file_display_format.rb b/app/models/mets_file_display_format.rb
new file mode 100644
index 00000000..55e0d2dc
--- /dev/null
+++ b/app/models/mets_file_display_format.rb
@@ -0,0 +1,13 @@
+class METSFileDisplayFormat
+
+  class << self
+    attr_accessor :display_format_translations
+  end
+
+  def self.get(mets_file, display_formats)
+    return if mets_file.root_type_attr.blank?
+    type_attr = mets_file.root_type_attr.split(':').last.downcase
+    display_formats[type_attr] || type_attr
+  end
+
+end
diff --git a/app/services/build_batch_from_mets_folder.rb b/app/services/build_batch_from_mets_folder.rb
new file mode 100644
index 00000000..8024ab90
--- /dev/null
+++ b/app/services/build_batch_from_mets_folder.rb
@@ -0,0 +1,35 @@
+class BuildBatchFromMETSFolder
+
+  attr_reader :batch_user, :filesystem, :batch_name, :batch_description, :display_formats
+  attr_accessor :batch, :collection
+
+  def initialize(batch_user:, filesystem:, collection:, batch_name: 'METS Folder', batch_description: nil, display_formats: {})
+    @batch_user = batch_user
+    @filesystem = filesystem
+    @collection = collection
+    @batch_name = batch_name
+    @batch_description = batch_description
+    @display_formats = display_formats
+  end
+
+  def call
+    @batch = create_batch
+    traverse_filesystem
+    batch.update_attributes(status: DulHydra::Batch::Models::Batch::STATUS_READY)
+    batch
+  end
+
+  private
+
+  def create_batch
+    DulHydra::Batch::Models::Batch.create(user: batch_user, name: batch_name, description: batch_description)
+  end
+
+  def traverse_filesystem
+    filesystem.tree.each_leaf do |leaf|
+      mets_file = METSFile.new(Filesystem.path_to_node(leaf), collection)
+      BuildBatchObjectFromMETSFile.new(batch: batch, mets_file: mets_file, display_formats: display_formats).call
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/app/services/build_batch_object_from_mets_file.rb b/app/services/build_batch_object_from_mets_file.rb
new file mode 100644
index 00000000..0ca638d1
--- /dev/null
+++ b/app/services/build_batch_object_from_mets_file.rb
@@ -0,0 +1,133 @@
+class BuildBatchObjectFromMETSFile
+
+  attr_reader :batch, :mets_file, :display_formats
+
+  def initialize(batch:, mets_file:, display_formats: {})
+    @batch = batch
+    @mets_file = mets_file
+    @display_formats = display_formats
+  end
+
+  def call
+    create_update_object
+  end
+
+  private
+
+  def create_update_object
+    update_object = DulHydra::Batch::Models::UpdateBatchObject.create(batch: batch, pid: mets_file.repo_pid, identifier: mets_file.local_id)
+    add_local_id(update_object) if mets_file.local_id.present?
+    if display_format = METSFileDisplayFormat.get(mets_file, display_formats)
+      add_display_format(update_object, display_format)
+    end
+    add_research_help_contact(update_object) if mets_file.repo_model == 'Collection' && mets_file.header_agent_id.present?
+    add_desc_metadata(update_object) if mets_file.desc_metadata.present?
+    add_struct_metadata(update_object) if mets_file.struct_metadata.present?
+    update_object
+  end
+
+  def add_local_id(update_object)
+    DulHydra::Batch::Models::BatchObjectAttribute.create(
+      batch_object: update_object,
+      datastream: Ddr::Datastreams::ADMIN_METADATA,
+      name: 'local_id',
+      operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR)
+    DulHydra::Batch::Models::BatchObjectAttribute.create(
+      batch_object: update_object,
+      datastream: Ddr::Datastreams::ADMIN_METADATA,
+      name: 'local_id',
+      value: mets_file.local_id,
+      value_type: DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING,
+      operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD)
+  end
+
+  def add_display_format(update_object, display_format)
+    DulHydra::Batch::Models::BatchObjectAttribute.create(
+      batch_object: update_object,
+      datastream: Ddr::Datastreams::ADMIN_METADATA,
+      name: 'display_format',
+      operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR)
+    DulHydra::Batch::Models::BatchObjectAttribute.create(
+      batch_object: update_object,
+      datastream: Ddr::Datastreams::ADMIN_METADATA,
+      name: 'display_format',
+      value: display_format,
+      value_type: DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING,
+      operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD)
+  end
+
+  def add_research_help_contact(update_object)
+    DulHydra::Batch::Models::BatchObjectAttribute.create(
+      batch_object: update_object,
+      datastream: Ddr::Datastreams::ADMIN_METADATA,
+      name: 'research_contact',
+      operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR)
+    DulHydra::Batch::Models::BatchObjectAttribute.create(
+      batch_object: update_object,
+      datastream: Ddr::Datastreams::ADMIN_METADATA,
+      name: 'research_help_contact',
+      value: mets_file.header_agent_id,
+      value_type: DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING,
+      operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD)
+  end
+
+  def add_desc_metadata(update_object)
+    # To replicate existing behavior, which is that the metadata harvested from the metadata
+    # folder completely replaces the existing metadata, first we need a directive to clear out
+    # all existing metadata
+    DulHydra::Batch::Models::BatchObjectAttribute.create(
+      batch_object: update_object,
+      datastream: Ddr::Datastreams::DESC_METADATA,
+      operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR_ALL
+      )
+    # Now we create the directives to add the attribute values from the METS file
+    mets_file.desc_metadata_attributes_values.each do |entry|
+      attr_name = entry.keys.first
+      DulHydra::Batch::Models::BatchObjectAttribute.create(
+        batch_object: update_object,
+        datastream: Ddr::Datastreams::DESC_METADATA,
+        operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
+        name: attr_name,
+        value: entry[attr_name],
+        value_type: DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING
+        )
+    end
+  end
+
+  def add_struct_metadata(update_object)
+    DulHydra::Batch::Models::BatchObjectDatastream.create(
+      batch_object: update_object,
+      name: Ddr::Datastreams::STRUCT_METADATA,
+      operation: DulHydra::Batch::Models::BatchObjectDatastream::OPERATION_ADDUPDATE,
+      payload: translate_struct_map(mets_file.struct_metadata),
+      payload_type: DulHydra::Batch::Models::BatchObjectDatastream::PAYLOAD_TYPE_BYTES)
+  end
+
+  def translate_struct_map(mets_file_struct_map)
+    structure = Ddr::Models::Structure.new(Ddr::Models::Structure.template)
+    mets_file_struct_map.each do |node|
+      add_to_struct_map(structure, node)
+    end
+    structure.to_xml
+  end
+
+  def add_to_struct_map(stru, node)
+    div = create_div(stru, node)
+    create_fptr(stru, div, Ddr::Utils.pid_for_identifier(div['ID']))
+  end
+
+  def create_div(stru, node)
+    div = Nokogiri::XML::Node.new('div', stru.as_xml_document)
+    node_attrs = node.attributes
+    node_attrs.keys.each { |k| div[k] = node_attrs[k] }
+    stru.structMap_node('default').add_child(div)
+    div
+  end
+
+  def create_fptr(stru, div, pid)
+    fptr = Nokogiri::XML::Node.new('fptr', stru.as_xml_document)
+    fptr['CONTENTIDS'] = "info:fedora/#{pid}"
+    div.add_child(fptr)
+  end
+
+end
\ No newline at end of file
diff --git a/app/services/inspect_mets_folder.rb b/app/services/inspect_mets_folder.rb
new file mode 100644
index 00000000..f65a707c
--- /dev/null
+++ b/app/services/inspect_mets_folder.rb
@@ -0,0 +1,53 @@
+class InspectMETSFolder
+
+  attr_accessor :results
+  attr_reader :folder, :collection, :scanner_config
+
+  Results = Struct.new(:file_count, :exclusions, :filesystem, :warnings, :errors)
+
+  def initialize(folder, collection, scanner_config={})
+    @folder = folder
+    @collection = collection
+    @scanner_config = scanner_config
+    @results = Results.new
+  end
+
+  def call
+    inspect_folder
+    results
+  end
+
+  private
+
+  def inspect_folder
+    validate_folderpath
+    scan_results = ScanFilesystem.new(folder, scanner_config).call
+    raise DulHydra::BatchError, "#{folder} does not appear to be a valid METS folder" unless mets_folder?(scan_results.filesystem)
+    results.warnings, results.errors = validate_mets_files(scan_results.filesystem)
+    results.file_count = scan_results.filesystem.file_count
+    results.exclusions = scan_results.exclusions
+    results.filesystem = scan_results.filesystem
+  end
+
+  def validate_folderpath
+    raise DulHydra::BatchError, "#{folder} not found or is not a directory" unless Dir.exist?(folder)
+    raise DulHydra::BatchError, "#{folder} is not readable" unless File.readable?(folder)
+  end
+
+  def mets_folder?(filesystem)
+    !filesystem.tree.each_leaf.any? { |leaf| File.extname(leaf.name) != '.xml' }
+  end
+
+  def validate_mets_files(filesystem)
+    warnings = []
+    errors = []
+    filesystem.tree.each_leaf do |leaf|
+      mets_file = METSFile.new(Filesystem.path_to_node(leaf), collection)
+      validation_results = ValidateMETSFile.new(mets_file).call
+      warnings += validation_results.warnings
+      errors += validation_results.errors
+    end
+    [ warnings, errors ]
+  end
+
+end
\ No newline at end of file
diff --git a/app/services/inspect_simple_ingest.rb b/app/services/inspect_simple_ingest.rb
index dffdaf8e..0e90dec2 100644
--- a/app/services/inspect_simple_ingest.rb
+++ b/app/services/inspect_simple_ingest.rb
@@ -26,8 +26,8 @@ def load_configuration(config_file)
   def inspect_filesystem
     validate_datapath
     scan_results = ScanFilesystem.new(datapath, scanner_config).call
-    raise DulHydra::BatchError, "#{datapath} is not a valid simple ingest directory" unless scan_results.filesystem.simple_ingest_filesystem?
-    results.file_count = file_count(scan_results.filesystem)
+    raise DulHydra::BatchError, "#{datapath} is not a valid simple ingest directory" unless simple_ingest_filesystem?(scan_results.filesystem)
+    results.file_count = scan_results.filesystem.file_count
     results.exclusions = scan_results.exclusions
     results.content_model_stats = content_model_stats(scan_results.filesystem)
     results.filesystem = scan_results.filesystem
@@ -42,12 +42,6 @@ def validate_datapath
     raise DulHydra::BatchError, "#{datapath} is not readable" unless File.readable?(datapath)
   end
 
-  def file_count(filesystem)
-    count = 0
-    filesystem.each_leaf { |leaf| count += 1 }
-    count
-  end
-
   def content_model_stats(filesystem)
     collections = items = components = 0
     filesystem.each do |n|
@@ -63,4 +57,9 @@ def content_model_stats(filesystem)
     { collections: collections, items: items, components: components }
   end
 
+  def simple_ingest_filesystem?(filesystem)
+    !filesystem.tree.each_leaf.any? { |leaf| leaf.node_depth != 2 }
+  end
+
+
 end
diff --git a/app/services/scan_filesystem.rb b/app/services/scan_filesystem.rb
index b5ad488f..046232a8 100644
--- a/app/services/scan_filesystem.rb
+++ b/app/services/scan_filesystem.rb
@@ -38,6 +38,7 @@ def scan_files(dirpath, node)
 
   def handle_entry(dirpath, node, entry)
     child_node = Tree::TreeNode.new(entry)
+    child_node.content = {}
     node << child_node
     entry_path = File.join(dirpath, entry)
     handle_directory(entry_path, child_node) if File.directory?(entry_path)
diff --git a/app/services/validate_mets_file.rb b/app/services/validate_mets_file.rb
new file mode 100644
index 00000000..b99b9f0d
--- /dev/null
+++ b/app/services/validate_mets_file.rb
@@ -0,0 +1,137 @@
+class ValidateMETSFile
+
+  attr_accessor :results
+  attr_reader :mets_file
+
+  Results = Struct.new(:warnings, :errors)
+
+  METADATA_NAMESPACES = { "dcterms"=>"http://purl.org/dc/terms/", "duke"=>"http://library.duke.edu/metadata/terms" }
+
+  def initialize(mets_file)
+    @mets_file = mets_file
+    @results = Results.new
+    results.warnings = []
+    results.errors = []
+  end
+
+  def call
+    validate_file
+  end
+
+  private
+
+  def validate_file
+    validate_repository_match
+    validate_root_type_attribute
+    validate_desc_metadata
+    validate_struct_metadata
+    results
+  end
+
+  def validate_repository_match
+    warning("Repository object not found for local id #{mets_file.local_id}") unless mets_file.repo_pid.present?
+  end
+
+  def validate_root_type_attribute
+    warning('Missing TYPE attribute on root node') unless mets_file.root_type_attr.present?
+  end
+
+  def validate_desc_metadata
+    case mets_file.dmd_secs.size
+    when 0
+      warning("No dmdSec")
+    when 1
+      validate_dmd_sec
+    else
+      error("Multiple dmdSecs")
+    end
+  end
+
+  def validate_dmd_sec
+    mets_file.desc_metadata.each do |node|
+      validate_dmd_namespace(node)
+      validate_dmd_attributes(node)
+      validate_dmd_elements(node)
+    end
+  end
+
+  def validate_dmd_namespace(node)
+    namespace = node.namespace
+    unless namespace.present?
+      error("Node #{node.name} does not have a namespace")
+    else
+      unless METADATA_NAMESPACES.keys.include?(namespace.prefix)
+        error("Node #{node.name} has unknown namespace prefix: #{namespace.prefix}")
+      else
+        unless namespace.href == METADATA_NAMESPACES[namespace.prefix]
+          error("Node #{node.name} with namespace prefix #{namespace.prefix} has invalid href #{namespace.href}")
+        end
+      end
+    end
+  end
+
+  def validate_dmd_attributes(node)
+    unless node.attributes.empty?
+      node.attributes.keys.each do |attr_name|
+        warning("Node #{node.name} has attribute: #{attr_name}")
+      end
+    end
+  end
+
+  def validate_dmd_elements(node)
+    if node.namespace.present?
+      vocabulary = case node.namespace.prefix
+      when "dcterms"
+        RDF::DC
+      when "duke"
+        Ddr::Vocab::DukeTerms
+      end
+      if vocabulary.present?
+        unless Ddr::Vocab::Vocabulary.term_names(vocabulary).include?(node.name.to_sym)
+          error("Unknown element name #{node.name}")
+        end
+      else
+        warning("Cannot validate element name #{node.name} in namespace #{node.namespace.prefix}")
+      end
+    else
+      warning("Cannot validate element name #{node.name}")
+    end
+  end
+
+  def validate_struct_metadata
+    case mets_file.struct_maps.size
+    when 0
+      warning("No structMap")
+    when 1
+      validate_struct_map
+    else
+      error("Multiple structMaps")
+    end
+  end
+
+  def validate_struct_map
+    mets_file.struct_metadata.each do |node|
+      validate_div(node)
+    end
+  end
+
+  def validate_div(node)
+    div_id_attr = node.attr('ID')
+    if div_id_attr.present?
+      unless Ddr::Utils.pid_for_identifier(div_id_attr)
+        error("Unable to locate repository object for div ID #{div_id_attr}")
+      end
+    else
+      error("Div does not have ID attribute")
+    end
+  end
+
+  def error(message)
+    results.errors << "#{mets_file.filepath}: #{message}"
+  end
+
+  def warning(message)
+    results.warnings << "#{mets_file.filepath}: #{message}"
+  end
+
+end
\ No newline at end of file
diff --git a/config/mets_folder.yml.sample b/config/mets_folder.yml.sample
new file mode 100644
index 00000000..e8699ded
--- /dev/null
+++ b/config/mets_folder.yml.sample
@@ -0,0 +1,6 @@
+:scanner:
+    :exclude:
+        - .DS_Store
+        - Thumbs.db
+:display_format:
+    slideshow: multi_image
\ No newline at end of file
diff --git a/lib/dul_hydra/batch/models/batch.rb b/lib/dul_hydra/batch/models/batch.rb
index 0fec619a..0b1f589d 100644
--- a/lib/dul_hydra/batch/models/batch.rb
+++ b/lib/dul_hydra/batch/models/batch.rb
@@ -29,7 +29,7 @@ def validate
           end
         end
       rescue Exception => e
-        errors << "Exception raised during batch validation: #{e}"
+        errors << "Exception raised during batch validation: #{e.backtrace}"
       end
       errors.flatten
     end
diff --git a/lib/dul_hydra/batch/models/batch_object.rb b/lib/dul_hydra/batch/models/batch_object.rb
index a2c9f021..8657579b 100644
--- a/lib/dul_hydra/batch/models/batch_object.rb
+++ b/lib/dul_hydra/batch/models/batch_object.rb
@@ -233,6 +233,11 @@ def add_attribute(repo_object, attribute)
       return repo_object
     end
 
+    def clear_attribute(repo_object, attribute)
+      repo_object.datastreams[attribute.datastream].set_values(attribute.name, nil)
+      return repo_object
+    end
+
     def clear_attributes(repo_object, attribute)
       repo_object.datastreams[attribute.datastream].class.term_names.each do |term|
         repo_object.datastreams[attribute.datastream].set_values(term, nil) if repo_object.datastreams[attribute.datastream].values(term)
diff --git a/lib/dul_hydra/batch/models/batch_object_datastream.rb b/lib/dul_hydra/batch/models/batch_object_datastream.rb
index f35aef5d..47466035 100644
--- a/lib/dul_hydra/batch/models/batch_object_datastream.rb
+++ b/lib/dul_hydra/batch/models/batch_object_datastream.rb
@@ -1,12 +1,13 @@
 module DulHydra::Batch::Models
 
   class BatchObjectDatastream < ActiveRecord::Base
-#    attr_accessible :name, :operation, :payload, :payload_type, :checksum, :checksum_type, :batch_object
+
     belongs_to :batch_object, :inverse_of => :batch_object_datastreams
 
     DATASTREAMS = [ Ddr::Datastreams::CONTENT,
                     Ddr::Datastreams::DESC_METADATA,
-                    Ddr::Datastreams::RIGHTS_METADATA ]
+                    Ddr::Datastreams::RIGHTS_METADATA,
+                    Ddr::Datastreams::STRUCT_METADATA ]
 
     OPERATION_ADD = "ADD" # add this datastream to the object -- considered an error if datastream already exists
     OPERATION_ADDUPDATE = "ADDUPDATE" # add this datastream to or update this datastream in the object
diff --git a/lib/dul_hydra/batch/models/update_batch_object.rb b/lib/dul_hydra/batch/models/update_batch_object.rb
index e648adec..d4019e43 100644
--- a/lib/dul_hydra/batch/models/update_batch_object.rb
+++ b/lib/dul_hydra/batch/models/update_batch_object.rb
@@ -64,6 +64,8 @@ def update_repository_object(user, opts = {})
           repo_object = case
           when a.operation.eql?(DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD)
             add_attribute(repo_object, a)
+          when a.operation.eql?(DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR)
+            clear_attribute(repo_object, a)
           when a.operation.eql?(DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR_ALL)
             clear_attributes(repo_object, a)
           end
@@ -78,7 +80,7 @@ def update_repository_object(user, opts = {})
           repo_object.notify_event(:update, user: user, comment: event_log_comment)
         end
       rescue Exception => e
-        logger.error("Error in updating repository object #{repo_object.pid} for #{identifier} : : #{e}")
+        logger.error("Error in updating repository object #{pid} for #{identifier} : : #{e}")
         if batch.present?
           batch.status = DulHydra::Batch::Models::Batch::STATUS_RESTARTABLE
           batch.save
diff --git a/lib/dul_hydra/batch/scripts/create_pending_batch_script.rb b/lib/dul_hydra/batch/scripts/create_pending_batch_script.rb
new file mode 100644
index 00000000..2a1a6be3
--- /dev/null
+++ b/lib/dul_hydra/batch/scripts/create_pending_batch_script.rb
@@ -0,0 +1,47 @@
+module DulHydra
+  module Batch
+    module Scripts
+
+      class CreatePendingBatchScript
+
+        def load_configuration(config_file)
+          YAML::load(File.read(config_file)).symbolize_keys
+        end
+
+        def user_options
+          options = {}
+          options['p'] = "Create pending batch"
+          options['x'] = "Cancel operation"
+          options
+        end
+
+        def prompt_user
+          user_options.each { |k, v| puts "#{k} - #{v}" }
+          get_user_choice
+        end
+
+        def get_user_choice
+          input = ""
+          while true do
+            print "Enter #{user_options.keys.join(', ')} : "
+            input = STDIN.gets.strip
+            break if user_options.keys.include?(input.downcase)
+          end
+          input.downcase
+        end
+
+        def respond_to_user_choice(choice, batch_args={})
+          case choice
+          when 'p'
+            batch = build_batch(batch_args)
+            puts "Created pending batch #{batch.id} for user #{batch.user.user_key}"
+          when 'x'
+            puts "Cancelling operation"
+          end
+        end
+
+      end
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/lib/dul_hydra/batch/scripts/metadata_folder_processor.rb b/lib/dul_hydra/batch/scripts/metadata_folder_processor.rb
deleted file mode 100644
index 4c5eefd6..00000000
--- a/lib/dul_hydra/batch/scripts/metadata_folder_processor.rb
+++ /dev/null
@@ -1,246 +0,0 @@
-require 'log4r'
-
-module DulHydra::Batch::Scripts
-  class MetadataFolderProcessor
-
-    include ActionView::Helpers::TextHelper
-
-    attr_accessor :errors, :scanner, :warnings
-    attr_reader :batch_user, :collection, :folder, :logger
-
-    INCLUDED_EXTENSIONS = [ '.xml' ]
-    COLLECTION_ID_SEPARATOR = '_'
-    VALID_NAMESPACE_DECLARATION_KEYS = [ "xmlns:dcterms", "xmlns:duke", "xmlns:xlink", "xmlns:xsi" ]
-    METADATA_NAMESPACES = { "dcterms"=>"http://purl.org/dc/terms/", "duke"=>"http://library.duke.edu/metadata/terms" }
-
-    def initialize(opts={})
-      @logger = Log4r::Logger.new('metadata_file')
-      logger.outputters << Log4r::Outputter.stdout
-      @folder = opts.fetch(:folder)
-      @collection = find_collection(opts[:collection]) if opts[:collection].present?
-      @batch_user = find_user(opts[:batch_user]) if opts[:batch_user].present?
-      @scanner = {}
-      @warnings = 0
-      @errors = 0
-    end
-
-    def scan
-      logger.info("Scanning #{folder}")
-      scan_files(folder)
-      logger.info(report)
-    end
-
-    def report
-      raise "Nothing to report.  Maybe you need to run 'scan' first?" if scanner.empty?
-      rep = []
-      rep << "Metadata Folder Scan"
-      rep << "Scanned #{folder}"
-      rep << "Found #{pluralize(scanner.keys.count, 'file')}"
-      rep << "Found #{pluralize(count_dmdsecs, 'descriptive metadata section')}"
-      if collection.present?
-        rep << "Collection #{collection.title_display} has #{pluralize(collection.items.count, 'item')}"
-      end
-      rep << "Scan generated #{pluralize(warnings, 'WARNING', 'WARNINGS')} and #{pluralize(errors, 'ERROR', 'ERRORS')}"
-      rep.join("\n")
-    end
-
-    def create_batch
-      batch = DulHydra::Batch::Models::Batch.create(user: batch_user, name: 'Metadata Folder', description: folder)
-      scanner.keys.each do |file_loc|
-        scanner[file_loc].keys.each do |dmdsec_id|
-          create_batch_object(batch, scanner[file_loc][dmdsec_id])
-        end
-      end
-      batch.update_attributes(status: DulHydra::Batch::Models::Batch::STATUS_READY)
-      batch
-    end
-
-    private
-
-    def create_batch_object(batch, scanner_object)
-      batch_object = DulHydra::Batch::Models::UpdateBatchObject.create(
-                        batch: batch,
-                        identifier: scanner_object[:id],
-                        pid: scanner_object[:pid]
-                        )
-      create_batch_object_md_attributes(batch_object, scanner_object)
-    end
-
-    def create_batch_object_md_attributes(batch_object, scanner_object)
-      # To replicate existing behavior, which is that the metadata harvested from the metadata
-      # folder completely replaces the existing metadata, first we need a directive to clear out
-      # all existing metadata
-      DulHydra::Batch::Models::BatchObjectAttribute.create(
-        batch_object: batch_object,
-        datastream: Ddr::Datastreams::DESC_METADATA,
-        operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR_ALL
-        )
-      # Now we create the directives to add the attribute values harvested from the metadata
-      # folder
-      scanner_object[:md].each do |attribute_hash|
-        attribute_hash.each do |key, value|
-          DulHydra::Batch::Models::BatchObjectAttribute.create(
-            batch_object: batch_object,
-            datastream: Ddr::Datastreams::DESC_METADATA,
-            operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
-            name: key,
-            value: value,
-            value_type: DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING
-            )
-        end
-      end
-    end
-
-    def scan_files(dirpath)
-      enumerator = Dir.foreach(dirpath)
-      enumerator.each do |entry|
-        unless [".", ".."].include?(entry)
-          @file_loc = File.join(dirpath, entry)
-          if File.directory?(@file_loc)
-            scan_files(@file_loc)
-          else
-            harvest_metadata
-          end
-        end
-      end
-    end
-
-    def harvest_metadata
-      if INCLUDED_EXTENSIONS.include?(File.extname(@file_loc))
-        scanner[@file_loc] = {}
-        doc = file_xml
-        doc.xpath("//dmdSec").each do |dmdsec|
-          dmdsec_id = dmdsec.attr("ID")
-          obj_id = dmdsec_id.include?(COLLECTION_ID_SEPARATOR) ?
-                    dmdsec_id.partition(COLLECTION_ID_SEPARATOR).last :
-                    dmdsec_id
-          begin
-            obj_pid = Ddr::Utils.pid_for_identifier(obj_id, collection: collection)
-            warning("Repository object not found for identifier #{obj_id} in #{abbrev_file_loc}") unless obj_pid.present?
-          rescue Ddr::Models::Error => e
-            error(e.message)
-          end
-          source_metadata = dmdsec.xpath("mdWrap/xmlData")
-          validate_source(source_metadata)
-          obj_md = object_metadata(source_metadata, obj_id, obj_pid)
-          scanner[@file_loc][dmdsec_id] = { id: obj_id, pid: obj_pid, md: obj_md }
-        end
-      end
-    end
-
-    def object_metadata(xml_metadata, identifier, pid)
-      obj_md = []
-      obj_md << { "identifier" => identifier }
-      nodeset = xml_metadata.children
-      nodeset.each do |node|
-        if Ddr::Datastreams::DescriptiveMetadataDatastream.term_names.include? node.name.to_sym
-          obj_md << { node.name => node.content }
-        else
-          error("Error adding value for #{node.name} element to descriptive metadata: No such term: #{node.name}")
-        end
-      end
-      obj_md
-    end
-
-    def validate_source(source_metadata)
-      nodeset = source_metadata.children
-      nodeset.each do |node|
-        validate_namespace(node)
-        validate_attributes(node)
-        validate_elements(node)
-      end
-    end
-
-    def validate_elements(node)
-      if node.namespace.present?
-        vocabulary = case node.namespace.prefix
-        when "dcterms"
-          RDF::DC
-        when "duke"
-          Ddr::Vocab::DukeTerms
-        end
-        if vocabulary.present?
-          unless Ddr::Vocab::Vocabulary.term_names(vocabulary).include?(node.name.to_sym)
-            error("Unknown element name #{node.name} in #{abbrev_file_loc}")
-          end
-        else
-          warning("Cannot validate element name #{node.name} in namespace #{node.namespace.prefix} in #{abbrev_file_loc}")
-        end
-      else
-        warning("Cannot validate element name #{node.name} in #{abbrev_file_loc}")
-      end
-    end
-
-    def validate_attributes(node)
-      unless node.attributes.empty?
-        node.attributes.keys.each do |attr_name|
-          warning("Node #{node.name} in #{abbrev_file_loc} has attribute: #{attr_name}")
-        end
-      end
-    end
-
-    def validate_namespace(node)
-      namespace = node.namespace
-      unless namespace.present?
-        error("Node #{node.name} in #{abbrev_file_loc} does not have a namespace")
-      else
-        unless METADATA_NAMESPACES.keys.include?(namespace.prefix)
-          error("Node #{node.name} in #{abbrev_file_loc} has unknown namespace prefix: #{namespace.prefix}")
-        else
-          unless namespace.href == METADATA_NAMESPACES[namespace.prefix]
-            error("Node #{node.name} in #{abbrev_file_loc} with namespace prefix #{namespace.prefix} has invalid href #{namespace.href}")
-          end
-        end
-      end
-    end
-
-    def file_xml
-      raw = File.read(@file_loc)
-      doc = Nokogiri::XML(clean_namespace(raw)) { |config| config.noblanks }
-      doc
-    end
-
-    def clean_namespace(source)
-      source.gsub(%q[xmlns:dcterms="http://purl.org/dc/terms"], %q[xmlns:dcterms="http://purl.org/dc/terms/"])
-    end
-
-    def count_dmdsecs
-      count = 0
-      scanner.each_key { |key| count += scanner[key].keys.count }
-      count
-    end
-
-    def find_collection(collection_option)
-      case
-      when collection_option.is_a?(Collection)
-        collection_option
-      when collection_option.is_a?(String)
-        Collection.find(collection_option)
-      end
-    end
-
-    def find_user(user_option)
-      case
-      when user_option.is_a?(User)
-        user_option
-      when user_option.is_a?(String)
-        User.find_by_user_key(user_option)
-      end
-    end
-
-    def abbrev_file_loc
-      @file_loc.sub(/#{Regexp.quote(folder)}\/?/, '')
-    end
-
-    def warning(message)
-      logger.warn(message)
-      @warnings += 1
-    end
-
-    def error(message)
-      logger.error(message)
-      @errors += 1
-    end
-
-  end
-end
diff --git a/lib/dul_hydra/batch/scripts/process_mets_folder.rb b/lib/dul_hydra/batch/scripts/process_mets_folder.rb
new file mode 100644
index 00000000..aac8fec7
--- /dev/null
+++ b/lib/dul_hydra/batch/scripts/process_mets_folder.rb
@@ -0,0 +1,58 @@
+module DulHydra
+  module Batch
+    module Scripts
+
+      class ProcessMETSFolder < CreatePendingBatchScript
+
+        include ActionView::Helpers::TextHelper
+
+        attr_reader :batch_user, :collection, :configuration, :folder
+
+        DEFAULT_CONFIG_FILE = Rails.root.join('config', 'mets_folder.yml')
+
+        def initialize(batch_user:, folder:, collection_pid:, config_file: DEFAULT_CONFIG_FILE)
+          puts "Using config file #{config_file}"
+          @batch_user = User.find_by_user_key(batch_user)
+          raise DulHydra::BatchError, "Unable to find user #{batch_user}" unless @batch_user.present?
+          @collection = Collection.find(collection_pid)
+          @configuration = load_configuration(config_file)
+          @folder = folder
+        end
+
+        def execute
+          inspection_results = inspect_folder
+          user_choice = prompt_user
+          respond_to_user_choice(user_choice, { filesystem: inspection_results.filesystem })
+        end
+
+        private
+
+        def inspect_folder
+          results = InspectMETSFolder.new(folder, collection, configuration[:scanner]).call
+          puts "Inspected #{results.filesystem.root.name}"
+          puts "Found #{results.file_count} files"
+          unless results.exclusions.empty?
+            puts "Excluding #{results.exclusions.join(', ')}"
+          end
+          results.warnings.each { |warn| puts "WARNING: #{warn}" }
+          results.errors.each { |err| puts "ERROR: #{err}" }
+          puts "Inspection generated #{pluralize(results.warnings.size, 'WARNING', 'WARNINGS')} and #{pluralize(results.errors.size, 'ERROR', 'ERRORS')}"
+          results
+        end
+
+        def build_batch(batch_args)
+          filesystem = batch_args[:filesystem]
+          batch_builder = BuildBatchFromMETSFolder.new(
+                              batch_user: batch_user,
+                              filesystem: filesystem,
+                              collection: collection,
+                              batch_description: filesystem.root.name,
+                              display_formats: configuration[:display_format])
+          batch = batch_builder.call
+        end
+
+      end
+
+    end
+  end
+end
diff --git a/lib/tasks/dul_hydra.rake b/lib/tasks/dul_hydra.rake
index a7f2edca..be5d0188 100644
--- a/lib/tasks/dul_hydra.rake
+++ b/lib/tasks/dul_hydra.rake
@@ -59,49 +59,17 @@ namespace :dul_hydra do
       processor = DulHydra::Batch::Scripts::ProcessSimpleIngest.new(processor_args)
       processor.execute
     end
-    desc "Creates descriptive metadata update batch from folder of METS files"
+    desc "Creates update batch from folder of METS files"
     task :mets_folder => :environment do
       raise "Must specify folder path. Ex.: FOLDER=/path/to/METS/folder" unless ENV['FOLDER']
-      operator_key = "#{ENV['USER']}@duke.edu"
-      operator = User.find_by_user_key(operator_key)
-      batch_user = ENV['BATCH_USER'].present? ? User.find_by_user_key(ENV['BATCH_USER']) : operator
-      unless batch_user.present?
-        raise "Unable to find batch user: #{ENV['BATCH_USER'].present? ? ENV['BATCH_USER'] : operator_key}"
-      end
-      args = {
-        folder: ENV['FOLDER'],
-        batch_user: batch_user,
-        collection: ENV['COLLECTION']
-      }
-      script = DulHydra::Batch::Scripts::MetadataFolderProcessor.new(args)
-      script.scan
-      options = {}
-      options['p'] = "Create pending batch"
-      options['s'] = "Create batch and submit for processing" if operator.present?
-      options['x'] = "Cancel operation"
-      options.each { |k, v| STDOUT.puts "#{k} - #{v}" }
-      input = ""
-      while true do
-        STDOUT.print "Enter #{options.keys.join(', ')} : "
-        input = STDIN.gets.strip
-        unless options.include?(input.downcase)
-          next
-        end
-        case input.downcase
-        when "p"
-          batch = script.create_batch
-          STDOUT.puts "Created pending batch #{batch.id} for user #{args[:user]}"
-        when "s"
-          STDOUT.puts "Creating batch and submitting for processing"
-          batch = script.create_batch
-          STDOUT.puts "Created batch #{batch.id} for user #{args[:user]}"
-          Resque.enqueue(DulHydra::Batch::Jobs::BatchProcessorJob, batch.id, operator.id)
-          STDOUT.puts "Submitted batch #{batch.id} for processing"
-        when "x"
-          STDOUT.puts "Cancelling operation"
-        end
-        break
-      end
+      raise "Must specify batch user.  Ex.: BATCH_USER=tom@school.edu" unless ENV['BATCH_USER']
+      raise "Must specify collection PID.  Ex: COLLECTION_PID=duke:72" unless ENV['COLLECTION_PID']
+      processor_args = { folder: ENV['FOLDER'] }
+      processor_args[:batch_user] = ENV['BATCH_USER']
+      processor_args[:collection_pid] = ENV['COLLECTION_PID']
+      processor_args[:config_file] = ENV['CONFIG_FILE'] if ENV['CONFIG_FILE']
+      processor = DulHydra::Batch::Scripts::ProcessMETSFolder.new(processor_args)
+      processor.execute
     end
     desc "Converts CSV file to one or more XML files"
     task :csv_to_xml => :environment do
diff --git a/spec/factories/batch_factories.rb b/spec/factories/batch_factories.rb
index c9799f67..510377a3 100644
--- a/spec/factories/batch_factories.rb
+++ b/spec/factories/batch_factories.rb
@@ -28,6 +28,12 @@
       end
     end
 
+    factory :batch_with_basic_clear_attribute_batch_object do
+      after(:create) do |batch|
+        FactoryGirl.create(:basic_update_clear_attribute_batch_object, batch: batch)
+      end
+    end
+
     factory :batch_with_basic_clear_all_and_add_batch_object do
       after(:create) do |batch|
         FactoryGirl.create(:basic_clear_all_and_add_batch_object, :batch => batch)
diff --git a/spec/factories/batch_object_attributes_factories.rb b/spec/factories/batch_object_attributes_factories.rb
index 179d608a..c3da9ac9 100644
--- a/spec/factories/batch_object_attributes_factories.rb
+++ b/spec/factories/batch_object_attributes_factories.rb
@@ -13,6 +13,15 @@
 
     end
 
+    factory :batch_object_clear_attribute do
+      operation DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR
+
+      factory :batch_object_clear_desc_metadata_attribute do
+        datastream Ddr::Datastreams::DESC_METADATA
+        name 'title'
+      end
+    end
+
     factory :batch_object_clear_all_attribute do
       operation DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR_ALL
 
diff --git a/spec/factories/batch_object_factories.rb b/spec/factories/batch_object_factories.rb
index 715691a3..ec6892a2 100644
--- a/spec/factories/batch_object_factories.rb
+++ b/spec/factories/batch_object_factories.rb
@@ -65,6 +65,12 @@
     end
   end
 
+  trait :with_clear_desc_metadata_attribute do
+    after(:create) do |batch_object|
+      FactoryGirl.create(:batch_object_clear_desc_metadata_attribute, batch_object: batch_object)
+    end
+  end
+
   trait :with_clear_all_desc_metadata do
     after(:create) do |batch_object|
       FactoryGirl.create(:batch_object_clear_all_desc_metadata, batch_object: batch_object)
@@ -116,6 +122,11 @@
       with_add_desc_metadata_attributes
     end
 
+    factory :basic_update_clear_attribute_batch_object do
+      has_model
+      with_clear_desc_metadata_attribute
+    end
+
     factory :basic_clear_all_and_add_batch_object do
       has_model
       with_clear_all_desc_metadata
diff --git a/spec/models/filesystem_spec.rb b/spec/models/filesystem_spec.rb
index db6e0e08..be8496bd 100644
--- a/spec/models/filesystem_spec.rb
+++ b/spec/models/filesystem_spec.rb
@@ -48,31 +48,8 @@
     end
     context 'method not missing' do
       it 'should not send the method to the inner tree' do
-        expect(filesystem.tree).to_not receive(:simple_ingest_filesystem?)
-        filesystem.simple_ingest_filesystem?
-      end
-    end
-  end
-
-  describe '#simple_ingest_filesystem?' do
-    context 'is simple ingest filesystem' do
-      before { filesystem.tree = filesystem_simple_ingest }
-      it "should be true" do
-        expect(filesystem.simple_ingest_filesystem?).to be true
-      end
-    end
-    context 'is not simple ingest filesystem' do
-      context 'too shallow' do
-        before { filesystem.tree = sample_filesystem }
-        it "should be false" do
-          expect(filesystem.simple_ingest_filesystem?).to be false        
-        end
-      end
-      context 'too deep' do
-        before { filesystem.tree = filesystem_three_deep }
-        it "should be false" do
-          expect(filesystem.simple_ingest_filesystem?).to be false        
-        end
+        expect(filesystem.tree).to_not receive(:file_count)
+        filesystem.file_count
       end
     end
   end
diff --git a/spec/models/mets_file_display_format_spec.rb b/spec/models/mets_file_display_format_spec.rb
new file mode 100644
index 00000000..4bac8dcb
--- /dev/null
+++ b/spec/models/mets_file_display_format_spec.rb
@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+RSpec.describe METSFileDisplayFormat, type: :model, batch: true, mets_file: true do
+
+  let(:collection) { Collection.new }
+  let(:mets_filepath) { '/tmp/mets.xml' }
+  let(:mets_file) { METSFile.new(mets_filepath, collection) }
+  let(:display_formats) { { 'slideshow' => 'multi_image' } }
+
+  before { allow(File).to receive(:read).with(mets_filepath) { sample_mets_xml } }
+
+  context "no type attribute" do
+    before { allow(mets_file).to receive(:root_type_attr) { nil } }
+    it "should provide nothing" do
+      expect(METSFileDisplayFormat.get(mets_file, display_formats)).to be_nil
+    end
+  end
+
+  context "translated type attribute" do
+    before { allow(mets_file).to receive(:root_type_attr) { 'Resource:slideshow' } }
+    it "should provide the translated display format" do
+      expect(METSFileDisplayFormat.get(mets_file, display_formats)).to eq('multi_image')
+    end
+  end
+
+  context "non-translated type attribute" do
+    context "non-resource type attribute" do
+      before { allow(mets_file).to receive(:root_type_attr) { 'Collection' } }
+      it "should provide the downcased type attribute" do
+        expect(METSFileDisplayFormat.get(mets_file, display_formats)).to eq('collection')
+      end
+    end
+    context "resource type attribute" do
+      before { allow(mets_file).to receive(:root_type_attr) { 'Resource:image' } }
+      it "should provide the downcased type attribute minus the resource designation" do
+        expect(METSFileDisplayFormat.get(mets_file, display_formats)).to eq('image')
+      end
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/spec/models/mets_file_spec.rb b/spec/models/mets_file_spec.rb
new file mode 100644
index 00000000..1e3da98d
--- /dev/null
+++ b/spec/models/mets_file_spec.rb
@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+RSpec.describe METSFile, type: :model, batch: true, mets_file: true do
+
+  let(:collection) { Collection.new }
+  let(:mets_filepath) { '/tmp/mets.xml' }
+  let(:subject) { METSFile.new(mets_filepath, collection) }
+
+  before do
+    allow(File).to receive(:read).with(mets_filepath) { sample_mets_xml }
+    allow(Ddr::Utils).to receive(:pid_for_identifier) { 'test:5' }
+    allow(ActiveFedora::SolrService).to receive(:query).with("_query_:\"{!raw f=id}test:5\"") { [ { "active_fedora_model_ssi"=>"Item" } ] }
+  end
+
+  its(:local_id) { is_expected.to eq('efghi01003') }
+  its(:collection_id) { is_expected.to eq('abcd') }
+  its(:collection) { is_expected.to eq(collection) }
+  its(:repo_pid) { is_expected.to eq('test:5') }
+  its(:repo_model) { is_expected.to eq('Item') }
+  its(:root_type_attr) { is_expected.to eq('Resource:slideshow') }
+  its(:header_agent_id) { is_expected.to eq('library')}
+
+  # public methods currently untested
+  # dmd_secs
+  # dmd_sec
+  # desc_metadata
+  # struct_maps
+  # struct_map
+  # struct_metadata
+
+end
\ No newline at end of file
diff --git a/spec/models/update_batch_object_spec.rb b/spec/models/update_batch_object_spec.rb
index e2172b7d..f025737e 100644
--- a/spec/models/update_batch_object_spec.rb
+++ b/spec/models/update_batch_object_spec.rb
@@ -79,6 +79,13 @@ module DulHydra::Batch::Models
             expect(repo_object.title).to eq( [ 'Test Model Title', 'Test Object Title' ] )
           end
         end
+        context "clear" do
+          let(:batch) { FactoryGirl.create(:batch_with_basic_clear_attribute_batch_object) }
+          it_behaves_like "a loggable event has occurred"
+          it "should clear the attribute in the repository object" do
+            expect(repo_object.title).to be_empty
+          end
+        end
         # Can't really test just clearing all attributes because can't save datastream with no content
         context "clear all and add" do
           let(:batch) { FactoryGirl.create(:batch_with_basic_clear_all_and_add_batch_object) }
diff --git a/spec/scripts/metadata_folder_processor_spec.rb b/spec/scripts/metadata_folder_processor_spec.rb
deleted file mode 100644
index d324a050..00000000
--- a/spec/scripts/metadata_folder_processor_spec.rb
+++ /dev/null
@@ -1,195 +0,0 @@
-require 'spec_helper'
-require 'rdf/isomorphic'
-
-include RDF::Isomorphic
-
-module DulHydra::Batch::Scripts
-
-  describe MetadataFolderProcessor do
-
-    let(:folder) { "/tmp" }
-
-    describe "#initialize" do
-      context "folder" do
-        context "no folder" do
-          it "should raise an exception" do
-            expect { described_class.new }.to raise_error
-          end
-        end
-      end
-      context "collection" do
-        let(:collection) { FactoryGirl.create(:collection) }
-        context "pid" do
-          it "should have a collection attribute containing the appropriate collection" do
-            expect(described_class.new({ folder: folder, collection: collection.pid }).collection).to eq(collection)
-          end
-        end
-        context "object" do
-          it 'should have a collection attribute containing the appropriate collection' do
-            expect(described_class.new({ folder: folder, collection: collection }).collection).to eq(collection)
-          end
-        end
-      end
-      context "user" do
-        let(:user) { FactoryGirl.create(:user) }
-        context "user key" do
-          it 'should have a user attribute set to the appropriate user' do
-            expect(described_class.new({ folder: folder, batch_user: user.user_key }).batch_user).to eq(user)
-          end
-        end
-        context "object" do
-          it 'should have a user attribute set to the appropriate user' do
-            expect(described_class.new({ folder: folder, batch_user: user }).batch_user).to eq(user)
-          end
-        end
-      end
-      context "logger" do
-        it "should have a logger" do
-          expect(described_class.new({ folder: folder }).logger).to_not be_nil
-        end
-      end
-    end
-
-    describe "#scan" do
-      let(:mfp) { described_class.new({ folder: folder }) }
-      let(:object) { FactoryGirl.create(:test_model) }
-      before do
-        object.update_attributes(identifier: [ "efghi01003"] )
-        allow(Dir).to receive(:foreach).and_call_original
-        allow(Dir).to receive(:foreach).with(folder).and_return(["md.xml"].each)
-        allow(File).to receive(:directory?).and_call_original
-        allow(File).to receive(:directory?).with(File.join(folder, "md.xml")).and_return(false)
-        allow(File).to receive(:read).and_call_original
-      end
-      context "no warnings or errors" do
-        let(:expected_md_array) { sample_metadata_array << { "identifier" => "efghi01003" } }
-        before do
-          allow(File).to receive(:read).with(File.join(folder, "md.xml")).and_return(sample_mets_xml)
-        end
-        it "should populate the scanner hash appropriately" do
-          mfp.scan
-          expect(mfp.scanner.keys).to eq( [ File.join(folder, "md.xml") ] )
-          dmdsecs = mfp.scanner[File.join(folder, "md.xml")]
-          expect(dmdsecs.keys).to eq( [ "abcd_efghi01003" ] )
-          dmdsec = dmdsecs["abcd_efghi01003"]
-          expect(dmdsec[:id]).to eq("efghi01003")
-          expect(dmdsec[:pid]).to eq(object.pid)
-          expect(dmdsec[:md]).to match_array(expected_md_array)
-        end
-        it "should not report any warnings or errors" do
-          expect(mfp.logger).to receive(:info).exactly(2).times
-          expect(mfp.logger).to_not receive(:warn)
-          expect(mfp.logger).to_not receive(:error)
-          mfp.scan
-          expect(mfp.report).to include("0 WARNINGS and 0 ERRORS")
-        end
-      end
-      context "element has attribute" do
-        before { allow(File).to receive(:read).with(File.join(folder, "md.xml")).and_return(sample_mets_with_element_attribute) }
-        it "should report a warning" do
-          expect(mfp.logger).to receive(:info).exactly(2).times
-          expect(mfp.logger).to receive(:warn).with("Node extent in md.xml has attribute: unit")
-          expect(mfp.logger).to_not receive(:error)
-          mfp.scan
-          expect(mfp.report).to include("1 WARNING and 0 ERRORS")
-        end
-      end
-      context "element has unknown vocabulary term" do
-        before { allow(File).to receive(:read).with(File.join(folder, "md.xml")).and_return(sample_mets_with_unknown_duketerm) }
-        it "should report an error" do
-          expect(mfp.logger).to receive(:info).exactly(2).times
-          expect(mfp.logger).to_not receive(:warn)
-          expect(mfp.logger).to receive(:error).with("Unknown element name unknown in md.xml")
-          expect(mfp.logger).to receive(:error).with("Error adding value for unknown element to descriptive metadata: No such term: unknown")
-          mfp.scan
-          expect(mfp.report).to include("0 WARNINGS and 2 ERRORS")
-        end
-      end
-      context "element with no namespace" do
-        before { allow(File).to receive(:read).with(File.join(folder, "md.xml")).and_return(sample_mets_with_no_namespace_element) }
-        it "should report an error" do
-          expect(mfp.logger).to receive(:info).exactly(2).times
-          expect(mfp.logger).to receive(:warn).with("Cannot validate element name abstract in md.xml")
-          expect(mfp.logger).to receive(:error).with("Node abstract in md.xml does not have a namespace")
-          mfp.scan
-          expect(mfp.report).to include("1 WARNING and 1 ERROR")
-        end
-      end
-      context "element with unknown namespace" do
-        before { allow(File).to receive(:read).with(File.join(folder, "md.xml")).and_return(sample_mets_with_unknown_namespace) }
-        it "should report an error" do
-          expect(mfp.logger).to receive(:info).exactly(2).times
-          expect(mfp.logger).to receive(:warn).with("Cannot validate element name extent in namespace special in md.xml")
-          expect(mfp.logger).to receive(:error).with("Node extent in md.xml has unknown namespace prefix: special")
-          mfp.scan
-          expect(mfp.report).to include("1 WARNING and 1 ERROR")
-        end
-      end
-      context "element with invalid namespace href" do
-        before { allow(File).to receive(:read).with(File.join(folder, "md.xml")).and_return(sample_mets_with_invalid_namespace_href) }
-        it "should report an error" do
-          expect(mfp.logger).to receive(:info).exactly(2).times
-          expect(mfp.logger).to_not receive(:warn)
-          expect(mfp.logger).to receive(:error).with("Node dcmitype in md.xml with namespace prefix duke has invalid href http://library.duke.edu/metadata/duketerms")
-          mfp.scan
-          expect(mfp.report).to include("0 WARNINGS and 1 ERROR")
-        end
-      end
-    end
-
-    describe "#report" do
-      context "scan not run" do
-        let(:mfp) { described_class.new({ folder: folder }) }
-        it "should raise an exception" do
-          expect { mfp.report }.to raise_error
-        end
-      end
-      context "scan run" do
-        let(:collection) { FactoryGirl.create(:collection) }
-        let(:mfp) { described_class.new({ folder: folder, collection: collection }).tap { |p| p.scanner = scanner_hash } }
-        let(:scanner_hash) { { "/tmp/a.xml" => { "sec_1" => { id: "id_1", pid: collection.pid, md: "testing" } } } }
-        it "should provide the appropriate data" do
-          report = mfp.report
-          expect(report).to include("Metadata Folder Scan")
-          expect(report).to include("Scanned #{folder}")
-          expect(report).to include("Found #{scanner_hash.keys.count} file")
-          expect(report).to include("Found 1 descriptive metadata section")
-          expect(report).to include("Collection #{collection.title_display} has #{collection.items.count} item")
-          expect(report).to include("Scan generated 0 WARNINGS and 0 ERRORS")
-        end
-      end
-    end
-
-    describe "#create_batch" do
-      let(:user) { FactoryGirl.create(:user) }
-      let(:object) { { id: "id_1", pid: "test:1" } }
-      let(:mfp) { described_class.new({ folder: folder, batch_user: user }).tap { |p| p.scanner = scanner_hash } }
-      let(:scanner_hash) { { "/tmp/a.xml" => { "sec_1" => { id: object[:id], pid: object[:pid], md: [ { "title" => "testing" } ] } } } }
-      it "should create the appropriate batch" do
-        batch = mfp.create_batch
-        expect(batch.status).to eq(DulHydra::Batch::Models::Batch::STATUS_READY)
-        expect(batch.user).to eq(user)
-        expect(batch.name).to eq("Metadata Folder")
-        expect(batch.description).to eq(folder)
-        expect(batch.batch_objects.size).to eq(1)
-        batch_object = batch.batch_objects.first
-        expect(batch_object).to be_a(DulHydra::Batch::Models::UpdateBatchObject)
-        expect(batch_object.identifier).to eq(object[:id])
-        expect(batch_object.pid).to eq(object[:pid])
-        expect(batch_object.batch_object_attributes.size).to eq(2)
-        batch_object.batch_object_attributes.each { |boa| puts "#{boa.id} #{boa.created_at.inspect}" }
-        attribute = batch_object.batch_object_attributes.first
-        expect(attribute.datastream).to eq(Ddr::Datastreams::DESC_METADATA)
-        expect(attribute.operation).to eq(DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR_ALL)
-        attribute = batch_object.batch_object_attributes.last
-        expect(attribute.datastream).to eq(Ddr::Datastreams::DESC_METADATA)
-        expect(attribute.operation).to eq(DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD)
-        expect(attribute.name).to eq("title")
-        expect(attribute.value).to eq("testing")
-        expect(attribute.value_type).to eq(DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING)
-      end
-    end
-
-  end
-
-end
diff --git a/spec/services/build_batch_object_from_mets_file_spec.rb b/spec/services/build_batch_object_from_mets_file_spec.rb
new file mode 100644
index 00000000..8b956a59
--- /dev/null
+++ b/spec/services/build_batch_object_from_mets_file_spec.rb
@@ -0,0 +1,96 @@
+require 'spec_helper'
+
+RSpec.describe BuildBatchObjectFromMETSFile, type: :service, batch: true, mets_file: true do
+
+  let(:collection) { Collection.new }
+  let(:mets_filepath) { '/tmp/mets.xml' }
+  let(:mets_file) { METSFile.new(mets_filepath, collection) }
+  let(:display_formats) { { 'slideshow' => 'multi_image' } }
+  let(:batch) { DulHydra::Batch::Models::Batch.new }
+  let(:service) { BuildBatchObjectFromMETSFile.new(batch: batch, mets_file: mets_file, display_formats: display_formats) }
+
+  before do
+    allow(File).to receive(:read).with(mets_filepath) { sample_mets_xml }
+    allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi01003', collection: collection) { 'test:7' }
+    allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi010030010') { 'test:19' }
+    allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi010030020') { 'test:20' }
+  end
+
+  context "batch object" do
+    it "should create an UpdateBatchObject for the batch" do
+      batch_object = service.call
+      expect(batch_object).to be_a(DulHydra::Batch::Models::UpdateBatchObject)
+      expect(batch_object.batch).to eq(batch)
+    end
+  end
+
+  context "local id" do
+    it "should clear and re-assign the local id" do
+      batch_object = service.call
+      attrs = batch_object.batch_object_attributes
+      clear_attrs = attrs.where(datastream: Ddr::Datastreams::ADMIN_METADATA,
+                                operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR,
+                                name: 'local_id')
+      add_attrs = attrs.where(datastream: Ddr::Datastreams::ADMIN_METADATA,
+                              operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
+                              name: 'local_id',
+                              value: 'efghi01003')
+      expect(clear_attrs.size).to eq(1)
+      expect(add_attrs.size).to eq(1)
+      expect(clear_attrs.first.id).to be < add_attrs.first.id
+    end
+  end
+
+  context "display format" do
+    it "should clear and re-assign the display format" do
+      batch_object = service.call
+      attrs = batch_object.batch_object_attributes
+      clear_attrs = attrs.where(datastream: Ddr::Datastreams::ADMIN_METADATA,
+                                operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR,
+                                name: 'display_format')
+      add_attrs = attrs.where(datastream: Ddr::Datastreams::ADMIN_METADATA,
+                              operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
+                              name: 'display_format',
+                              value: 'multi_image')
+      expect(clear_attrs.size).to eq(1)
+      expect(add_attrs.size).to eq(1)
+      expect(clear_attrs.first.id).to be < add_attrs.first.id
+    end
+  end
+
+  context "descriptive metadata" do
+    it "should clear and re-assign all descriptive metadata" do
+      batch_object = service.call
+      attrs = batch_object.batch_object_attributes
+      clear_all_attrs = attrs.where(datastream: Ddr::Datastreams::DESC_METADATA,
+                                    operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR_ALL)
+      add_attrs = attrs.where(datastream: Ddr::Datastreams::DESC_METADATA,
+                              operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD).order('id')
+      add_spatial_1_attrs = attrs.where(datastream: Ddr::Datastreams::DESC_METADATA,
+                                        operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
+                                        name: 'spatial',
+                                        value: 'Durham County (NC)')
+      add_spatial_2_attrs = attrs.where(datastream: Ddr::Datastreams::DESC_METADATA,
+                                        operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
+                                        name: 'spatial',
+                                        value: 'Durham (NC)')
+      expect(clear_all_attrs.size).to eq(1)
+      expect(add_attrs.size).to eq(11)
+      expect(clear_all_attrs.first.id).to be < add_attrs.first.id
+      expect(add_spatial_1_attrs.size).to eq(1)
+      expect(add_spatial_2_attrs.size).to eq(1)
+    end
+  end
+
+  context "structural metadata" do
+    it "should populate the structural metadata datastream" do
+      batch_object = service.call
+      dss = batch_object.batch_object_datastreams
+      add_update_dss = dss.where(name: Ddr::Datastreams::STRUCT_METADATA,
+                                 operation: DulHydra::Batch::Models::BatchObjectDatastream::OPERATION_ADDUPDATE)
+      expect(add_update_dss.size).to eq(1)
+      expect(add_update_dss.first.payload).to be_equivalent_to(sample_xml_struct_metadata)
+    end
+  end
+
+end
diff --git a/spec/services/validate_mets_file_spec.rb b/spec/services/validate_mets_file_spec.rb
new file mode 100644
index 00000000..5e82204d
--- /dev/null
+++ b/spec/services/validate_mets_file_spec.rb
@@ -0,0 +1,131 @@
+require 'spec_helper'
+
+RSpec.describe ValidateMETSFile, type: :service, batch: true, mets_file: true do
+
+  let(:collection) { Collection.new }
+  let(:mets_filepath) { '/tmp/mets.xml' }
+  let(:mets_file) { METSFile.new(mets_filepath, collection) }
+  let(:validation_service) { described_class.new(mets_file) }
+
+  before { allow(Ddr::Utils).to receive(:pid_for_identifier).and_call_original }
+
+  context "valid file" do
+    before do
+      allow(File).to receive(:read).with(mets_filepath) { sample_mets_xml }
+      allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi01003', collection: collection) { 'test:5' }
+      allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi010030010') { 'test:7' }
+      allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi010030020') { 'test:8' }
+    end
+    it "should return no errors or warnings" do
+      results = validation_service.call
+      expect(results.errors).to be_empty
+      expect(results.warnings).to be_empty
+    end
+  end
+
+  context "invalid file" do
+    context "no matching repository object" do
+      before do
+        allow(File).to receive(:read).with(mets_filepath) { sample_mets_xml }
+        allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi01003', collection: collection) { nil }
+        allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi010030010') { 'test:7' }
+      end
+      it "should return a warning" do
+        results = validation_service.call
+        expect(results.warnings).to include("#{mets_file.filepath}: Repository object not found for local id #{mets_file.local_id}")
+      end
+    end
+    context "invalid descriptive metadata" do
+      context "element has attribute" do
+        before do
+          allow(File).to receive(:read).with(mets_filepath) { sample_mets_with_element_attribute }
+          allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi01003', collection: collection) { 'test:5' }
+        end
+        it "should return a warning" do
+          results = validation_service.call
+          expect(results.warnings).to include("#{mets_file.filepath}: Node extent has attribute: unit")
+        end
+      end
+      context "element has unknown vocabulary term" do
+        before do
+          allow(File).to receive(:read).with(mets_filepath) { sample_mets_with_unknown_duketerm }
+          allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi01003', collection: collection) { 'test:5' }
+        end
+        it "should report an error" do
+          results = validation_service.call
+          expect(results.errors).to include("#{mets_file.filepath}: Unknown element name unknown")
+        end
+      end
+      context "element with no namespace" do
+        before do
+          allow(File).to receive(:read).with(mets_filepath) { sample_mets_with_no_namespace_element }
+          allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi01003', collection: collection) { 'test:5' }
+        end
+        it "should report a warning and an error" do
+          results = validation_service.call
+          expect(results.warnings).to include("#{mets_file.filepath}: Cannot validate element name abstract")
+          expect(results.errors).to include("#{mets_file.filepath}: Node abstract does not have a namespace")
+        end
+      end
+      context "element with unknown namespace" do
+        before do
+          allow(File).to receive(:read).with(mets_filepath) { sample_mets_with_unknown_namespace }
+          allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi01003', collection: collection) { 'test:5' }
+        end
+        it "should report a warning and an error" do
+          results = validation_service.call
+          expect(results.warnings).to include("#{mets_file.filepath}: Cannot validate element name extent in namespace special")
+          expect(results.errors).to include("#{mets_file.filepath}: Node extent has unknown namespace prefix: special")
+        end
+      end
+      context "element with invalid namespace href" do
+        before do
+          allow(File).to receive(:read).with(mets_filepath) { sample_mets_with_invalid_namespace_href }
+          allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi01003', collection: collection) { 'test:5' }
+        end
+        it "should report an error" do
+          results = validation_service.call
+          expect(results.errors).to include("#{mets_file.filepath}: Node dcmitype with namespace prefix duke has invalid href http://library.duke.edu/metadata/duketerms")
+        end
+      end
+    end
+    context "missing root type attribute" do
+      before do
+        allow(File).to receive(:read).with(mets_filepath) { sample_mets_xml_with_missing_type_attr }
+        allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi01003', collection: collection) { 'test:5' }
+      end
+      it "should report a warning" do
+        results = validation_service.call
+        expect(results.warnings).to include("#{mets_file.filepath}: Missing TYPE attribute on root node")
+      end
+    end
+  end
+  context "invalid struct metadata" do
+    context "missing ID attribute" do
+      before do
+        allow(File).to receive(:read).with(mets_filepath) { sample_mets_xml_with_missing_div_id_attr }
+        # allow(Ddr::Utils).to receive(:pid_for_identifier).and_call_original
+        allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi01003', collection: collection) { 'test:5' }
+        allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi010030010') { 'test:7' }
+      end
+      it "should report a warning" do
+        results = validation_service.call
+        expect(results.errors).to include("#{mets_file.filepath}: Div does not have ID attribute")
+      end
+    end
+    context "no repository object matching ID attribute" do
+      context "missing ID attribute" do
+        before do
+          allow(File).to receive(:read).with(mets_filepath) { sample_mets_xml }
+          allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi01003', collection: collection) { 'test:5' }
+          allow(Ddr::Utils).to receive(:pid_for_identifier).with('efghi010030010') { nil }
+        end
+        it "should report a warning" do
+          results = validation_service.call
+          expect(results.errors).to include("#{mets_file.filepath}: Unable to locate repository object for div ID efghi010030010")
+        end
+      end
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/spec/support/ingest_folder_helper.rb b/spec/support/ingest_folder_helper.rb
index 063eaeb4..c354caab 100644
--- a/spec/support/ingest_folder_helper.rb
+++ b/spec/support/ingest_folder_helper.rb
@@ -62,15 +62,15 @@ def simple_ingest_configuration
 
 def sample_filesystem
   root_node = Tree::TreeNode.new('/test/directory')
-  root_node << Tree::TreeNode.new('movie.mp4')
-  root_node << Tree::TreeNode.new('file01001.tif')
-  itemA_node = Tree::TreeNode.new('itemA')
-  itemA_node << Tree::TreeNode.new('file01.pdf')
-  itemA_node << Tree::TreeNode.new('track01.wav')
+  root_node << Tree::TreeNode.new('movie.mp4', {})
+  root_node << Tree::TreeNode.new('file01001.tif', {})
+  itemA_node = Tree::TreeNode.new('itemA', {})
+  itemA_node << Tree::TreeNode.new('file01.pdf', {})
+  itemA_node << Tree::TreeNode.new('track01.wav', {})
   root_node << itemA_node
-  itemB_node = Tree::TreeNode.new('itemB')
-  itemB_node << Tree::TreeNode.new('file02.pdf')
-  itemB_node << Tree::TreeNode.new('track02.wav')
+  itemB_node = Tree::TreeNode.new('itemB', {})
+  itemB_node << Tree::TreeNode.new('file02.pdf', {})
+  itemB_node << Tree::TreeNode.new('track02.wav', {})
   root_node << itemB_node
   root_node
 end
diff --git a/spec/support/metadata_helper.rb b/spec/support/metadata_helper.rb
index 22da4b4a..47736222 100644
--- a/spec/support/metadata_helper.rb
+++ b/spec/support/metadata_helper.rb
@@ -36,14 +36,66 @@ def sample_mets_xml
           <dcterms:rights>The copyright for these materials is unknown.</dcterms:rights>
           <duke:print_number>12-345-6</duke:print_number>
           <duke:series>Photographic Materials Series</duke:series>
-          <duke:subseries>Local Court House</duke:series>
+          <duke:subseries>Local Court House</duke:subseries>
         </xmlData>
       </mdWrap>
     </dmdSec>
+    <fileSec>
+      <fileGrp ID="efghi010030010" USE="DEFAULT">
+        <file USE="THUMBNAIL" ID="efghi010030010-thm">
+          <FLocat LOCTYPE="URL" xlink:href="http://library.university.edu/media/abcd/thm/efghi010030010.jpg"/>
+        </file>
+        <file USE="MEDIUM" ID="efghi010030010-med">
+          <FLocat LOCTYPE="URL" xlink:href="http://library.university.edu/media/abcd/med/efghi010030010.jpg"/>
+        </file>
+        <file USE="LARGE" ID="efghi010030010-lrg">
+          <FLocat LOCTYPE="URL" xlink:href="http://library.university.edu/media/abcd/lrg/efghi010030010.jpg"/>
+        </file>
+      </fileGrp>
+      <fileGrp ID="efghi010030020">
+        <file USE="THUMBNAIL" ID="efghi010030020-thm">
+          <FLocat LOCTYPE="URL" xlink:href="http://library.university.edu/media/abcd/thm/efghi010030020.jpg"/>
+        </file>
+        <file USE="MEDIUM" ID="efghi010030020-med">
+          <FLocat LOCTYPE="URL" xlink:href="http://library.university.edu/media/abcd/med/efghi010030020.jpg"/>
+        </file>
+        <file USE="LARGE" ID="efghi010030020-lrg">
+          <FLocat LOCTYPE="URL" xlink:href="http://library.university.edu/media/abcd/lrg/efghi010030020.jpg"/>
+        </file>
+      </fileGrp>
+    </fileSec>
+    <structMap>
+      <div LABEL="1" TYPE="Image" ID="efghi010030010" ORDER="1">
+        <fptr fileID="efghi010030010-thm"/>
+        <fptr fileID="efghi010030010-med"/>
+        <fptr fileID="efghi010030010-lrg"/>
+      </div>
+      <div LABEL="2" TYPE="Image" ID="efghi010030020" ORDER="2">
+        <fptr fileID="efghi010030020-thm"/>
+        <fptr fileID="efghi010030020-med"/>
+        <fptr fileID="efghi010030020-lrg"/>
+      </div>
+    </structMap>
   </mets>
   EOS
 end
 
+def sample_xml_struct_metadata
+  xml = <<-EOS
+    <?xml version="1.0"?>
+    <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
+      <structMap TYPE="default">
+        <div LABEL="1" TYPE="Image" ID="efghi010030010" ORDER="1">
+          <fptr CONTENTIDS="info:fedora/test:19"/>
+        </div>
+        <div LABEL="2" TYPE="Image" ID="efghi010030020" ORDER="2">
+          <fptr CONTENTIDS="info:fedora/test:20"/>
+        </div>
+      </structMap>
+    </mets>
+  EOS
+end
+
 def sample_mets_with_element_attribute
   xml = <<-EOS
   <mets xmlns:duke="http://library.duke.edu/metadata/terms" xmlns:dcterms="http://purl.org/dc/terms" xmlns:xlink="http://www.w3.org/TR/xlink/" ID="abcd_efghi01003" TYPE="Resource:slideshow">
@@ -153,3 +205,71 @@ def sample_mets_with_invalid_namespace_href
   </mets>
   EOS
 end
+
+def sample_mets_xml_with_missing_type_attr
+  xml = <<-EOS
+  <mets xmlns:duke="http://library.duke.edu/metadata/terms" xmlns:dcterms="http://purl.org/dc/terms" xmlns:xlink="http://www.w3.org/TR/xlink/" ID="abcd_efghi01003">
+    <metsHdr>
+      <agent ID="library" ROLE="CUSTODIAN">
+        <name>Library</name>
+      </agent>
+    </metsHdr>
+    <dmdSec ID="abcd_efghi01003">
+      <mdWrap>
+        <xmlData>
+          <dcterms:title>Sample title</dcterms:title>
+          <dcterms:creator>Sample, Example</dcterms:creator>
+          <dcterms:type>Image</dcterms:type>
+          <dcterms:type>Still Image</dcterms:type>
+          <dcterms:spatial>Durham County (NC)</dcterms:spatial>
+          <dcterms:spatial>Durham (NC)</dcterms:spatial>
+          <dcterms:date>1981-01</dcterms:date>
+          <dcterms:rights>The copyright for these materials is unknown.</dcterms:rights>
+          <duke:print_number>12-345-6</duke:print_number>
+          <duke:series>Photographic Materials Series</duke:series>
+          <duke:subseries>Local Court House</duke:series>
+        </xmlData>
+      </mdWrap>
+    </dmdSec>
+  </mets>
+  EOS
+end
+
+def sample_mets_xml_with_missing_div_id_attr
+  xml = <<-EOS
+  <mets xmlns:duke="http://library.duke.edu/metadata/terms" xmlns:dcterms="http://purl.org/dc/terms" xmlns:xlink="http://www.w3.org/TR/xlink/" ID="abcd_efghi01003" TYPE="Resource:slideshow">
+    <metsHdr>
+      <agent ID="library" ROLE="CUSTODIAN">
+        <name>Library</name>
+      </agent>
+    </metsHdr>
+    <dmdSec ID="abcd_efghi01003">
+      <mdWrap>
+        <xmlData>
+          <dcterms:title>Sample title</dcterms:title>
+        </xmlData>
+      </mdWrap>
+    </dmdSec>
+    <fileSec>
+      <fileGrp ID="efghi010030010" USE="DEFAULT">
+        <file USE="THUMBNAIL" ID="efghi010030010-thm">
+          <FLocat LOCTYPE="URL" xlink:href="http://library.university.edu/media/abcd/thm/efghi010030010.jpg"/>
+        </file>
+        <file USE="MEDIUM" ID="efghi010030010-med">
+          <FLocat LOCTYPE="URL" xlink:href="http://library.university.edu/media/abcd/med/efghi010030010.jpg"/>
+        </file>
+        <file USE="LARGE" ID="efghi010030010-lrg">
+          <FLocat LOCTYPE="URL" xlink:href="http://library.university.edu/media/abcd/lrg/efghi010030010.jpg"/>
+        </file>
+      </fileGrp>
+    </fileSec>
+    <structMap>
+      <div LABEL="1" TYPE="Image" ORDER="1">
+        <fptr fileID="efghi010030010-thm"/>
+        <fptr fileID="efghi010030010-med"/>
+        <fptr fileID="efghi010030010-lrg"/>
+      </div>
+    </structMap>
+  </mets>
+  EOS
+end

From 0e58ea2eed6072742ae83618c525fa57c2aa35db Mon Sep 17 00:00:00 2001
From: Jim Coble <jim.coble@duke.edu>
Date: Wed, 26 Aug 2015 16:48:24 -0400
Subject: [PATCH 16/33] Fix empty array bug; closes #1423.

---
 app/models/mets_file.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/mets_file.rb b/app/models/mets_file.rb
index de2b0e76..7e18a84b 100644
--- a/app/models/mets_file.rb
+++ b/app/models/mets_file.rb
@@ -96,11 +96,11 @@ def mets_hdr
   end
 
   def mets_hdr_agent
-    @mets_hdr_agent ||= mets_hdr.xpath('agent') if mets_hdr
+    @mets_hdr_agent ||= mets_hdr.xpath('agent') if mets_hdr.present?
   end
 
   def mets_hdr_agent_id_attr
-    @mets_hdr_agent_id_attr ||= mets_hdr_agent.attr('ID') if mets_hdr_agent
+    @mets_hdr_agent_id_attr ||= mets_hdr_agent.attr('ID') if mets_hdr_agent.present?
   end
 
 end
\ No newline at end of file

From 9e628c5933b58617a7f97a687a358e5fd346edf6 Mon Sep 17 00:00:00 2001
From: Jim Coble <jim.coble@duke.edu>
Date: Thu, 27 Aug 2015 10:00:03 -0400
Subject: [PATCH 17/33] Account for case where no structMap present; fixes
 #1425

---
 app/models/mets_file.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/mets_file.rb b/app/models/mets_file.rb
index 7e18a84b..b44cd074 100644
--- a/app/models/mets_file.rb
+++ b/app/models/mets_file.rb
@@ -63,7 +63,7 @@ def struct_map
   end
 
   def struct_metadata
-    @struct_metadata ||= struct_map.xpath('div')
+    @struct_metadata ||= struct_map.xpath('div') if struct_map.present?
   end
 
   private

From 3478495dabffb7244d17eb817bef795d83ff3411 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Mon, 31 Aug 2015 12:06:20 -0400
Subject: [PATCH 18/33] Adds DulHydra::Fixity for the new fixity check process
 ...

... which submits an individual fixity job for each object to be checked.
Adds rake task dul_hydra:fixity:check.
Deprecates DulHydra::Scripts::BatchFixityCheck and task
dul_hydra:batch:fixity_check.
---
 Gemfile                                     |  2 +-
 Gemfile.lock                                |  7 +--
 lib/dul_hydra.rb                            |  1 +
 lib/dul_hydra/configurable.rb               |  8 ++++
 lib/dul_hydra/fixity.rb                     | 53 +++++++++++++++++++++
 lib/dul_hydra/scripts/batch_fixity_check.rb |  3 ++
 lib/tasks/dul_hydra.rake                    | 22 ++++++++-
 spec/lib/dul_hydra/fixity_spec.rb           | 36 ++++++++++++++
 spec/scripts/batch_processor_spec.rb        |  1 -
 spec/spec_helper.rb                         |  7 ++-
 10 files changed, 127 insertions(+), 13 deletions(-)
 create mode 100644 lib/dul_hydra/fixity.rb
 create mode 100644 spec/lib/dul_hydra/fixity_spec.rb

diff --git a/Gemfile b/Gemfile
index 906c8a10..2aa66476 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'rails', '~> 4.1.6'
 gem 'hydra-head', '~> 7.2.0'
 gem 'ddr-alerts', '~> 1.0.0'
-gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: '9cfa285a6414c55746442a877397c4b734dfd689'
+gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: '6d33c38c0991b97b694553e060b1920d7bf01d75'
 gem 'rubydora', '>= 1.8.1'
 gem 'devise'
 gem 'deprecation'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9007cfca..c8f3d136 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,11 @@
 GIT
   remote: git://github.com/duke-libraries/ddr-models.git
-  revision: 9cfa285a6414c55746442a877397c4b734dfd689
-  ref: 9cfa285a6414c55746442a877397c4b734dfd689
+  revision: 6d33c38c0991b97b694553e060b1920d7bf01d75
+  ref: 6d33c38c0991b97b694553e060b1920d7bf01d75
   specs:
     ddr-models (2.0.1.post)
       active-fedora (~> 7.0)
       cancancan (~> 1.12)
-      ddr-antivirus (~> 1.3.1)
       devise (~> 3.4)
       ezid-client (~> 1.1, >= 1.1.1)
       grouper-rest-client
@@ -100,8 +99,6 @@ GEM
     database_cleaner (1.4.0)
     ddr-alerts (1.0.0)
       rails (~> 4.1.6)
-    ddr-antivirus (1.3.3)
-      activesupport (~> 4.0)
     deprecation (0.2.2)
       activesupport
     devise (3.5.1)
diff --git a/lib/dul_hydra.rb b/lib/dul_hydra.rb
index 69b9c307..978bedec 100644
--- a/lib/dul_hydra.rb
+++ b/lib/dul_hydra.rb
@@ -5,6 +5,7 @@ module DulHydra
 
   autoload :BatchError, 'dul_hydra/error'
   autoload :Configurable
+  autoload :Error
   autoload :Jobs
   autoload :Reports
 
diff --git a/lib/dul_hydra/configurable.rb b/lib/dul_hydra/configurable.rb
index e8cefe00..b7255cb9 100644
--- a/lib/dul_hydra/configurable.rb
+++ b/lib/dul_hydra/configurable.rb
@@ -62,6 +62,14 @@ module Configurable
 
       # Context used in alert message selection
       mattr_accessor :alert_message_context
+
+      mattr_accessor :fixity_check_limit do
+        ENV["FIXITY_CHECK_LIMIT"] || 10**5
+      end
+
+      mattr_accessor :fixity_check_period_in_days do
+        ENV["FIXITY_CHECK_PERIOD"] || 60
+      end
     end
 
     module ClassMethods
diff --git a/lib/dul_hydra/fixity.rb b/lib/dul_hydra/fixity.rb
new file mode 100644
index 00000000..94189f6d
--- /dev/null
+++ b/lib/dul_hydra/fixity.rb
@@ -0,0 +1,53 @@
+module DulHydra
+  class Fixity
+
+    def self.check(before_days: DulHydra.fixity_check_period_in_days,
+                   limit: DulHydra.fixity_check_limit)
+      counter = 0
+      not_checked(limit: limit).each_pid do |pid|
+        counter += 1
+        enqueue(pid)
+      end
+
+      if counter < limit
+        last_checked(before_days: before_days, limit: limit-counter).each_pid do |pid|
+          enqueue(pid)
+        end
+      end
+    end
+
+    # Return a query for objects not fixity checked
+    def self.not_checked(limit: nil)
+      builder = Ddr::Index::QueryBuilder.new
+      builder.absent(Ddr::Index::Fields::LAST_FIXITY_CHECK_ON)
+      if limit
+        builder.limit(limit)
+      end
+      query = builder.query
+      Rails.logger.debug "Fixity check query for objects not checked: #{query.inspect}"
+      query
+    end
+
+    # Return a query for objects last checked more than `older_than_days` ago
+    def self.last_checked(before_days: nil, limit: nil)
+      builder = Ddr::Index::QueryBuilder.new
+      builder.asc(Ddr::Index::Fields::LAST_FIXITY_CHECK_ON)
+      if before_days
+        builder.before_days(Ddr::Index::Fields::LAST_FIXITY_CHECK_ON, before_days)
+      else
+        builder.present(Ddr::Index::Fields::LAST_FIXITY_CHECK_ON)
+      end
+      if limit
+        builder.limit(limit)
+      end
+      query = builder.query
+      Rails.logger.debug "Fixity check query for objects last checked before days (#{before_days}): #{query.inspect}"
+      query
+    end
+
+    def self.enqueue(pid)
+      Resque.enqueue(DulHydra::Jobs::FixityCheck, pid)
+    end
+
+  end
+end
diff --git a/lib/dul_hydra/scripts/batch_fixity_check.rb b/lib/dul_hydra/scripts/batch_fixity_check.rb
index d80c798a..4af663cd 100644
--- a/lib/dul_hydra/scripts/batch_fixity_check.rb
+++ b/lib/dul_hydra/scripts/batch_fixity_check.rb
@@ -6,6 +6,9 @@ module DulHydra
   module Scripts
     class BatchFixityCheck
 
+      warn "[DEPRECATION] `DulHydra::Scripts::BatchFixityCheck` is deprecated and will be removed." \
+           " Use `DulHydra::Fixity.check` instead."
+
       # TODO migrate defaults to config
       DEFAULT_LIMIT = 1000
       DEFAULT_PERIOD = "60DAYS"
diff --git a/lib/tasks/dul_hydra.rake b/lib/tasks/dul_hydra.rake
index 0b049e42..3f322b35 100644
--- a/lib/tasks/dul_hydra.rake
+++ b/lib/tasks/dul_hydra.rake
@@ -116,8 +116,10 @@ namespace :dul_hydra do
       script = DulHydra::Scripts::CsvToXml.new(opts)
       script.execute
     end
-    desc "Runs the fixity check routine"
+    desc "[DEPRECATED] Runs the fixity check routine"
     task :fixity_check => :environment do
+      warn "[DEPRECATION] The task `dul_hydra:batch:fixity_check` is deprecated and will be removed" \
+           " from DulHydra v5.0. Use `dul_hydra:fixity:check` instead."
       opts = {
         :dryrun => ENV['dryrun'] == 'true' ? true : false,
         :limit => ENV.fetch('limit', 1000).to_i,
@@ -125,11 +127,12 @@ namespace :dul_hydra do
         :report => ENV['report']
       }
       mailto = ENV['mailto']
+
       puts "Running batch fixity check with options #{opts} ..."
       bfc = DulHydra::Scripts::BatchFixityCheck.new(opts)
       bfc.execute
       if bfc.total > 0
-        BatchFixityCheckMailer.send_notification(bfc, mailto).deliver!
+       BatchFixityCheckMailer.send_notification(bfc, mailto).deliver!
       end
     end
     desc "Make manifest MANIFEST based on files in directory DIRPATH"
@@ -165,6 +168,21 @@ namespace :dul_hydra do
     end
   end
 
+  namespace :fixity do
+    desc "Run fixity check routine"
+    task :check => :environment do
+      args = {}
+      if ENV["before_days"]
+        args[:before_days] = ENV["before_days"].to_i
+      end
+      if ENV["limit"]
+        args[:limit] = ENV["limit"].to_i
+      end
+      puts "Running fixity check with args #{args.inspect}."
+      DulHydra::Fixity.check(**args)
+    end
+  end
+
   namespace :index do
     desc "Deletes everything from the Solr index"
     task :clean => :environment do
diff --git a/spec/lib/dul_hydra/fixity_spec.rb b/spec/lib/dul_hydra/fixity_spec.rb
new file mode 100644
index 00000000..443be1b1
--- /dev/null
+++ b/spec/lib/dul_hydra/fixity_spec.rb
@@ -0,0 +1,36 @@
+require "spec_helper"
+
+module DulHydra
+  RSpec.describe Fixity do
+
+    let(:obj) { FactoryGirl.create(:item) }
+
+    describe "with an object that was just checked" do
+      before do
+        Ddr::Events::FixityCheckEvent.create(pid: obj.pid, event_date_time: Time.now.utc)
+      end
+      it "should not queue the pid for fixity checking" do
+        expect(Resque).not_to receive(:enqueue).with(DulHydra::Jobs::FixityCheck, obj.pid)
+        described_class.check
+      end
+    end
+
+    describe "with an object that has not previously been checked" do
+      it "should queue the pid for fixity checking" do
+        expect(Resque).to receive(:enqueue).with(DulHydra::Jobs::FixityCheck, obj.pid)
+        described_class.check
+      end
+    end
+
+    describe "with an object that was last checked one year ago" do
+      before do
+        Ddr::Events::FixityCheckEvent.create(pid: obj.pid, event_date_time: Time.now.ago(1.year).utc)
+      end
+      it "should queue the pid for fixity checking" do
+        expect(Resque).to receive(:enqueue).with(DulHydra::Jobs::FixityCheck, obj.pid)
+        described_class.check
+      end
+    end
+
+  end
+end
diff --git a/spec/scripts/batch_processor_spec.rb b/spec/scripts/batch_processor_spec.rb
index 7de57aea..2c279c34 100644
--- a/spec/scripts/batch_processor_spec.rb
+++ b/spec/scripts/batch_processor_spec.rb
@@ -20,7 +20,6 @@ module DulHydra::Batch::Scripts
         batch_obj_rs = batch_obj.batch_object_relationships
         batch_obj_rs.each { |r| expect(obj.send(r.name).pid).to eq(r.object) }
         obj.events.each do |event|
-          expect(event).to be_success
           expect(event.pid).to eq(obj.pid)
           expect(event.event_date_time).to be_within(3.minutes).of(DateTime.now)
           case event.type
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 66806234..6e589e91 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -9,14 +9,13 @@
 require 'capybara/rails'
 require 'capybara/rspec'
 require 'dul_hydra'
-require 'dul_hydra/error'
 require 'database_cleaner'
 require "ddr/auth/test_helpers"
+require "resque"
 
-DatabaseCleaner.strategy = :truncation
+Resque.inline = true
 
-Ddr::Antivirus.scanner_adapter = :null
-Ddr::Antivirus.logger = Logger.new(File::NULL)
+DatabaseCleaner.strategy = :truncation
 
 # XXX Hack to bypass file characterization
 # See https://github.com/duke-libraries/ddr-models/issues/315

From 2fca947eddb986a16cf17b8dbad13ceac504f01c Mon Sep 17 00:00:00 2001
From: Jim Coble <jim.coble@duke.edu>
Date: Tue, 8 Sep 2015 10:46:21 -0400
Subject: [PATCH 19/33] Use ddr-batch engine; remove manifest functionality.

Also fixes an unrelated bug in METS folder processing.
---
 Gemfile                                       |   1 +
 Gemfile.lock                                  |  59 +-
 app/controllers/batch_objects_controller.rb   |   2 +-
 app/controllers/batches_controller.rb         |   8 +-
 app/helpers/batches_helper.rb                 |  12 +-
 app/mailers/batch_processor_run_mailer.rb     |  15 -
 app/models/ability.rb                         |   2 +-
 app/models/ingest_folder.rb                   |  66 +--
 app/models/metadata_file.rb                   |  16 +-
 app/models/user.rb                            |   2 +-
 .../build_batch_from_folder_ingest.rb         |  30 +-
 app/services/build_batch_from_mets_folder.rb  |   4 +-
 .../build_batch_object_from_mets_file.rb      |  50 +-
 .../batch_ability_definitions.rb              |  14 -
 .../batch/jobs/batch_processor_job.rb         |  21 -
 lib/dul_hydra/batch/models/batch.rb           |  70 ---
 lib/dul_hydra/batch/models/batch_object.rb    | 296 ----------
 .../batch/models/batch_object_attribute.rb    |  57 --
 .../batch/models/batch_object_datastream.rb   |  23 -
 .../batch/models/batch_object_relationship.rb |  26 -
 .../batch/models/ingest_batch_object.rb       | 118 ----
 lib/dul_hydra/batch/models/manifest.rb        | 340 ------------
 lib/dul_hydra/batch/models/manifest_object.rb | 296 ----------
 .../batch/models/update_batch_object.rb       |  94 ----
 .../batch/scripts/batch_processor.rb          | 151 ------
 lib/dul_hydra/batch/scripts/manifest_maker.rb |  95 ----
 .../batch/scripts/manifest_processor.rb       | 163 ------
 lib/tasks/dul_hydra.rake                      |  25 -
 spec/controllers/batches_controller_spec.rb   |  18 +-
 spec/factories/batch_factories.rb             |   2 +-
 .../batch_object_attributes_factories.rb      |  10 +-
 .../batch_object_datastream_factories.rb      |  14 +-
 spec/factories/batch_object_factories.rb      |   4 +-
 .../batch_object_relationship_factories.rb    |  10 +-
 .../batch_objects/show.html.erb_spec.rb       |   4 +-
 spec/features/batches/index.html.erb_spec.rb  |  14 +-
 spec/features/batches/show.html.erb_spec.rb   |  14 +-
 .../batch_ability_definitions_spec.rb         |  37 --
 .../batch_processor_run_mailer_spec.rb        |  16 -
 spec/models/ability_spec.rb                   |  25 -
 spec/models/batch_object_attribute_spec.rb    |  31 --
 spec/models/batch_spec.rb                     |  62 ---
 spec/models/ingest_batch_object_spec.rb       | 306 -----------
 spec/models/ingest_folder_spec.rb             |   2 +-
 spec/models/manifest_object_spec.rb           | 508 ------------------
 spec/models/manifest_spec.rb                  | 376 -------------
 spec/models/metadata_file_spec.rb             |  12 +-
 spec/models/update_batch_object_spec.rb       | 101 ----
 spec/scripts/batch_processor_spec.rb          | 171 ------
 spec/scripts/manifest_maker_spec.rb           |  73 ---
 spec/scripts/manifest_processor_spec.rb       | 104 ----
 spec/scripts/process_simple_ingest_spec.rb    |   2 +-
 .../build_batch_from_folder_ingest_spec.rb    |  10 +-
 .../build_batch_object_from_mets_file_spec.rb |  22 +-
 54 files changed, 199 insertions(+), 3805 deletions(-)
 delete mode 100644 app/mailers/batch_processor_run_mailer.rb
 delete mode 100644 lib/dul_hydra/ability_definitions/batch_ability_definitions.rb
 delete mode 100644 lib/dul_hydra/batch/jobs/batch_processor_job.rb
 delete mode 100644 lib/dul_hydra/batch/models/batch.rb
 delete mode 100644 lib/dul_hydra/batch/models/batch_object.rb
 delete mode 100644 lib/dul_hydra/batch/models/batch_object_attribute.rb
 delete mode 100644 lib/dul_hydra/batch/models/batch_object_datastream.rb
 delete mode 100644 lib/dul_hydra/batch/models/batch_object_relationship.rb
 delete mode 100644 lib/dul_hydra/batch/models/ingest_batch_object.rb
 delete mode 100644 lib/dul_hydra/batch/models/manifest.rb
 delete mode 100644 lib/dul_hydra/batch/models/manifest_object.rb
 delete mode 100644 lib/dul_hydra/batch/models/update_batch_object.rb
 delete mode 100644 lib/dul_hydra/batch/scripts/batch_processor.rb
 delete mode 100644 lib/dul_hydra/batch/scripts/manifest_maker.rb
 delete mode 100644 lib/dul_hydra/batch/scripts/manifest_processor.rb
 delete mode 100644 spec/lib/dul_hydra/ability_definitions/batch_ability_definitions_spec.rb
 delete mode 100644 spec/mailers/batch_processor_run_mailer_spec.rb
 delete mode 100644 spec/models/batch_object_attribute_spec.rb
 delete mode 100644 spec/models/batch_spec.rb
 delete mode 100644 spec/models/ingest_batch_object_spec.rb
 delete mode 100644 spec/models/manifest_object_spec.rb
 delete mode 100644 spec/models/manifest_spec.rb
 delete mode 100644 spec/models/update_batch_object_spec.rb
 delete mode 100644 spec/scripts/batch_processor_spec.rb
 delete mode 100644 spec/scripts/manifest_maker_spec.rb
 delete mode 100644 spec/scripts/manifest_processor_spec.rb

diff --git a/Gemfile b/Gemfile
index 2aa66476..1297dbec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,6 +4,7 @@ gem 'rails', '~> 4.1.6'
 gem 'hydra-head', '~> 7.2.0'
 gem 'ddr-alerts', '~> 1.0.0'
 gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: '6d33c38c0991b97b694553e060b1920d7bf01d75'
+gem 'ddr-batch', '1.0.0.rc1'
 gem 'rubydora', '>= 1.8.1'
 gem 'devise'
 gem 'deprecation'
diff --git a/Gemfile.lock b/Gemfile.lock
index c8f3d136..eddeb2df 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -20,17 +20,17 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.1.10)
-      actionpack (= 4.1.10)
-      actionview (= 4.1.10)
+    actionmailer (4.1.13)
+      actionpack (= 4.1.13)
+      actionview (= 4.1.13)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.10)
-      actionview (= 4.1.10)
-      activesupport (= 4.1.10)
+    actionpack (4.1.13)
+      actionview (= 4.1.13)
+      activesupport (= 4.1.13)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.10)
-      activesupport (= 4.1.10)
+    actionview (4.1.13)
+      activesupport (= 4.1.13)
       builder (~> 3.1)
       erubis (~> 2.7.0)
     active-fedora (7.1.2)
@@ -48,14 +48,14 @@ GEM
       deprecation (~> 0.1)
       linkeddata (~> 1.1)
       rdf (~> 1.1)
-    activemodel (4.1.10)
-      activesupport (= 4.1.10)
+    activemodel (4.1.13)
+      activesupport (= 4.1.13)
       builder (~> 3.1)
-    activerecord (4.1.10)
-      activemodel (= 4.1.10)
-      activesupport (= 4.1.10)
+    activerecord (4.1.13)
+      activemodel (= 4.1.13)
+      activesupport (= 4.1.13)
       arel (~> 5.0.0)
-    activesupport (4.1.10)
+    activesupport (4.1.13)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -99,6 +99,12 @@ GEM
     database_cleaner (1.4.0)
     ddr-alerts (1.0.0)
       rails (~> 4.1.6)
+    ddr-batch (1.0.0.rc1)
+      ddr-models (~> 2.0)
+      devise (~> 3.4)
+      log4r
+      paperclip (~> 4.2.0)
+      rails (~> 4.1.13)
     deprecation (0.2.2)
       activesupport
     devise (3.5.1)
@@ -201,7 +207,7 @@ GEM
       mime-types (>= 1.16, < 3)
     mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     mono_logger (1.1.0)
     multi_json (1.11.0)
     mysql2 (0.3.17)
@@ -238,19 +244,19 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.10)
-      actionmailer (= 4.1.10)
-      actionpack (= 4.1.10)
-      actionview (= 4.1.10)
-      activemodel (= 4.1.10)
-      activerecord (= 4.1.10)
-      activesupport (= 4.1.10)
+    rails (4.1.13)
+      actionmailer (= 4.1.13)
+      actionpack (= 4.1.13)
+      actionview (= 4.1.13)
+      activemodel (= 4.1.13)
+      activerecord (= 4.1.13)
+      activesupport (= 4.1.13)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.10)
+      railties (= 4.1.13)
       sprockets-rails (~> 2.0)
-    railties (4.1.10)
-      actionpack (= 4.1.10)
-      activesupport (= 4.1.10)
+    railties (4.1.13)
+      actionpack (= 4.1.13)
+      activesupport (= 4.1.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -430,6 +436,7 @@ DEPENDENCIES
   capybara (~> 2.0)
   database_cleaner
   ddr-alerts (~> 1.0.0)
+  ddr-batch (= 1.0.0.rc1)
   ddr-models!
   deprecation
   devise
diff --git a/app/controllers/batch_objects_controller.rb b/app/controllers/batch_objects_controller.rb
index e27adbcc..03a8a151 100644
--- a/app/controllers/batch_objects_controller.rb
+++ b/app/controllers/batch_objects_controller.rb
@@ -1,6 +1,6 @@
 class BatchObjectsController < ApplicationController
 
-  load_and_authorize_resource :class => DulHydra::Batch::Models::BatchObject
+  load_and_authorize_resource :class => Ddr::Batch::BatchObject
 
   def index
   end
diff --git a/app/controllers/batches_controller.rb b/app/controllers/batches_controller.rb
index 51b6eab9..f1e115fe 100644
--- a/app/controllers/batches_controller.rb
+++ b/app/controllers/batches_controller.rb
@@ -1,6 +1,6 @@
 class BatchesController < ApplicationController
 
-  load_and_authorize_resource :class => DulHydra::Batch::Models::Batch
+  load_and_authorize_resource :class => Ddr::Batch::Batch
 
   include DulHydra::Controller::TabbedViewBehavior
   self.tabs = [:tab_pending_batches, :tab_finished_batches]
@@ -23,7 +23,7 @@ def show
 
   def destroy
     case @batch.status
-    when nil, DulHydra::Batch::Models::Batch::STATUS_READY, DulHydra::Batch::Models::Batch::STATUS_VALIDATED, DulHydra::Batch::Models::Batch::STATUS_INVALID
+    when nil, Ddr::Batch::Batch::STATUS_READY, Ddr::Batch::Batch::STATUS_VALIDATED, Ddr::Batch::Batch::STATUS_INVALID
       @batch.destroy
       flash[:notice] = I18n.t('batch.web.batch_deleted', :id => @batch.id)
     else
@@ -33,7 +33,7 @@ def destroy
   end
 
   def procezz
-    Resque.enqueue(DulHydra::Batch::Jobs::BatchProcessorJob, @batch.id, current_user.id)
+    Resque.enqueue(Ddr::Batch::BatchProcessorJob, @batch.id, current_user.id)
     flash[:notice] = I18n.t('batch.web.batch_queued', :id => @batch.id)
     redirect_to batches_url
   end
@@ -43,7 +43,7 @@ def validate
     @errors = @batch.validate
     valid = @errors.empty?
     if valid
-      @batch.status = DulHydra::Batch::Models::Batch::STATUS_VALIDATED
+      @batch.status = Ddr::Batch::Batch::STATUS_VALIDATED
       @batch.save
     end
     flash[:notice] = "Batch is #{valid ? '' : 'not '}valid"
diff --git a/app/helpers/batches_helper.rb b/app/helpers/batches_helper.rb
index 9802e106..9f57ef68 100644
--- a/app/helpers/batches_helper.rb
+++ b/app/helpers/batches_helper.rb
@@ -2,16 +2,16 @@ module BatchesHelper
 
   def batch_action(batch)
     case batch.status
-    when DulHydra::Batch::Models::Batch::STATUS_READY
+    when Ddr::Batch::Batch::STATUS_READY
       # Temporarily remove the functionality requiring a separate validation step before processing
       # cf. issue #760
       #   link_to(I18n.t('batch.web.action_names.validate'), validate_batch_path(batch))
       link_to(I18n.t('batch.web.action_names.procezz'), procezz_batch_path(batch))
-    when DulHydra::Batch::Models::Batch::STATUS_VALIDATED
+    when Ddr::Batch::Batch::STATUS_VALIDATED
       link_to(I18n.t('batch.web.action_names.procezz'), procezz_batch_path(batch))
-    when DulHydra::Batch::Models::Batch::STATUS_RESTARTABLE
+    when Ddr::Batch::Batch::STATUS_RESTARTABLE
       link_to(I18n.t('batch.web.action_names.restart'), procezz_batch_path(batch))
-    when DulHydra::Batch::Models::Batch::STATUS_INVALID
+    when Ddr::Batch::Batch::STATUS_INVALID
       link_to(I18n.t('batch.web.action_names.retry'), procezz_batch_path(batch))
     else
       "--"
@@ -22,7 +22,7 @@ def batch_status_message(batch)
     case batch.status
     when nil
       "NEW"
-    when DulHydra::Batch::Models::Batch::STATUS_PROCESSING
+    when Ddr::Batch::Batch::STATUS_PROCESSING
       "#{batch.status}&nbsp;#{batch.completed_count}/#{batch.batch_objects.count}<br /><em>#{est_time_to_complete(batch)}</em>".html_safe
     else
       batch.status
@@ -82,7 +82,7 @@ def render_link_to_batch_with_name(batch)
 
     def render_batch_delete_link(batch)
       case batch.status
-      when nil, DulHydra::Batch::Models::Batch::STATUS_READY, DulHydra::Batch::Models::Batch::STATUS_VALIDATED, DulHydra::Batch::Models::Batch::STATUS_INVALID
+      when nil, Ddr::Batch::Batch::STATUS_READY, Ddr::Batch::Batch::STATUS_VALIDATED, Ddr::Batch::Batch::STATUS_INVALID
         link_to content_tag(:span, "", :class => "glyphicon glyphicon-trash"), {:action => 'destroy', :id => batch}, :method => 'delete', :id => "batch_delete_#{batch.id}", :data => { :confirm => "#{t('batch.web.batch_deletion_confirmation', batch_id: batch.id)}" }
       end
     end
diff --git a/app/mailers/batch_processor_run_mailer.rb b/app/mailers/batch_processor_run_mailer.rb
deleted file mode 100644
index 5c9889c4..00000000
--- a/app/mailers/batch_processor_run_mailer.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class BatchProcessorRunMailer < ActionMailer::Base
-
-  default :from => "noreply@duke.edu"
-
-  def send_notification(batch)
-    @batch = batch
-    @title = "Batch Processor Run #{@batch.status}"
-    @host = `uname -n`.strip
-    @subject = "[#{@host}] #{@title}"
-    from = "#{`echo $USER`.strip}@#{@host}"
-    attachments["details.txt"] = File.read(@batch.logfile.path)
-    mail(from: from, to: @batch.user.email, subject: @subject)
-  end
-
-end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 8c18da1a..67a11bf4 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -1,7 +1,7 @@
 class Ability < Ddr::Auth::Ability
 
   self.ability_definitions += [ DulHydra::AliasAbilityDefinitions,
-                                DulHydra::BatchAbilityDefinitions,
+                                Ddr::Batch::BatchAbilityDefinitions,
                                 DulHydra::ExportSetAbilityDefinitions,
                                 DulHydra::MetadataFileAbilityDefinitions,
                                 DulHydra::IngestFolderAbilityDefinitions,
diff --git a/app/models/ingest_folder.rb b/app/models/ingest_folder.rb
index 1e6be718..1220a4fb 100644
--- a/app/models/ingest_folder.rb
+++ b/app/models/ingest_folder.rb
@@ -107,7 +107,7 @@ def scan
   end
 
   def procezz
-    @batch = DulHydra::Batch::Models::Batch.create(
+    @batch = Ddr::Batch::Batch.create(
                 user: user,
                 name: I18n.t('batch.ingest_folder.batch_name'),
                 description: abbreviated_path
@@ -120,7 +120,7 @@ def procezz
     @parent_hash = {} if add_parents
     @checksum_hash = checksums if checksum_file.present?
     scan_files(full_path, true)
-    @batch.update_attributes(status: DulHydra::Batch::Models::Batch::STATUS_READY)
+    @batch.update_attributes(status: Ddr::Batch::Batch::STATUS_READY)
   end
 
   def file_checksum(file_entry)
@@ -188,33 +188,33 @@ def create_batch_object_for_parent(parent_identifier)
     parent_model = Ddr::Utils.reflection_object_class(Ddr::Utils.relationship_object_reflection(model, "parent")).name
     parent_pid = ActiveFedora::Base.connection_for_pid('0').mint
     policy_pid = collection_admin_policy ? collection_admin_policy.pid : collection_pid
-    obj = DulHydra::Batch::Models::IngestBatchObject.create(
+    obj = Ddr::Batch::IngestBatchObject.create(
             batch: @batch,
             identifier: parent_identifier,
             model: parent_model,
             pid: parent_pid
             )
-    DulHydra::Batch::Models::BatchObjectAttribute.create(
+    Ddr::Batch::BatchObjectAttribute.create(
             batch_object: obj,
             datastream: Ddr::Datastreams::ADMIN_METADATA,
             name: 'local_id',
-            operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
+            operation: Ddr::Batch::BatchObjectAttribute::OPERATION_ADD,
             value: parent_identifier,
-            value_type: DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING
+            value_type: Ddr::Batch::BatchObjectAttribute::VALUE_TYPE_STRING
             )
-    DulHydra::Batch::Models::BatchObjectRelationship.create(
+    Ddr::Batch::BatchObjectRelationship.create(
             batch_object: obj,
-            name: DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_ADMIN_POLICY,
+            name: Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_ADMIN_POLICY,
             object: policy_pid,
-            object_type: DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPE_PID,
-            operation: DulHydra::Batch::Models::BatchObjectRelationship::OPERATION_ADD
+            object_type: Ddr::Batch::BatchObjectRelationship::OBJECT_TYPE_PID,
+            operation: Ddr::Batch::BatchObjectRelationship::OPERATION_ADD
             )
-    DulHydra::Batch::Models::BatchObjectRelationship.create(
+    Ddr::Batch::BatchObjectRelationship.create(
             batch_object: obj,
-            name: DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_PARENT,
+            name: Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_PARENT,
             object: collection_pid,
-            object_type: DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPE_PID,
-            operation: DulHydra::Batch::Models::BatchObjectRelationship::OPERATION_ADD
+            object_type: Ddr::Batch::BatchObjectRelationship::OBJECT_TYPE_PID,
+            operation: Ddr::Batch::BatchObjectRelationship::OPERATION_ADD
             ) if collection_pid
     parent_pid
   end
@@ -243,48 +243,48 @@ def create_batch_object_for_file(dirpath, file_entry)
       end
     end
     policy_pid = collection_admin_policy ? collection_admin_policy.pid : collection_pid
-    obj = DulHydra::Batch::Models::IngestBatchObject.create(
+    obj = Ddr::Batch::IngestBatchObject.create(
             batch: @batch,
             identifier: file_identifier,
             model: file_model
             )
-    DulHydra::Batch::Models::BatchObjectAttribute.create(
+    Ddr::Batch::BatchObjectAttribute.create(
             batch_object: obj,
             datastream: Ddr::Datastreams::ADMIN_METADATA,
             name: 'local_id',
-            operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
+            operation: Ddr::Batch::BatchObjectAttribute::OPERATION_ADD,
             value: file_identifier,
-            value_type: DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING
+            value_type: Ddr::Batch::BatchObjectAttribute::VALUE_TYPE_STRING
             )
-    DulHydra::Batch::Models::BatchObjectDatastream.create(
+    Ddr::Batch::BatchObjectDatastream.create(
             batch_object: obj,
             name: Ddr::Datastreams::CONTENT,
-            operation: DulHydra::Batch::Models::BatchObjectDatastream::OPERATION_ADD,
+            operation: Ddr::Batch::BatchObjectDatastream::OPERATION_ADD,
             payload: File.join(dirpath, file_entry),
-            payload_type: DulHydra::Batch::Models::BatchObjectDatastream::PAYLOAD_TYPE_FILENAME,
+            payload_type: Ddr::Batch::BatchObjectDatastream::PAYLOAD_TYPE_FILENAME,
             checksum: checksum_file.present? ? file_checksum(File.join(dirpath, file_entry)) : nil,
             checksum_type: checksum_file.present? ? checksum_type : nil
             )
-    DulHydra::Batch::Models::BatchObjectRelationship.create(
+    Ddr::Batch::BatchObjectRelationship.create(
             batch_object: obj,
-            name: DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_ADMIN_POLICY,
+            name: Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_ADMIN_POLICY,
             object: policy_pid,
-            object_type: DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPE_PID,
-            operation: DulHydra::Batch::Models::BatchObjectRelationship::OPERATION_ADD
+            object_type: Ddr::Batch::BatchObjectRelationship::OBJECT_TYPE_PID,
+            operation: Ddr::Batch::BatchObjectRelationship::OPERATION_ADD
             )
-    DulHydra::Batch::Models::BatchObjectRelationship.create(
+    Ddr::Batch::BatchObjectRelationship.create(
             batch_object: obj,
-            name: DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_PARENT,
+            name: Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_PARENT,
             object: parent_pid,
-            object_type: DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPE_PID,
-            operation: DulHydra::Batch::Models::BatchObjectRelationship::OPERATION_ADD
+            object_type: Ddr::Batch::BatchObjectRelationship::OBJECT_TYPE_PID,
+            operation: Ddr::Batch::BatchObjectRelationship::OPERATION_ADD
             ) if add_parents && parent_pid
-    DulHydra::Batch::Models::BatchObjectRelationship.create(
+    Ddr::Batch::BatchObjectRelationship.create(
             batch_object: obj,
-            name: DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_COLLECTION,
+            name: Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_COLLECTION,
             object: collection_pid,
-            object_type: DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPE_PID,
-            operation: DulHydra::Batch::Models::BatchObjectRelationship::OPERATION_ADD
+            object_type: Ddr::Batch::BatchObjectRelationship::OBJECT_TYPE_PID,
+            operation: Ddr::Batch::BatchObjectRelationship::OPERATION_ADD
             ) if target?(dirpath) && collection_pid
     obj.save
   end
diff --git a/app/models/metadata_file.rb b/app/models/metadata_file.rb
index aa17b032..2d656e5b 100644
--- a/app/models/metadata_file.rb
+++ b/app/models/metadata_file.rb
@@ -78,19 +78,19 @@ def model(row)
   end
 
   def procezz
-    @batch = DulHydra::Batch::Models::Batch.create(
+    @batch = Ddr::Batch::Batch.create(
                 :user => user,
                 :name => I18n.t('batch.metadata_file.batch_name'),
                 :description => metadata_file_name
                 )
     CSV.foreach(metadata.path, effective_options[:csv]) do |row|
-      obj = DulHydra::Batch::Models::UpdateBatchObject.new(:batch => @batch)
+      obj = Ddr::Batch::UpdateBatchObject.new(:batch => @batch)
       obj.model = row.field("model") if row.headers.include?("model")
       obj.pid = row.field("pid") if row.headers.include?("pid")
-      att = DulHydra::Batch::Models::BatchObjectAttribute.new(
+      att = Ddr::Batch::BatchObjectAttribute.new(
                 batch_object: obj,
                 datastream: Ddr::Datastreams::DESC_METADATA,
-                operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR_ALL)
+                operation: Ddr::Batch::BatchObjectAttribute::OPERATION_CLEAR_ALL)
       obj.batch_object_attributes << att
       obj.save
       row.headers.each_with_index do |header, idx|
@@ -100,13 +100,13 @@ def procezz
           end
           if canonical_attribute_name(header).present?
             parse_field(row.field(header, idx), header).each do |value|
-              att = DulHydra::Batch::Models::BatchObjectAttribute.new(
+              att = Ddr::Batch::BatchObjectAttribute.new(
                         batch_object: obj,
                         datastream: Ddr::Datastreams::DESC_METADATA,
                         name: canonical_attribute_name(header),
-                        operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
+                        operation: Ddr::Batch::BatchObjectAttribute::OPERATION_ADD,
                         value: value,
-                        value_type: DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING
+                        value_type: Ddr::Batch::BatchObjectAttribute::VALUE_TYPE_STRING
                         )
               # puts canonical_attribute_name(header)
               # puts parse_field(row.field(header, idx), header)
@@ -128,7 +128,7 @@ def procezz
         end
       end
     end
-    @batch.update_attributes(status: DulHydra::Batch::Models::Batch::STATUS_READY)
+    @batch.update_attributes(status: Ddr::Batch::Batch::STATUS_READY)
   end
 
   def downcase_repeatable_field_names
diff --git a/app/models/user.rb b/app/models/user.rb
index 891e4535..2f62cce8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,8 +2,8 @@ class User < ActiveRecord::Base
 
   include Blacklight::User
   include Ddr::Auth::User
+  include Ddr::Batch::BatchUser
 
-  has_many :batches, :inverse_of => :user, :class_name => DulHydra::Batch::Models::Batch
   has_many :ingest_folders, :inverse_of => :user
   has_many :metadata_files, :inverse_of => :user
   has_many :export_sets, :dependent => :destroy
diff --git a/app/services/build_batch_from_folder_ingest.rb b/app/services/build_batch_from_folder_ingest.rb
index bdab34e9..feb572fd 100644
--- a/app/services/build_batch_from_folder_ingest.rb
+++ b/app/services/build_batch_from_folder_ingest.rb
@@ -16,14 +16,14 @@ def initialize(user, filesystem, content_modeler, metadata_provider, checksum_pr
   def call
     @batch = create_batch
     traverse_filesystem
-    batch.update_attributes(status: DulHydra::Batch::Models::Batch::STATUS_READY)
+    batch.update_attributes(status: Ddr::Batch::Batch::STATUS_READY)
     batch    
   end
 
   private
 
   def create_batch
-    DulHydra::Batch::Models::Batch.create(user: user, name: batch_name, description: batch_description)
+    Ddr::Batch::Batch.create(user: user, name: batch_name, description: batch_description)
   end
 
   def traverse_filesystem
@@ -36,7 +36,7 @@ def create_object(node)
     object_model = content_modeler.new(node).call
     pid = assign_pid(node) if ['Collection', 'Item'].include?(object_model)
     self.collection_pid = pid if object_model == 'Collection'
-    batch_object = DulHydra::Batch::Models::IngestBatchObject.create(batch: batch, model: object_model, pid: pid)
+    batch_object = Ddr::Batch::IngestBatchObject.create(batch: batch, model: object_model, pid: pid)
     add_relationships(batch_object, node.parent)
     add_metadata(batch_object, node)
     add_content_datastream(batch_object, node) if object_model == 'Component'
@@ -49,14 +49,14 @@ def assign_pid(node)
 
   def add_relationships(batch_object, parent_node)
     batch_object.batch_object_relationships <<
-          create_relationship(DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_ADMIN_POLICY, collection_pid)
+          create_relationship(Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_ADMIN_POLICY, collection_pid)
     case batch_object.model
     when 'Item'
       batch_object.batch_object_relationships <<
-            create_relationship(DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_PARENT, parent_node.content[:pid])
+            create_relationship(Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_PARENT, parent_node.content[:pid])
     when 'Component'
       batch_object.batch_object_relationships <<
-            create_relationship(DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_PARENT, parent_node.content[:pid])
+            create_relationship(Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_PARENT, parent_node.content[:pid])
     end
   end
 
@@ -64,13 +64,13 @@ def add_metadata(batch_object, node)
     locator = Filesystem.node_locator(node)
     metadata_provider.metadata(locator).each do |key, value|
       Array(value).each do |v|
-        DulHydra::Batch::Models::BatchObjectAttribute.create(
+        Ddr::Batch::BatchObjectAttribute.create(
               batch_object: batch_object,
               datastream: Ddr::Datastreams::DESC_METADATA,
               name: key,
-              operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
+              operation: Ddr::Batch::BatchObjectAttribute::OPERATION_ADD,
               value: v,
-              value_type: DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING
+              value_type: Ddr::Batch::BatchObjectAttribute::VALUE_TYPE_STRING
         )
       end
     end
@@ -79,11 +79,11 @@ def add_metadata(batch_object, node)
   def add_content_datastream(batch_object, node)
     full_filepath = Filesystem.path_to_node(node)
     rel_filepath = Filesystem.path_to_node(node, 'relative')
-    ds = DulHydra::Batch::Models::BatchObjectDatastream.create(
+    ds = Ddr::Batch::BatchObjectDatastream.create(
       name: Ddr::Datastreams::CONTENT,
-      operation: DulHydra::Batch::Models::BatchObjectDatastream::OPERATION_ADD,
+      operation: Ddr::Batch::BatchObjectDatastream::OPERATION_ADD,
       payload: full_filepath,
-      payload_type: DulHydra::Batch::Models::BatchObjectDatastream::PAYLOAD_TYPE_FILENAME,
+      payload_type: Ddr::Batch::BatchObjectDatastream::PAYLOAD_TYPE_FILENAME,
       checksum: checksum_provider.checksum(rel_filepath),
       checksum_type: Ddr::Datastreams::CHECKSUM_TYPE_SHA256
     )
@@ -91,11 +91,11 @@ def add_content_datastream(batch_object, node)
   end
 
   def create_relationship(relationship_name, relationship_target_pid)
-    DulHydra::Batch::Models::BatchObjectRelationship.create(
+    Ddr::Batch::BatchObjectRelationship.create(
         name: relationship_name,
-        operation: DulHydra::Batch::Models::BatchObjectRelationship::OPERATION_ADD,
+        operation: Ddr::Batch::BatchObjectRelationship::OPERATION_ADD,
         object: relationship_target_pid,
-        object_type: DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPE_PID
+        object_type: Ddr::Batch::BatchObjectRelationship::OBJECT_TYPE_PID
     )
   end
 
diff --git a/app/services/build_batch_from_mets_folder.rb b/app/services/build_batch_from_mets_folder.rb
index 8024ab90..451c8c00 100644
--- a/app/services/build_batch_from_mets_folder.rb
+++ b/app/services/build_batch_from_mets_folder.rb
@@ -15,14 +15,14 @@ def initialize(batch_user:, filesystem:, collection:, batch_name: 'METS Folder',
   def call
     @batch = create_batch
     traverse_filesystem
-    batch.update_attributes(status: DulHydra::Batch::Models::Batch::STATUS_READY)
+    batch.update_attributes(status: Ddr::Batch::Batch::STATUS_READY)
     batch
   end
 
   private
 
   def create_batch
-    DulHydra::Batch::Models::Batch.create(user: batch_user, name: batch_name, description: batch_description)
+    Ddr::Batch::Batch.create(user: batch_user, name: batch_name, description: batch_description)
   end
 
   def traverse_filesystem
diff --git a/app/services/build_batch_object_from_mets_file.rb b/app/services/build_batch_object_from_mets_file.rb
index 0ca638d1..3810cc0a 100644
--- a/app/services/build_batch_object_from_mets_file.rb
+++ b/app/services/build_batch_object_from_mets_file.rb
@@ -15,7 +15,7 @@ def call
   private
 
   def create_update_object
-    update_object = DulHydra::Batch::Models::UpdateBatchObject.create(batch: batch, pid: mets_file.repo_pid, identifier: mets_file.local_id)
+    update_object = Ddr::Batch::UpdateBatchObject.create(batch: batch, pid: mets_file.repo_pid, identifier: mets_file.local_id)
     add_local_id(update_object) if mets_file.local_id.present?
     if display_format = METSFileDisplayFormat.get(mets_file, display_formats)
       add_display_format(update_object, display_format)
@@ -27,80 +27,80 @@ def create_update_object
   end
 
   def add_local_id(update_object)
-    DulHydra::Batch::Models::BatchObjectAttribute.create(
+    Ddr::Batch::BatchObjectAttribute.create(
       batch_object: update_object,
       datastream: Ddr::Datastreams::ADMIN_METADATA,
       name: 'local_id',
-      operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR)
-    DulHydra::Batch::Models::BatchObjectAttribute.create(
+      operation: Ddr::Batch::BatchObjectAttribute::OPERATION_CLEAR)
+    Ddr::Batch::BatchObjectAttribute.create(
       batch_object: update_object,
       datastream: Ddr::Datastreams::ADMIN_METADATA,
       name: 'local_id',
       value: mets_file.local_id,
-      value_type: DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING,
-      operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD)
+      value_type: Ddr::Batch::BatchObjectAttribute::VALUE_TYPE_STRING,
+      operation: Ddr::Batch::BatchObjectAttribute::OPERATION_ADD)
   end
 
   def add_display_format(update_object, display_format)
-    DulHydra::Batch::Models::BatchObjectAttribute.create(
+    Ddr::Batch::BatchObjectAttribute.create(
       batch_object: update_object,
       datastream: Ddr::Datastreams::ADMIN_METADATA,
       name: 'display_format',
-      operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR)
-    DulHydra::Batch::Models::BatchObjectAttribute.create(
+      operation: Ddr::Batch::BatchObjectAttribute::OPERATION_CLEAR)
+    Ddr::Batch::BatchObjectAttribute.create(
       batch_object: update_object,
       datastream: Ddr::Datastreams::ADMIN_METADATA,
       name: 'display_format',
       value: display_format,
-      value_type: DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING,
-      operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD)
+      value_type: Ddr::Batch::BatchObjectAttribute::VALUE_TYPE_STRING,
+      operation: Ddr::Batch::BatchObjectAttribute::OPERATION_ADD)
   end
 
   def add_research_help_contact(update_object)
-    DulHydra::Batch::Models::BatchObjectAttribute.create(
+    Ddr::Batch::BatchObjectAttribute.create(
       batch_object: update_object,
       datastream: Ddr::Datastreams::ADMIN_METADATA,
-      name: 'research_contact',
-      operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR)
-    DulHydra::Batch::Models::BatchObjectAttribute.create(
+      name: 'research_help_contact',
+      operation: Ddr::Batch::BatchObjectAttribute::OPERATION_CLEAR)
+    Ddr::Batch::BatchObjectAttribute.create(
       batch_object: update_object,
       datastream: Ddr::Datastreams::ADMIN_METADATA,
       name: 'research_help_contact',
       value: mets_file.header_agent_id,
-      value_type: DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING,
-      operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD)
+      value_type: Ddr::Batch::BatchObjectAttribute::VALUE_TYPE_STRING,
+      operation: Ddr::Batch::BatchObjectAttribute::OPERATION_ADD)
   end
 
   def add_desc_metadata(update_object)
     # To replicate existing behavior, which is that the metadata harvested from the metadata
     # folder completely replaces the existing metadata, first we need a directive to clear out
     # all existing metadata
-    DulHydra::Batch::Models::BatchObjectAttribute.create(
+    Ddr::Batch::BatchObjectAttribute.create(
       batch_object: update_object,
       datastream: Ddr::Datastreams::DESC_METADATA,
-      operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR_ALL
+      operation: Ddr::Batch::BatchObjectAttribute::OPERATION_CLEAR_ALL
       )
     # Now we create the directives to add the attribute values from the METS file
     mets_file.desc_metadata_attributes_values.each do |entry|
       attr_name = entry.keys.first
-      DulHydra::Batch::Models::BatchObjectAttribute.create(
+      Ddr::Batch::BatchObjectAttribute.create(
         batch_object: update_object,
         datastream: Ddr::Datastreams::DESC_METADATA,
-        operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
+        operation: Ddr::Batch::BatchObjectAttribute::OPERATION_ADD,
         name: attr_name,
         value: entry[attr_name],
-        value_type: DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING
+        value_type: Ddr::Batch::BatchObjectAttribute::VALUE_TYPE_STRING
         )
     end
   end
 
   def add_struct_metadata(update_object)
-    DulHydra::Batch::Models::BatchObjectDatastream.create(
+    Ddr::Batch::BatchObjectDatastream.create(
       batch_object: update_object,
       name: Ddr::Datastreams::STRUCT_METADATA,
-      operation: DulHydra::Batch::Models::BatchObjectDatastream::OPERATION_ADDUPDATE,
+      operation: Ddr::Batch::BatchObjectDatastream::OPERATION_ADDUPDATE,
       payload: translate_struct_map(mets_file.struct_metadata),
-      payload_type: DulHydra::Batch::Models::BatchObjectDatastream::PAYLOAD_TYPE_BYTES)
+      payload_type: Ddr::Batch::BatchObjectDatastream::PAYLOAD_TYPE_BYTES)
   end
 
   def translate_struct_map(mets_file_struct_map)
diff --git a/lib/dul_hydra/ability_definitions/batch_ability_definitions.rb b/lib/dul_hydra/ability_definitions/batch_ability_definitions.rb
deleted file mode 100644
index 5292f7da..00000000
--- a/lib/dul_hydra/ability_definitions/batch_ability_definitions.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module DulHydra
-  class BatchAbilityDefinitions < Ddr::Auth::AbilityDefinitions
-
-    def call
-      if authenticated?
-        can :manage, DulHydra::Batch::Models::Batch, user_id: user.id
-      end
-      can :manage, DulHydra::Batch::Models::BatchObject do |batch_object|
-        can? :manage, batch_object.batch
-      end
-    end
-
-  end
-end
diff --git a/lib/dul_hydra/batch/jobs/batch_processor_job.rb b/lib/dul_hydra/batch/jobs/batch_processor_job.rb
deleted file mode 100644
index 5862efe1..00000000
--- a/lib/dul_hydra/batch/jobs/batch_processor_job.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module DulHydra::Batch::Jobs
-  class BatchProcessorJob
-    @queue = :batch
-
-    def self.perform(batch_id, operator_id)
-      ts = Time.now.strftime("%Y%m%d%H%M%S%L")
-      logfile = "batch_processor_#{ts}_log.txt"
-      batch = DulHydra::Batch::Models::Batch.find(batch_id)
-      operator = User.find(operator_id)
-      bp = DulHydra::Batch::Scripts::BatchProcessor.new(batch, operator, log_file: logfile)
-      bp.execute
-    end
-
-    def self.after_enqueue_set_status(batch_id, operator_id)
-      batch = DulHydra::Batch::Models::Batch.find(batch_id)
-      batch.status = DulHydra::Batch::Models::Batch::STATUS_QUEUED
-      batch.save
-    end
-
-  end
-end
diff --git a/lib/dul_hydra/batch/models/batch.rb b/lib/dul_hydra/batch/models/batch.rb
deleted file mode 100644
index 0b1f589d..00000000
--- a/lib/dul_hydra/batch/models/batch.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-module DulHydra::Batch::Models
-
-  class Batch < ActiveRecord::Base
-    belongs_to :user, :inverse_of => :batches
-    has_many :batch_objects, -> { order("id ASC") }, :inverse_of => :batch, :dependent => :destroy
-    has_attached_file :logfile
-    do_not_validate_attachment_file_type :logfile
-
-    OUTCOME_SUCCESS = "SUCCESS"
-    OUTCOME_FAILURE = "FAILURE"
-
-    STATUS_READY = "READY"
-    STATUS_VALIDATING = "VALIDATING"
-    STATUS_INVALID = "INVALID"
-    STATUS_VALIDATED = "VALIDATED"
-    STATUS_QUEUED = "QUEUED"
-    STATUS_PROCESSING = "PROCESSING"
-    STATUS_RUNNING = "RUNNING"
-    STATUS_FINISHED = "FINISHED"
-    STATUS_INTERRUPTED = "INTERRUPTED"
-    STATUS_RESTARTABLE = "INTERRUPTED - RESTARTABLE"
-
-    def validate
-      errors = []
-      begin
-        batch_objects.each do |object|
-          unless object.verified
-            errors << object.validate
-          end
-        end
-      rescue Exception => e
-        errors << "Exception raised during batch validation: #{e.backtrace}"
-      end
-      errors.flatten
-    end
-
-    def completed_count
-      batch_objects.where(verified: true).count
-    end
-
-    def time_to_complete
-      unless processing_step_start.nil?
-        completed = completed_count
-        ((Time.now - processing_step_start.to_time) / completed) * (batch_objects.count - completed)
-      end
-    end
-
-    def found_pids
-      @found_pids ||= {}
-    end
-
-    def add_found_pid(pid, model)
-      @found_pids[pid] = model
-    end
-
-    def pre_assigned_pids
-      @pre_assigned_pids ||= collect_pre_assigned_pids
-    end
-
-    def collect_pre_assigned_pids
-      batch_objects.map{ |x| x.pid if x.pid.present? }.compact
-    end
-
-    def finished?
-      status == STATUS_FINISHED
-    end
-
-  end
-
-end
diff --git a/lib/dul_hydra/batch/models/batch_object.rb b/lib/dul_hydra/batch/models/batch_object.rb
deleted file mode 100644
index 8657579b..00000000
--- a/lib/dul_hydra/batch/models/batch_object.rb
+++ /dev/null
@@ -1,296 +0,0 @@
-module DulHydra::Batch::Models
-
-  # This is a superclass containing methods common to all batch object objects.  It is not intended to be instantiated directly.
-  # This superclass and its subclasses are designed following the ActiveRecord single-table inheritance pattern.
-  class BatchObject < ActiveRecord::Base
-
-    belongs_to :batch, inverse_of: :batch_objects
-    has_many :batch_object_attributes, -> { order "id ASC" }, inverse_of: :batch_object, dependent: :destroy
-    has_many :batch_object_datastreams, inverse_of: :batch_object, dependent: :destroy
-    has_many :batch_object_relationships, inverse_of: :batch_object, dependent: :destroy
-
-    VERIFICATION_PASS = "PASS"
-    VERIFICATION_FAIL = "FAIL"
-
-    EVENT_SUMMARY = <<-EOS
-%{label}
-Batch object database id: %{batch_id}
-Batch object identifier: %{identifier}
-Model: %{model}
-    EOS
-
-    def self.pid_from_identifier(identifier, batch_id)
-      query = "identifier = :identifier"
-      query << " and batch_id = :batch_id" if batch_id
-      params = { :identifier => identifier }
-      params[:batch_id] = batch_id if batch_id
-      sort = "updated_at asc"
-      found_objects = DulHydra::Batch::Models::BatchObject.where(query, params).order(sort)
-      pids = []
-      found_objects.each { |obj| pids << obj.pid }
-      return pids
-    end
-
-    def validate
-      @error_prefix = I18n.t('batch.manifest_object.errors.prefix', :identifier => identifier, :id => id)
-      errors = []
-      errors += validate_model if model
-      errors += validate_datastreams if batch_object_datastreams
-      errors += validate_relationships if batch_object_relationships
-      errors += local_validations
-      return errors
-    end
-
-    def local_validations
-      []
-    end
-
-    def model_datastream_keys
-      raise NotImplementedError
-    end
-
-    def process(user, opts = {})
-      raise NotImplementedError
-    end
-
-    def results_message
-      raise NotImplementedError
-    end
-
-    Results = Struct.new(:repository_object, :verified, :verifications)
-
-    private
-
-    def validate_model
-      errs = []
-      begin
-        model.constantize
-      rescue NameError
-        errs << "#{@error_prefix} Invalid model name: #{model}"
-      end
-      return errs
-    end
-
-    def validate_datastreams
-      errs = []
-      batch_object_datastreams.each do |d|
-        if model_datastream_keys.present?
-          unless model_datastream_keys.include?(d.name)
-            errs << "#{@error_prefix} Invalid datastream name for #{model}: #{d.name}"
-          end
-        end
-        unless DulHydra::Batch::Models::BatchObjectDatastream::PAYLOAD_TYPES.include?(d.payload_type)
-          errs << "#{@error_prefix} Invalid payload type for #{d.name} datastream: #{d.payload_type}"
-        end
-        if d.payload_type.eql?(DulHydra::Batch::Models::BatchObjectDatastream::PAYLOAD_TYPE_FILENAME)
-          unless File.readable?(d.payload)
-            errs << "#{@error_prefix} Missing or unreadable file for #{d[:name]} datastream: #{d[:payload]}"
-          end
-        end
-        if d.checksum && !d.checksum_type
-          errs << "#{@error_prefix} Must specify checksum type if providing checksum for #{d.name} datastream"
-        end
-        if d.checksum_type
-          unless Ddr::Datastreams::CHECKSUM_TYPES.include?(d.checksum_type)
-            errs << "#{@error_prefix} Invalid checksum type for #{d.name} datastream: #{d.checksum_type}"
-          end
-        end
-      end
-      return errs
-    end
-
-    def validate_relationships
-      errs = []
-      batch_object_relationships.each do |r|
-        obj_model = nil
-        unless DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPES.include?(r[:object_type])
-          errs << "#{@error_prefix} Invalid object_type for #{r[:name]} relationship: #{r[:object_type]}"
-        end
-        if r[:object_type].eql?(DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPE_PID)
-          if batch.present? && batch.found_pids.keys.include?(r[:object])
-            obj_model = batch.found_pids[r[:object]]
-          else
-            begin
-              obj = ActiveFedora::Base.find(r[:object], :cast => true)
-              obj_model = obj.class.name
-              if batch.present?
-                batch.add_found_pid(obj.pid, obj_model)
-              end
-            rescue ActiveFedora::ObjectNotFoundError
-              pid_in_batch = false
-              if batch.present?
-                if batch.pre_assigned_pids.include?(r[:object])
-                  pid_in_batch = true
-                end
-              end
-              unless pid_in_batch
-                errs << "#{@error_prefix} #{r[:name]} relationship object does not exist: #{r[:object]}"
-              end
-            end
-          end
-          if obj_model
-            relationship_reflection = Ddr::Utils.relationship_object_reflection(model, r[:name])
-            if relationship_reflection
-              klass = Ddr::Utils.reflection_object_class(relationship_reflection)
-              if klass
-                errs << "#{@error_prefix} #{r[:name]} relationship object #{r[:object]} exists but is not a(n) #{klass}" unless batch.found_pids[r[:object]].eql?(klass.name)
-              end
-            else
-              errs << "#{@error_prefix} #{model} does not define a(n) #{r[:name]} relationship"
-            end
-          end
-        end
-      end
-      return errs
-    end
-
-    def verify_repository_object
-      verifications = {}
-      begin
-        repo_object = ActiveFedora::Base.find(pid, :cast => true)
-      rescue ActiveFedora::ObjectNotFound
-        verifications["Object exists in repository"] = VERIFICATION_FAIL
-      else
-        verifications["Object exists in repository"] = VERIFICATION_PASS
-        verifications["Object is correct model"] = verify_model(repo_object) if model
-        verifications["Object has correct label"] = verify_label(repo_object) if label
-        unless batch_object_attributes.empty?
-          batch_object_attributes.each do |a|
-            if a.operation == DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD
-              verifications["#{a.name} attribute set correctly"] = verify_attribute(repo_object, a)
-            end
-          end
-        end
-        unless batch_object_datastreams.empty?
-          batch_object_datastreams.each do |d|
-            verifications["#{d.name} datastream present and not empty"] = verify_datastream(repo_object, d)
-            verifications["#{d.name} external checksum match"] = verify_datastream_external_checksum(repo_object, d) if d.checksum
-          end
-        end
-        unless batch_object_relationships.empty?
-          batch_object_relationships.each do |r|
-            verifications["#{r.name} relationship is correct"] = verify_relationship(repo_object, r)
-          end
-        end
-        result = Ddr::Actions::FixityCheck.execute repo_object
-        verifications["Fixity check"] = result.success ? VERIFICATION_PASS : VERIFICATION_FAIL
-      end
-      verifications
-    end
-
-    def verify_model(repo_object)
-      begin
-        if repo_object.class.eql?(model.constantize)
-          return VERIFICATION_PASS
-        else
-          return VERIFICATION_FAIL
-        end
-      rescue NameError
-        return VERIFICATION_FAIL
-      end
-    end
-
-    def verify_label(repo_object)
-      repo_object.label.eql?(label) ? VERIFICATION_PASS : VERIFICATION_FAIL
-    end
-
-    def verify_attribute(repo_object, attribute)
-      repo_object.datastreams[attribute.datastream].values(attribute.name).include?(attribute.value) ?
-              VERIFICATION_PASS : VERIFICATION_FAIL
-    end
-
-    def verify_datastream(repo_object, datastream)
-      if repo_object.datastreams.include?(datastream.name) &&
-          repo_object.datastreams[datastream.name].has_content?
-        VERIFICATION_PASS
-      else
-        VERIFICATION_FAIL
-      end
-    end
-
-    def verify_datastream_external_checksum(repo_object, datastream)
-      repo_object.datastreams[datastream.name].validate_checksum! datastream.checksum, datastream.checksum_type
-      return VERIFICATION_PASS
-    rescue Ddr::Models::ChecksumInvalid
-      return VERIFICATION_FAIL
-    end
-
-    def verify_relationship(repo_object, relationship)
-      relationship_reflection = Ddr::Utils.relationship_object_reflection(model, relationship.name)
-      relationship_object_class = Ddr::Utils.reflection_object_class(relationship_reflection)
-      relationship_object = repo_object.send(relationship.name)
-      if !relationship_object.nil? &&
-          relationship_object.pid.eql?(relationship.object) &&
-          relationship_object.is_a?(relationship_object_class)
-        VERIFICATION_PASS
-      else
-        VERIFICATION_FAIL
-      end
-    end
-
-    def add_attribute(repo_object, attribute)
-      repo_object.datastreams[attribute.datastream].add_value(attribute.name, attribute.value)
-      return repo_object
-    end
-
-    def clear_attribute(repo_object, attribute)
-      repo_object.datastreams[attribute.datastream].set_values(attribute.name, nil)
-      return repo_object
-    end
-
-    def clear_attributes(repo_object, attribute)
-      repo_object.datastreams[attribute.datastream].class.term_names.each do |term|
-        repo_object.datastreams[attribute.datastream].set_values(term, nil) if repo_object.datastreams[attribute.datastream].values(term)
-      end
-      return repo_object
-    end
-
-    def populate_datastream(repo_object, datastream)
-      case datastream[:payload_type]
-      when DulHydra::Batch::Models::BatchObjectDatastream::PAYLOAD_TYPE_BYTES
-        ds_content = datastream[:payload]
-        if repo_object.datastreams[datastream[:name]].is_a? ActiveFedora::RDFDatastream
-          ds_content = set_rdf_subject(repo_object, ds_content)
-        end
-        repo_object.datastreams[datastream[:name]].content = ds_content
-      when DulHydra::Batch::Models::BatchObjectDatastream::PAYLOAD_TYPE_FILENAME
-        if repo_object.datastreams[datastream[:name]].is_a? ActiveFedora::RDFDatastream
-          ds_content = set_rdf_subject(repo_object, File.read(datastream[:payload]))
-          mime_type = "application/n-triples"
-        else
-          ds_content = File.new(datastream[:payload])
-        end
-        file_name = File.basename(datastream[:payload])
-        dsid = datastream[:name]
-        opts = { filename: file_name }
-        opts.merge({ mime_type: mime_type }) if mime_type
-        repo_object.add_file(ds_content, dsid, opts)
-      end
-      return repo_object
-    end
-
-    def add_relationship(repo_object, relationship)
-      relationship_object = case relationship[:object_type]
-      when BatchObjectRelationship::OBJECT_TYPE_PID
-        ActiveFedora::Base.find(relationship[:object], :cast => true)
-      end
-      repo_object.send("#{relationship[:name]}=", relationship_object)
-      return repo_object
-    end
-
-    def set_rdf_subject(repo_object, ds_content)
-      graph = RDF::Graph.new
-      RDF::Reader.for(:ntriples).new(ds_content) do |reader|
-        reader.each_statement do |statement|
-          if statement.subject.is_a? RDF::Node
-            statement.subject = RDF::URI(repo_object.internal_uri)
-          end
-          graph.insert(statement)
-        end
-      end
-      graph.dump :ntriples
-    end
-
-  end
-
-end
diff --git a/lib/dul_hydra/batch/models/batch_object_attribute.rb b/lib/dul_hydra/batch/models/batch_object_attribute.rb
deleted file mode 100644
index d991e8b4..00000000
--- a/lib/dul_hydra/batch/models/batch_object_attribute.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-module DulHydra::Batch::Models
-
-  class BatchObjectAttribute < ActiveRecord::Base
-    belongs_to :batch_object, :inverse_of => :batch_object_attributes
-
-    OPERATION_ADD = "ADD"              # Add the provided value to the attribute
-    OPERATION_DELETE = "DELETE"        # Delete the provided value from the attribute
-    OPERATION_CLEAR = "CLEAR"          # Clear all values from the attribute
-    OPERATION_CLEAR_ALL = "CLEAR_ALL"  # Clear all attributes in the datastream
-
-    OPERATIONS = [ OPERATION_ADD, OPERATION_DELETE, OPERATION_CLEAR, OPERATION_CLEAR_ALL ]
-
-    VALUE_TYPE_STRING = "STRING"
-
-    VALUE_TYPES = [ VALUE_TYPE_STRING ]
-
-    validates :operation, inclusion: { in: OPERATIONS }
-    validates :datastream, presence: true
-    with_options if: :operation_requires_name? do |obj|
-      obj.validates :name, presence: true
-    end
-    validate :valid_datastream_and_attribute_name, if: [ 'batch_object.model', 'datastream', 'name' ]
-    with_options if: :operation_requires_value? do |obj|
-      obj.validates :value, presence: true
-      obj.validates :value_type, inclusion: { in: VALUE_TYPES }
-    end
-
-    def operation_requires_name?
-      [ OPERATION_ADD, OPERATION_DELETE, OPERATION_CLEAR ].include? operation
-    end
-
-    def operation_requires_value?
-      [ OPERATION_ADD, OPERATION_DELETE ].include? operation
-    end
-
-    def valid_datastream_and_attribute_name
-      if datastream_valid?
-        errors.add(:name, "is not valid") unless attribute_name_valid?
-      else
-        errors.add(:datastream, "is not valid")
-      end
-    end
-
-    def datastream_type
-      batch_object.model.constantize.ds_specs[datastream][:type] rescue nil
-    end
-
-    def datastream_valid?
-        datastream_type < ActiveFedora::RDFDatastream rescue false
-    end
-
-    def attribute_name_valid?
-      datastream_type.term_names.include?(name.to_sym)
-    end
-
-  end
-end
diff --git a/lib/dul_hydra/batch/models/batch_object_datastream.rb b/lib/dul_hydra/batch/models/batch_object_datastream.rb
deleted file mode 100644
index 47466035..00000000
--- a/lib/dul_hydra/batch/models/batch_object_datastream.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-module DulHydra::Batch::Models
-
-  class BatchObjectDatastream < ActiveRecord::Base
-
-    belongs_to :batch_object, :inverse_of => :batch_object_datastreams
-
-    DATASTREAMS = [ Ddr::Datastreams::CONTENT,
-                    Ddr::Datastreams::DESC_METADATA,
-                    Ddr::Datastreams::RIGHTS_METADATA,
-                    Ddr::Datastreams::STRUCT_METADATA ]
-
-    OPERATION_ADD = "ADD" # add this datastream to the object -- considered an error if datastream already exists
-    OPERATION_ADDUPDATE = "ADDUPDATE" # add this datastream to or update this datastream in the object
-    OPERATION_UPDATE = "UPDATE" # update this datastream in the object -- considered an error if datastream does not already exist
-    OPERATION_DELETE = "DELETE" # delete this datastream from the object -- considered an error if datastream does not exist
-
-    PAYLOAD_TYPE_BYTES = "BYTES"
-    PAYLOAD_TYPE_FILENAME = "FILENAME"
-
-    PAYLOAD_TYPES = [ PAYLOAD_TYPE_BYTES, PAYLOAD_TYPE_FILENAME ]
-  end
-
-end
diff --git a/lib/dul_hydra/batch/models/batch_object_relationship.rb b/lib/dul_hydra/batch/models/batch_object_relationship.rb
deleted file mode 100644
index b70c28bc..00000000
--- a/lib/dul_hydra/batch/models/batch_object_relationship.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module DulHydra::Batch::Models
-
-  class BatchObjectRelationship < ActiveRecord::Base
-#    attr_accessible :name, :object, :object_type, :operation, :batch_object
-    belongs_to :batch_object, :inverse_of => :batch_object_relationships
-
-    RELATIONSHIP_ADMIN_POLICY = "admin_policy"
-    RELATIONSHIP_COLLECTION = "collection"
-    RELATIONSHIP_PARENT = "parent"
-    RELATIONSHIP_ITEM = "item"
-    RELATIONSHIP_COMPONENT = "component"
-    RELATIONSHIP_ATTACHED_TO = "attached_to"
-
-    RELATIONSHIPS = [ RELATIONSHIP_ADMIN_POLICY, RELATIONSHIP_COLLECTION, RELATIONSHIP_PARENT, RELATIONSHIP_ITEM,
-      RELATIONSHIP_COMPONENT, RELATIONSHIP_ATTACHED_TO ]
-
-    OPERATION_ADD = "ADD"
-    OPERATION_UPDATE = "UPDATE"
-    OPERATION_DELETE = "DELETE"
-
-    OBJECT_TYPE_PID = "PID"
-
-    OBJECT_TYPES = [ OBJECT_TYPE_PID ]
-  end
-
-end
diff --git a/lib/dul_hydra/batch/models/ingest_batch_object.rb b/lib/dul_hydra/batch/models/ingest_batch_object.rb
deleted file mode 100644
index 1156ae1f..00000000
--- a/lib/dul_hydra/batch/models/ingest_batch_object.rb
+++ /dev/null
@@ -1,118 +0,0 @@
-module DulHydra::Batch::Models
-
-  class IngestBatchObject < DulHydra::Batch::Models::BatchObject
-
-    def local_validations
-      errors = []
-      errors << "#{@error_prefix} Model required for INGEST operation" unless model
-      errors += validate_pre_assigned_pid if pid
-      errors
-    end
-
-    def model_datastream_keys
-      model.constantize.new.datastreams.keys
-    end
-
-    def process(user, opts = {})
-      ingest(user, opts) unless verified
-    end
-
-    def results_message
-      if pid
-        verification_result = (verified ? "Verified" : "VERIFICATION FAILURE")
-        message = "Ingested #{model} #{identifier} into #{pid}...#{verification_result}"
-      else
-        message = "Attempt to ingest #{model} #{identifier} FAILED"
-      end
-    end
-
-    private
-
-    def validate_pre_assigned_pid
-      errs = []
-      errs << "#{@error_prefix} #{pid} already exists in repository" if ActiveFedora::Base.exists?(pid)
-      return errs
-    end
-
-    def ingest(user, opts = {})
-      repo_object = create_repository_object
-      if !repo_object.nil? && !repo_object.new_record?
-        ingest_outcome_detail = []
-        ingest_outcome_detail << "Ingested #{model} #{identifier} into #{repo_object.pid}"
-        Ddr::Events::IngestionEvent.new.tap do |event|
-          event.object = repo_object
-          event.user = user
-          event.summary = EVENT_SUMMARY % {
-            :label => "Object ingestion",
-            :batch_id => id,
-            :identifier => identifier,
-            :model => model
-          }
-          event.detail = ingest_outcome_detail.join("\n")
-          event.save!
-        end
-        update_attributes(:pid => repo_object.pid)
-        verifications = verify_repository_object
-        verification_outcome_detail = []
-        verified = true
-        verifications.each do |key, value|
-          verification_outcome_detail << "#{key}...#{value}"
-          verified = false if value.eql?(VERIFICATION_FAIL)
-        end
-        update_attributes(:verified => verified)
-        Ddr::Events::ValidationEvent.new.tap do |event|
-          event.object = repo_object
-          event.failure! unless verified
-          event.summary = EVENT_SUMMARY % {
-            :label => "Object ingestion validation",
-            :batch_id => id,
-            :identifier => identifier,
-            :model => model
-          }
-          event.detail = verification_outcome_detail.join("\n")
-          event.save!
-        end
-      else
-        verifications = nil
-      end
-      repo_object
-    end
-
-    def create_repository_object
-      repo_pid = pid if pid.present?
-      repo_object = nil
-      begin
-        repo_object = model.constantize.new(:pid => repo_pid)
-        repo_object.label = label if label
-        repo_object.save(validate: false)
-        batch_object_attributes.each { |a| repo_object = add_attribute(repo_object, a) }
-        batch_object_datastreams.each { |d| repo_object = populate_datastream(repo_object, d) }
-        batch_object_relationships.each { |r| repo_object = add_relationship(repo_object, r) }
-        repo_object.save
-      rescue Exception => e1
-        logger.fatal("Error in creating repository object #{repo_object.pid} for #{identifier} : #{e1}")
-        repo_clean = false
-        if repo_object && !repo_object.new_record?
-          begin
-            logger.info("Deleting potentially incomplete #{repo_object.pid} due to error in ingest batch processing")
-            repo_object.destroy
-          rescue Exception => e2
-            logger.fatal("Error deleting repository object #{repo_object.pid}: #{e2}")
-          else
-            repo_clean = true
-          end
-        else
-          repo_clean = true
-        end
-        if batch.present?
-          batch.status = repo_clean ? DulHydra::Batch::Models::Batch::STATUS_RESTARTABLE : DulHydra::Batch::Models::Batch::STATUS_INTERRUPTED
-          batch.save
-        end
-        raise e1
-      end
-      repo_object
-    end
-
-  end
-
-end
diff --git a/lib/dul_hydra/batch/models/manifest.rb b/lib/dul_hydra/batch/models/manifest.rb
deleted file mode 100644
index 3f55ddc1..00000000
--- a/lib/dul_hydra/batch/models/manifest.rb
+++ /dev/null
@@ -1,340 +0,0 @@
-module DulHydra::Batch::Models
-
-  class Manifest
-
-    AUTOIDLENGTH = 'autoidlength'
-    BASEPATH = 'basepath'
-    BATCH = 'batch'
-    BATCHID = 'batchid'
-    CHECKSUM = 'checksum'
-    DATASTREAMS = 'datastreams'
-    DESCRIPTION = 'description'
-    EXTENSION = 'extension'
-    ID = 'id'
-    IDENTIFIER_ELEMENT = 'identifier_element'
-    LABEL = 'label'
-    LOCATION = 'location'
-    MODEL = 'model'
-    NAME = 'name'
-    NODE_XPATH = 'node_xpath'
-    OBJECTS = 'objects'
-    PID = 'pid'
-    SOURCE = 'source'
-    TYPE = 'type'
-    TYPE_XPATH = 'type_xpath'
-    USER_EMAIL = 'user_email'
-    VALUE_XPATH = 'value_xpath'
-
-    MANIFEST_KEYS = [ BASEPATH, BATCH, CHECKSUM, DATASTREAMS, DESCRIPTION, LABEL, MODEL, NAME, OBJECTS, DulHydra::Batch::Models::BatchObjectDatastream::DATASTREAMS, DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIPS ].flatten
-    BATCH_KEYS = [ DESCRIPTION, ID, NAME, USER_EMAIL ]
-    MANIFEST_CHECKSUM_KEYS = [ LOCATION, SOURCE, TYPE, NODE_XPATH, IDENTIFIER_ELEMENT, TYPE_XPATH, VALUE_XPATH ]
-    MANIFEST_DATASTREAM_KEYS = [ EXTENSION, LOCATION ]
-    MANIFEST_RELATIONSHIP_KEYS = [ AUTOIDLENGTH, BATCHID, ID, PID ]
-
-    def initialize(manifest_filepath=nil)
-      if manifest_filepath
-        begin
-          @manifest_hash = File.open(manifest_filepath) { |f| YAML::load(f) }
-        rescue
-          raise ArgumentError, I18n.t('batch.manifest.errors.file_error', :file => manifest_filepath)
-        end
-      else
-        @manifest_hash = {}
-      end
-    end
-
-    def validate
-      errors = []
-      errors += validate_model if model
-      errors += validate_keys
-      errors += validate_basepath
-      errors += validate_datastream_list if datastreams
-      BatchObjectDatastream::DATASTREAMS.each do |datastream|
-        if manifest_hash[datastream] && manifest_hash[datastream][LOCATION]
-          errors += validate_datastream_filepath(datastream)
-        end
-      end
-      errors += validate_checksum_file if checksums?
-      errors += validate_checksum_type if checksum_type?
-      BatchObjectRelationship::RELATIONSHIPS.each do |relationship|
-        if has_relationship?(relationship)
-          errors += validate_relationship(relationship)
-        end
-      end
-      return errors
-    end
-
-    def validate_basepath
-      errs = []
-      if basepath
-        errs << I18n.t('batch.manifest.errors.basepath_error', :path => basepath) unless File.readable?(basepath)
-      else
-        errs << I18n.t('batch.manifest.errors.basepath_missing')
-      end
-      return errs
-    end
-
-    def validate_keys
-      errs = []
-      manifest_hash.keys.each do |key|
-        errs << I18n.t('batch.manifest.errors.invalid_key', :key => key) unless MANIFEST_KEYS.include?(key)
-        case
-        when key.eql?(BATCH)
-          manifest_hash[BATCH].keys.each do |subkey|
-            errs << I18n.t('batch.manifest.errors.invalid_subkey', :key => BATCH, :subkey => subkey) unless BATCH_KEYS.include?(subkey)
-          end
-        when key.eql?(CHECKSUM)
-          manifest_hash[CHECKSUM].keys.each do |subkey|
-            errs << I18n.t('batch.manifest.errors.invalid_subkey', :key => CHECKSUM, :subkey => subkey) unless MANIFEST_CHECKSUM_KEYS.include?(subkey)
-          end
-        when BatchObjectDatastream::DATASTREAMS.include?(key)
-          manifest_hash[key].keys.each do |subkey|
-            errs << I18n.t('batch.manifest.errors.invalid_subkey', :key => key, :subkey => subkey) unless MANIFEST_DATASTREAM_KEYS.include?(subkey)
-          end
-        when BatchObjectRelationship::RELATIONSHIPS.include?(key)
-          if manifest_hash[key].is_a?(Hash)
-            manifest_hash[key].keys.each do |subkey|
-              errs << I18n.t('batch.manifest.errors.invalid_subkey', :key => key, :subkey => subkey) unless MANIFEST_RELATIONSHIP_KEYS.include?(subkey)
-            end
-          end
-        end
-      end
-      return errs
-    end
-
-    def validate_relationship(relationship)
-      errs = []
-      pid = relationship_pid(relationship)
-      if pid
-        begin
-          obj = ActiveFedora::Base.find(pid, :cast => true)
-        rescue
-          errs << I18n.t('batch.manifest.errors.relationship_object_not_found', :relationship => relationship, :pid => pid)
-        end
-        if obj && model
-          object_class = Ddr::Utils.reflection_object_class(Ddr::Utils.relationship_object_reflection(model, relationship))
-          errs << I18n.t('batch.manifest.errors.relationship_object_class_mismatch', :relationship => relationship, :exp_class => object_class, :actual_class => obj.class) unless obj.is_a?(object_class)
-        end
-      else
-        unless @manifest_hash[relationship].has_key?(Manifest::AUTOIDLENGTH) # when autoidlength specified at manifest level, pid is determined at object level
-          errs << I18n.t('batch.manifest.errors.relationship_object_pid_not_determined', :relationship => relationship)
-        end
-      end
-      return errs
-    end
-
-    def validate_datastream_filepath(datastream)
-      errs = []
-      filepath = datastream_location(datastream)
-      errs << I18n.t('batch.manifest.errors.datastream_filepath_error', :datastream => datastream, :filepath => filepath) unless File.readable?(filepath)
-      return errs
-    end
-
-    def validate_datastream_list
-      errs = []
-      datastreams.each do |ds|
-        errs << I18n.t('batch.manifest.errors.datastream_name_invalid', :name => ds) unless BatchObjectDatastream::DATASTREAMS.include?(ds)
-      end
-      return errs.flatten
-    end
-
-    def validate_checksum_type
-      errs = []
-      unless Ddr::Datastreams::CHECKSUM_TYPES.include?(checksum_type)
-        errs << I18n.t('batch.manifest.errors.checksum_type_invalid', :type => checksum_type)
-      end
-      return errs
-    end
-
-    def validate_checksum_file
-      errs = []
-      errs << I18n.t('batch.manifest.errors.checksum_file_error', :file => checksum_location) unless File.readable?(checksum_location)
-      if errs.empty?
-        checksums = File.open(checksum_location) { |f| Nokogiri::XML(f) }
-        errs << I18n.t('batch.manifest.errors.checksum_file_not_xml', :file => checksum_location) if checksums.root.nil?
-      end
-      if errs.empty?
-        errs << I18n.t('batch.manifest.errors.checksum_file_node_error', :node => checksum_node_xpath, :file => checksum_location) \
-                    if checksums.xpath(checksum_node_xpath).empty?
-      end
-      if errs.empty?
-        base_node_xpath = checksum_node_xpath.end_with?('/') ? checksum_node_xpath : "#{checksum_node_xpath}/"
-        identifier_xpath = "#{base_node_xpath}#{checksum_identifier_element}"
-        type_xpath = "#{base_node_xpath}#{checksum_type_xpath}"
-        value_xpath = "#{base_node_xpath}#{checksum_value_xpath}"
-        errs << I18n.t('batch.manifest.errors.checksum_file_node_error', :node => checksum_identifier_element, :file => checksum_location) \
-                    if checksums.xpath(identifier_xpath).empty?
-        errs << I18n.t('batch.manifest.errors.checksum_file_node_error', :node => checksum_type_xpath, :file => checksum_location) \
-                    if checksums.xpath(type_xpath).empty?
-        errs << I18n.t('batch.manifest.errors.checksum_file_node_error', :node => checksum_value_xpath, :file => checksum_location) \
-                    if checksums.xpath(value_xpath).empty?
-      end
-      return errs
-    end
-
-    def validate_model
-      errs = []
-      model.constantize.new rescue errs << I18n.t('batch.manifest.errors.model_invalid', :model => model)
-      return errs
-    end
-
-    def basepath
-      manifest_hash[BASEPATH]
-    end
-
-    def basepath=(basepath)
-      manifest_hash[BASEPATH] = basepath
-    end
-
-    def batch
-      @batch
-    end
-
-    def batch=(batch)
-      @batch = batch
-    end
-
-    def batch_description
-      manifest_hash[BATCH][DESCRIPTION] if manifest_hash[BATCH]
-    end
-
-    def batch_id
-      manifest_hash[BATCH][ID] if manifest_hash[BATCH]
-    end
-
-    def batch_name
-      manifest_hash[BATCH][NAME] if manifest_hash[BATCH]
-    end
-
-    def batch_user_email
-      manifest_hash[BATCH][USER_EMAIL] if manifest_hash[BATCH]
-    end
-
-    def checksum_identifier_element
-      if manifest_hash[CHECKSUM] && manifest_hash[CHECKSUM][IDENTIFIER_ELEMENT]
-        manifest_hash[CHECKSUM][IDENTIFIER_ELEMENT]
-      else
-        'id'
-      end
-    end
-
-    def checksum_location
-      manifest_hash[CHECKSUM][LOCATION] if manifest_hash[CHECKSUM]
-    end
-
-    def checksum_node_xpath
-      if manifest_hash[CHECKSUM] && manifest_hash[CHECKSUM][NODE_XPATH]
-        manifest_hash[CHECKSUM][NODE_XPATH]
-      else
-        '/checksums/checksum'
-      end
-    end
-
-    def checksum_type
-      manifest_hash[CHECKSUM][TYPE] if manifest_hash[CHECKSUM]
-    end
-
-    def checksum_type?
-      manifest_hash[CHECKSUM] && manifest_hash[CHECKSUM][TYPE]
-    end
-
-    def checksum_type_xpath
-      if manifest_hash[CHECKSUM] && manifest_hash[CHECKSUM][TYPE_XPATH]
-        manifest_hash[CHECKSUM][TYPE_XPATH]
-      else
-        'type'
-      end
-    end
-
-    def checksum_value_xpath
-      if manifest_hash[CHECKSUM] && manifest_hash[CHECKSUM][VALUE_XPATH]
-        manifest_hash[CHECKSUM][VALUE_XPATH]
-      else
-        'value'
-      end
-    end
-
-    def checksums
-      return @checksums if @checksums
-      if checksums?
-        @checksums = File.open(manifest_hash[CHECKSUM][LOCATION]) { |f| Nokogiri::XML(f) }
-      end
-      return @checksums
-    end
-
-    def checksums?
-      manifest_hash[CHECKSUM] && manifest_hash[CHECKSUM][LOCATION]
-    end
-
-    def datastream_extension(datastream_name)
-      manifest_hash[datastream_name][EXTENSION] if manifest_hash[datastream_name]
-    end
-
-    def datastream_location(datastream_name)
-      manifest_hash[datastream_name][LOCATION] if manifest_hash[datastream_name]
-    end
-
-    def datastreams
-      manifest_hash[DATASTREAMS]
-    end
-
-    def label
-      manifest_hash[LABEL]
-    end
-
-    def model
-      manifest_hash[MODEL]
-    end
-
-    def manifest_hash
-      @manifest_hash
-    end
-
-    def manifest_hash=(manifest_hash)
-      @manifest_hash = manifest_hash
-    end
-
-    def name
-      manifest_hash[NAME]
-    end
-
-    def objects
-      objects = []
-      manifest_objects = manifest_hash[OBJECTS]
-      manifest_objects.each { |object_hash| objects << ManifestObject.new(object_hash, self) }
-      return objects
-    end
-
-    def has_relationship?(relationship_name)
-      manifest_hash[relationship_name] ? true : false
-    end
-
-    def relationship_autoidlength(relationship_name)
-      manifest_hash[relationship_name][AUTOIDLENGTH] if manifest_hash[relationship_name] && manifest_hash[relationship_name].is_a?(Hash)
-    end
-
-    def relationship_id(relationship_name)
-      manifest_hash[relationship_name][ID] if manifest_hash[relationship_name] && manifest_hash[relationship_name].is_a?(Hash)
-    end
-
-    def relationship_batchid(relationship_name)
-      manifest_hash[relationship_name][BATCHID] if manifest_hash[relationship_name] && manifest_hash[relationship_name].is_a?(Hash)
-    end
-
-    def relationship_pid(relationship_name)
-      if manifest_hash[relationship_name]
-        case
-        when manifest_hash[relationship_name].is_a?(String)
-          manifest_hash[relationship_name]
-        when manifest_hash[relationship_name][PID]
-          manifest_hash[relationship_name][PID]
-        when manifest_hash[relationship_name][ID]
-          pids = BatchObject.pid_from_identifier(manifest_hash[relationship_name][ID], manifest_hash[relationship_name][BATCHID])
-          pids.last if pids
-        end
-      end
-    end
-
-  end
-
-end
diff --git a/lib/dul_hydra/batch/models/manifest_object.rb b/lib/dul_hydra/batch/models/manifest_object.rb
deleted file mode 100644
index ae2341a2..00000000
--- a/lib/dul_hydra/batch/models/manifest_object.rb
+++ /dev/null
@@ -1,296 +0,0 @@
-module DulHydra::Batch::Models
-
-  class ManifestObject
-
-    AUTOIDLENGTH = 'autoidlength'
-    BATCHID = 'batchid'
-    CHECKSUM = 'checksum'
-    DATASTREAMS = 'datastreams'
-    ID = 'id'
-    IDENTIFIER = 'identifier'
-    LABEL = 'label'
-    MODEL = 'model'
-    PID = 'pid'
-    TYPE = 'type'
-    VALUE = 'value'
-
-    OBJECT_KEYS = [ CHECKSUM, DATASTREAMS, IDENTIFIER, LABEL, MODEL, BatchObjectDatastream::DATASTREAMS, BatchObjectRelationship::RELATIONSHIPS].flatten
-    OBJECT_CHECKSUM_KEYS = [ TYPE, VALUE ]
-    OBJECT_RELATIONSHIP_KEYS = [ AUTOIDLENGTH, BATCHID, ID, PID ]
-
-    def initialize(object_hash, manifest)
-      @object_hash = object_hash
-      @manifest = manifest
-    end
-
-    def validate
-      errors = []
-      errors += validate_identifier
-      errors += validate_model
-      errors += validate_keys
-      errors += validate_datastreams if datastreams
-      errors += validate_checksum_type if checksum_type?
-      BatchObjectRelationship::RELATIONSHIPS.each do |relationship|
-        if has_relationship?(relationship)
-          errors += validate_relationship(relationship)
-        end
-      end
-      return errors
-    end
-
-    def validate_relationship(relationship)
-      errs = []
-      pid = relationship_pid(relationship)
-      if pid
-        begin
-          obj = ActiveFedora::Base.find(pid, :cast => true)
-        rescue
-          errs << I18n.t('batch.manifest_object.errors.relationship_object_not_found', :identifier => key_identifier, :relationship => relationship, :pid => pid)
-        end
-        if obj && model
-          object_class = Ddr::Utils.reflection_object_class(Ddr::Utils.relationship_object_reflection(model, relationship))
-          errs << I18n.t('batch.manifest_object.errors.relationship_object_class_mismatch', :identifier => key_identifier, :relationship => relationship, :exp_class => object_class, :actual_class => obj.class) unless obj.is_a?(object_class)
-        end
-      else
-        errs << I18n.t('batch.manifest_object.errors.relationship_object_pid_not_determined', :identifier => key_identifier, :relationship => relationship)
-      end
-      return errs
-    end
-
-    def validate_datastream_filepath(datastream)
-      errs = []
-      filepath = datastream_filepath(datastream)
-      errs << I18n.t('batch.manifest_object.errors.datastream_filepath_error', :identifier => key_identifier, :datastream => datastream, :filepath => filepath) unless File.readable?(filepath)
-      return errs
-    end
-
-    def validate_datastreams
-      errs = []
-      datastreams.each do |ds|
-        errs << I18n.t('batch.manifest_object.errors.datastream_name_invalid', :identifier => key_identifier, :name => ds) unless BatchObjectDatastream::DATASTREAMS.include?(ds)
-        errs << validate_datastream_filepath(ds)
-      end
-      return errs.flatten
-    end
-
-    def validate_checksum_type
-      errs = []
-      unless Ddr::Datastreams::CHECKSUM_TYPES.include?(checksum_type)
-        errs << I18n.t('batch.manifest_object.errors.checksum_type_invalid', :identifier => key_identifier, :type => checksum_type)
-      end
-      return errs
-    end
-
-    def validate_model
-      errs = []
-      if model
-        model.constantize.new rescue errs << I18n.t('batch.manifest_object.errors.model_invalid', :identifier => key_identifier, :model => model)
-      else
-        errs << I18n.t('batch.manifest_object.errors.model_missing', :identifier => key_identifier)
-      end
-      return errs
-    end
-
-    def validate_identifier
-      errs = []
-      errs << I18n.t('batch.manifest_object.errors.identifier_missing') unless key_identifier
-      return errs
-    end
-
-    def validate_keys
-      errs = []
-      object_hash.keys.each do |key|
-        errs << I18n.t('batch.manifest_object.errors.invalid_key', :identifier => key_identifier, :key => key) unless OBJECT_KEYS.include?(key)
-        case
-        when key.eql?(CHECKSUM)
-          if object_hash[CHECKSUM].is_a?(Hash)
-            object_hash[CHECKSUM].keys.each do |subkey|
-              errs << I18n.t('batch.manifest_object.errors.invalid_subkey', :identifier => key_identifier, :key => CHECKSUM, :subkey => subkey) unless OBJECT_CHECKSUM_KEYS.include?(subkey)
-            end
-          end
-        when BatchObjectRelationship::RELATIONSHIPS.include?(key)
-          if object_hash[key].is_a?(Hash)
-            object_hash[key].keys.each do |subkey|
-              errs << I18n.t('batch.manifest_object.errors.invalid_subkey', :identifier => key_identifier, :key => key, :subkey => subkey) unless OBJECT_RELATIONSHIP_KEYS.include?(subkey)
-            end
-          end
-        end
-      end
-      return errs
-    end
-
-    def batch
-      manifest.batch
-    end
-
-    def checksum
-      if object_hash[CHECKSUM]
-        if object_hash[CHECKSUM][VALUE]
-          object_hash[CHECKSUM][VALUE]
-        else
-          object_hash[CHECKSUM]
-        end
-      else
-        if manifest.checksums?
-          checksums = manifest.checksums
-          checksum_node = checksums.xpath("#{manifest.checksum_node_xpath}[#{manifest.checksum_identifier_element}[text() = '#{key_identifier}']]")
-          checksum_node.xpath(manifest.checksum_value_xpath).text()
-        end
-      end
-    end
-
-    def checksum?
-      object_hash[CHECKSUM] || manifest.checksums? ? true : false
-    end
-
-    def checksum_type
-      case
-      when object_hash[CHECKSUM] && object_hash[CHECKSUM][TYPE]
-        object_hash[CHECKSUM][TYPE]
-      when manifest.checksums?
-        checksums = manifest.checksums
-        checksum_node = checksums.xpath("#{manifest.checksum_node_xpath}[#{manifest.checksum_identifier_element}[text() = '#{key_identifier}']]")
-        checksum_node.xpath(manifest.checksum_type_xpath).text()
-      when manifest.checksum_type
-        manifest.checksum_type
-      end
-    end
-
-    def checksum_type?
-      (object_hash[CHECKSUM] && object_hash[CHECKSUM][TYPE]) || manifest.checksums? || manifest.checksum_type?
-    end
-
-    def datastream_filepath(datastream_name)
-      datastream = object_hash[datastream_name]
-      filepath = case
-        # canonical location is @manifest["basepath"] + datastream (name)
-        # canonical filename is batch_object.identifier
-        # canonical extension is ".xml"
-      when datastream.nil?
-        # (manifest datastream location || canonical location) + canonical filename + (manifest datastream extension || canonical extension)
-        location = manifest.datastream_location(datastream_name) || File.join(manifest.basepath, datastream_name)
-        extension = manifest.datastream_extension(datastream_name) || ".xml"
-        File.join(location, key_identifier + extension)
-      when datastream.start_with?(File::SEPARATOR)
-        # datastream contains full path, file name, and extension
-        datastream
-      else
-        # (manifest datastream location || canonical location) + datastream
-        location = manifest.datastream_location(datastream_name) || File.join(manifest.basepath, datastream_name)
-        File.join(location, datastream)
-      end
-    end
-
-    def datastreams
-      object_hash[DATASTREAMS] || manifest.datastreams
-    end
-
-    def key_identifier
-      case object_hash[IDENTIFIER]
-      when String
-        object_hash[IDENTIFIER]
-      when Array
-        object_hash[IDENTIFIER].first
-      end
-    end
-
-    def label
-      object_hash[LABEL] || manifest.label
-    end
-
-    def model
-      object_hash[MODEL] || manifest.model
-    end
-
-    def manifest
-      @manifest
-    end
-
-    def manifest=(manifest)
-      @manifest = manifest
-    end
-
-    def object_hash
-      @object_hash
-    end
-
-    def object_hash=(object_hash)
-      @object_hash = object_hash
-    end
-
-    def has_relationship?(relationship_name)
-      object_hash[relationship_name] || manifest.has_relationship?(relationship_name) ? true : false
-    end
-
-    def relationship_pid(relationship_name)
-      pid = explicit_relationship_pid(relationship_name)
-      unless pid
-        id = relationship_id(relationship_name)
-        unless id
-          autoidlength = relationship_autoidlength(relationship_name)
-          if autoidlength
-            index = autoidlength - 1
-            id = key_identifier[0..index]
-          end
-        end
-        if id
-          batchid = relationship_batchid(relationship_name)
-          pids = BatchObject.pid_from_identifier(id, batchid)
-          pid = pids.last if pids
-        end
-      end
-      pid = manifest.relationship_pid(relationship_name) unless pid
-      return pid
-    end
-
-    # should be private?
-    def explicit_relationship_pid(relationship_name)
-      pid = nil
-      if object_hash[relationship_name]
-        if object_hash[relationship_name].is_a?(String)
-          pid = object_hash[relationship_name]
-        else
-          pid = object_hash[relationship_name][PID]
-        end
-      end
-      return pid
-    end
-
-    # should be private?
-    def relationship_autoidlength(relationship_name)
-      autoidlength = nil
-      if object_hash[relationship_name]
-        if object_hash[relationship_name].is_a?(Hash)
-          autoidlength = object_hash[relationship_name][AUTOIDLENGTH]
-        end
-      end
-      autoidlength = manifest.relationship_autoidlength(relationship_name) unless autoidlength
-      return autoidlength
-    end
-
-    # should be private?
-    def relationship_id(relationship_name)
-      id = nil
-      if object_hash[relationship_name]
-        if object_hash[relationship_name].is_a?(Hash)
-          id = object_hash[relationship_name][ID]
-        end
-      end
-      id = manifest.relationship_id(relationship_name) unless id
-      return id
-    end
-
-    # should be private?
-    def relationship_batchid(relationship_name)
-      batchid = nil
-      if object_hash[relationship_name]
-        if object_hash[relationship_name].is_a?(Hash)
-          batchid = object_hash[relationship_name][BATCHID]
-        end
-      end
-      batchid = manifest.relationship_batchid(relationship_name) unless batchid
-      return batchid
-    end
-  end
-
-end
diff --git a/lib/dul_hydra/batch/models/update_batch_object.rb b/lib/dul_hydra/batch/models/update_batch_object.rb
deleted file mode 100644
index d4019e43..00000000
--- a/lib/dul_hydra/batch/models/update_batch_object.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-module DulHydra::Batch::Models
-
-  class UpdateBatchObject < DulHydra::Batch::Models::BatchObject
-
-    def local_validations
-      errs = []
-      errs << "#{@error_prefix} PID required for UPDATE operation" unless pid
-      if pid
-        if ActiveFedora::Base.exists?(pid)
-          errs << "#{@error_prefix} #{batch.user.user_key} not permitted to edit #{pid}" unless batch.user.can?(:edit, ActiveFedora::Base.find(pid, :cast => true))
-        else
-          errs << "#{@error_prefix} PID #{pid} not found in repository" unless ActiveFedora::Base.exists?(pid)
-        end
-      end
-      errs
-    end
-
-    def model_datastream_keys
-      if pid
-        begin
-          obj = ActiveFedora::Base.find(pid, :cast => true)
-          obj.datastreams.keys
-        rescue
-          nil
-        end
-      end
-    end
-
-    def process(user, opts = {})
-      unless verified
-        repo_object = update_repository_object(user, opts)
-        verifications = verify_repository_object
-        verification_outcome_detail = []
-        verified = true
-        verifications.each do |key, value|
-          verification_outcome_detail << "#{key}...#{value}"
-          verified = false if value.eql?(VERIFICATION_FAIL)
-        end
-        update_attributes(:verified => verified)
-        repo_object
-      end
-    end
-
-    def results_message
-      if pid
-        verification_result = (verified ? "Verified" : "VERIFICATION FAILURE")
-        message = "Updated #{pid}...#{verification_result}"
-      else
-        message = "Attempt to update #{model} #{identifier} FAILED"
-      end
-    end
-
-    def event_log_comment
-      "Updated by batch process (Batch #{batch.id}, BatchObject #{id})"
-    end
-
-    private
-
-    def update_repository_object(user, opts = {})
-      repo_object = nil
-      begin
-        repo_object = ActiveFedora::Base.find(pid)
-        batch_object_attributes.each do |a|
-          repo_object = case
-          when a.operation.eql?(DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD)
-            add_attribute(repo_object, a)
-          when a.operation.eql?(DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR)
-            clear_attribute(repo_object, a)
-          when a.operation.eql?(DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR_ALL)
-            clear_attributes(repo_object, a)
-          end
-        end
-        batch_object_datastreams.each do |d|
-          repo_object = case
-          when d.operation.eql?(DulHydra::Batch::Models::BatchObjectDatastream::OPERATION_ADDUPDATE)
-            populate_datastream(repo_object, d)
-          end
-        end
-        if repo_object.save
-          repo_object.notify_event(:update, user: user, comment: event_log_comment)
-        end
-      rescue Exception => e
-        logger.error("Error in updating repository object #{pid} for #{identifier} : : #{e}")
-        if batch.present?
-          batch.status = DulHydra::Batch::Models::Batch::STATUS_RESTARTABLE
-          batch.save
-        end
-        raise e
-      end
-      repo_object
-    end
-
-  end
-end
diff --git a/lib/dul_hydra/batch/scripts/batch_processor.rb b/lib/dul_hydra/batch/scripts/batch_processor.rb
deleted file mode 100644
index ea0b3bd3..00000000
--- a/lib/dul_hydra/batch/scripts/batch_processor.rb
+++ /dev/null
@@ -1,151 +0,0 @@
-module DulHydra::Batch::Scripts
-  class BatchProcessor
-
-    LOG_CONFIG_FILEPATH = File.join(Rails.root, 'config', 'log4r_batch_processor.yml')
-    DEFAULT_LOG_DIR = File.join(Rails.root, 'log')
-    DEFAULT_LOG_FILE = "batch_processor_log.txt"
-    PASS = "PASS"
-    FAIL = "FAIL"
-
-    # Options
-    #   :log_dir - optional - directory for log file - default is given in DEFAULT_LOG_DIR
-    #   :log_file - optional - filename of log file - default is given in DEFAULT_LOG_FILE
-    #   :skip_validation - optional - whether to skip batch object validation step when processing - default is false
-    #   :ignore_validation_errors - optional - whether to continue processing even if batch object validation errors occur - default is false
-    def initialize(batch, operator=nil, opts={})
-      @batch = batch
-      @operator = operator
-      @bp_log_dir = opts.fetch(:log_dir, DEFAULT_LOG_DIR)
-      @bp_log_file = opts.fetch(:log_file, DEFAULT_LOG_FILE)
-      @skip_validation = opts.fetch(:skip_validation, false)
-      @ignore_validation_errors = opts.fetch(:ignore_validation_errors, false)
-    end
-
-    def execute
-      config_logger
-      if @batch
-        initiate_batch_run
-        unless @skip_validation
-          valid_batch = validate_batch
-          @batch.update_attributes(status: DulHydra::Batch::Models::Batch::STATUS_INVALID) unless valid_batch
-        end
-        if @skip_validation || @ignore_validation_errors || valid_batch
-          process_batch
-        end
-        close_batch_run
-      end
-      save_logfile
-      send_notification if @batch.user && @batch.user.email
-    end
-
-    private
-
-    def validate_batch
-      @batch.update_attributes(status: DulHydra::Batch::Models::Batch::STATUS_VALIDATING)
-      valid = true
-      errors = @batch.validate
-      unless errors.empty?
-        valid = false
-        errors.each do |error|
-          message = "Batch Object Validation Error: #{error}"
-          @bp_log.error(message)
-        end
-      end
-      @batch.update_attributes(status: DulHydra::Batch::Models::Batch::STATUS_RUNNING)
-      return valid
-    end
-
-    def process_batch
-      @batch.update_attributes(status: DulHydra::Batch::Models::Batch::STATUS_PROCESSING, processing_step_start: DateTime.now)
-      @batch.batch_objects.each do |object|
-        begin
-          process_object(object)
-        rescue Exception => e
-          break
-        end
-        sleep 2
-      end
-      @batch.update_attributes(status: DulHydra::Batch::Models::Batch::STATUS_RUNNING) if @batch.status == DulHydra::Batch::Models::Batch::STATUS_PROCESSING
-    end
-
-    def initiate_batch_run
-      @bp_log.info "Batch id: #{@batch.id}"
-      @bp_log.info "Batch name: #{@batch.name}" if @batch.name
-      @bp_log.info "Batch size: #{@batch.batch_objects.size}"
-      @batch.logfile.clear  # clear out any attached logfile
-      @batch.update_attributes(:start => DateTime.now,
-                               :status => DulHydra::Batch::Models::Batch::STATUS_RUNNING,
-                               :version => DulHydra::VERSION)
-      @failures = 0
-      @successes = 0
-      @results_tracker = Hash.new
-    end
-
-    def close_batch_run
-      @batch.reload
-      @batch.failure = @failures
-      @batch.outcome = @successes.eql?(@batch.batch_objects.size) ? DulHydra::Batch::Models::Batch::OUTCOME_SUCCESS : DulHydra::Batch::Models::Batch::OUTCOME_FAILURE
-      if @batch.status.eql?(DulHydra::Batch::Models::Batch::STATUS_RUNNING)
-        @batch.status = DulHydra::Batch::Models::Batch::STATUS_FINISHED
-      end
-      @batch.stop = DateTime.now
-      @batch.success = @successes
-      @batch.save
-      @bp_log.info "====== Summary ======"
-      @results_tracker.keys.each do |type|
-        verb = case type
-        when DulHydra::Batch::Models::IngestBatchObject.name
-          "Ingested"
-        when DulHydra::Batch::Models::UpdateBatchObject.name
-          "Updated"
-        end
-        @results_tracker[type].keys.each do |model|
-          @bp_log.info "#{verb} #{@results_tracker[type][model][:successes]} #{model}"
-        end
-      end
-    end
-
-    def update_results_tracker(type, model, verified)
-      @results_tracker[type] = Hash.new unless @results_tracker.has_key?(type)
-      @results_tracker[type][model] = Hash.new unless @results_tracker[type].has_key?(model)
-      @results_tracker[type][model][:successes] = 0 unless @results_tracker[type][model].has_key?(:successes)
-      @results_tracker[type][model][:successes] += 1 if verified
-    end
-
-    def process_object(object)
-      @bp_log.debug "Processing object: #{object.identifier}"
-      repository_object = object.process(@operator)
-      update_results_tracker(object.type, repository_object.present? ? repository_object.class.name : object.model, object.verified)
-      if object.verified
-        @successes += 1
-      else
-        @failures += 1
-      end
-      message = object.results_message
-      @bp_log.info(message)
-    end
-
-    def config_logger
-      logconfig = Log4r::YamlConfigurator
-      logconfig['LOG_FILE'] = File.join(@bp_log_dir, @bp_log_file)
-      logconfig.load_yaml_file File.join(LOG_CONFIG_FILEPATH)
-      @bp_log = Log4r::Logger['batch_processor']
-    end
-
-    def save_logfile
-      @bp_log.outputters.each do |outputter|
-        @logfilename = outputter.filename if outputter.respond_to?(:filename)
-      end
-      @batch.update!({ logfile: File.new(@logfilename) }) if @logfilename
-    end
-
-    def send_notification
-      begin
-        BatchProcessorRunMailer.send_notification(@batch).deliver!
-      rescue
-        puts "An error occurred while attempting to send the notification."
-      end
-    end
-
-  end
-end
diff --git a/lib/dul_hydra/batch/scripts/manifest_maker.rb b/lib/dul_hydra/batch/scripts/manifest_maker.rb
deleted file mode 100644
index e0b03802..00000000
--- a/lib/dul_hydra/batch/scripts/manifest_maker.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-module DulHydra::Batch::Scripts
-  class ManifestMaker
-
-    LOG_CONFIG_FILEPATH = File.join(Rails.root, 'config', 'log4r_batch_processor.yml')
-    DEFAULT_LOG_DIR = File.join(Rails.root, 'log')
-    DEFAULT_LOG_FILE = "manifest_maker.log"
-    DEFAULT_MODEL = "Component"
-    DEFAULT_DATASTREAMS = [ "content" ]
-    DEFAULT_CONTENT_EXTENSION = ".tif"
-    PLACEHOLDER = "PLACEHOLDER VALUE - replace with actual value or remove this entry"
-
-    # Options
-    #   :dirpath - required - path to directory containing files on which manifest is to be based
-    #   :manifest - required - path and filename of manifest to make
-    #   :extension - optional - extension of files to include - default is given in DEFAULT_CONTENT_EXTENSION
-    #   :log_dir - optional - directory for log file - default is given in DEFAULT_LOG_DIR
-    #   :log_file - optional - filename of log file - default is given in DEFAULT_LOG_FILE
-    def initialize(opts={})
-      begin
-        @dirpath = opts.fetch(:dirpath)
-      rescue KeyError
-        puts "Must specify :dirpath in options; e.g., :dirpath => /path/to/files/"
-      end
-      begin
-        @manifest = opts.fetch(:manifest)
-      rescue KeyError
-        puts "Must specify :manifest in options; e.g., :manifest => /path/to/manifest.yml"
-      end
-      @extension = opts.fetch(:extension, DEFAULT_CONTENT_EXTENSION)
-      @log_dir = opts.fetch(:log_dir, DEFAULT_LOG_DIR)
-      @log_file = opts.fetch(:log_file, DEFAULT_LOG_FILE)
-    end
-
-    def execute
-      config_logger
-      begin
-        @log.info("Processing directory: #{@dirpath}")
-        @log.info("Making manifest: #{@manifest}")
-        @manifest_hash = {}
-        build_manifest_level
-        objects_list = enumerate_objects(@dirpath).flatten
-        @manifest_hash["objects"] = objects_list
-        @log.debug(@manifest_hash)
-        write_manifest
-      rescue Exception => e
-        @log.error(e.message)
-        @log.debug(e.backtrace)
-      end
-    end
-
-    private
-
-    def build_manifest_level
-      @manifest_hash["model"] = DEFAULT_MODEL
-      @manifest_hash["basepath"] = PLACEHOLDER
-      @manifest_hash["datastreams"] = DEFAULT_DATASTREAMS
-      content_hash = {}
-      content_hash["extension"] = @extension
-      @manifest_hash["content"] = content_hash
-    end
-
-    def enumerate_objects(dirpath)
-      objects_list = []
-      Dir.foreach(dirpath) do |entry|
-        unless [".", ".."].include?(entry)
-          if File.directory?(File.join(dirpath, entry))
-            objects_list << enumerate_objects(File.join(dirpath, entry))
-          else
-            if File.extname(entry).eql?(@extension)
-              object_hash = {}
-              base_filename = File.basename(entry, File.extname(entry))
-              object_hash["identifier"] = base_filename
-              object_hash["content"] = File.join(dirpath, entry)
-              objects_list << object_hash
-            end
-          end
-        end
-      end
-      objects_list
-    end
-
-    def write_manifest
-      File.open(@manifest, 'w') { |f| f.write(@manifest_hash.to_yaml) }
-    end
-
-    def config_logger
-      logconfig = Log4r::YamlConfigurator
-      logconfig['LOG_FILE'] = File.join(@log_dir, @log_file)
-      logconfig.load_yaml_file File.join(LOG_CONFIG_FILEPATH)
-      @log = Log4r::Logger['batch_processor']
-    end
-
-  end
-
-end
diff --git a/lib/dul_hydra/batch/scripts/manifest_processor.rb b/lib/dul_hydra/batch/scripts/manifest_processor.rb
deleted file mode 100644
index a2ee40e8..00000000
--- a/lib/dul_hydra/batch/scripts/manifest_processor.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-module DulHydra::Batch::Scripts
-  class ManifestProcessor
-
-    LOG_CONFIG_FILEPATH = File.join(Rails.root, 'config', 'log4r_batch_processor.yml')
-    DEFAULT_LOG_DIR = File.join(Rails.root, 'log')
-    DEFAULT_LOG_FILE = "manifest_processor.log"
-
-    # Options
-    #   :manifest - required - manifest file path and filename
-    #   :log_dir - optional - directory for log file - default is given in DEFAULT_LOG_DIR
-    #   :log_file - optional - filename of log file - default is given in DEFAULT_LOG_FILE
-    #   :validate_only - optional - whether to only validate the manifest - default is false
-    #   :dryrun - optional - whether this is a processing dry run or the real deal - default is false
-    #   :skip_validation - optional - whether to skip batch object validation step when processing - default is false
-    #   :ignore_validation_errors - optional - whether to continue processing even if batch object validation errors occur - default is false
-    def initialize(opts={})
-      begin
-        @manifest_file = opts.fetch(:manifest)
-      rescue KeyError
-        puts "Must specify :manifest in options; e.g., :manifest => /path/to/manifest.yml"
-      end
-      @log_dir = opts.fetch(:log_dir, DEFAULT_LOG_DIR)
-      @log_file = opts.fetch(:log_file, DEFAULT_LOG_FILE)
-      @validate_only = opts.fetch(:validate_only, false)
-      @dryrun = opts.fetch(:dryrun, false)
-      @skip_validation = opts.fetch(:skip_validation, false)
-      @ignore_validation_errors = opts.fetch(:ignore_validation_errors, false)
-    end
-
-    def execute
-      config_logger
-      @obj_count = 0
-      @success = 0
-      begin
-        @log.info("Processing manifest: #{@manifest_file}")
-        manifest = DulHydra::Batch::Models::Manifest.new(@manifest_file)
-        @log.info("Manifest name: #{manifest.name}")
-        validation_errors = manifest.validate
-        if validation_errors.empty?
-          @log.info("Manifest validates")
-          unless @validate_only
-            set_batch(manifest)
-            @log.debug("Batch id: #{manifest.batch.id}")
-            process_objects(manifest.objects)
-            @log.info "Processed #{@success} of #{@obj_count} manifest objects into batch id #{manifest.batch.id}"
-          end
-        else
-          validation_errors.each { |err| @log.info(err) }
-          if @ignore_validation_errors
-            @log.info(I18n.t('batch.manifest.validation_errors_ignored'))
-          else
-            @log.info(I18n.t('batch.manifest.validation_failed'))
-          end
-        end
-      rescue Exception => e
-        @log.error(e.message)
-        @log.debug(e.backtrace)
-      end
-    end
-
-    private
-
-    def set_batch(manifest)
-      begin
-        if manifest.batch_id
-          batch = DulHydra::Batch::Models::Batch.find(manifest.batch_id)
-        else
-          name = manifest.batch_name
-          description = manifest.batch_description
-          user = find_user(manifest.batch_user_email) if manifest.batch_user_email
-          batch = DulHydra::Batch::Models::Batch.create(:name => name, :description => description, :user => user)
-        end
-      rescue ActiveRecord::RecordNotFound
-        @log.error("Cannot find Batch with id #{manifest_hash[BATCH][ID]}")
-      end
-      manifest.batch = batch
-    end
-
-    def find_user(user_email)
-      users = User.where("email = ?", user_email)
-      if users.size.eql?(1)
-        user = users.first
-      else
-        @log.error("Cannot find User with email #{user_email}")
-      end
-      return user
-    end
-
-    def process_objects(manifest_objects)
-      manifest_objects.each do |object|
-        @obj_count += 1
-        begin
-          process_object(object)
-          @success += 1
-        rescue Exception => e
-          @log.error(e.message)
-          @log.debug(e.backtrace)
-        end
-      end
-    end
-
-    def process_object(manifest_object)
-      @log.debug("Processing manifest object #{manifest_object.key_identifier}")
-      batch_object = DulHydra::Batch::Models::IngestBatchObject.create(:batch => manifest_object.batch)
-      batch_object.identifier = manifest_object.key_identifier
-      batch_object.label = manifest_object.label
-      batch_object.model = manifest_object.model
-      create_batch_object_datastreams(manifest_object, batch_object)
-      create_batch_object_relationships(manifest_object, batch_object)
-      batch_object.save
-      @log.info("Processed manifest object #{manifest_object.key_identifier} into batch object #{batch_object.id}")
-    end
-
-    def create_batch_object_datastreams(manifest_object, batch_object)
-      manifest_object.datastreams.each do |datastream|
-        @log.debug("... datastream #{datastream}")
-        name = datastream
-        operation = DulHydra::Batch::Models::BatchObjectDatastream::OPERATION_ADD
-        payload = manifest_object.datastream_filepath(datastream)
-        payload_type = DulHydra::Batch::Models::BatchObjectDatastream::PAYLOAD_TYPE_FILENAME
-        ds = DulHydra::Batch::Models::BatchObjectDatastream.create(:name => name,
-                                          :operation => operation,
-                                          :payload => payload,
-                                          :payload_type => payload_type,
-                                          :batch_object => batch_object)
-        # For now, we assume that the only datastream for which we might have a checksum
-        # in the Ddr::Datastreams::CONTENT datastream
-        if datastream.eql?(Ddr::Datastreams::CONTENT)
-          ds.checksum = manifest_object.checksum if manifest_object.checksum?
-          ds.checksum_type = manifest_object.checksum_type if manifest_object.checksum_type?
-        end
-        ds.save
-      end
-    end
-
-    def create_batch_object_relationships(manifest_object, batch_object)
-      DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIPS.each do |relationship|
-        if manifest_object.has_relationship?(relationship)
-          @log.debug("... relationship #{relationship}")
-          relationship_object_pid = manifest_object.relationship_pid(relationship)
-          if relationship_object_pid
-            DulHydra::Batch::Models::BatchObjectRelationship.create(:name => relationship,
-                                           :object => manifest_object.relationship_pid(relationship),
-                                           :object_type => DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPE_PID,
-                                           :operation => DulHydra::Batch::Models::BatchObjectRelationship::OPERATION_ADD,
-                                           :batch_object => batch_object)
-          else
-            @log.error("Could not create #{relationship} for #{manifest_object.key_identifier}")
-            @log.error("Could not find pid for relationship object")
-          end
-        end
-      end
-    end
-
-    def config_logger
-      logconfig = Log4r::YamlConfigurator
-      logconfig['LOG_FILE'] = File.join(@log_dir, @log_file)
-      logconfig.load_yaml_file File.join(LOG_CONFIG_FILEPATH)
-      @log = Log4r::Logger['batch_processor']
-    end
-
-  end
-end
diff --git a/lib/tasks/dul_hydra.rake b/lib/tasks/dul_hydra.rake
index 744b2c70..eb469888 100644
--- a/lib/tasks/dul_hydra.rake
+++ b/lib/tasks/dul_hydra.rake
@@ -103,31 +103,6 @@ namespace :dul_hydra do
        BatchFixityCheckMailer.send_notification(bfc, mailto).deliver!
       end
     end
-    desc "Make manifest MANIFEST based on files in directory DIRPATH"
-    task :make_manifest => :environment do
-      raise "Must specify directory path to files.  Ex.: DIRPATH=/nas/VOLUME/na_COL/" unless ENV['DIRPATH']
-      raise "Must specify manifest.  Ex.: MANIFEST=/srv/fedora-working/ingest/COL/manifests/item.yml" unless ENV['MANIFEST']
-      opts = { :dirpath => ENV['DIRPATH'], :manifest => ENV['MANIFEST'] }
-      opts[:log_dir] = ENV['LOG_DIR'] if ENV['LOG_DIR']
-      mm = DulHydra::Batch::Scripts::ManifestMaker.new(opts)
-      mm.execute
-    end
-    desc "Create ingest batch objects from MANIFEST"
-    task :process_manifest => :environment do
-      raise "Must specify manifest.  Ex.: MANIFEST=/srv/fedora-working/ingest/COL/manifests/item.yml" unless ENV['MANIFEST']
-      opts = { :manifest => ENV['MANIFEST'] }
-      opts[:log_dir] = ENV['LOG_DIR'] if ENV['LOG_DIR']
-      mp = DulHydra::Batch::Scripts::ManifestProcessor.new(opts)
-      mp.execute
-    end
-    desc "Process ingest batch for BATCH_ID"
-    task :process_ingest => :environment do
-      raise "Must specify batch ID.  Ex.: BATCH_ID=7" unless ENV['BATCH_ID']
-      opts = { :batch_id => ENV['BATCH_ID'] }
-      opts[:log_dir] = ENV['LOG_DIR'] if ENV['LOG_DIR']
-      bp = DulHydra::Batch::Scripts::BatchProcessor.new(opts)
-      bp.execute
-    end
     desc "Sets missing thumbnails in collection specified by COLLECTION_PID="
     task :thumbnails => :environment do
       raise "Must specify collection pid.  Ex: COLLECTION_PID=duke:72" unless ENV['COLLECTION_PID']
diff --git a/spec/controllers/batches_controller_spec.rb b/spec/controllers/batches_controller_spec.rb
index 887ee689..76cad64b 100644
--- a/spec/controllers/batches_controller_spec.rb
+++ b/spec/controllers/batches_controller_spec.rb
@@ -5,7 +5,7 @@
   shared_examples "a delete-able batch" do
     it "should delete the batch and redirect to the index page" do
       delete :destroy, :id => batch
-      expect{ DulHydra::Batch::Models::Batch.find(batch.id) }.to raise_error(ActiveRecord::RecordNotFound)
+      expect{ Ddr::Batch::Batch.find(batch.id) }.to raise_error(ActiveRecord::RecordNotFound)
       expect(subject).to redirect_to(batches_path)
     end
   end
@@ -13,7 +13,7 @@
   shared_examples "a non-delete-able batch" do
     it "should not delete the batch and redirect to the index page" do
       delete :destroy, :id => batch
-      expect(DulHydra::Batch::Models::Batch.find(batch.id)).to eql(batch)
+      expect(Ddr::Batch::Batch.find(batch.id)).to eql(batch)
       expect(subject).to redirect_to(batches_path)
     end
   end
@@ -26,28 +26,28 @@
     end
     context "batch is validated" do
       before do
-        batch.status = DulHydra::Batch::Models::Batch::STATUS_VALIDATED
+        batch.status = Ddr::Batch::Batch::STATUS_VALIDATED
         batch.save!
       end
       it_behaves_like "a delete-able batch"
     end
     context "batch is queued" do
       before do
-        batch.status = DulHydra::Batch::Models::Batch::STATUS_QUEUED
+        batch.status = Ddr::Batch::Batch::STATUS_QUEUED
         batch.save!
       end
       it_behaves_like "a non-delete-able batch"
     end
     context "batch is running" do
       before do
-        batch.status = DulHydra::Batch::Models::Batch::STATUS_RUNNING
+        batch.status = Ddr::Batch::Batch::STATUS_RUNNING
         batch.save!
       end
       it_behaves_like "a non-delete-able batch"
     end
     context "batch is finished" do
       before do
-        batch.status = DulHydra::Batch::Models::Batch::STATUS_FINISHED
+        batch.status = Ddr::Batch::Batch::STATUS_FINISHED
         batch.save!
       end
       it_behaves_like "a non-delete-able batch"
@@ -55,14 +55,14 @@
     context "batch is interrupted" do
       context "batch is not restartable" do
         before do
-          batch.status = DulHydra::Batch::Models::Batch::STATUS_INTERRUPTED
+          batch.status = Ddr::Batch::Batch::STATUS_INTERRUPTED
           batch.save!
         end
         it_behaves_like "a non-delete-able batch"
       end
       context "batch is restartable" do
         before do
-          batch.status = DulHydra::Batch::Models::Batch::STATUS_RESTARTABLE
+          batch.status = Ddr::Batch::Batch::STATUS_RESTARTABLE
           batch.save!
         end
         it_behaves_like "a non-delete-able batch"
@@ -78,7 +78,7 @@
       batch.reload
     end
     it "should set the status of the batch to QUEUED" do
-      expect(batch.status).to eq(DulHydra::Batch::Models::Batch::STATUS_QUEUED)
+      expect(batch.status).to eq(Ddr::Batch::Batch::STATUS_QUEUED)
     end
   end
 
diff --git a/spec/factories/batch_factories.rb b/spec/factories/batch_factories.rb
index 510377a3..ba3f77fc 100644
--- a/spec/factories/batch_factories.rb
+++ b/spec/factories/batch_factories.rb
@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :batch, :class => DulHydra::Batch::Models::Batch do
+  factory :batch, :class => Ddr::Batch::Batch do
     name "Batch"
     description "This is a batch of stuff to do."
     user { FactoryGirl.create(:user) }
diff --git a/spec/factories/batch_object_attributes_factories.rb b/spec/factories/batch_object_attributes_factories.rb
index c3da9ac9..b9a0499b 100644
--- a/spec/factories/batch_object_attributes_factories.rb
+++ b/spec/factories/batch_object_attributes_factories.rb
@@ -1,20 +1,20 @@
 FactoryGirl.define do
-  factory :batch_object_attribute, :class => DulHydra::Batch::Models::BatchObjectAttribute do
+  factory :batch_object_attribute, :class => Ddr::Batch::BatchObjectAttribute do
 
     factory :batch_object_add_attribute do
-      operation DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD
+      operation Ddr::Batch::BatchObjectAttribute::OPERATION_ADD
 
       factory :batch_object_add_desc_metadata_attribute do
         datastream Ddr::Datastreams::DESC_METADATA
         name 'title'
         value 'Test Object Title'
-        value_type DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING
+        value_type Ddr::Batch::BatchObjectAttribute::VALUE_TYPE_STRING
       end
 
     end
 
     factory :batch_object_clear_attribute do
-      operation DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR
+      operation Ddr::Batch::BatchObjectAttribute::OPERATION_CLEAR
 
       factory :batch_object_clear_desc_metadata_attribute do
         datastream Ddr::Datastreams::DESC_METADATA
@@ -23,7 +23,7 @@
     end
 
     factory :batch_object_clear_all_attribute do
-      operation DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR_ALL
+      operation Ddr::Batch::BatchObjectAttribute::OPERATION_CLEAR_ALL
 
       factory :batch_object_clear_all_desc_metadata do
         datastream Ddr::Datastreams::DESC_METADATA
diff --git a/spec/factories/batch_object_datastream_factories.rb b/spec/factories/batch_object_datastream_factories.rb
index 5a8dca41..d05e966f 100644
--- a/spec/factories/batch_object_datastream_factories.rb
+++ b/spec/factories/batch_object_datastream_factories.rb
@@ -1,25 +1,25 @@
 FactoryGirl.define do
-  factory :batch_object_datastream, :class => DulHydra::Batch::Models::BatchObjectDatastream do
+  factory :batch_object_datastream, :class => Ddr::Batch::BatchObjectDatastream do
 
     factory :batch_object_add_datastream do
-      operation DulHydra::Batch::Models::BatchObjectDatastream::OPERATION_ADD
+      operation Ddr::Batch::BatchObjectDatastream::OPERATION_ADD
 
       factory :batch_object_add_desc_metadata_datastream_bytes do
         name Ddr::Datastreams::DESC_METADATA
         payload '_:test <http://purl.org/dc/terms/title> "Test Object Title" .'
-        payload_type DulHydra::Batch::Models::BatchObjectDatastream::PAYLOAD_TYPE_BYTES
+        payload_type Ddr::Batch::BatchObjectDatastream::PAYLOAD_TYPE_BYTES
       end
 
       factory :batch_object_add_desc_metadata_datastream_file do
         name Ddr::Datastreams::DESC_METADATA
         payload "/tmp/qdc-rdf.nt"
-        payload_type DulHydra::Batch::Models::BatchObjectDatastream::PAYLOAD_TYPE_FILENAME
+        payload_type Ddr::Batch::BatchObjectDatastream::PAYLOAD_TYPE_FILENAME
       end
 
       factory :batch_object_add_content_datastream do
         name Ddr::Datastreams::CONTENT
         payload File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'miscellaneous', 'id001.tif')
-        payload_type DulHydra::Batch::Models::BatchObjectDatastream::PAYLOAD_TYPE_FILENAME
+        payload_type Ddr::Batch::BatchObjectDatastream::PAYLOAD_TYPE_FILENAME
         checksum "120ad0814f207c45d968b05f7435034ecfee8ac1a0958cd984a070dad31f66f3"
         checksum_type Ddr::Datastreams::CHECKSUM_TYPE_SHA256
       end
@@ -27,12 +27,12 @@
     end
 
     factory :batch_object_addupdate_datastream do
-      operation DulHydra::Batch::Models::BatchObjectDatastream::OPERATION_ADDUPDATE
+      operation Ddr::Batch::BatchObjectDatastream::OPERATION_ADDUPDATE
 
       factory :batch_object_addupdate_desc_metadata_datastream_file do
         name Ddr::Datastreams::DESC_METADATA
         payload "/tmp/qdc-rdf.nt"
-        payload_type DulHydra::Batch::Models::BatchObjectDatastream::PAYLOAD_TYPE_FILENAME
+        payload_type Ddr::Batch::BatchObjectDatastream::PAYLOAD_TYPE_FILENAME
       end
 
     end
diff --git a/spec/factories/batch_object_factories.rb b/spec/factories/batch_object_factories.rb
index ec6892a2..8af4c7f4 100644
--- a/spec/factories/batch_object_factories.rb
+++ b/spec/factories/batch_object_factories.rb
@@ -77,7 +77,7 @@
     end
   end
 
-  factory :ingest_batch_object, :class => DulHydra::Batch::Models::IngestBatchObject do
+  factory :ingest_batch_object, :class => Ddr::Batch::IngestBatchObject do
     has_identifier
     has_label
 
@@ -112,7 +112,7 @@
     end
   end
 
-  factory :update_batch_object, :class => DulHydra::Batch::Models::UpdateBatchObject do
+  factory :update_batch_object, :class => Ddr::Batch::UpdateBatchObject do
     has_identifier
     has_label
     has_pid
diff --git a/spec/factories/batch_object_relationship_factories.rb b/spec/factories/batch_object_relationship_factories.rb
index be904aa9..9067623b 100644
--- a/spec/factories/batch_object_relationship_factories.rb
+++ b/spec/factories/batch_object_relationship_factories.rb
@@ -1,25 +1,25 @@
 FactoryGirl.define do
-  factory :batch_object_relationship, :class => DulHydra::Batch::Models::BatchObjectRelationship do
+  factory :batch_object_relationship, :class => Ddr::Batch::BatchObjectRelationship do
 
     factory :batch_object_add_relationship do
-      operation DulHydra::Batch::Models::BatchObjectRelationship::OPERATION_ADD
+      operation Ddr::Batch::BatchObjectRelationship::OPERATION_ADD
 
       factory :batch_object_add_admin_policy do
         name "admin_policy"
         object { create(:collection).pid }
-        object_type DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPE_PID
+        object_type Ddr::Batch::BatchObjectRelationship::OBJECT_TYPE_PID
       end
 
       factory :batch_object_add_parent do
         name "parent"
         object { create(:test_parent).pid }
-        object_type DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPE_PID
+        object_type Ddr::Batch::BatchObjectRelationship::OBJECT_TYPE_PID
       end
 
       factory :batch_object_add_target_for_collection do
         name "collection"
         object { create(:collection).pid }
-        object_type DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPE_PID
+        object_type Ddr::Batch::BatchObjectRelationship::OBJECT_TYPE_PID
       end
 
     end
diff --git a/spec/features/batch_objects/show.html.erb_spec.rb b/spec/features/batch_objects/show.html.erb_spec.rb
index 70202395..4079824c 100644
--- a/spec/features/batch_objects/show.html.erb_spec.rb
+++ b/spec/features/batch_objects/show.html.erb_spec.rb
@@ -12,9 +12,9 @@
       @admin_policy_pid = @parent_pid = nil
       batch_object.batch_object_relationships.each do |r|
         case r.name
-        when DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_ADMIN_POLICY
+        when Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_ADMIN_POLICY
           @admin_policy_pid = r.object
-        when DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_PARENT
+        when Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_PARENT
           @parent_pid = r.object
         end
       end
diff --git a/spec/features/batches/index.html.erb_spec.rb b/spec/features/batches/index.html.erb_spec.rb
index 73a43dc6..4a0f5a27 100644
--- a/spec/features/batches/index.html.erb_spec.rb
+++ b/spec/features/batches/index.html.erb_spec.rb
@@ -83,7 +83,7 @@
       context "ready to process batch" do
         context "ready" do
           before do
-            batch.status = DulHydra::Batch::Models::Batch::STATUS_READY
+            batch.status = Ddr::Batch::Batch::STATUS_READY
             batch.save
             login_as batch.user
             visit batches_path
@@ -99,7 +99,7 @@
         before { login_as batch.user }
         context "validated and valid" do
           before do
-            batch.status = DulHydra::Batch::Models::Batch::STATUS_VALIDATED
+            batch.status = Ddr::Batch::Batch::STATUS_VALIDATED
             batch.save
             visit batches_path
           end
@@ -111,7 +111,7 @@
         end
         context "validated and invalid" do
           before do
-            batch.status = DulHydra::Batch::Models::Batch::STATUS_INVALID
+            batch.status = Ddr::Batch::Batch::STATUS_INVALID
             batch.save
             visit batches_path
           end
@@ -138,7 +138,7 @@
       end
       context "user has some finished batches" do
         before do
-          batch.status = DulHydra::Batch::Models::Batch::STATUS_FINISHED
+          batch.status = Ddr::Batch::Batch::STATUS_FINISHED
           batch.save
           login_as batch.user
           visit batches_path
@@ -153,9 +153,9 @@
     context "deleting batches" do
       before { login_as batch.user }
       context "no delete-able batches" do
-        [ DulHydra::Batch::Models::Batch::STATUS_QUEUED, DulHydra::Batch::Models::Batch::STATUS_RUNNING,
-          DulHydra::Batch::Models::Batch::STATUS_FINISHED, DulHydra::Batch::Models::Batch::STATUS_INTERRUPTED,
-          DulHydra::Batch::Models::Batch::STATUS_RESTARTABLE ].each do |status|
+        [ Ddr::Batch::Batch::STATUS_QUEUED, Ddr::Batch::Batch::STATUS_RUNNING,
+          Ddr::Batch::Batch::STATUS_FINISHED, Ddr::Batch::Batch::STATUS_INTERRUPTED,
+          Ddr::Batch::Batch::STATUS_RESTARTABLE ].each do |status|
             context "status #{status}" do
               before do
                 batch.status = status
diff --git a/spec/features/batches/show.html.erb_spec.rb b/spec/features/batches/show.html.erb_spec.rb
index b888c312..ccab6816 100644
--- a/spec/features/batches/show.html.erb_spec.rb
+++ b/spec/features/batches/show.html.erb_spec.rb
@@ -14,7 +14,7 @@
       end
       context "ready to process batch" do
         before do
-          batch.status = DulHydra::Batch::Models::Batch::STATUS_READY
+          batch.status = Ddr::Batch::Batch::STATUS_READY
           batch.save
           visit batch_path(batch)
         end
@@ -25,7 +25,7 @@
       context "validate action" do
         context "validated and valid" do
           before do
-            batch.status = DulHydra::Batch::Models::Batch::STATUS_VALIDATED
+            batch.status = Ddr::Batch::Batch::STATUS_VALIDATED
             batch.save
             visit batch_path(batch)
           end
@@ -35,7 +35,7 @@
         end
         context "validated and invalid" do
           before do
-            batch.status = DulHydra::Batch::Models::Batch::STATUS_INVALID
+            batch.status = Ddr::Batch::Batch::STATUS_INVALID
             batch.save
             visit batch_path(batch)
           end
@@ -46,10 +46,10 @@
       end
       context "delete action" do
         context "not delete-able" do
-          [ DulHydra::Batch::Models::Batch::STATUS_QUEUED, DulHydra::Batch::Models::Batch::STATUS_RUNNING,
-            DulHydra::Batch::Models::Batch::STATUS_VALIDATING, DulHydra::Batch::Models::Batch::STATUS_PROCESSING,
-            DulHydra::Batch::Models::Batch::STATUS_FINISHED, DulHydra::Batch::Models::Batch::STATUS_INTERRUPTED,
-            DulHydra::Batch::Models::Batch::STATUS_RESTARTABLE ].each do |status|
+          [ Ddr::Batch::Batch::STATUS_QUEUED, Ddr::Batch::Batch::STATUS_RUNNING,
+            Ddr::Batch::Batch::STATUS_VALIDATING, Ddr::Batch::Batch::STATUS_PROCESSING,
+            Ddr::Batch::Batch::STATUS_FINISHED, Ddr::Batch::Batch::STATUS_INTERRUPTED,
+            Ddr::Batch::Batch::STATUS_RESTARTABLE ].each do |status|
             context "status #{status}" do
               before do
                 batch.status = status
diff --git a/spec/lib/dul_hydra/ability_definitions/batch_ability_definitions_spec.rb b/spec/lib/dul_hydra/ability_definitions/batch_ability_definitions_spec.rb
deleted file mode 100644
index ed3f49de..00000000
--- a/spec/lib/dul_hydra/ability_definitions/batch_ability_definitions_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'spec_helper'
-require 'cancan/matchers'
-
-module DulHydra
-  RSpec.describe BatchAbilityDefinitions do
-
-    subject { described_class.call(ability) }
-
-    let(:ability) { FactoryGirl.build(:abstract_ability) }
-
-    describe "Batch permissions" do
-      let(:resource) { FactoryGirl.create(:batch) }
-      describe "when the user is the creator of the batch" do
-        before { allow(ability).to receive(:user) { resource.user } }
-        it { should be_able_to(:manage, resource) }
-      end
-      describe "when the user is not the creator of the batch" do
-        it { should_not be_able_to(:manage, resource) }
-      end
-    end
-
-    describe "BatchObject permissions" do
-      let(:batch) { FactoryGirl.create(:batch) }
-      let(:resource) { DulHydra::Batch::Models::BatchObject.create(batch: batch) }
-      before { allow(ability).to receive(:user) { batch.user } }
-      describe "when the user can :manage the batch" do
-        before { subject.can :manage, batch }
-        it { should be_able_to(:manage, resource) }
-      end
-      describe "when the user cannot :manage the batch" do
-        before { subject.cannot :manage, batch }
-        it { should_not be_able_to(:manage, resource) }
-      end
-    end
-
-  end
-end
diff --git a/spec/mailers/batch_processor_run_mailer_spec.rb b/spec/mailers/batch_processor_run_mailer_spec.rb
deleted file mode 100644
index 2e87b7df..00000000
--- a/spec/mailers/batch_processor_run_mailer_spec.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require "spec_helper"
-
-describe BatchProcessorRunMailer, type: :mailer, batch: true do
-  let(:batch) { FactoryGirl.create(:batch_with_basic_ingest_batch_objects) }
-  let(:bp) { DulHydra::Batch::Scripts::BatchProcessor.new(batch, batch.user) }
-  before { bp.execute }
-  it "should send a notification" do
-    expect(ActionMailer::Base.deliveries).not_to be_empty
-    email = ActionMailer::Base.deliveries.first
-    expect(email.to).to eq([batch.user.email])
-    expect(email.subject).to include("Batch Processor Run #{batch.status}")
-    expect(email.parts.first.to_s).to include("Ingested TestModelOmnibus")
-    expect(email.parts.second.to_s).to include("Objects in batch: #{batch.batch_objects.count}")
-    expect(email.parts.second.to_s).to include(DulHydra::Batch::Models::Batch::OUTCOME_SUCCESS)
-  end
-end
diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb
index d624d26d..9f30248f 100644
--- a/spec/models/ability_spec.rb
+++ b/spec/models/ability_spec.rb
@@ -23,31 +23,6 @@
     end
   end
 
-  describe "Batch permissions" do
-    let(:resource) { FactoryGirl.create(:batch) }
-    describe "when the user is the creator of the batch" do
-      before { allow(auth_context).to receive(:user) { resource.user } }
-      it { should be_able_to(:manage, resource) }
-    end
-    describe "when the user is not the creator of the batch" do
-      it { should_not be_able_to(:manage, resource) }
-    end
-  end
-
-  describe "BatchObject permissions" do
-    let(:batch) { FactoryGirl.create(:batch) }
-    let(:resource) { DulHydra::Batch::Models::BatchObject.create(batch: batch) }
-    before { allow(subject).to receive(:user) { batch.user } }
-    describe "when the user can :manage the batch" do
-      before { subject.can :manage, batch }
-      it { should be_able_to(:manage, resource) }
-    end
-    describe "when the user cannot :manage the batch" do
-      before { subject.cannot :manage, batch }
-      it { should_not be_able_to(:manage, resource) }
-    end
-  end
-
   describe "ExportSet abilities" do
     describe "auth context is authenticated" do
       let(:resource) { FactoryGirl.create(:content_export_set_with_pids) }
diff --git a/spec/models/batch_object_attribute_spec.rb b/spec/models/batch_object_attribute_spec.rb
deleted file mode 100644
index 82563fc0..00000000
--- a/spec/models/batch_object_attribute_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'spec_helper'
-
-module DulHydra::Batch::Models
-
-  shared_examples "an invalid batch object attribute object" do
-    before { object.valid? }
-    it "shouild report the appropriate error" do
-      expect(object.errors.keys).to include(error_key)
-    end
-  end
-
-  RSpec.describe BatchObjectAttribute, type: :model, batch: true do
-
-    describe "validation" do
-      let(:batch_object) { BatchObject.new(model: 'TestModel') }
-      context "invalid" do
-        context "datastream" do
-          let(:error_key) { :datastream }
-          let(:object) { BatchObjectAttribute.new(batch_object: batch_object, datastream: 'foo', name: 'bar') }
-          it_should_behave_like 'an invalid batch object attribute object'
-        end
-        context "datastream" do
-          let(:error_key) { :name }
-          let(:object) { BatchObjectAttribute.new(batch_object: batch_object, datastream: 'descMetadata', name: 'bar') }
-          it_should_behave_like 'an invalid batch object attribute object'
-        end
-      end
-    end
-
-  end
-end
diff --git a/spec/models/batch_spec.rb b/spec/models/batch_spec.rb
deleted file mode 100644
index de66c3f8..00000000
--- a/spec/models/batch_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'spec_helper'
-
-module DulHydra::Batch::Models
-
-  describe Batch, type: :model, batch: true do
-
-    let(:batch) { FactoryGirl.create(:batch_with_basic_ingest_batch_objects) }
-
-    context "completed count" do
-      before { batch.batch_objects.first.update_attributes(verified: true) }
-      it "should return the number of verified batch objects" do
-        expect(batch.completed_count).to eq(1)
-      end
-    end
-
-    context "time to complete" do
-      before do
-        batch.batch_objects.first.update_attributes(verified: true)
-        batch.update_attributes(processing_step_start: DateTime.now - 5.minutes)
-      end
-      it "should estimate the time to complete processing" do
-        expect(batch.time_to_complete).to be_within(3).of(600)
-      end
-    end
-
-    context "destroy" do
-      before do
-        batch.user.destroy
-        batch.destroy
-      end
-      it "should destroy all the associated dependent objects" do
-        expect(DulHydra::Batch::Models::Batch.all).to be_empty
-        expect(DulHydra::Batch::Models::BatchObject.all).to be_empty
-        expect(DulHydra::Batch::Models::BatchObjectDatastream.all).to be_empty
-        expect(DulHydra::Batch::Models::BatchObjectRelationship.all).to be_empty
-      end
-    end
-
-    context "validate" do
-      let(:parent) { FactoryGirl.create(:test_parent) }
-      let(:pid_cache) { { parent.pid => parent.class.name} }
-      before do
-        batch.batch_objects.each do |obj|
-          obj.batch_object_relationships <<
-              DulHydra::Batch::Models::BatchObjectRelationship.new(
-                  :name => DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_PARENT,
-                  :object => parent.pid,
-                  :object_type => DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPE_PID,
-                  :operation => DulHydra::Batch::Models::BatchObjectRelationship::OPERATION_ADD
-                  )
-        end
-      end
-      it "should cache the results of looking up relationship objects" do
-        expect(batch).to receive(:add_found_pid).once.with(parent.pid, "TestParent").and_call_original
-        batch.validate
-        expect(batch.found_pids).to eq(pid_cache)
-      end
-    end
-
-  end
-
-end
diff --git a/spec/models/ingest_batch_object_spec.rb b/spec/models/ingest_batch_object_spec.rb
deleted file mode 100644
index 39cff857..00000000
--- a/spec/models/ingest_batch_object_spec.rb
+++ /dev/null
@@ -1,306 +0,0 @@
-require 'spec_helper'
-
-module DulHydra::Batch::Models
-
-  shared_examples "a valid ingest object" do
-    it "should be valid" do
-      expect(object.validate).to be_empty
-    end
-  end
-
-  shared_examples "an invalid ingest object" do
-    it "should not be valid" do
-      expect(object.validate).to include(error_message)
-    end
-  end
-
-  shared_examples "a successful ingest" do
-    let(:repo_object) { ActiveFedora::Base.find(object.pid) }
-    let(:verification_event) { repo_object.events.select { |e| e.is_a? Ddr::Events::ValidationEvent }.first }
-    before { object.process(user) }
-    it "should result in a verified repository object" do
-      expect(object.verified).to be_truthy
-      expect(object.pid).to eq(assigned_pid) if assigned_pid.present?
-      expect(repo_object.title).to eq(["Test Object Title"])
-      unless object.batch_object_attributes.empty?
-        expect(verification_event.detail).to include("title attribute set correctly...#{DulHydra::Batch::Models::BatchObject::VERIFICATION_PASS}")
-      end
-    end
-  end
-
-  describe IngestBatchObject, type: :model, batch: true, ingest: true do
-
-    before do
-      allow(File).to receive(:readable?).and_call_original
-      allow(File).to receive(:readable?).with("/tmp/qdc-rdf.nt").and_return(true)
-    end
-
-    context "validate" do
-
-      context "valid object" do
-        context "generic object" do
-          let(:object) { FactoryGirl.create(:generic_ingest_batch_object_with_bytes, :has_batch) }
-          it_behaves_like "a valid ingest object"
-        end
-        context "target object" do
-          let(:object) { FactoryGirl.create(:target_ingest_batch_object, :has_batch) }
-          it_behaves_like "a valid ingest object"
-        end
-        context "object related to an uncreated object with pre-assigned PID" do
-          let(:object) { FactoryGirl.create(:generic_ingest_batch_object_with_bytes) }
-          let(:parent) { FactoryGirl.create(:generic_ingest_batch_object_with_bytes) }
-          let(:parent_pid) { 'test:4321' }
-          let(:batch) { FactoryGirl.create(:batch) }
-          let(:relationship) do
-            DulHydra::Batch::Models::BatchObjectRelationship.create(
-              :name => DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_PARENT,
-              :object => parent_pid,
-              :object_type => DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPE_PID,
-              :operation => DulHydra::Batch::Models::BatchObjectRelationship::OPERATION_ADD
-              )
-          end
-          before do
-            object.batch = batch
-            object.batch_object_relationships << relationship
-            object.save
-            parent.batch = batch
-            parent.pid = parent_pid
-            parent.save
-          end
-          it_behaves_like "a valid ingest object"
-        end
-      end
-
-      context "invalid object" do
-        let(:error_prefix) { "#{object.identifier} [Database ID: #{object.id}]:"}
-        context "missing model" do
-          let(:object) { FactoryGirl.create(:ingest_batch_object) }
-          let(:error_message) { "#{error_prefix} Model required for INGEST operation" }
-          it_behaves_like "an invalid ingest object"
-        end
-        context "invalid model" do
-          let(:object) { FactoryGirl.create(:ingest_batch_object) }
-          let(:error_message) { "#{error_prefix} Invalid model name: #{object.model}" }
-          before { object.model = "BadModel" }
-          it_behaves_like "an invalid ingest object"
-        end
-        context "pre-assigned pid already exists" do
-          let(:object) { FactoryGirl.create(:ingest_batch_object, :has_model) }
-          let(:existing_object) { FactoryGirl.create(:test_model) }
-          let(:error_message) { "#{error_prefix} #{existing_object.pid} already exists in repository" }
-          before { object.pid = existing_object.pid }
-          it_behaves_like "an invalid ingest object"
-        end
-        context "invalid admin policy" do
-          let(:object) { FactoryGirl.create(:ingest_batch_object, :has_batch, :has_model) }
-          context "admin policy pid object does not exist" do
-            let(:admin_policy_pid) { "bogus:AdminPolicy" }
-            let(:error_message) { "#{error_prefix} admin_policy relationship object does not exist: #{admin_policy_pid}" }
-            before do
-              relationship = FactoryGirl.create(:batch_object_add_relationship, :name => "admin_policy", :object => admin_policy_pid, :object_type => BatchObjectRelationship::OBJECT_TYPE_PID)
-              object.batch_object_relationships << relationship
-              object.save
-            end
-            it_behaves_like "an invalid ingest object"
-          end
-          context "admin policy pid object exists but is not admin policy" do
-            let(:error_message) { "#{error_prefix} admin_policy relationship object #{@not_admin_policy.pid} exists but is not a(n) Collection" }
-            before do
-              @not_admin_policy = FactoryGirl.create(:test_model)
-              relationship = FactoryGirl.create(:batch_object_add_relationship, :name => "admin_policy", :object => @not_admin_policy.pid, :object_type => BatchObjectRelationship::OBJECT_TYPE_PID)
-              object.batch_object_relationships << relationship
-              object.save
-            end
-            it_behaves_like "an invalid ingest object"
-          end
-        end
-        context "invalid datastreams" do
-          let(:object) { FactoryGirl.create(:ingest_batch_object, :has_model, :with_add_desc_metadata_datastream_bytes, :with_add_content_datastream) }
-          context "invalid datastream name" do
-            let(:error_message) { "#{error_prefix} Invalid datastream name for #{object.model}: #{object.batch_object_datastreams.first[:name]}" }
-            before do
-              datastream = object.batch_object_datastreams.first
-              datastream.name = "invalid_name"
-              datastream.save!
-            end
-            it_behaves_like "an invalid ingest object"
-          end
-          context "invalid payload type" do
-            let(:error_message) { "#{error_prefix} Invalid payload type for #{object.batch_object_datastreams.first[:name]} datastream: #{object.batch_object_datastreams.first[:payload_type]}" }
-            before do
-              datastream = object.batch_object_datastreams.first
-              datastream.payload_type = "invalid_type"
-              datastream.save!
-            end
-            it_behaves_like "an invalid ingest object"
-          end
-          context "missing data file" do
-            let(:error_message) { "#{error_prefix} Missing or unreadable file for #{object.batch_object_datastreams.last[:name]} datastream: #{object.batch_object_datastreams.last[:payload]}" }
-            before do
-              datastream = object.batch_object_datastreams.last
-              datastream.payload = "non_existent_file.xml"
-              datastream.save!
-            end
-            it_behaves_like "an invalid ingest object"
-          end
-          context "checksum without checksum type" do
-            let(:error_message) { "#{error_prefix} Must specify checksum type if providing checksum for #{object.batch_object_datastreams.first.name} datastream" }
-            before do
-              datastream = object.batch_object_datastreams.first
-              datastream.checksum = "123456"
-              datastream.checksum_type = nil
-              datastream.save!
-            end
-            it_behaves_like "an invalid ingest object"
-          end
-          context "invalid checksum type" do
-            let(:error_message) { "#{error_prefix} Invalid checksum type for #{object.batch_object_datastreams.first.name} datastream: #{object.batch_object_datastreams.first.checksum_type}" }
-            before do
-              datastream = object.batch_object_datastreams.first
-              datastream.checksum_type = "SHA-INVALID"
-              datastream.save!
-            end
-            it_behaves_like "an invalid ingest object"
-          end
-        end
-        context "invalid parent" do
-          let(:object) { FactoryGirl.create(:ingest_batch_object, :has_batch, :has_model) }
-          context "parent pid object does not exist" do
-            let(:parent_pid) { "bogus:TestParent" }
-            let(:error_message) { "#{error_prefix} parent relationship object does not exist: #{parent_pid}" }
-            before do
-              relationship = FactoryGirl.create(:batch_object_add_relationship, :name => "parent", :object => parent_pid, :object_type => BatchObjectRelationship::OBJECT_TYPE_PID)
-              object.batch_object_relationships << relationship
-              object.save
-            end
-            it_behaves_like "an invalid ingest object"
-          end
-          context "parent pid object exists but is not correct parent object type" do
-            let(:error_message) { "#{error_prefix} parent relationship object #{@not_parent.pid} exists but is not a(n) TestParent" }
-            before do
-              @not_parent = FactoryGirl.create(:test_model)
-              relationship = FactoryGirl.create(:batch_object_add_relationship, :name => "parent", :object => @not_parent.pid, :object_type => BatchObjectRelationship::OBJECT_TYPE_PID)
-              object.batch_object_relationships << relationship
-              object.save
-            end
-            it_behaves_like "an invalid ingest object"
-          end
-        end
-        context "invalid target_for" do
-          let(:object) { FactoryGirl.create(:ingest_batch_object, :has_batch) }
-          context "target_for pid object does not exist" do
-            let(:collection_pid) { "bogus:Collection" }
-            let(:error_message) { "#{error_prefix} collection relationship object does not exist: #{collection_pid}" }
-            before do
-              object.model = "Target"
-              relationship = FactoryGirl.create(:batch_object_add_relationship, :name => "collection", :object => collection_pid, :object_type => BatchObjectRelationship::OBJECT_TYPE_PID)
-              object.batch_object_relationships << relationship
-              object.save
-            end
-            it_behaves_like "an invalid ingest object"
-          end
-          context "target_for pid object exists but is not collection" do
-            let(:error_message) { "#{error_prefix} collection relationship object #{@not_collection.pid} exists but is not a(n) Collection" }
-            before do
-              @not_collection = FactoryGirl.create(:test_model)
-              object.model = "Target"
-              relationship = FactoryGirl.create(:batch_object_add_relationship, :name => "collection", :object => @not_collection.pid, :object_type => BatchObjectRelationship::OBJECT_TYPE_PID)
-              object.batch_object_relationships << relationship
-              object.save
-            end
-            it_behaves_like "an invalid ingest object"
-          end
-        end
-      end
-    end
-
-    context "ingest" do
-
-      let(:user) { FactoryGirl.create(:user) }
-      context "successful ingest" do
-        context "object without a pre-assigned PID" do
-          let(:assigned_pid) { nil }
-          context "payload type bytes" do
-            let(:object) { FactoryGirl.create(:generic_ingest_batch_object_with_bytes) }
-            it_behaves_like "a successful ingest"
-          end
-          context "payload type file" do
-            let(:object) { FactoryGirl.create(:generic_ingest_batch_object_with_file) }
-            before { allow(File).to receive(:read).with('/tmp/qdc-rdf.nt').and_return('_:test <http://purl.org/dc/terms/title> "Test Object Title" .') }
-            it_behaves_like "a successful ingest"
-          end
-          context "attributes" do
-            let(:object) { FactoryGirl.create(:generic_ingest_batch_object_with_attributes) }
-            it_behaves_like "a successful ingest"
-          end
-        end
-        context "object with a pre-assigned PID" do
-          let(:object) { FactoryGirl.create(:generic_ingest_batch_object_with_bytes) }
-          let(:assigned_pid) { 'test:6543' }
-          before do
-            object.pid = assigned_pid
-            object.save
-          end
-          it_behaves_like "a successful ingest"
-        end
-        context "previously ingested object (e.g., during restart)" do
-          let(:object) { FactoryGirl.create(:generic_ingest_batch_object_with_bytes) }
-          let(:assigned_pid) { 'test:6543' }
-          before do
-            object.pid = assigned_pid
-            object.verified = true
-            object.save
-            repo_object = object.model.constantize.new(:pid => assigned_pid, title: ["Test Object Title"])
-            repo_object.save(validate: false)
-          end
-          it_behaves_like "a successful ingest"
-        end
-      end
-
-      context "exception during ingest" do
-        let(:object) { FactoryGirl.create(:generic_ingest_batch_object_with_bytes) }
-        before { allow_any_instance_of(DulHydra::Batch::Models::IngestBatchObject).to receive(:populate_datastream).and_raise(RuntimeError) }
-        context "error during processing" do
-          it "should log a fatal message and re-raise the exception" do
-            expect(Rails.logger).to receive(:fatal).with(/Error in creating repository object/)
-            expect { object.process(user) }.to raise_error(RuntimeError)
-          end
-        end
-        context "error while destroying repository object" do
-          before { allow_any_instance_of(TestModelOmnibus).to receive(:destroy).and_raise(RuntimeError) }
-          after { allow_any_instance_of(TestModelOmnibus).to receive(:destroy).and_call_original }
-          it "should log two fatal messages and re-raise the initial exception" do
-            expect(Rails.logger).to receive(:fatal).with(/Error in creating repository object/)
-            expect(Rails.logger).to receive(:fatal).with(/Error deleting repository object/)
-            expect { object.process(user) }.to raise_error(RuntimeError)
-          end
-        end
-      end
-
-      context "external checksum verification failure" do
-        let(:object) { FactoryGirl.create(:generic_ingest_batch_object_with_bytes) }
-        before do
-          object.batch_object_datastreams.each do |ds|
-            if ds.name == "content"
-              ds.checksum = "badabcdef0123456789"
-              object.save!
-            end
-          end
-        end
-        it "should not result in a verified ingest" do
-          object.process(user)
-          expect(object.verified).to be_falsey
-          ActiveFedora::Base.find(object.pid).events.each do |e|
-            if e.is_a?(Ddr::Events::ValidationEvent)
-              expect(e.outcome).to eq(Ddr::Events::Event::FAILURE)
-              expect(e.detail).to include("content external checksum match...FAIL")
-            end
-          end
-        end
-      end
-
-    end
-
-  end
-
-end
diff --git a/spec/models/ingest_folder_spec.rb b/spec/models/ingest_folder_spec.rb
index a499497e..34ac8048 100644
--- a/spec/models/ingest_folder_spec.rb
+++ b/spec/models/ingest_folder_spec.rb
@@ -12,7 +12,7 @@
     expect(user.batches.count).to eql(1)
     expect(user.batches.first.name).to eql(I18n.t('batch.ingest_folder.batch_name'))
     expect(user.batches.first.description).to eql(ingest_folder.abbreviated_path)
-    expect(user.batches.first.status).to eql(DulHydra::Batch::Models::Batch::STATUS_READY)
+    expect(user.batches.first.status).to eql(Ddr::Batch::Batch::STATUS_READY)
     expect(objects.fetch('f').model).to eql(parent_model)
     expect(objects.fetch('file01001').model).to eql(IngestFolder.default_file_model)
     expect(objects.fetch('file01002').model).to eql(IngestFolder.default_file_model)
diff --git a/spec/models/manifest_object_spec.rb b/spec/models/manifest_object_spec.rb
deleted file mode 100644
index cd49f0b6..00000000
--- a/spec/models/manifest_object_spec.rb
+++ /dev/null
@@ -1,508 +0,0 @@
-require 'spec_helper'
-
-module DulHydra::Batch::Models
-
-  describe ManifestObject, type: :model, batch: true do
-
-    shared_examples "a valid manifest object" do
-      it "should be valid" do
-        expect(manifest_object.validate).to be_empty
-      end
-    end
-
-    shared_examples "an invalid manifest object" do
-      it "should not be valid" do
-        expect(manifest_object.validate).to include(error_message)
-      end
-    end
-
-    context "validate" do
-      let(:manifest) { Manifest.new() }
-      let(:manifest_object) { ManifestObject.new({}, manifest) }
-      let(:basepath) { File.join(File::SEPARATOR, 'tmp') }
-      let(:identifier) { 'id001001' }
-      let(:model) { 'TestModel' }
-      before do
-        manifest.manifest_hash['basepath'] = basepath
-        manifest_object.object_hash['identifier'] = identifier
-        manifest_object.object_hash['model'] = model
-      end
-      context "valid" do
-        it_behaves_like "a valid manifest object"
-      end
-      context "invalid" do
-        context "identifier missing" do
-          let(:error_message) { I18n.t('batch.manifest_object.errors.identifier_missing') }
-          before { manifest_object.object_hash['identifier'] = nil }
-          it_behaves_like "an invalid manifest object"
-        end
-        context "model" do
-          context "missing" do
-            let(:error_message) { I18n.t('batch.manifest_object.errors.model_missing', :identifier => identifier) }
-            before { manifest_object.object_hash['model'] = nil }
-            it_behaves_like "an invalid manifest object"
-          end
-          context "invalid" do
-            let(:badmodel) { 'BadModel' }
-            let(:error_message) { I18n.t('batch.manifest_object.errors.model_invalid', :identifier => identifier, :model => badmodel) }
-            before { manifest_object.object_hash['model'] = badmodel }
-            it_behaves_like "an invalid manifest object"
-          end
-        end
-        context "keys" do
-          let(:badkey) { "badkey" }
-          let(:value) { "some_value" }
-          context "invalid manifest object key" do
-            let(:error_message) { I18n.t('batch.manifest_object.errors.invalid_key', :identifier => identifier, :key => badkey) }
-            before { manifest_object.object_hash[badkey] = value }
-            it_behaves_like "an invalid manifest object"
-          end
-          context "invalid manifest object sublevel key" do
-            let(:key) { ManifestObject::CHECKSUM }
-            let(:error_message) { I18n.t('batch.manifest_object.errors.invalid_subkey', :identifier => identifier, :key => key, :subkey => badkey) }
-            before { manifest_object.object_hash[key] = { badkey => value } }
-            it_behaves_like "an invalid manifest object"
-          end
-        end
-        context "datastreams" do
-          context "datastream list" do
-            let(:key) { ManifestObject::DATASTREAMS }
-            let(:bad_datastream_name) { "badDatastreamName" }
-            let(:error_message) { I18n.t('batch.manifest_object.errors.datastream_name_invalid', :identifier => identifier, :name => bad_datastream_name) }
-            before { manifest_object.object_hash[key] = [ bad_datastream_name ] }
-            it_behaves_like "an invalid manifest object"
-          end
-          context "datastream filepath" do
-            let(:key1) { ManifestObject::DATASTREAMS }
-            let(:key2) { Ddr::Datastreams::DESC_METADATA }
-            let(:bad_location) { File.join(File::SEPARATOR, 'tmp', 'unreadable','filepath', 'metadata.xml') }
-            let(:error_message) { I18n.t('batch.manifest_object.errors.datastream_filepath_error', :identifier => identifier, :datastream => key2, :filepath => bad_location) }
-            before do
-              manifest_object.object_hash[key1] = [ Ddr::Datastreams::DESC_METADATA ]
-              manifest_object.object_hash[key2] = bad_location
-            end
-            it_behaves_like "an invalid manifest object"
-          end
-        end
-        context "checksum type" do
-          let(:key) { Manifest::CHECKSUM }
-          let(:bad_checksum_type) { "BAD-9999" }
-          let(:error_message) { I18n.t('batch.manifest_object.errors.checksum_type_invalid', :identifier => identifier, :type => bad_checksum_type) }
-          before { manifest_object.object_hash[key] = { Manifest::TYPE => bad_checksum_type } }
-          it_behaves_like "an invalid manifest object"
-        end
-        context "relationships" do
-          context "pid" do
-            context "object not in repository" do
-              let(:key) { BatchObjectRelationship::RELATIONSHIP_ADMIN_POLICY }
-              let(:pid) { "test:1" }
-              let(:error_message) { I18n.t('batch.manifest_object.errors.relationship_object_not_found', :identifier => identifier, :relationship => key, :pid => pid) }
-              before { manifest_object.object_hash[key] = pid }
-              it_behaves_like "an invalid manifest object"
-            end
-            context "repository object not correct model" do
-              let(:model) { "Item" }
-              let(:key) { BatchObjectRelationship::RELATIONSHIP_PARENT }
-              let(:relationship_class) { "Collection" }
-              let(:error_message) { I18n.t('batch.manifest_object.errors.relationship_object_class_mismatch', :identifier => identifier, :relationship => key, :exp_class => relationship_class, :actual_class => object.class) }
-              let(:object) { FactoryGirl.create(:component) }
-              before do
-                manifest_object.object_hash[Manifest::MODEL] = model
-                manifest_object.object_hash[key] = object.pid
-              end
-              it_behaves_like "an invalid manifest object"
-            end
-          end
-          context "id" do
-            let(:key) { BatchObjectRelationship::RELATIONSHIP_PARENT }
-            let(:subkey) { ManifestObject::ID }
-            let(:id) { "test001" }
-            before { manifest_object.object_hash[key] = { subkey => id } }
-            context "cannot determine pid" do
-              let(:error_message) { I18n.t('batch.manifest_object.errors.relationship_object_pid_not_determined', :identifier => identifier, :relationship => key) }
-              it_behaves_like "an invalid manifest object"
-            end
-            context "object not in repository" do
-              let(:pid) { "test:not_there" }
-              let(:error_message) { I18n.t('batch.manifest_object.errors.relationship_object_not_found', :identifier => identifier, :relationship => key, :pid => pid) }
-              let!(:batch_object) { BatchObject.create(:identifier => id, :pid => pid) }
-              before { manifest_object.object_hash[key] = { subkey => id } }
-              it_behaves_like "an invalid manifest object"
-            end
-            context "repository object not correct model" do
-              let(:model) { "Item" }
-              let(:relationship_class) { "Collection" }
-              let(:error_message) { I18n.t('batch.manifest_object.errors.relationship_object_class_mismatch', :identifier => identifier, :relationship => key, :exp_class => relationship_class, :actual_class => object.class) }
-              let(:object) { FactoryGirl.create(:component) }
-              let!(:batch_object) { BatchObject.create(:identifier => object.identifier.first, :pid => object.pid) }
-              before do
-                manifest_object.object_hash[Manifest::MODEL] = model
-                manifest_object.object_hash[key] = { subkey => object.identifier.first }
-              end
-              it_behaves_like "an invalid manifest object"
-            end
-          end
-        end
-      end
-    end
-
-    context "batch" do
-      let(:manifest) { Manifest.new }
-      let(:manifest_object) { ManifestObject.new({}, manifest) }
-      it "should return the batch specified in the manifest" do
-        expect(manifest_object.batch).to eq(manifest.batch)
-      end
-    end
-
-    context "checksum" do
-      context "in object" do
-        let(:manifest) { Manifest.new }
-        let(:manifest_object) { ManifestObject.new({}, manifest) }
-        context "in object 'checksum'" do
-          before { manifest_object.object_hash["checksum"] = "abcdef" }
-          it "should return the object 'checksum'" do
-            expect(manifest_object.checksum?).to be_truthy
-            expect(manifest_object.checksum).to eq("abcdef")
-          end
-        end
-        context "in object 'checksum''value'" do
-          before { manifest_object.object_hash["checksum"] = { "value" => "123456" } }
-          it "should return the object 'checksum''value'" do
-            expect(manifest_object.checksum?).to be_truthy
-            expect(manifest_object.checksum).to eq("123456")
-          end
-        end
-      end
-      context "in manifest 'checksum' file" do
-        let(:manifest) { Manifest.new(File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'manifests', 'manifest_with_files.yml')) }
-        let(:manifest_object) { ManifestObject.new({ "identifier" => "id001" }, manifest) }
-        it "should return the checksum from manifest 'checksum' file" do
-          expect(manifest_object.checksum?).to be_truthy
-          expect(manifest_object.checksum).to eq("120ad0814f207c45d968b05f7435034ecfee8ac1a0958cd984a070dad31f66f3")
-        end
-      end
-      context "no checksum" do
-        let(:manifest) { Manifest.new }
-        let(:manifest_object) { ManifestObject.new({}, manifest) }
-        it "should return nil" do
-          expect(manifest_object.checksum?).to be_falsey
-          expect(manifest_object.checksum).to be_nil
-        end
-      end
-    end
-
-    context "checksum type" do
-      context "in object" do
-        let(:manifest) { Manifest.new }
-        let(:manifest_object) { ManifestObject.new({}, manifest) }
-        context "in object 'checksum''type'" do
-          before { manifest_object.object_hash["checksum"] = { "type" => "SHA-1" } }
-          it "should return the object 'checksum''type'" do
-            expect(manifest_object.checksum_type?).to be_truthy
-            expect(manifest_object.checksum_type).to eq("SHA-1")
-          end
-        end
-      end
-      context "in manifest 'checksum' file" do
-        let(:manifest) { Manifest.new(File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'manifests', 'manifest_with_files.yml')) }
-        let(:manifest_object) { ManifestObject.new({ "identifier" => "id001" }, manifest) }
-        it "should return the checksum from manifest 'checksum' file" do
-          expect(manifest_object.checksum_type?).to be_truthy
-          expect(manifest_object.checksum_type).to eq("SHA-256")
-        end
-      end
-      context "no checksum type" do
-        let(:manifest) { Manifest.new }
-        let(:manifest_object) { ManifestObject.new({}, manifest) }
-        it "should return nil" do
-          expect(manifest_object.checksum_type?).to be_falsey
-          expect(manifest_object.checksum_type).to be_nil
-        end
-      end
-    end
-
-    context "datastream filepath" do
-      let(:manifest) { Manifest.new() }
-      let(:manifest_object) { ManifestObject.new({}, manifest) }
-      context "in object"do
-        context "absolute filepath" do
-          before { manifest_object.object_hash["foo"] = "/a/b/c.xml" }
-          it "should return the absolute filepath" do
-            expect(manifest_object.datastream_filepath("foo")).to eq("/a/b/c.xml")
-          end
-        end
-        context "relative filepath" do
-          before { manifest_object.object_hash["foo"] = "a/b/c.xml" }
-          context "manifest has datastream location" do
-            before do
-              manifest.manifest_hash["foo"] = { "location" => "/x/y/" }
-            end
-            it "should return the object relative filepath appended to the manifest location" do
-              expect(manifest_object.datastream_filepath("foo")).to eq("/x/y/a/b/c.xml")
-            end
-          end
-          context "manifest does not have datastream location" do
-            before do
-              manifest.manifest_hash["basepath"] = "/e/f/"
-            end
-            it "should return the object relative filepath appended to the canonical location" do
-              expect(manifest_object.datastream_filepath("foo")).to eq("/e/f/foo/a/b/c.xml")
-            end
-          end
-        end
-      end
-      context "not in object" do
-        before { manifest_object.object_hash["identifier"] = "id99" }
-        context "manifest has datastream location" do
-          before do
-            manifest.manifest_hash["foo"] = { "location" => "/x/y/", "extension" => ".xls" }
-          end
-          it "should return the canonical filename appended to the manifest location" do
-            expect(manifest_object.datastream_filepath("foo")).to eq("/x/y/id99.xls")
-          end
-        end
-        context "manifest does not have datastream location" do
-          before do
-            manifest.manifest_hash["basepath"] = "/e/f/"
-          end
-          it "should return the canonical location and filename" do
-            expect(manifest_object.datastream_filepath("foo")).to eq("/e/f/foo/id99.xml")
-          end
-        end
-      end
-    end
-
-    context "datastreams" do
-      let(:manifest) { Manifest.new() }
-      let(:manifest_object) { ManifestObject.new({}, manifest) }
-      context "object has datastreams" do
-        before do
-          manifest.manifest_hash["datastreams"] = [ "e", "f" ]
-          manifest_object.object_hash["datastreams"] = [ "a", "b", "c"]
-        end
-        it "should return the object datastreams" do
-          expect(manifest_object.datastreams).to eq([ "a", "b", "c" ])
-        end
-      end
-      context "object does not have datastreams but manifest does" do
-        before do
-          manifest.manifest_hash["datastreams"] = [ "e", "f" ]
-        end
-        it "should return the manifest datastreams" do
-          expect(manifest_object.datastreams).to eq([ "e", "f" ])
-        end
-      end
-      context "neither object nor manifest have datastreams" do
-        it "should return nil" do
-          expect(manifest_object.datastreams).to be_nil
-        end
-      end
-    end
-
-    context "key identifier" do
-      let(:manifest) { Manifest.new() }
-      let(:manifest_object) { ManifestObject.new({}, manifest) }
-      context "object identifier is a string" do
-        before { manifest_object.object_hash["identifier"] = "id1234" }
-        it "should return the identifier" do
-          expect(manifest_object.key_identifier).to eq("id1234")
-        end
-      end
-      context "object identifier is a list" do
-        before { manifest_object.object_hash["identifier"] = [ "id1234", "id5678" ] }
-        it "should return the first identifier" do
-          expect(manifest_object.key_identifier).to eq("id1234")
-        end
-      end
-      context "object identifier missing" do
-        it "should return nil" do
-          expect(manifest_object.key_identifier).to be_nil
-        end
-      end
-    end
-
-    context "label / model" do
-      let(:manifest) { Manifest.new }
-      let(:manifest_object) { ManifestObject.new({}, manifest) }
-      context "label / model in object" do
-        before do
-          manifest.manifest_hash["label"] = "Manifest Label"
-          manifest.manifest_hash["model"] = "ManifestModel"
-          manifest_object.object_hash["label"] = "Object Label"
-          manifest_object.object_hash["model"] = "ObjectModel"
-        end
-        it "should return the label / model specified in the object" do
-          expect(manifest_object.label).to eq("Object Label")
-          expect(manifest_object.model).to eq("ObjectModel")
-        end
-      end
-      context "label / model not in object but in manifest" do
-        before do
-          manifest.manifest_hash["label"] = "Manifest Label"
-          manifest.manifest_hash["model"] = "ManifestModel"
-        end
-        it "should return the label / model specified in the manifest" do
-          expect(manifest_object.model).to eq("ManifestModel")
-        end
-      end
-      context "no label / model" do
-        it "should return nil" do
-          expect(manifest_object.label).to be_nil
-          expect(manifest_object.model).to be_nil
-        end
-      end
-    end
-
-    context "relationship" do
-      let(:relationship) { "test_relationship" }
-      let(:manifest) { Manifest.new }
-      let(:manifest_object) { ManifestObject.new({}, manifest) }
-      context "relationship in object" do
-        context "explicit pid" do
-          let(:manifest_relationship_pid) { "test:1234" }
-          let(:object_relationship_pid) { "test:5678" }
-          before { manifest.manifest_hash[relationship] = manifest_relationship_pid }
-          context "bare pid" do
-            before { manifest_object.object_hash[relationship] = object_relationship_pid }
-            it "should return the object pid" do
-              expect(manifest_object.has_relationship?(relationship)).to be_truthy
-              expect(manifest_object.relationship_pid(relationship)).to eq(object_relationship_pid)
-            end
-          end
-          context "pid in 'pid'" do
-            before { manifest_object.object_hash[relationship] = { "pid" => object_relationship_pid } }
-            it "should return the object pid" do
-              expect(manifest_object.has_relationship?(relationship)).to be_truthy
-              expect(manifest_object.relationship_pid(relationship)).to eq(object_relationship_pid)
-            end
-          end
-        end
-        context "id" do
-          let(:relationship_id) { "id001" }
-          let(:relationship_id_length) { 5 }
-          let(:distractor_id) { "id002" }
-          let(:distractor_id_length) { 4 }
-          let(:pid_1) { "test:1234" }
-          let(:pid_2) { "test:5678" }
-          let(:manifest) { Manifest.new }
-          let(:manifest_object) { ManifestObject.new({ "identifier" => "id00100020" }, manifest) }
-          let(:batch1) { Batch.create! }
-          let(:batch2) { Batch.create! }
-          before do
-            @batch_object_a = BatchObject.create!(:batch_id => batch1.id, :identifier => relationship_id, :pid => pid_1)
-            @batch_object_b = BatchObject.create!(:batch_id => batch2.id, :identifier => relationship_id, :pid => pid_2)
-          end
-          context "batchid" do
-            context "explicit id" do
-              before do
-                manifest.manifest_hash[relationship] = { "id" => relationship_id, "batchid" => batch2.id }
-                manifest_object.object_hash[relationship] = { "id" => relationship_id, "batchid" => batch1.id }
-              end
-              it "should return the correct pid" do
-                expect(manifest_object.relationship_pid(relationship)).to eq(pid_1)
-              end
-            end
-            context "autoidlength" do
-              before do
-                manifest.manifest_hash[relationship] = { "autoidlength" => relationship_id_length, "batchid" => batch2.id }
-                manifest_object.object_hash[relationship] = { "autoidlength" => relationship_id_length, "batchid" => batch1.id }
-              end
-              it "should return the correct pid" do
-                expect(manifest_object.relationship_pid(relationship)).to eq(pid_1)
-              end
-            end
-          end
-          context "no batchid" do
-            context "explicit id" do
-              before do
-                manifest.manifest_hash[relationship] = { "id" => distractor_id }
-                manifest_object.object_hash[relationship] = { "id" => relationship_id }
-              end
-              it "should return the correct pid" do
-                expect(manifest_object.relationship_pid(relationship)).to eq(pid_2)
-              end
-            end
-            context "autoidlength" do
-              before do
-                manifest.manifest_hash[relationship] = { "autoidlength" => distractor_id_length }
-                manifest_object.object_hash[relationship] = { "autoidlength" => relationship_id_length }
-              end
-              it "should return the correct pid" do
-                expect(manifest_object.relationship_pid(relationship)).to eq(pid_2)
-              end
-            end
-          end
-        end
-      end
-      context "relationship in manifest" do
-        context "explicit pid" do
-          let(:relationship_pid) { "test:1234" }
-          context "bare pid" do
-            before { manifest.manifest_hash[relationship] = relationship_pid }
-            it "should return the manifest pid" do
-              expect(manifest_object.has_relationship?(relationship)).to be_truthy
-              expect(manifest_object.relationship_pid(relationship)).to eq(relationship_pid)
-            end
-          end
-          context "pid in 'pid'" do
-            before { manifest.manifest_hash[relationship] = { "pid" => relationship_pid } }
-            it "should return the manifest pid" do
-              expect(manifest_object.has_relationship?(relationship)).to be_truthy
-              expect(manifest_object.relationship_pid(relationship)).to eq(relationship_pid)
-            end
-          end
-        end
-        context "id" do
-          let(:relationship_id) { "id001" }
-          let(:relationship_id_length) { 5 }
-          let(:pid_1) { "test:1234" }
-          let(:pid_2) { "test:5678" }
-          let(:manifest) { Manifest.new }
-          let(:manifest_object) { ManifestObject.new({ "identifier" => "id00100020" }, manifest) }
-          let(:batch1) { Batch.create! }
-          let(:batch2) { Batch.create! }
-          before do
-            @batch_object_a = BatchObject.create!(:batch_id => batch1.id, :identifier => relationship_id, :pid => pid_1)
-            @batch_object_b = BatchObject.create!(:batch_id => batch2.id, :identifier => relationship_id, :pid => pid_2)
-          end
-          context "batchid" do
-            context "explicit id" do
-              before { manifest.manifest_hash[relationship] = { "id" => relationship_id, "batchid" => batch1.id } }
-              it "should return the correct pid" do
-                expect(manifest_object.relationship_pid(relationship)).to eq(pid_1)
-              end
-            end
-            context "autoidlength" do
-              before { manifest.manifest_hash[relationship] = { "autoidlength" => relationship_id_length, "batchid" => batch1.id } }
-              it "should return the correct pid" do
-                expect(manifest_object.relationship_pid(relationship)).to eq(pid_1)
-              end
-            end
-          end
-          context "no batchid" do
-            context "explicit id" do
-              before { manifest.manifest_hash[relationship] = { "id" => relationship_id } }
-              it "should return the correct pid" do
-                expect(manifest_object.relationship_pid(relationship)).to eq(pid_2)
-              end
-            end
-            context "autoidlength" do
-              before { manifest.manifest_hash[relationship] = { "autoidlength" => relationship_id_length } }
-              it "should return the correct pid" do
-                expect(manifest_object.relationship_pid(relationship)).to eq(pid_2)
-              end
-            end
-          end
-        end
-      end
-      context "no relationship" do
-        it "should return false / nil" do
-          expect(manifest_object.has_relationship?(relationship)).to be_falsey
-          expect(manifest_object.relationship_pid(relationship)).to be_nil
-        end
-      end
-    end
-
-  end
-
-end
diff --git a/spec/models/manifest_spec.rb b/spec/models/manifest_spec.rb
deleted file mode 100644
index 68f134dc..00000000
--- a/spec/models/manifest_spec.rb
+++ /dev/null
@@ -1,376 +0,0 @@
-require 'spec_helper'
-
-module DulHydra::Batch::Models
-
-  describe Manifest, type: :model, batch: true do
-
-    shared_examples "a valid manifest" do
-      it "should be valid" do
-        expect(manifest.validate).to be_empty
-      end
-    end
-
-    shared_examples "an invalid manifest" do
-      it "should not be valid" do
-        expect(manifest.validate).to include(error_message)
-      end
-    end
-
-    context "validate" do
-      let(:collection_pid) { "test:1" }
-      context "valid" do
-        let!(:collection) { Collection.create(:pid => collection_pid, :title => ["Test Collection"]) }
-        context "manifest with files" do
-          let(:manifest) { Manifest.new(File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'manifests', 'manifest_with_files.yml')) }
-          before { manifest.manifest_hash['basepath'] = File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'miscellaneous') }
-          it_behaves_like "a valid manifest"
-        end
-        context "manifest with parent autoidlength" do
-          let(:manifest) { Manifest.new }
-          before do
-            manifest.manifest_hash[Manifest::BASEPATH] = "/tmp"
-            manifest.manifest_hash[BatchObjectRelationship::RELATIONSHIP_PARENT] = { Manifest::AUTOIDLENGTH => 5 }
-          end
-          it_behaves_like "a valid manifest"
-        end
-      end
-      context "invalid" do
-        let(:manifest) { Manifest.new }
-        context "invalid model" do
-          let(:key) { Manifest::MODEL }
-          let(:model) { "BadModel" }
-          let(:error_message) { I18n.t('batch.manifest.errors.model_invalid', :model => manifest.model) }
-          before { manifest.manifest_hash[key] = model }
-          it_behaves_like "an invalid manifest"
-        end
-        context "keys" do
-          let(:badkey) { "badkey" }
-          let(:value) { "some_value" }
-          context "invalid manifest level key" do
-            let(:error_message) { I18n.t('batch.manifest.errors.invalid_key', :key => badkey) }
-            before { manifest.manifest_hash[badkey] = value }
-            it_behaves_like "an invalid manifest"
-          end
-          context "invalid manifest sublevel key" do
-            let(:key) { Ddr::Datastreams::DESC_METADATA }
-            let(:error_message) { I18n.t('batch.manifest.errors.invalid_subkey', :key => key, :subkey => badkey) }
-            before { manifest.manifest_hash[key] = { badkey => value } }
-            it_behaves_like "an invalid manifest"
-          end
-        end
-        context "datastreams" do
-          context "datastream list" do
-            let(:key) { Manifest::DATASTREAMS }
-            let(:bad_datastream_name) { "badDatastreamName" }
-            let(:error_message) { I18n.t('batch.manifest.errors.datastream_name_invalid', :name => bad_datastream_name) }
-            before { manifest.manifest_hash[key] = [ bad_datastream_name ] }
-            it_behaves_like "an invalid manifest"
-          end
-          context "datastream filepath" do
-            let(:key) { Ddr::Datastreams::DESC_METADATA }
-            let(:bad_location) { File.join(File::SEPARATOR, 'tmp', 'unreadable','filepath') }
-            let(:error_message) { I18n.t('batch.manifest.errors.datastream_filepath_error', :datastream => key, :filepath => bad_location) }
-            before { manifest.manifest_hash[key] = { Manifest::LOCATION => bad_location } }
-            it_behaves_like "an invalid manifest"
-          end
-        end
-        context "checksums" do
-          let(:key) { Manifest::CHECKSUM }
-          context "checksum type" do
-            let(:bad_checksum_type) { "BAD-9999" }
-            let(:error_message) { I18n.t('batch.manifest.errors.checksum_type_invalid', :type => bad_checksum_type) }
-            before { manifest.manifest_hash[key] = { Manifest::TYPE => bad_checksum_type } }
-            it_behaves_like "an invalid manifest"
-          end
-          context "checksum file" do
-            context "invalid location" do
-              let(:location) { "/tmp/nonexistent/file/checksums.xml" }
-              let(:error_message) { I18n.t('batch.manifest.errors.checksum_file_error', :file => location) }
-              before { manifest.manifest_hash[key] = { Manifest::LOCATION => location } }
-              it_behaves_like "an invalid manifest"
-            end
-            context "not XML document" do
-              let(:file) { File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'miscellaneous', 'yaml_hash.txt') }
-              let(:error_message) { I18n.t('batch.manifest.errors.checksum_file_not_xml', :file => file) }
-              before { manifest.manifest_hash[key] = { Manifest::LOCATION => file } }
-              it_behaves_like "an invalid manifest"
-            end
-            context "node_xpath" do
-              context "not specified and default xpath absent" do
-                let(:file) { File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'miscellaneous', 'metadata.xml') }
-                let(:error_message) { I18n.t('batch.manifest.errors.checksum_file_node_error', :node => manifest.checksum_node_xpath, :file => file) }
-                before { manifest.manifest_hash[key] = { Manifest::LOCATION => file } }
-                it_behaves_like "an invalid manifest"
-              end
-              context "specified but absent" do
-                let(:file) { File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'miscellaneous', 'checksums.xml') }
-                let(:node_xpath) { "/foo/bar" }
-                let(:error_message) { I18n.t('batch.manifest.errors.checksum_file_node_error', :node => manifest.checksum_node_xpath, :file => file) }
-                before { manifest.manifest_hash[key] = { Manifest::LOCATION => file, Manifest::NODE_XPATH => node_xpath } }
-                it_behaves_like "an invalid manifest"
-              end
-            end
-            context "identifier_element" do
-              context "not specified and default xpath absent" do
-                let(:file) { File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'miscellaneous', 'incorrect_checksums.xml') }
-                let(:error_message) { I18n.t('batch.manifest.errors.checksum_file_node_error', :node => manifest.checksum_identifier_element, :file => file) }
-                before { manifest.manifest_hash[key] = { Manifest::LOCATION => file } }
-                it_behaves_like "an invalid manifest"
-              end
-              context "specified but absent" do
-                let(:file) { File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'miscellaneous', 'checksums.xml') }
-                let(:identifier_element) { "bogus" }
-                let(:error_message) { I18n.t('batch.manifest.errors.checksum_file_node_error', :node => manifest.checksum_identifier_element, :file => file) }
-                before { manifest.manifest_hash[key] = { Manifest::LOCATION => file, Manifest::IDENTIFIER_ELEMENT => identifier_element } }
-                it_behaves_like "an invalid manifest"
-              end
-            end
-            context "type xpath" do
-              context "not specified and default type xpath absent" do
-                let(:file) { File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'miscellaneous', 'checksums_bad_elements.xml') }
-                let(:error_message) { I18n.t('batch.manifest.errors.checksum_file_node_error', :node => manifest.checksum_type_xpath, :file => file) }
-                before { manifest.manifest_hash[key] = { Manifest::LOCATION => file } }
-                it_behaves_like "an invalid manifest"
-              end
-              context "specified but absent" do
-                let(:file) { File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'miscellaneous', 'checksums.xml') }
-                let(:type_xpath) { "bogus" }
-                let(:error_message) { I18n.t('batch.manifest.errors.checksum_file_node_error', :node => manifest.checksum_type_xpath, :file => file) }
-                before { manifest.manifest_hash[key] = { Manifest::LOCATION => file, Manifest::TYPE_XPATH => type_xpath } }
-                it_behaves_like "an invalid manifest"
-              end
-            end
-            context "value xpath" do
-              context "not specified and default value xpath absent" do
-                let(:file) { File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'miscellaneous', 'checksums_bad_elements.xml') }
-                let(:error_message) { I18n.t('batch.manifest.errors.checksum_file_node_error', :node => manifest.checksum_value_xpath, :file => file) }
-                before { manifest.manifest_hash[key] = { Manifest::LOCATION => file } }
-                it_behaves_like "an invalid manifest"
-              end
-              context "specified but absent" do
-                let(:file) { File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'miscellaneous', 'checksums_bad_elements.xml') }
-                let(:value_xpath) { "bogus" }
-                let(:error_message) { I18n.t('batch.manifest.errors.checksum_file_node_error', :node => manifest.checksum_value_xpath, :file => file) }
-                before { manifest.manifest_hash[key] = { Manifest::LOCATION => file, Manifest::VALUE_XPATH => value_xpath } }
-                it_behaves_like "an invalid manifest"
-              end
-            end
-          end
-        end
-        context "relationships" do
-          context "pid" do
-            context "object not in repository" do
-              let(:key) { BatchObjectRelationship::RELATIONSHIP_ADMIN_POLICY }
-              let(:pid) { "test:1" }
-              let(:error_message) { I18n.t('batch.manifest.errors.relationship_object_not_found', :relationship => key, :pid => pid) }
-              before { manifest.manifest_hash[key] = pid }
-              it_behaves_like "an invalid manifest"
-            end
-            context "repository object not correct model" do
-              let(:model) { "Item" }
-              let(:key) { BatchObjectRelationship::RELATIONSHIP_PARENT }
-              let(:relationship_class) { "Collection" }
-              let(:error_message) { I18n.t('batch.manifest.errors.relationship_object_class_mismatch', :relationship => key, :exp_class => relationship_class, :actual_class => object.class) }
-              let(:object) { FactoryGirl.create(:component) }
-              before do
-                manifest.manifest_hash[Manifest::MODEL] = model
-                manifest.manifest_hash[key] = object.pid
-              end
-              it_behaves_like "an invalid manifest"
-            end
-          end
-          context "id" do
-            let(:key) { BatchObjectRelationship::RELATIONSHIP_PARENT }
-            let(:subkey) { Manifest::ID }
-            let(:id) { "test001" }
-            before { manifest.manifest_hash[key] = { subkey => id } }
-            context "cannot determine pid" do
-              let(:error_message) { I18n.t('batch.manifest.errors.relationship_object_pid_not_determined', :relationship => key) }
-              it_behaves_like "an invalid manifest"
-            end
-            context "object not in repository" do
-              let(:pid) { "test:not_there" }
-              let(:error_message) { I18n.t('batch.manifest.errors.relationship_object_not_found', :relationship => key, :pid => pid) }
-              let!(:batch_object) { BatchObject.create(:identifier => id, :pid => pid) }
-              before { manifest.manifest_hash[key] = { subkey => id } }
-              it_behaves_like "an invalid manifest"
-            end
-            context "repository object not correct model" do
-              let(:model) { "Item" }
-              let(:relationship_class) { "Collection" }
-              let(:error_message) { I18n.t('batch.manifest.errors.relationship_object_class_mismatch', :relationship => key, :exp_class => relationship_class, :actual_class => object.class) }
-              let(:object) { FactoryGirl.create(:component) }
-              let!(:batch_object) { BatchObject.create(:identifier => object.identifier.first, :pid => object.pid) }
-              before do
-                manifest.manifest_hash[Manifest::MODEL] = model
-                manifest.manifest_hash[key] = { subkey => object.identifier.first }
-              end
-              it_behaves_like "an invalid manifest"
-            end
-          end
-        end
-      end
-    end
-
-    context "load yaml manifest file" do
-      let(:manifest) { Manifest.new(File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'miscellaneous', 'yaml.yml')) }
-      let(:yaml_hash) { eval File.open(File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'miscellaneous', 'yaml_hash.txt')) { |f| f.read } }
-      it "should lead the YAML file" do
-        expect(manifest.manifest_hash).to be_a_kind_of(Hash)
-        expect(manifest.manifest_hash).to eq(yaml_hash)
-      end
-    end
-
-    context "methods" do
-      let(:manifest) { Manifest.new }
-      context "basepath, label, model" do
-        let(:basepath) { "basePath" }
-        let(:label) { "expectedLabel" }
-        let(:model) { "modelToUse" }
-        before { manifest.manifest_hash = HashWithIndifferentAccess.new("basepath" => basepath, "label" => label, "model" => model) }
-        it "should return the correct basepath, label, and model" do
-          expect(manifest.basepath).to eq(basepath)
-          expect(manifest.label).to eq(label)
-          expect(manifest.model).to eq(model)
-        end
-      end
-      context "batch" do
-        context "new batch" do
-          let(:user) { FactoryGirl.create(:user) }
-          let(:batch_name) { "New Batch Name #{Time.now.to_s}" }
-          let(:batch_description) { "New Batch Description #{Time.now.to_s}" }
-          before do
-            manifest.manifest_hash = { "batch" =>
-                { "name" => batch_name,
-                  "description" => batch_description,
-                  "user_email" => user.email
-                }
-              }
-          end
-          it "should return the correct values" do
-            expect(manifest.batch_name).to eq(batch_name)
-            expect(manifest.batch_description).to eq(batch_description)
-            expect(manifest.batch_user_email).to eq(user.email)
-          end
-        end
-        context "existing batch" do
-          let(:batch) { Batch.create }
-          before { manifest.manifest_hash = { "batch" => { "id" => batch.id } } }
-          it "should return the correct value" do
-            expect(manifest.batch_id).to eq(batch.id)
-          end
-        end
-      end
-      context "checksums" do
-        context "identifier element, node xpath, type, type xpath, value xpath" do
-          context "provided" do
-            let(:identifier_element) { "identifierElement" }
-            let(:node_xpath) { "/node/xpath" }
-            let(:type) { "FOO-1" }
-            let(:type_xpath) { "the_type" }
-            let(:value_xpath) { "the_value" }
-            before do
-              manifest.manifest_hash = HashWithIndifferentAccess.new("checksum" => { "identifier_element" =>  identifier_element,
-                                                                                   "node_xpath" => node_xpath,
-                                                                                   "type" => type,
-                                                                                   "type_xpath" => type_xpath,
-                                                                                   "value_xpath" => value_xpath
-                                                                                 } )
-            end
-            it "should use the provided values" do
-              expect(manifest.checksum_identifier_element).to eq(identifier_element)
-              expect(manifest.checksum_node_xpath).to eq(node_xpath)
-              expect(manifest.checksum_type?).to be_truthy
-              expect(manifest.checksum_type).to eq(type)
-              expect(manifest.checksum_type_xpath).to eq(type_xpath)
-              expect(manifest.checksum_value_xpath).to eq(value_xpath)
-            end
-          end
-          context "not provided" do
-            it "should use the default values if any" do
-              expect(manifest.checksum_identifier_element).to eq("id")
-              expect(manifest.checksum_node_xpath).to eq("/checksums/checksum")
-              expect(manifest.checksum_type?).to be_falsey
-              expect(manifest.checksum_type).to be_nil
-              expect(manifest.checksum_type_xpath).to eq("type")
-              expect(manifest.checksum_value_xpath).to eq("value")
-            end
-          end
-        end
-        context "checksums XML document" do
-          let(:checksums_filepath) { File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'miscellaneous', 'checksums.xml') }
-          let(:checksums_document) { File.open(checksums_filepath) { |f| Nokogiri.XML(f) } }
-          before { manifest.manifest_hash = HashWithIndifferentAccess.new("checksum" => { "location" => checksums_filepath }) }
-          it "should open the XML document" do
-            expect(manifest.checksums?).to be_truthy
-            expect(manifest.checksums).to be_equivalent_to(checksums_document)
-          end
-        end
-      end
-      context "datastreams" do
-        context "datastreams list" do
-          let(:datastream_names) { [ "DS1", "DS2", "DS3" ] }
-          before { manifest.manifest_hash = HashWithIndifferentAccess.new("datastreams" => datastream_names) }
-          it "should return the list of datastream names" do
-            expect(manifest.datastreams.size).to eq(datastream_names.size)
-            manifest.datastreams.each { |datastream| expect(datastream_names).to include(datastream) }
-          end
-        end
-        context "datastream extension, datastream location" do
-          let(:datastream_name) { "fooDatastream" }
-          let(:extension) { ".foo" }
-          let(:location) { "/tmp" }
-          context "provided" do
-            before { manifest.manifest_hash = HashWithIndifferentAccess.new(datastream_name => { "extension" => extension, "location" => location }) }
-            it "should use the provided values" do
-              expect(manifest.datastream_extension(datastream_name)).to eq(extension)
-              expect(manifest.datastream_location(datastream_name)).to eq(location)
-            end
-          end
-          context "not provided" do
-            it "should return nil" do
-              expect(manifest.datastream_extension(datastream_name)).to be_nil
-              expect(manifest.datastream_location(datastream_name)).to be_nil
-            end
-          end
-        end
-      end
-      context "objects" do
-        let(:object1) { HashWithIndifferentAccess.new( "identifier" => "id001" ) }
-        let(:object2) { HashWithIndifferentAccess.new( "identifier" => "id002" ) }
-        let(:object3) { HashWithIndifferentAccess.new( "identifier" => "id003" ) }
-        let(:objects) { [ object1, object2, object3 ] }
-        before { manifest.manifest_hash = HashWithIndifferentAccess.new( "objects" => objects ) }
-        it "should return manifest objects" do
-          expect(manifest.objects.size).to eq(objects.size)
-          manifest.objects.each { |obj| expect(["id001", "id002", "id003"]).to include(obj.key_identifier) }
-        end
-      end
-      context "relationships" do
-        context "relationship autoidlength, relationship id, relationship pid" do
-          let(:relationship_name) { "foo_relationship" }
-          let(:autoidlength) { 5 }
-          let(:id) { "id123" }
-          let(:pid) { "foo:1234" }
-          context "provided" do
-            before { manifest.manifest_hash = HashWithIndifferentAccess.new(relationship_name => { "autoidlength" => autoidlength, "id" => id, "pid" => pid }) }
-            it "should use the provided values" do
-              expect(manifest.relationship_autoidlength(relationship_name)).to eq(autoidlength)
-              expect(manifest.relationship_id(relationship_name)).to eq(id)
-              expect(manifest.relationship_pid(relationship_name)).to eq(pid)
-            end
-          end
-          context "not provided" do
-            it "should return nil" do
-              expect(manifest.relationship_autoidlength(relationship_name)).to be_nil
-              expect(manifest.relationship_id(relationship_name)).to be_nil
-              expect(manifest.relationship_pid(relationship_name)).to be_nil
-            end
-          end
-        end
-      end
-    end
-
-  end
-
-end
diff --git a/spec/models/metadata_file_spec.rb b/spec/models/metadata_file_spec.rb
index dc6ab0ef..af82304e 100644
--- a/spec/models/metadata_file_spec.rb
+++ b/spec/models/metadata_file_spec.rb
@@ -12,16 +12,16 @@
 
 shared_examples "a successful metadata file processing" do
   it "should create a batch with an appropriate UpdateBatchObject" do
-    expect(@batch.status).to eq(DulHydra::Batch::Models::Batch::STATUS_READY)
-    expect(@batch_object).to be_a(DulHydra::Batch::Models::UpdateBatchObject)
+    expect(@batch.status).to eq(Ddr::Batch::Batch::STATUS_READY)
+    expect(@batch_object).to be_a(Ddr::Batch::UpdateBatchObject)
     expect(@attributes.size).to eq(11)
     expect(@attributes[0].datastream).to eq(Ddr::Datastreams::DESC_METADATA)
-    expect(@attributes[0].operation).to eq(DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR_ALL)
+    expect(@attributes[0].operation).to eq(Ddr::Batch::BatchObjectAttribute::OPERATION_CLEAR_ALL)
     actual_md = {}
     @attributes[1..-1].each do |att|
       expect(att.datastream).to eq(Ddr::Datastreams::DESC_METADATA)
-      expect(att.operation).to eq(DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD)
-      expect(att.value_type).to eq(DulHydra::Batch::Models::BatchObjectAttribute::VALUE_TYPE_STRING)
+      expect(att.operation).to eq(Ddr::Batch::BatchObjectAttribute::OPERATION_ADD)
+      expect(att.value_type).to eq(Ddr::Batch::BatchObjectAttribute::VALUE_TYPE_STRING)
       actual_md[att.name] ||= []
       actual_md[att.name] << att.value
     end
@@ -107,7 +107,7 @@
       allow_any_instance_of(MetadataFile).to receive_message_chain(:metadata, :path).and_return(delimited_file)
       allow_any_instance_of(MetadataFile).to receive(:effective_options).and_return(options)
       metadata_file.procezz
-      @batch = DulHydra::Batch::Models::Batch.all.last
+      @batch = Ddr::Batch::Batch.all.last
       @batch_object = @batch.batch_objects.first
       @attributes = @batch_object.batch_object_attributes
     end
diff --git a/spec/models/update_batch_object_spec.rb b/spec/models/update_batch_object_spec.rb
deleted file mode 100644
index f025737e..00000000
--- a/spec/models/update_batch_object_spec.rb
+++ /dev/null
@@ -1,101 +0,0 @@
-require 'spec_helper'
-
-module DulHydra::Batch::Models
-
-  shared_examples "a valid update object" do
-    it "should be valid" do
-      expect(object.validate).to be_empty
-    end
-  end
-
-  shared_examples "an invalid update object" do
-    it "should not be valid" do
-      expect(object.validate).to include(error_message)
-    end
-  end
-
-  shared_examples "a loggable event has occurred" do
-    it "should log the event" do
-      expect(repo_object.update_events.last.comment).to eq("Updated by batch process (Batch #{object.batch.id}, BatchObject #{object.id})")
-    end
-  end
-
-  describe UpdateBatchObject, type: :model, batch: true do
-
-    let(:object) { batch.batch_objects.first }
-
-    before { allow(File).to receive(:readable?).with("/tmp/qdc-rdf.nt").and_return(true) }
-
-    context "validate", validation: true do
-      let(:batch) { FactoryGirl.create(:batch_with_basic_update_batch_object) }
-      context "valid object" do
-        let(:repo_object) { TestModel.create(:pid => object.pid) }
-        before do
-          batch.user.can :edit, repo_object
-        end
-        context "generic object" do
-          it_behaves_like "a valid update object"
-        end
-        context "generic object without a model attribute" do
-          before { object.model = nil }
-          it_behaves_like "a valid update object"
-        end
-      end
-      context "invalid object" do
-        let(:error_prefix) { "#{object.identifier} [Database ID: #{object.id}]:"}
-        context "missing pid" do
-          let(:error_message) { "#{error_prefix} PID required for UPDATE operation" }
-          before do
-            object.pid = nil
-            object.save!
-          end
-          it_behaves_like "an invalid update object"
-        end
-        context "pid not found in repository" do
-          let(:error_message) { "#{error_prefix} PID #{object.pid} not found in repository" }
-          it_behaves_like "an invalid update object"
-        end
-        context "batch user not permitted to edit repository object" do
-          let!(:repo_object) { TestModel.create(:pid => object.pid) }
-          let(:error_message) { "#{error_prefix} #{batch.user.user_key} not permitted to edit #{object.pid}" }
-          it_behaves_like "an invalid update object"
-        end
-      end
-    end
-
-    context "update" do
-      let(:repo_object) { TestModel.create(pid: object.pid, title: [ "Test Model Title" ], identifier: [ "id1", "id2" ]) }
-      before do
-        repo_object.edit_users = [batch.user.user_key]
-        repo_object.save!
-        object.process(batch.user)
-        repo_object.reload
-      end
-      context "attributes" do
-        context "add" do
-          let(:batch) { FactoryGirl.create(:batch_with_basic_update_batch_object) }
-          it_behaves_like "a loggable event has occurred"
-          it "should add the attribute value to the repository object" do
-            expect(repo_object.title).to eq( [ 'Test Model Title', 'Test Object Title' ] )
-          end
-        end
-        context "clear" do
-          let(:batch) { FactoryGirl.create(:batch_with_basic_clear_attribute_batch_object) }
-          it_behaves_like "a loggable event has occurred"
-          it "should clear the attribute in the repository object" do
-            expect(repo_object.title).to be_empty
-          end
-        end
-        # Can't really test just clearing all attributes because can't save datastream with no content
-        context "clear all and add" do
-          let(:batch) { FactoryGirl.create(:batch_with_basic_clear_all_and_add_batch_object) }
-          it_behaves_like "a loggable event has occurred"
-          it "should clear the existing attributes from the repository object and add an attribute value" do
-            expect(repo_object.title).to eq( [ 'Test Object Title' ] )
-            expect(repo_object.identifier).to be_empty
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/spec/scripts/batch_processor_spec.rb b/spec/scripts/batch_processor_spec.rb
deleted file mode 100644
index 2c279c34..00000000
--- a/spec/scripts/batch_processor_spec.rb
+++ /dev/null
@@ -1,171 +0,0 @@
-require 'spec_helper'
-
-module DulHydra::Batch::Scripts
-
-  shared_examples "a successful ingest batch" do
-    let(:log_contents) { File.read(batch.logfile.path) }
-    before do
-      batch.reload
-      @repo_objects = []
-      batch.batch_objects.each { |obj| @repo_objects << ActiveFedora::Base.find(obj.pid, :cast => true) }
-    end
-    it "should add the objects to the repository and verify them" do
-      expect(@repo_objects.size).to eq(batch.batch_objects.size)
-      @repo_objects.each_with_index do |obj, index|
-        batch_obj = batch.batch_objects[index]
-        expect(obj).to be_an_instance_of(batch_obj.model.constantize)
-        expect(obj.label).to eq(batch_obj.label) if batch_obj.label
-        batch_obj_ds = batch_obj.batch_object_datastreams
-        batch_obj_ds.each { |d| expect(obj.datastreams[d.name].content).to_not be_nil }
-        batch_obj_rs = batch_obj.batch_object_relationships
-        batch_obj_rs.each { |r| expect(obj.send(r.name).pid).to eq(r.object) }
-        obj.events.each do |event|
-          expect(event.pid).to eq(obj.pid)
-          expect(event.event_date_time).to be_within(3.minutes).of(DateTime.now)
-          case event.type
-          when "Ddr::Events::FixityCheckEvent"
-            expect(event.detail).to include(Ddr::Events::FixityCheckEvent::VALID)
-            expect(event.detail).to_not include(Ddr::Events::FixityCheckEvent::INVALID)
-          when "Ddr::Events::IngestionEvent"
-            expect(event.summary).to include("Batch object identifier: #{batch_obj.identifier}")
-            expect(event.user_key).to eq(bp_user.user_key)
-          when "Ddr::Events::ValidationEvent"
-            expect(event.detail).to include(DulHydra::Batch::Scripts::BatchProcessor::PASS)
-            expect(event.detail).to_not include(DulHydra::Batch::Scripts::BatchProcessor::FAIL)
-          end
-        end
-      end
-      expect(batch.outcome).to eq(DulHydra::Batch::Models::Batch::OUTCOME_SUCCESS)
-      expect(batch.success).to eq(batch.batch_objects.size)
-      expect(batch.failure).to eq(0)
-      expect(batch.status).to eq(DulHydra::Batch::Models::Batch::STATUS_FINISHED)
-      expect(batch.start).to be < batch.stop
-      expect(batch.stop).to be_within(3.minutes).of(Time.now)
-      expect(batch.version).to eq(DulHydra::VERSION)
-      batch.batch_objects.each { |obj| expect(log_contents).to include("Ingested #{obj.model} #{obj.identifier} into #{obj.pid}") }
-      expect(log_contents).to include("Ingested #{batch.success} TestModelOmnibus")
-    end
-  end
-
-  shared_examples "a successful update batch" do
-    let(:log_contents) { File.read(batch.logfile.path) }
-    before do
-      batch.reload
-      @repo_objects = []
-      batch.batch_objects.each { |obj| @repo_objects << ActiveFedora::Base.find(obj.pid) }
-    end
-    it "should update the objects in the repository" do
-      expect(@repo_objects.size).to eq(batch.batch_objects.size)
-      @repo_objects.each_with_index do |obj, index|
-        batch_obj = batch.batch_objects[index]
-        expect(obj).to be_an_instance_of(batch_obj.model.constantize)
-        expect(obj.label).to eq(batch_obj.label) if batch_obj.label
-        expect(obj.title).to eq([ 'Test Object Title' ])
-        expect(obj.update_events.last.user_key).to eq(bp_user.user_key)
-        batch_obj_ds = batch_obj.batch_object_datastreams
-        batch_obj_ds.each { |d| expect(obj.datastreams[d.name].content).to_not be_nil }
-        batch_obj_rs = batch_obj.batch_object_relationships
-        batch_obj_rs.each { |r| expect(obj.send(r.name).pid).to eq(r.object) }
-      end
-      expect(batch.outcome).to eq(DulHydra::Batch::Models::Batch::OUTCOME_SUCCESS)
-      expect(batch.success).to eq(batch.batch_objects.size)
-      expect(batch.failure).to eq(0)
-      expect(batch.status).to eq(DulHydra::Batch::Models::Batch::STATUS_FINISHED)
-      expect(batch.start).to be <= batch.stop
-      expect(batch.stop).to be_within(3.minutes).of(Time.now)
-      expect(batch.version).to eq(DulHydra::VERSION)
-      batch.batch_objects.each { |obj| expect(log_contents).to include("Updated #{obj.pid}") }
-      expect(log_contents).to include("Updated #{batch.success} TestModelOmnibus")
-    end
-  end
-
-  shared_examples "an interrupted batch run" do
-    before { batch.reload }
-    it "should have an interrupted status and a failed outcome" do
-      expect([DulHydra::Batch::Models::Batch::STATUS_INTERRUPTED, DulHydra::Batch::Models::Batch::STATUS_RESTARTABLE]).to include(batch.status)
-      expect(batch.outcome).to eq(DulHydra::Batch::Models::Batch::OUTCOME_FAILURE)
-    end
-    it "should have a logfile" do
-      expect(batch.logfile).to_not be_nil
-    end
-  end
-
-  shared_examples "an invalid batch" do
-    before { batch.reload }
-    it "should have an invalid status and a failed outcome" do
-      expect(batch.status).to eq(DulHydra::Batch::Models::Batch::STATUS_INVALID)
-      expect(batch.outcome).to eq(DulHydra::Batch::Models::Batch::OUTCOME_FAILURE)
-    end
-    it "should have a logfile" do
-      expect(batch.logfile).to_not be_nil
-    end
-  end
-
-  describe BatchProcessor do
-    let(:test_dir) { Dir.mktmpdir("dul_hydra_test") }
-    let(:log_dir) { test_dir }
-    let(:bp_user) { FactoryGirl.create(:user) }
-    before do
-      allow(File).to receive(:readable?).and_call_original
-      allow(File).to receive(:readable?).with("/tmp/qdc-rdf.nt").and_return(true)
-      allow(File).to receive(:read).and_call_original
-    end
-    after { FileUtils.remove_dir test_dir }
-    context "ingest" do
-      let(:batch) { FactoryGirl.create(:batch_with_generic_ingest_batch_objects) }
-      let(:bp) { DulHydra::Batch::Scripts::BatchProcessor.new(batch, bp_user, log_dir: log_dir) }
-      context "successful initial run" do
-        before { bp.execute }
-        it_behaves_like "a successful ingest batch"
-      end
-      context "successful restart run" do
-        before do
-          batch.batch_objects.first.process(bp_user)
-          batch.update_attributes(:status => DulHydra::Batch::Models::Batch::STATUS_RESTARTABLE)
-          bp.execute
-        end
-        it_behaves_like "a successful ingest batch"
-      end
-      context "exception during run" do
-        before do
-          allow_any_instance_of(DulHydra::Batch::Models::IngestBatchObject).to receive(:populate_datastream).and_raise(RuntimeError)
-          bp.execute
-        end
-        it_behaves_like "an interrupted batch run"
-      end
-    end
-    context "update" do
-      let(:batch) { FactoryGirl.create(:batch_with_basic_update_batch_object) }
-      let(:repo_object) do
-        r_obj = TestModelOmnibus.new(:pid => batch.batch_objects.first.pid, :label => 'Object Label')
-        r_obj.add_file("#{Rails.root}/spec/fixtures/imageA.tif", Ddr::Datastreams::CONTENT)
-        r_obj.save
-        r_obj
-      end
-      let(:bp) { DulHydra::Batch::Scripts::BatchProcessor.new(batch, bp_user, log_dir: log_dir) }
-      before do
-        batch.user.can :edit, repo_object
-      end
-      context "successful update" do
-        before { bp.execute }
-        it_behaves_like "a successful update batch"
-      end
-      context "invalid batch" do
-        before do
-          batch.batch_objects.first.update_attributes(pid: nil)
-          bp.execute
-        end
-        it_behaves_like "an invalid batch"
-      end
-      context "exception during run" do
-        before do
-          allow_any_instance_of(DulHydra::Batch::Models::BatchObject).to receive(:add_attribute).and_raise(RuntimeError)
-          bp.execute
-        end
-        it_behaves_like "an interrupted batch run"
-      end
-    end
-  end
-
-end
-
diff --git a/spec/scripts/manifest_maker_spec.rb b/spec/scripts/manifest_maker_spec.rb
deleted file mode 100644
index e02d63c1..00000000
--- a/spec/scripts/manifest_maker_spec.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-require 'spec_helper'
-
-module DulHydra::Batch::Scripts
-
-  shared_examples "a successful manifest making run" do
-    let(:manifest) { DulHydra::Batch::Models::Manifest.new(manifest_file) }
-    let(:objects) { manifest.objects }
-    let(:object_identifiers) do
-      identifiers = []
-      objects.each { |object| identifiers << object.key_identifier }
-      identifiers
-    end
-    let(:content_locations) do
-      locations = {}
-      objects.each { |object| locations[object.key_identifier] = object.object_hash['content'] }
-      locations
-    end
-    it "should create an appropriate manifest file" do
-      expect(manifest.datastream_extension('content')).to eql(ext)
-      expect(object_identifiers).to include('imageA')
-      expect(object_identifiers).to include('imageB')
-      expect(object_identifiers).to_not include('sample')
-      expect(content_locations).to eql(file_locations)
-    end
-  end
-
-  describe ManifestMaker do
-    let(:test_dir) { Dir.mktmpdir("dul_hydra_test") }
-    let(:source_path) { File.join(test_dir, 'source') }
-    let(:ext) { '.tif' }
-    let(:file_locations) { Hash.new }
-    let(:manifest_file) { File.join(test_dir, 'manifest.yml') }
-    let(:log_dir) { test_dir }
-    before do
-      FileUtils.mkdir(source_path)
-      FileUtils.cp File.join(Rails.root, 'spec', 'fixtures', 'imageA.tif'), source_path
-      FileUtils.cp File.join(Rails.root, 'spec', 'fixtures', 'sample.pdf'), source_path
-      file_locations['imageA'] = File.join(source_path, 'imageA.tif')
-    end
-    after do
-      FileUtils.remove_dir test_dir
-    end
-    context "non-recursive" do
-      before do
-        FileUtils.cp File.join(Rails.root, 'spec', 'fixtures', 'imageB.tif'), source_path
-        file_locations['imageB'] = File.join(source_path, 'imageB.tif')
-      end
-      context "execute" do
-        let(:mm) { DulHydra::Batch::Scripts::ManifestMaker.new(:dirpath => source_path, :manifest => manifest_file, :log_dir => log_dir, :extension => ext) }
-        before { mm.execute }
-        context "successful processing run" do
-          it_behaves_like "a successful manifest making run"
-        end
-      end
-    end
-    context "recursive" do
-      let(:source_path_subdir) { File.join(source_path, 'subdir') }
-      before do
-        FileUtils.mkdir(source_path_subdir)
-        FileUtils.cp File.join(Rails.root, 'spec', 'fixtures', 'imageB.tif'), source_path_subdir
-        file_locations['imageB'] = File.join(source_path_subdir, 'imageB.tif')
-      end
-      context "execute" do
-        let(:mm) { DulHydra::Batch::Scripts::ManifestMaker.new(:dirpath => source_path, :manifest => manifest_file, :log_dir => log_dir, :extension => ext) }
-        before { mm.execute }
-        context "successful processing run" do
-          it_behaves_like "a successful manifest making run"
-        end
-      end
-    end
-  end
-
-end
diff --git a/spec/scripts/manifest_processor_spec.rb b/spec/scripts/manifest_processor_spec.rb
deleted file mode 100644
index 548fcdbb..00000000
--- a/spec/scripts/manifest_processor_spec.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-require 'spec_helper'
-
-module DulHydra::Batch::Scripts
-
-  shared_examples "a successful manifest processing run" do
-    let(:batch) { DulHydra::Batch::Models::Batch.all.last }
-    let(:batch_objects) { batch.batch_objects }
-    let(:batch_object) { batch_objects.first }
-    let(:batch_object_datastreams) { batch_object.batch_object_datastreams }
-    let(:batch_object_relationships) { batch_object.batch_object_relationships }
-    it "should create a new batch" do
-      expect(batch.created_at).to be > 3.minutes.ago
-      expect(batch.name).to eq(@manifest.batch_name)
-      expect(batch.description).to eq(@manifest.batch_description)
-    end
-    it "should create a new batch object in the batch for each manifest object" do
-      expect(batch_objects.size).to eq(@manifest.objects.size)
-      expect(batch_object.identifier).to eq(@manifest.objects.first.key_identifier)
-      expect(batch_object_datastreams.size).to eq(@manifest.objects.first.datastreams.size)
-      batch_object_datastreams.each do |datastream|
-        expect(datastream.operation).to eq(DulHydra::Batch::Models::BatchObjectDatastream::OPERATION_ADD)
-        expect(datastream.payload_type).to eq(DulHydra::Batch::Models::BatchObjectDatastream::PAYLOAD_TYPE_FILENAME)
-        expect(datastream.batch_object).to eq(batch_object)
-        expect(datastream.payload).to eq(@manifest.objects.first.datastream_filepath(datastream.name))
-        if datastream.name.eql?(Ddr::Datastreams::CONTENT)
-          expect(datastream.checksum).to eq(@manifest.objects.first.checksum) if @manifest.objects.first.checksum?
-          expect(datastream.checksum_type).to eq(@manifest.objects.first.checksum_type) if @manifest.objects.first.checksum_type?
-        end
-      end
-      batch_object_relationships.each do |relationship|
-        expect(relationship.operation).to eq(DulHydra::Batch::Models::BatchObjectRelationship::OPERATION_ADD)
-        expect(relationship.object_type).to eq(DulHydra::Batch::Models::BatchObjectRelationship::OBJECT_TYPE_PID)
-        case relationship.name
-        when DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_ADMIN_POLICY
-          expect(relationship.object).to eq(coll.pid)
-        when DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_PARENT
-          expect(relationship.object).to eq(parent_batch_object.pid)
-        when DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_ATTACHED_TO
-          expect(relationship.object).to eq(attached_to_batch_object.pid)
-        end
-      end
-    end
-  end
-
-  shared_examples "an invalid manifest to process" do
-    let(:log) { File.read(File.join(log_dir, "manifest_processor.log"))}
-    it "should not create a new batch" do
-      expect(DulHydra::Batch::Models::Batch.all).to be_empty
-    end
-    it "should log the manifest errors" do
-      expect(log).to include(I18n.t('batch.manifest.errors.basepath_error', :path => 'placeholder'))
-      expect(log).to include(I18n.t('batch.manifest.errors.relationship_object_not_found', :relationship => 'admin_policy', :pid => 'test:1'))
-      expect(log).to include(I18n.t('batch.manifest.validation_failed'))
-    end
-  end
-
-  describe ManifestProcessor, batch: true do
-    let(:test_dir) { Dir.mktmpdir("dul_hydra_test") }
-    let(:manifest_file) { File.join(test_dir, 'manifest.yml') }
-    let(:log_dir) { test_dir }
-    let(:coll) { Collection.create(title: ["Test Collection"]) }
-    after do
-      FileUtils.remove_dir test_dir
-    end
-    context "process" do
-      let!(:parent_batch_object) { DulHydra::Batch::Models::BatchObject.create(:identifier => "id0", :pid=> "test:1234") }
-      before do
-        FileUtils.cp File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'manifests', 'manifest_with_files.yml'), manifest_file
-        @manifest = DulHydra::Batch::Models::Manifest.new(manifest_file)
-      end
-      context "successful processing run" do
-        before do
-          @manifest.manifest_hash[DulHydra::Batch::Models::Manifest::BASEPATH] = test_dir
-          @manifest.manifest_hash['admin_policy'] = coll.pid
-          File.write(manifest_file, @manifest.manifest_hash.to_yaml)
-          mp = DulHydra::Batch::Scripts::ManifestProcessor.new(:manifest => manifest_file, :log_dir => log_dir)
-          mp.execute
-        end
-        it_behaves_like "a successful manifest processing run"
-      end
-      context "invalid manifest" do
-        before do
-          mp = DulHydra::Batch::Scripts::ManifestProcessor.new(:manifest => manifest_file, :log_dir => log_dir)
-          mp.execute
-        end
-        it_behaves_like "an invalid manifest to process"
-      end
-    end
-    context "attachment manifest" do
-      let!(:attached_to_batch_object) { DulHydra::Batch::Models::BatchObject.create(:identifier => "id001", :pid=> "test:1234") }
-      before do
-        FileUtils.cp File.join(Rails.root, 'spec', 'fixtures', 'batch_ingest', 'manifests', 'attachment_manifest.yml'), manifest_file
-        @manifest = DulHydra::Batch::Models::Manifest.new(manifest_file)
-        @manifest.manifest_hash[DulHydra::Batch::Models::Manifest::BASEPATH] = test_dir
-        @manifest.manifest_hash['admin_policy'] = coll.pid
-        File.write(manifest_file, @manifest.manifest_hash.to_yaml)
-        mp = DulHydra::Batch::Scripts::ManifestProcessor.new(:manifest => manifest_file, :log_dir => log_dir)
-        mp.execute
-      end
-      it_behaves_like "a successful manifest processing run"
-    end
-  end
-
-end
diff --git a/spec/scripts/process_simple_ingest_spec.rb b/spec/scripts/process_simple_ingest_spec.rb
index 4f035e5c..7885a50f 100644
--- a/spec/scripts/process_simple_ingest_spec.rb
+++ b/spec/scripts/process_simple_ingest_spec.rb
@@ -36,7 +36,7 @@ module DulHydra::Batch::Scripts
       end
       it "should produce the appropriate batch" do
         processor.execute
-        batch = DulHydra::Batch::Models::Batch.last
+        batch = Ddr::Batch::Batch.last
         expect(batch.user).to eq(batch_user)
         batch_objects = batch.batch_objects
         expect(batch_objects.size).to eq(3)
diff --git a/spec/services/build_batch_from_folder_ingest_spec.rb b/spec/services/build_batch_from_folder_ingest_spec.rb
index d2de85c3..005b7788 100644
--- a/spec/services/build_batch_from_folder_ingest_spec.rb
+++ b/spec/services/build_batch_from_folder_ingest_spec.rb
@@ -38,7 +38,7 @@
       expect(batch.id).to be_present
       expect(batch.name).to eq(batch_name)
       expect(batch.description).to eq(batch_description)
-      expect(batch.status).to eq(DulHydra::Batch::Models::Batch::STATUS_READY)
+      expect(batch.status).to eq(Ddr::Batch::Batch::STATUS_READY)
 
       # Batch objects
       batch_objects = batch.batch_objects
@@ -48,9 +48,9 @@
 
       # All batch object expectations
       batch_objects.each do |obj|
-        expect(obj.type).to eq('DulHydra::Batch::Models::IngestBatchObject')
+        expect(obj.type).to eq('Ddr::Batch::IngestBatchObject')
         admin_policy_relationships = obj.batch_object_relationships.where(
-                                        name: DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_ADMIN_POLICY)
+                                        name: Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_ADMIN_POLICY)
         expect(admin_policy_relationships.size).to eq(1)
         expect(admin_policy_relationships.first.object).to eq(collections.first.pid)
       end
@@ -68,7 +68,7 @@
         expect(obj.pid).to be_present
         item_pids << obj.pid
         parent_relationships = obj.batch_object_relationships.where(
-                                  name: DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_PARENT)
+                                  name: Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_PARENT)
         expect(parent_relationships.size).to eq(1)
         expect(parent_relationships.first.object).to eq(collections.first.pid)
         item_titles << obj.batch_object_attributes.where(name: 'title').first.value
@@ -85,7 +85,7 @@
       components.each do |obj|
         # Parent relationship
         parent_relationships = obj.batch_object_relationships.where(
-                                  name: DulHydra::Batch::Models::BatchObjectRelationship::RELATIONSHIP_PARENT)
+                                  name: Ddr::Batch::BatchObjectRelationship::RELATIONSHIP_PARENT)
         expect(parent_relationships.size).to eq(1)
         expect(item_pids).to include(parent_relationships.first.object)
         # Content datastream
diff --git a/spec/services/build_batch_object_from_mets_file_spec.rb b/spec/services/build_batch_object_from_mets_file_spec.rb
index 8b956a59..fa7daca9 100644
--- a/spec/services/build_batch_object_from_mets_file_spec.rb
+++ b/spec/services/build_batch_object_from_mets_file_spec.rb
@@ -6,7 +6,7 @@
   let(:mets_filepath) { '/tmp/mets.xml' }
   let(:mets_file) { METSFile.new(mets_filepath, collection) }
   let(:display_formats) { { 'slideshow' => 'multi_image' } }
-  let(:batch) { DulHydra::Batch::Models::Batch.new }
+  let(:batch) { Ddr::Batch::Batch.new }
   let(:service) { BuildBatchObjectFromMETSFile.new(batch: batch, mets_file: mets_file, display_formats: display_formats) }
 
   before do
@@ -19,7 +19,7 @@
   context "batch object" do
     it "should create an UpdateBatchObject for the batch" do
       batch_object = service.call
-      expect(batch_object).to be_a(DulHydra::Batch::Models::UpdateBatchObject)
+      expect(batch_object).to be_a(Ddr::Batch::UpdateBatchObject)
       expect(batch_object.batch).to eq(batch)
     end
   end
@@ -29,10 +29,10 @@
       batch_object = service.call
       attrs = batch_object.batch_object_attributes
       clear_attrs = attrs.where(datastream: Ddr::Datastreams::ADMIN_METADATA,
-                                operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR,
+                                operation: Ddr::Batch::BatchObjectAttribute::OPERATION_CLEAR,
                                 name: 'local_id')
       add_attrs = attrs.where(datastream: Ddr::Datastreams::ADMIN_METADATA,
-                              operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
+                              operation: Ddr::Batch::BatchObjectAttribute::OPERATION_ADD,
                               name: 'local_id',
                               value: 'efghi01003')
       expect(clear_attrs.size).to eq(1)
@@ -46,10 +46,10 @@
       batch_object = service.call
       attrs = batch_object.batch_object_attributes
       clear_attrs = attrs.where(datastream: Ddr::Datastreams::ADMIN_METADATA,
-                                operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR,
+                                operation: Ddr::Batch::BatchObjectAttribute::OPERATION_CLEAR,
                                 name: 'display_format')
       add_attrs = attrs.where(datastream: Ddr::Datastreams::ADMIN_METADATA,
-                              operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
+                              operation: Ddr::Batch::BatchObjectAttribute::OPERATION_ADD,
                               name: 'display_format',
                               value: 'multi_image')
       expect(clear_attrs.size).to eq(1)
@@ -63,15 +63,15 @@
       batch_object = service.call
       attrs = batch_object.batch_object_attributes
       clear_all_attrs = attrs.where(datastream: Ddr::Datastreams::DESC_METADATA,
-                                    operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_CLEAR_ALL)
+                                    operation: Ddr::Batch::BatchObjectAttribute::OPERATION_CLEAR_ALL)
       add_attrs = attrs.where(datastream: Ddr::Datastreams::DESC_METADATA,
-                              operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD).order('id')
+                              operation: Ddr::Batch::BatchObjectAttribute::OPERATION_ADD).order('id')
       add_spatial_1_attrs = attrs.where(datastream: Ddr::Datastreams::DESC_METADATA,
-                                        operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
+                                        operation: Ddr::Batch::BatchObjectAttribute::OPERATION_ADD,
                                         name: 'spatial',
                                         value: 'Durham County (NC)')
       add_spatial_2_attrs = attrs.where(datastream: Ddr::Datastreams::DESC_METADATA,
-                                        operation: DulHydra::Batch::Models::BatchObjectAttribute::OPERATION_ADD,
+                                        operation: Ddr::Batch::BatchObjectAttribute::OPERATION_ADD,
                                         name: 'spatial',
                                         value: 'Durham (NC)')
       expect(clear_all_attrs.size).to eq(1)
@@ -87,7 +87,7 @@
       batch_object = service.call
       dss = batch_object.batch_object_datastreams
       add_update_dss = dss.where(name: Ddr::Datastreams::STRUCT_METADATA,
-                                 operation: DulHydra::Batch::Models::BatchObjectDatastream::OPERATION_ADDUPDATE)
+                                 operation: Ddr::Batch::BatchObjectDatastream::OPERATION_ADDUPDATE)
       expect(add_update_dss.size).to eq(1)
       expect(add_update_dss.first.payload).to be_equivalent_to(sample_xml_struct_metadata)
     end

From 1590aa35383e076baf96d0c4403bbf49987b2634 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Wed, 9 Sep 2015 16:03:49 -0400
Subject: [PATCH 20/33] Uses new adminMetadata license field instead of
 rightsMetadata license info.

Upgrade notes:
- Set DDR_AUX_API_URL environment variable or DdrAux::Client.api_url
  module variable.
---
 Gemfile                                           |  2 +-
 Gemfile.lock                                      |  6 ++++--
 app/controllers/collections_controller.rb         |  5 +++++
 app/helpers/application_helper.rb                 | 15 +++++++++++++++
 app/views/admin_metadata_form/_admin_set.html.erb |  2 ++
 .../admin_metadata_form/_display_format.html.erb  |  2 ++
 app/views/admin_metadata_form/_license.html.erb   |  8 ++++++++
 app/views/admin_metadata_form/_local_id.html.erb  |  2 ++
 app/views/application/_admin_metadata.html.erb    |  2 +-
 .../application/_admin_metadata_fields.html.erb   | 10 ++++------
 .../_admin_metadata_form_fields.html.erb          |  9 +++------
 app/views/application/_license.html.erb           |  4 ++++
 app/views/application/_license_fields.html.erb    | 15 ---------------
 .../application/_license_form_fields.html.erb     | 15 ---------------
 app/views/application/admin_metadata.html.erb     |  1 -
 .../collections/_admin_metadata_fields.html.erb   | 14 --------------
 .../_admin_metadata_form_fields.html.erb          | 14 --------------
 app/views/collections/_license_fields.html.erb    | 15 ---------------
 .../collections/_license_form_fields.html.erb     | 15 ---------------
 config/locales/en.yml                             |  2 ++
 20 files changed, 53 insertions(+), 105 deletions(-)
 create mode 100644 app/views/admin_metadata_form/_admin_set.html.erb
 create mode 100644 app/views/admin_metadata_form/_display_format.html.erb
 create mode 100644 app/views/admin_metadata_form/_license.html.erb
 create mode 100644 app/views/admin_metadata_form/_local_id.html.erb
 create mode 100644 app/views/application/_license.html.erb
 delete mode 100644 app/views/application/_license_fields.html.erb
 delete mode 100644 app/views/application/_license_form_fields.html.erb
 delete mode 100644 app/views/collections/_admin_metadata_fields.html.erb
 delete mode 100644 app/views/collections/_admin_metadata_form_fields.html.erb
 delete mode 100644 app/views/collections/_license_fields.html.erb
 delete mode 100644 app/views/collections/_license_form_fields.html.erb

diff --git a/Gemfile b/Gemfile
index 1297dbec..3ed61afe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,8 +3,8 @@ source 'http://rubygems.org'
 gem 'rails', '~> 4.1.6'
 gem 'hydra-head', '~> 7.2.0'
 gem 'ddr-alerts', '~> 1.0.0'
-gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: '6d33c38c0991b97b694553e060b1920d7bf01d75'
 gem 'ddr-batch', '1.0.0.rc1'
+gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: '04b55ff246271fb2f68dad05d89864cdcc0222b9'
 gem 'rubydora', '>= 1.8.1'
 gem 'devise'
 gem 'deprecation'
diff --git a/Gemfile.lock b/Gemfile.lock
index eddeb2df..59e618bd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,12 @@
 GIT
   remote: git://github.com/duke-libraries/ddr-models.git
-  revision: 6d33c38c0991b97b694553e060b1920d7bf01d75
-  ref: 6d33c38c0991b97b694553e060b1920d7bf01d75
+  revision: 04b55ff246271fb2f68dad05d89864cdcc0222b9
+  ref: 04b55ff246271fb2f68dad05d89864cdcc0222b9
   specs:
     ddr-models (2.0.1.post)
       active-fedora (~> 7.0)
       cancancan (~> 1.12)
+      ddr-aux-client (= 1.0.0.pre.1)
       devise (~> 3.4)
       ezid-client (~> 1.1, >= 1.1.1)
       grouper-rest-client
@@ -99,6 +100,7 @@ GEM
     database_cleaner (1.4.0)
     ddr-alerts (1.0.0)
       rails (~> 4.1.6)
+    ddr-aux-client (1.0.0.pre.1)
     ddr-batch (1.0.0.rc1)
       ddr-models (~> 2.0)
       devise (~> 3.4)
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index b4b64558..0ce493fe 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -7,6 +7,7 @@ class CollectionsController < ApplicationController
 
   before_action :set_desc_metadata, only: :create
   self.tabs << :tab_reports
+  helper_method :admin_metadata_fields
 
   def items
     get_children
@@ -32,6 +33,10 @@ def report
 
   protected
 
+  def admin_metadata_fields
+    [:license, :local_id, :display_format, :admin_set]
+  end
+
   def tab_reports
     Tab.new("reports",
             guard: can?(:report, current_object)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1f744916..74afa2c8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,5 +1,20 @@
 module ApplicationHelper
 
+  # Controls what fields are displayed on the admin metadata tab and edit form
+  def admin_metadata_fields
+    [:license, :local_id, :display_format]
+  end
+
+  def render_admin_metadata_field(field)
+    render field.to_s
+  rescue ActionView::MissingTemplate
+    current_object.send(field)
+  end
+
+  def license_options_for_select
+    options_from_collection_for_select(Ddr::Models::License.all, :url, :title, current_object.license)
+  end
+
   def alert_messages
     Ddr::Alerts::Message.active.pluck(:message)
   end
diff --git a/app/views/admin_metadata_form/_admin_set.html.erb b/app/views/admin_metadata_form/_admin_set.html.erb
new file mode 100644
index 00000000..c71d8081
--- /dev/null
+++ b/app/views/admin_metadata_form/_admin_set.html.erb
@@ -0,0 +1,2 @@
+<%= f.label :admin_set, "Admin Set" %>
+<%= f.text_field :admin_set, class: "form-control" %>
diff --git a/app/views/admin_metadata_form/_display_format.html.erb b/app/views/admin_metadata_form/_display_format.html.erb
new file mode 100644
index 00000000..dba53bf4
--- /dev/null
+++ b/app/views/admin_metadata_form/_display_format.html.erb
@@ -0,0 +1,2 @@
+<%= f.label :display_format, "Display Format" %>
+<%= f.text_field :display_format, class: "form-control" %>
diff --git a/app/views/admin_metadata_form/_license.html.erb b/app/views/admin_metadata_form/_license.html.erb
new file mode 100644
index 00000000..2e12b94f
--- /dev/null
+++ b/app/views/admin_metadata_form/_license.html.erb
@@ -0,0 +1,8 @@
+<%= f.label :license %>
+<% if inherited_license = current_object.inherited_license %>
+  <p class="form-control-static">
+    <%= inherited_license.title %> (inherited)
+  </p>
+<% else %>
+  <%= f.select :license, license_options_for_select, {include_blank: "N/A"}, {class: "form-control"} %>
+<% end %>
diff --git a/app/views/admin_metadata_form/_local_id.html.erb b/app/views/admin_metadata_form/_local_id.html.erb
new file mode 100644
index 00000000..c0c2d251
--- /dev/null
+++ b/app/views/admin_metadata_form/_local_id.html.erb
@@ -0,0 +1,2 @@
+<%= f.label :local_id, "Local ID" %>
+<%= f.text_field :local_id, class: "form-control" %>
diff --git a/app/views/application/_admin_metadata.html.erb b/app/views/application/_admin_metadata.html.erb
index 2ea28694..104ed731 100644
--- a/app/views/application/_admin_metadata.html.erb
+++ b/app/views/application/_admin_metadata.html.erb
@@ -1,4 +1,4 @@
 <%= render partial: "tab_actions", locals: {tab: tab} %>
 <%= render "admin_metadata_fields" %>
-<%= render "license_fields" %>
+
 
diff --git a/app/views/application/_admin_metadata_fields.html.erb b/app/views/application/_admin_metadata_fields.html.erb
index 9a4caf11..8946ee17 100644
--- a/app/views/application/_admin_metadata_fields.html.erb
+++ b/app/views/application/_admin_metadata_fields.html.erb
@@ -1,10 +1,8 @@
 <table class="table">
+  <% admin_metadata_fields.each do |field| %>
   <tr>
-    <th scope="row">Local ID</th>
-    <td><%= current_object.local_id %></td>
-  </tr>
+    <th scope="row"><%= t("dul_hydra.admin_metadata.#{field}", default: field.to_s.titleize) %></th>    
+    <td><%= render_admin_metadata_field field %></td>
   <tr>
-    <th scope="row">Display Format</th>
-    <td><%= current_object.display_format %></td>
-  </tr>
+  <% end %>
 </table>
diff --git a/app/views/application/_admin_metadata_form_fields.html.erb b/app/views/application/_admin_metadata_form_fields.html.erb
index 36953682..02b472a4 100644
--- a/app/views/application/_admin_metadata_form_fields.html.erb
+++ b/app/views/application/_admin_metadata_form_fields.html.erb
@@ -1,10 +1,7 @@
 <fieldset>
+  <% admin_metadata_fields.each do |field| %>
   <div class="form-group">
-    <%= f.label :local_id, "Local ID" %>
-    <%= f.text_field :local_id, class: "form-control" %>
-  </div>
-  <div class="form-group">
-    <%= f.label :display_format, "Display Format" %>
-    <%= f.text_field :display_format, class: "form-control" %>
+    <%= render partial: "admin_metadata_form/#{field}", locals: {f: f} %>
   </div>
+  <% end %>
 </fieldset>
diff --git a/app/views/application/_license.html.erb b/app/views/application/_license.html.erb
new file mode 100644
index 00000000..f0bf4501
--- /dev/null
+++ b/app/views/application/_license.html.erb
@@ -0,0 +1,4 @@
+<% if license = current_object.effective_license %>
+  <%= license.title %>
+  <% if license.licensed != current_object.pid %>(inherited)<% end %>
+<% end %>
diff --git a/app/views/application/_license_fields.html.erb b/app/views/application/_license_fields.html.erb
deleted file mode 100644
index 8a50c3d8..00000000
--- a/app/views/application/_license_fields.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="table">
-  <caption>License</caption>
-  <tr>
-    <th scope="row">License Title</th>
-    <td><%= current_object.license_title %></td>
-  </tr>
-  <tr>
-    <th scope="row">License Description</th>
-    <td><%= current_object.license_description %></td>
-  </tr>
-  <tr>
-    <th scope="row">License URL</th>
-    <td><%= current_object.license_url %></td>    
-  </tr>
-</table>
diff --git a/app/views/application/_license_form_fields.html.erb b/app/views/application/_license_form_fields.html.erb
deleted file mode 100644
index 2b2d6223..00000000
--- a/app/views/application/_license_form_fields.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<fieldset>
-  <legend>License</legend>
-  <div class="form-group">
-    <%= f.label :license_title, "License Title" %>
-    <%= f.text_field :license_title, class: "form-control" %>
-  </div>
-  <div class="form-group">
-    <%= f.label :license_description, "License Description" %>
-    <%= f.text_area :license_description, class: "form-control" %>
-  </div>
-  <div class="form-group">
-    <%= f.label :license_url, "License URL" %>
-    <%= f.text_field :license_url, class: "form-control" %>
-  </div>
-</fieldset>
diff --git a/app/views/application/admin_metadata.html.erb b/app/views/application/admin_metadata.html.erb
index a3e8ca71..fa877fb1 100644
--- a/app/views/application/admin_metadata.html.erb
+++ b/app/views/application/admin_metadata.html.erb
@@ -4,7 +4,6 @@
 
 <%= form_for current_object, as: :adminMetadata, url: {action: "admin_metadata"}, method: :patch, html: {role: "form"} do |f| %>
   <%= render partial: "admin_metadata_form_fields", locals: {f: f} %>
-  <%= render partial: "license_form_fields", locals: {f: f} %>
   <%= render partial: "form_comment" %>
   <%= render partial: "form_actions", locals: {f: f} %>
 <% end %>
diff --git a/app/views/collections/_admin_metadata_fields.html.erb b/app/views/collections/_admin_metadata_fields.html.erb
deleted file mode 100644
index 510400a1..00000000
--- a/app/views/collections/_admin_metadata_fields.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<table class="table">
-  <tr>
-    <th scope="row">Local ID</th>
-    <td><%= current_object.local_id %></td>
-  </tr>
-  <tr>
-    <th scope="row">Display Format</th>
-    <td><%= current_object.display_format %></td>
-  </tr>
-  <tr>
-    <th scope="row">Admin Set</th>
-    <td><%= current_object.admin_set %></td>
-  </tr>
-</table>
diff --git a/app/views/collections/_admin_metadata_form_fields.html.erb b/app/views/collections/_admin_metadata_form_fields.html.erb
deleted file mode 100644
index fa6cfaf2..00000000
--- a/app/views/collections/_admin_metadata_form_fields.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<fieldset>
-  <div class="form-group">
-    <%= f.label :local_id, "Local ID" %>
-    <%= f.text_field :local_id, class: "form-control" %>
-  </div>
-  <div class="form-group">
-    <%= f.label :display_format, "Display Format" %>
-    <%= f.text_field :display_format, class: "form-control" %>
-  </div>
-  <div class="form-group">
-    <%= f.label :admin_set, "Admin Set" %>
-    <%= f.text_field :admin_set, class: "form-control" %>
-  </div>
-</fieldset>
diff --git a/app/views/collections/_license_fields.html.erb b/app/views/collections/_license_fields.html.erb
deleted file mode 100644
index 4dd37632..00000000
--- a/app/views/collections/_license_fields.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<table class="table">
-  <caption>Default License</caption>
-  <tr>
-    <th scope="row">Default License Title</th>
-    <td><%= current_object.default_license_title %></td>
-  </tr>
-  <tr>
-    <th scope="row">Default License Description</th>
-    <td><%= current_object.default_license_description %></td>
-  </tr>
-  <tr>
-    <th scope="row">Default License URL</th>
-    <td><%= current_object.default_license_url %></td>
-  </tr>
-</table>
diff --git a/app/views/collections/_license_form_fields.html.erb b/app/views/collections/_license_form_fields.html.erb
deleted file mode 100644
index 2ad1ee06..00000000
--- a/app/views/collections/_license_form_fields.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<fieldset>
-  <legend>Default License</legend>  
-  <div class="form-group">
-    <%= f.label :default_license_title, "Default License Title" %>
-    <%= f.text_field :default_license_title, class: "form-control" %>
-  </div>
-  <div class="form-group">
-    <%= f.label :default_license_description, "Default License Description" %>
-    <%= f.text_area :default_license_description, class: "form-control" %>
-  </div>
-  <div class="form-group">
-    <%= f.label :default_license_url, "Default License URL" %>
-    <%= f.text_field :default_license_url, class: "form-control" %>
-  </div>
-</fieldset>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cfece1f6..a4669815 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,6 +3,8 @@ en:
     errors:
       multiple_object_matches: "%{criteria} retrieved multiple repository objects"
   dul_hydra:        
+    admin_metadata:
+      local_id: "Local ID"
     techmd:
       file_human_size: "File Size"
       pronom_identifier: "PRONOM Identifier"

From 8ae2c7f7c7942c130a130be8a0d344529e700ffd Mon Sep 17 00:00:00 2001
From: Jim Coble <jim.coble@duke.edu>
Date: Fri, 11 Sep 2015 08:45:50 -0400
Subject: [PATCH 21/33] Display object's structural metadata; closes #1431

---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  |  8 +++---
 .../has_structural_metadata_behavior.rb       | 25 +++++++++++++++++++
 app/controllers/items_controller.rb           |  1 +
 app/views/application/_struct_map.html.erb    | 24 ++++++++++++++++++
 .../application/_structural_metadata.html.erb |  6 +++++
 config/locales/en.yml                         |  4 +++
 7 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 app/controllers/concerns/dul_hydra/controller/has_structural_metadata_behavior.rb
 create mode 100644 app/views/application/_struct_map.html.erb
 create mode 100644 app/views/application/_structural_metadata.html.erb

diff --git a/Gemfile b/Gemfile
index 3ed61afe..94093a9f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '~> 4.1.6'
 gem 'hydra-head', '~> 7.2.0'
 gem 'ddr-alerts', '~> 1.0.0'
 gem 'ddr-batch', '1.0.0.rc1'
-gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: '04b55ff246271fb2f68dad05d89864cdcc0222b9'
+gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: 'f4f9603043d3a946a0bf48cb2aa4a524d8b9d381'
 gem 'rubydora', '>= 1.8.1'
 gem 'devise'
 gem 'deprecation'
diff --git a/Gemfile.lock b/Gemfile.lock
index 59e618bd..7472af60 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
 GIT
   remote: git://github.com/duke-libraries/ddr-models.git
-  revision: 04b55ff246271fb2f68dad05d89864cdcc0222b9
-  ref: 04b55ff246271fb2f68dad05d89864cdcc0222b9
+  revision: f4f9603043d3a946a0bf48cb2aa4a524d8b9d381
+  ref: f4f9603043d3a946a0bf48cb2aa4a524d8b9d381
   specs:
     ddr-models (2.0.1.post)
       active-fedora (~> 7.0)
       cancancan (~> 1.12)
-      ddr-aux-client (= 1.0.0.pre.1)
+      ddr-aux-client (~> 1.0)
       devise (~> 3.4)
       ezid-client (~> 1.1, >= 1.1.1)
       grouper-rest-client
@@ -100,7 +100,7 @@ GEM
     database_cleaner (1.4.0)
     ddr-alerts (1.0.0)
       rails (~> 4.1.6)
-    ddr-aux-client (1.0.0.pre.1)
+    ddr-aux-client (1.0.0)
     ddr-batch (1.0.0.rc1)
       ddr-models (~> 2.0)
       devise (~> 3.4)
diff --git a/app/controllers/concerns/dul_hydra/controller/has_structural_metadata_behavior.rb b/app/controllers/concerns/dul_hydra/controller/has_structural_metadata_behavior.rb
new file mode 100644
index 00000000..6ae86d7e
--- /dev/null
+++ b/app/controllers/concerns/dul_hydra/controller/has_structural_metadata_behavior.rb
@@ -0,0 +1,25 @@
+module DulHydra
+  module Controller
+    module HasStructuralMetadataBehavior
+      extend ActiveSupport::Concern
+
+      included do
+        self.tabs.insert -2, :tab_structural_metadata
+      end
+
+      protected
+
+      def tab_structural_metadata
+        Tab.new("structural_metadata",
+                actions: [
+                  TabAction.new("struct_map_xml",
+                                download_path(current_object, "structMetadata"),
+                                show_ds_download_link?(current_object.structMetadata)
+                               ),
+                ]
+               )
+      end
+
+    end
+  end
+end
diff --git a/app/controllers/items_controller.rb b/app/controllers/items_controller.rb
index 2d5cd440..e3bcbd2b 100644
--- a/app/controllers/items_controller.rb
+++ b/app/controllers/items_controller.rb
@@ -3,6 +3,7 @@ class ItemsController < ApplicationController
   include DulHydra::Controller::RepositoryBehavior
   include DulHydra::Controller::HasParentBehavior
   include DulHydra::Controller::HasChildrenBehavior
+  include DulHydra::Controller::HasStructuralMetadataBehavior
 
   before_action :set_desc_metadata, only: :create
 
diff --git a/app/views/application/_struct_map.html.erb b/app/views/application/_struct_map.html.erb
new file mode 100644
index 00000000..0eb59eaf
--- /dev/null
+++ b/app/views/application/_struct_map.html.erb
@@ -0,0 +1,24 @@
+<table class="table table-bordered text-center">
+	<thead>
+		<tr>
+			<th class="text-center">ORDER</th>
+			<th class="text-center">ID</th>
+			<th class="text-center">LABEL</th>
+			<th class="text-center">ORDERLABEL</th>
+			<th class="text-center">TYPE</th>
+			<th class="text-center">PID</th>
+		</tr>
+	</thead>
+	<tbody>
+		<% Ddr::Models::StructDiv.new(current_object.structure.structMap_node).divs.each do |div| %>
+			<tr>
+				<td><%= div.order %></td>
+				<td><%= div.id %></td>
+				<td><%= div.label %></td>
+				<td><%= div.orderlabel %></td>
+				<td><%= div.type %></td>
+				<td><%= link_to(div.fptrs.first, catalog_path(div.fptrs.first)) %></td>
+			</tr>
+		<% end %>
+	</tbody>
+</table>
diff --git a/app/views/application/_structural_metadata.html.erb b/app/views/application/_structural_metadata.html.erb
new file mode 100644
index 00000000..7e9ab579
--- /dev/null
+++ b/app/views/application/_structural_metadata.html.erb
@@ -0,0 +1,6 @@
+<%= render partial: "tab_actions", locals: {tab: tab} %>
+<% if current_object.has_struct_metadata? %>
+	<%= render partial: "struct_map" %>
+<% else %>
+	<div class="col-md-4 h5">No structural metadata</div>
+<% end %>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a4669815..21d604c0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -142,6 +142,10 @@ en:
           download: "Download N-Triples"
         errors:
           empty_form_submission: "You can't submit a form containing no descriptive metadata.  Use 'Cancel' to exit Edit mode."
+      structural_metadata:
+          label: "Structural Metadata"
+          actions:
+              struct_map_xml: "StructMap XML"
       roles:
         label: Roles
         actions:

From 42c5946aaf3359f17ab6a842a2fed5583a573a81 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Fri, 18 Sep 2015 11:52:59 -0400
Subject: [PATCH 22/33] Added ddr-aux integration for admin_set.

Closes #1418
---
 Gemfile                                           |  2 +-
 Gemfile.lock                                      | 13 ++++++++-----
 app/helpers/application_helper.rb                 |  4 ++++
 app/views/admin_metadata_form/_admin_set.html.erb |  2 +-
 app/views/application/_admin_set.html.erb         |  3 +++
 app/views/application/_license.html.erb           |  2 +-
 6 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 app/views/application/_admin_set.html.erb

diff --git a/Gemfile b/Gemfile
index 94093a9f..31f5b83d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '~> 4.1.6'
 gem 'hydra-head', '~> 7.2.0'
 gem 'ddr-alerts', '~> 1.0.0'
 gem 'ddr-batch', '1.0.0.rc1'
-gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: 'f4f9603043d3a946a0bf48cb2aa4a524d8b9d381'
+gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: '14dc0ef5c1a987564937e7aa1391add2db4bd8db'
 gem 'rubydora', '>= 1.8.1'
 gem 'devise'
 gem 'deprecation'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7472af60..2ab59f2f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,13 @@
 GIT
   remote: git://github.com/duke-libraries/ddr-models.git
-  revision: f4f9603043d3a946a0bf48cb2aa4a524d8b9d381
-  ref: f4f9603043d3a946a0bf48cb2aa4a524d8b9d381
+  revision: 14dc0ef5c1a987564937e7aa1391add2db4bd8db
+  ref: 14dc0ef5c1a987564937e7aa1391add2db4bd8db
   specs:
-    ddr-models (2.0.1.post)
+    ddr-models (2.1.0.rc1)
       active-fedora (~> 7.0)
       cancancan (~> 1.12)
-      ddr-aux-client (~> 1.0)
+      ddr-antivirus (= 2.0.0)
+      ddr-aux-client (~> 1.2, >= 1.2.1)
       devise (~> 3.4)
       ezid-client (~> 1.1, >= 1.1.1)
       grouper-rest-client
@@ -100,7 +101,9 @@ GEM
     database_cleaner (1.4.0)
     ddr-alerts (1.0.0)
       rails (~> 4.1.6)
-    ddr-aux-client (1.0.0)
+    ddr-antivirus (2.0.0)
+    ddr-aux-client (1.2.1)
+      hashie (~> 3.4)
     ddr-batch (1.0.0.rc1)
       ddr-models (~> 2.0)
       devise (~> 3.4)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 74afa2c8..49009f0a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -15,6 +15,10 @@ def license_options_for_select
     options_from_collection_for_select(Ddr::Models::License.all, :url, :title, current_object.license)
   end
 
+  def admin_set_options_for_select
+    options_from_collection_for_select(Ddr::Models::AdminSet.all, :code, :title, current_object.admin_set)
+  end
+
   def alert_messages
     Ddr::Alerts::Message.active.pluck(:message)
   end
diff --git a/app/views/admin_metadata_form/_admin_set.html.erb b/app/views/admin_metadata_form/_admin_set.html.erb
index c71d8081..8d7049ed 100644
--- a/app/views/admin_metadata_form/_admin_set.html.erb
+++ b/app/views/admin_metadata_form/_admin_set.html.erb
@@ -1,2 +1,2 @@
 <%= f.label :admin_set, "Admin Set" %>
-<%= f.text_field :admin_set, class: "form-control" %>
+<%= f.select :admin_set, admin_set_options_for_select, {include_blank: "N/A"}, {class: "form-control"} %>
diff --git a/app/views/application/_admin_set.html.erb b/app/views/application/_admin_set.html.erb
new file mode 100644
index 00000000..f3badec6
--- /dev/null
+++ b/app/views/application/_admin_set.html.erb
@@ -0,0 +1,3 @@
+<% if admin_set = Ddr::Models::AdminSet.call(current_object) %>
+  <%= admin_set.title %>
+<% end %>
diff --git a/app/views/application/_license.html.erb b/app/views/application/_license.html.erb
index f0bf4501..50d05787 100644
--- a/app/views/application/_license.html.erb
+++ b/app/views/application/_license.html.erb
@@ -1,4 +1,4 @@
 <% if license = current_object.effective_license %>
   <%= license.title %>
-  <% if license.licensed != current_object.pid %>(inherited)<% end %>
+  <% if license.pid != current_object.pid %>(inherited)<% end %>
 <% end %>

From 7f07ccc46fed6eafea07d4ec145d037ab3002f00 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Fri, 18 Sep 2015 12:25:05 -0400
Subject: [PATCH 23/33] Removes unused and deprecated BL document extensions
 from SolrDocument.

---
 app/models/solr_document.rb | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/app/models/solr_document.rb b/app/models/solr_document.rb
index 79277e7b..fea167fc 100644
--- a/app/models/solr_document.rb
+++ b/app/models/solr_document.rb
@@ -7,32 +7,4 @@ class SolrDocument
   include Blacklight::Solr::Document
   include Ddr::Models::SolrDocument
 
-  # self.unique_key = 'id'
-
-  # The following shows how to setup this blacklight document to display marc documents
-  # extension_parameters[:marc_source_field] = :marc_display
-  # extension_parameters[:marc_format_type] = :marcxml
-  # use_extension( Blacklight::Solr::Document::Marc) do |document|
-  #   document.key?( :marc_display  )
-  # end
-
-  # Email uses the semantic field mappings below to generate the body of an email.
-  SolrDocument.use_extension( Blacklight::Solr::Document::Email )
-
-  # SMS uses the semantic field mappings below to generate the body of an SMS email.
-  SolrDocument.use_extension( Blacklight::Solr::Document::Sms )
-
-  # DublinCore uses the semantic field mappings below to assemble an OAI-compliant Dublin Core document
-  # Semantic mappings of solr stored fields. Fields may be multi or
-  # single valued. See Blacklight::Solr::Document::ExtendableClassMethods#field_semantics
-  # and Blacklight::Solr::Document#to_semantic_values
-  # Recommendation: Use field names from Dublin Core
-  use_extension( Blacklight::Solr::Document::DublinCore)
-  field_semantics.merge!(
-                         :title => "title_display",
-                         :author => "author_display",
-                         :language => "language_facet",
-                         :format => "format"
-                         )
-
 end

From e8d5cb15e05d2bb54aacef6f66d6a668023229c9 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Fri, 18 Sep 2015 12:35:19 -0400
Subject: [PATCH 24/33] Ran `rails generate blacklight:search_builder` to add
 SearchBuilder model.

Squashes deprecation warning.
---
 app/models/search_builder.rb | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 app/models/search_builder.rb

diff --git a/app/models/search_builder.rb b/app/models/search_builder.rb
new file mode 100644
index 00000000..efcef225
--- /dev/null
+++ b/app/models/search_builder.rb
@@ -0,0 +1,3 @@
+class SearchBuilder < Blacklight::SearchBuilder
+  include Blacklight::Solr::SearchBuilderBehavior
+end

From 8953216a736642b41283f0317a5108a3181b3600 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Fri, 18 Sep 2015 13:10:27 -0400
Subject: [PATCH 25/33] Replace deprecated factory_girl `ignore` with
 `transient`.

---
 spec/factories/batch_factories.rb      | 4 ++--
 spec/factories/test_model_factories.rb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/factories/batch_factories.rb b/spec/factories/batch_factories.rb
index ba3f77fc..3ebe68fc 100644
--- a/spec/factories/batch_factories.rb
+++ b/spec/factories/batch_factories.rb
@@ -5,7 +5,7 @@
     user { FactoryGirl.create(:user) }
 
     factory :batch_with_basic_ingest_batch_objects do
-      ignore do
+      transient do
         object_count 3
       end
       after(:create) do |batch, evaluator|
@@ -14,7 +14,7 @@
     end
 
     factory :batch_with_generic_ingest_batch_objects do
-      ignore do
+      transient do
         object_count 3
       end
       after(:create) do |batch, evaluator|
diff --git a/spec/factories/test_model_factories.rb b/spec/factories/test_model_factories.rb
index 1ceb5962..12ed064a 100644
--- a/spec/factories/test_model_factories.rb
+++ b/spec/factories/test_model_factories.rb
@@ -34,7 +34,7 @@ class TestModelOmnibus < TestModel
     sequence(:identifier) { |n| [ "testparent%05d" % n ] }
 
     factory :test_parent_has_children do
-      ignore do
+      transient do
         child_count 3
       end
       after(:create) do |parent, evaluator|

From a41a02be2a8c5bcd12a161ec7c6f2e5fe21fd1da Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Tue, 29 Sep 2015 08:35:49 -0400
Subject: [PATCH 26/33] Upgrades ddr-models to v2.1.0.rc2

Adds display and edit support for EAD ID admin metadata field.
---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  | 38 ++++++++-----------
 app/controllers/collections_controller.rb     |  2 +-
 app/helpers/application_helper.rb             |  2 +-
 .../admin_metadata_form/_ead_id.html.erb      |  2 +
 config/locales/en.yml                         |  1 +
 lib/dul_hydra/version.rb                      |  2 +-
 7 files changed, 23 insertions(+), 26 deletions(-)
 create mode 100644 app/views/admin_metadata_form/_ead_id.html.erb

diff --git a/Gemfile b/Gemfile
index 31f5b83d..4c69d12b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '~> 4.1.6'
 gem 'hydra-head', '~> 7.2.0'
 gem 'ddr-alerts', '~> 1.0.0'
 gem 'ddr-batch', '1.0.0.rc1'
-gem 'ddr-models', github: 'duke-libraries/ddr-models', ref: '14dc0ef5c1a987564937e7aa1391add2db4bd8db'
+gem 'ddr-models', '2.1.0.rc2'
 gem 'rubydora', '>= 1.8.1'
 gem 'devise'
 gem 'deprecation'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2ab59f2f..5b5b15a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,24 +1,3 @@
-GIT
-  remote: git://github.com/duke-libraries/ddr-models.git
-  revision: 14dc0ef5c1a987564937e7aa1391add2db4bd8db
-  ref: 14dc0ef5c1a987564937e7aa1391add2db4bd8db
-  specs:
-    ddr-models (2.1.0.rc1)
-      active-fedora (~> 7.0)
-      cancancan (~> 1.12)
-      ddr-antivirus (= 2.0.0)
-      ddr-aux-client (~> 1.2, >= 1.2.1)
-      devise (~> 3.4)
-      ezid-client (~> 1.1, >= 1.1.1)
-      grouper-rest-client
-      hydra-core (~> 7.2)
-      hydra-validations (~> 0.5)
-      net-ldap (~> 0.11)
-      omniauth-shibboleth (~> 1.2.0)
-      rails (~> 4.1.6)
-      rdf-vocab (~> 0.8)
-      resque (~> 1.25)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -110,6 +89,21 @@ GEM
       log4r
       paperclip (~> 4.2.0)
       rails (~> 4.1.13)
+    ddr-models (2.1.0.rc2)
+      active-fedora (~> 7.0)
+      cancancan (~> 1.12)
+      ddr-antivirus (= 2.0.0)
+      ddr-aux-client (~> 1.2, >= 1.2.1)
+      devise (~> 3.4)
+      ezid-client (~> 1.1, >= 1.1.1)
+      grouper-rest-client
+      hydra-core (~> 7.2)
+      hydra-validations (~> 0.5)
+      net-ldap (~> 0.11)
+      omniauth-shibboleth (~> 1.2.0)
+      rails (~> 4.1.6)
+      rdf-vocab (~> 0.8)
+      resque (~> 1.25)
     deprecation (0.2.2)
       activesupport
     devise (3.5.1)
@@ -442,7 +436,7 @@ DEPENDENCIES
   database_cleaner
   ddr-alerts (~> 1.0.0)
   ddr-batch (= 1.0.0.rc1)
-  ddr-models!
+  ddr-models (= 2.1.0.rc2)
   deprecation
   devise
   equivalent-xml
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 0ce493fe..8f13cb2c 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -34,7 +34,7 @@ def report
   protected
 
   def admin_metadata_fields
-    [:license, :local_id, :display_format, :admin_set]
+    [:license, :local_id, :display_format, :admin_set, :ead_id]
   end
 
   def tab_reports
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 49009f0a..ec86461c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,7 +2,7 @@ module ApplicationHelper
 
   # Controls what fields are displayed on the admin metadata tab and edit form
   def admin_metadata_fields
-    [:license, :local_id, :display_format]
+    [:license, :local_id, :display_format, :ead_id]
   end
 
   def render_admin_metadata_field(field)
diff --git a/app/views/admin_metadata_form/_ead_id.html.erb b/app/views/admin_metadata_form/_ead_id.html.erb
new file mode 100644
index 00000000..ef66c2f5
--- /dev/null
+++ b/app/views/admin_metadata_form/_ead_id.html.erb
@@ -0,0 +1,2 @@
+<%= f.label :ead_id, "EAD ID" %>
+<%= f.text_field :ead_id, class: "form-control" %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 21d604c0..9d2d209f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5,6 +5,7 @@ en:
   dul_hydra:        
     admin_metadata:
       local_id: "Local ID"
+      ead_id: "EAD ID"
     techmd:
       file_human_size: "File Size"
       pronom_identifier: "PRONOM Identifier"
diff --git a/lib/dul_hydra/version.rb b/lib/dul_hydra/version.rb
index bc46645a..ba7f8da0 100644
--- a/lib/dul_hydra/version.rb
+++ b/lib/dul_hydra/version.rb
@@ -1,3 +1,3 @@
 module DulHydra
-  VERSION = "4.0.4.post"
+  VERSION = "4.1.0.pre1"
 end

From 7d20fbb0b0667040bab4e60481ab73c6408d773c Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Tue, 29 Sep 2015 12:48:20 -0400
Subject: [PATCH 27/33] Adds Versions tab to content-bearing objects.

Closes #1392
Tab content loads asynchronously.
Versions removed from object info sidebar.
---
 .../controller/has_content_behavior.rb        | 24 +++++++++++++++++++
 app/views/application/_object_info.html.erb   |  7 ------
 app/views/application/_versions.html.erb      | 22 +++++++++++++++++
 app/views/application/versions.html.erb       |  1 +
 config/locales/en.yml                         |  7 +++---
 config/routes.rb                              |  5 +---
 .../alias_ability_definitions.rb              |  3 ++-
 .../alias_ability_definitions_spec.rb         |  2 +-
 spec/models/ability_spec.rb                   |  2 +-
 9 files changed, 55 insertions(+), 18 deletions(-)
 create mode 100644 app/views/application/_versions.html.erb
 create mode 100644 app/views/application/versions.html.erb

diff --git a/app/controllers/concerns/dul_hydra/controller/has_content_behavior.rb b/app/controllers/concerns/dul_hydra/controller/has_content_behavior.rb
index 021f4dcd..507e4900 100644
--- a/app/controllers/concerns/dul_hydra/controller/has_content_behavior.rb
+++ b/app/controllers/concerns/dul_hydra/controller/has_content_behavior.rb
@@ -6,6 +6,7 @@ module HasContentBehavior
       included do
         before_action :upload_content, only: :create
         self.tabs.unshift :tab_tech_metadata
+        self.tabs << :tab_versions
         helper_method :tech_metadata_fields
       end
 
@@ -26,6 +27,16 @@ def upload
         end
       end
 
+      def versions
+        if request.xhr?
+          # For async loading of tab content
+          @tab = tab_versions
+          render "versions", layout: false
+        else
+          redirect_to action: "show", tab: "versions"
+        end
+      end
+
       protected
 
       def tech_metadata_fields
@@ -75,6 +86,19 @@ def tab_tech_metadata
                )
       end
 
+      def tab_versions
+        Tab.new("versions",
+                actions: [
+                  TabAction.new("upload",
+                                url_for(id: current_object, action: "upload"),
+                                can?(:upload, current_object)
+                               ),
+                ],
+                guard: current_object.has_content?,
+                href: url_for(id: current_object, action: "versions")
+               )
+      end
+
     end
   end
 end
diff --git a/app/views/application/_object_info.html.erb b/app/views/application/_object_info.html.erb
index 50f6a2c9..ea1f3e0b 100644
--- a/app/views/application/_object_info.html.erb
+++ b/app/views/application/_object_info.html.erb
@@ -32,13 +32,6 @@
   <% else %>
     <%= object_info_item label: "virus.not_scanned", status: "warning" %>
   <% end %>
-
-  <% if current_object.has_content? %>
-  <li class="list-group-item">
-    <span class="badge"><%= current_object.content.versions.length %></span>
-    <%= t("dul_hydra.object_info.versions") %>
-  </li>
-  <% end %>
 <% end %>
 
 <%# EVENTS %>
diff --git a/app/views/application/_versions.html.erb b/app/views/application/_versions.html.erb
new file mode 100644
index 00000000..85422da6
--- /dev/null
+++ b/app/views/application/_versions.html.erb
@@ -0,0 +1,22 @@
+<%= render partial: 'tab_actions', locals: {tab: tab} %>
+
+<table class="table table-striped">
+  <thead>
+    <tr>
+      <th scope="col">Version</th>
+      <th scope="col">Date</th>
+      <th scope="col">Media Type</th>
+      <th scope="col">Size</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% current_object.content.versions.each do |version| %>
+    <tr>
+      <td><%= version.dsVersionID %></td>
+      <td><%= version.dsCreateDate %></td>
+      <td><%= version.mimeType %></td>
+      <td><%= version.dsSize %></td>
+    </tr>
+    <% end %>
+  </tbody>
+</table>
diff --git a/app/views/application/versions.html.erb b/app/views/application/versions.html.erb
new file mode 100644
index 00000000..352fc593
--- /dev/null
+++ b/app/views/application/versions.html.erb
@@ -0,0 +1 @@
+<%= render partial: 'versions', locals: {tab: @tab} %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9d2d209f..ecbe2517 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -151,14 +151,13 @@ en:
         label: Roles
         actions:
           edit: Modify
+      versions:
+        actions:
+          upload: "Upload New Version"
       admin_metadata:
         label: Admin Metadata
         actions:
           edit: Edit
-      collection_info:
-        label: "Collection Info"
-        actions:
-          download: "Download CSV Report"
       pending_batches:
           label: Pending
       finished_batches:
diff --git a/config/routes.rb b/config/routes.rb
index 4085ad5c..4036fdd9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,10 +16,6 @@ def pid_constraint
     /[a-zA-Z0-9\-_]+:[a-zA-Z0-9\-_]+/
   end
 
-  def tab_constraint
-    /attachments|items|components|descriptive_metadata|permissions|default_permissions/
-  end
-
   namespace :admin do
     get 'dashboard', to: 'dashboard#show'
     get 'reports/:type', to: 'reports#show', as: 'report', constraints: {format: 'csv'}
@@ -34,6 +30,7 @@ def tab_constraint
   def content_routes
     get 'upload'
     patch 'upload'
+    get 'versions'
   end
 
   def event_routes
diff --git a/lib/dul_hydra/ability_definitions/alias_ability_definitions.rb b/lib/dul_hydra/ability_definitions/alias_ability_definitions.rb
index 969014d2..0af29758 100644
--- a/lib/dul_hydra/ability_definitions/alias_ability_definitions.rb
+++ b/lib/dul_hydra/ability_definitions/alias_ability_definitions.rb
@@ -2,7 +2,8 @@ module DulHydra
   class AliasAbilityDefinitions < Ddr::Auth::AbilityDefinitions
 
     def call
-      alias_action :attachments, :collection_info, :components, :event, :events, :items, :targets, to: :read
+      alias_action :attachments, :components, :event, :events, :items, :targets, :versions,
+                   to: :read
       alias_action :roles, to: :grant
       alias_action :admin_metadata, to: :update
       alias_action :report, to: :audit
diff --git a/spec/lib/dul_hydra/ability_definitions/alias_ability_definitions_spec.rb b/spec/lib/dul_hydra/ability_definitions/alias_ability_definitions_spec.rb
index fd992fa8..73d74042 100644
--- a/spec/lib/dul_hydra/ability_definitions/alias_ability_definitions_spec.rb
+++ b/spec/lib/dul_hydra/ability_definitions/alias_ability_definitions_spec.rb
@@ -10,7 +10,7 @@ module DulHydra
 
     it "should alias actions to :read" do
       expect(subject.aliased_actions[:read])
-        .to include(:attachments, :collection_info, :components, :event, :events, :items, :targets)
+        .to include(:attachments, :components, :event, :events, :items, :targets, :versions)
     end
     it "should alias actions to :grant" do
       expect(subject.aliased_actions[:grant]).to include(:roles)
diff --git a/spec/models/ability_spec.rb b/spec/models/ability_spec.rb
index 9f30248f..5142f18a 100644
--- a/spec/models/ability_spec.rb
+++ b/spec/models/ability_spec.rb
@@ -10,7 +10,7 @@
   describe "aliases" do
     it "should alias actions to :read" do
       expect(subject.aliased_actions[:read])
-        .to include(:attachments, :collection_info, :components, :event, :events, :items, :targets)
+        .to include(:attachments, :components, :event, :events, :items, :targets, :versions)
     end
     it "should alias actions to :grant" do
       expect(subject.aliased_actions[:grant]).to include(:roles)

From 2be4838667376c5a34480a74b683a56cfd176a73 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Wed, 30 Sep 2015 17:39:00 -0400
Subject: [PATCH 28/33] Version 4.1.0.rc1

Upgrades ddr-models to v2.1.0
---
 Gemfile                  | 2 +-
 Gemfile.lock             | 4 ++--
 lib/dul_hydra/version.rb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4c69d12b..17f46a53 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '~> 4.1.6'
 gem 'hydra-head', '~> 7.2.0'
 gem 'ddr-alerts', '~> 1.0.0'
 gem 'ddr-batch', '1.0.0.rc1'
-gem 'ddr-models', '2.1.0.rc2'
+gem 'ddr-models', '2.1.0'
 gem 'rubydora', '>= 1.8.1'
 gem 'devise'
 gem 'deprecation'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5b5b15a5..73c3fe86 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,7 +89,7 @@ GEM
       log4r
       paperclip (~> 4.2.0)
       rails (~> 4.1.13)
-    ddr-models (2.1.0.rc2)
+    ddr-models (2.1.0)
       active-fedora (~> 7.0)
       cancancan (~> 1.12)
       ddr-antivirus (= 2.0.0)
@@ -436,7 +436,7 @@ DEPENDENCIES
   database_cleaner
   ddr-alerts (~> 1.0.0)
   ddr-batch (= 1.0.0.rc1)
-  ddr-models (= 2.1.0.rc2)
+  ddr-models (= 2.1.0)
   deprecation
   devise
   equivalent-xml
diff --git a/lib/dul_hydra/version.rb b/lib/dul_hydra/version.rb
index ba7f8da0..7e4d9c4e 100644
--- a/lib/dul_hydra/version.rb
+++ b/lib/dul_hydra/version.rb
@@ -1,3 +1,3 @@
 module DulHydra
-  VERSION = "4.1.0.pre1"
+  VERSION = "4.1.0.rc1"
 end

From 933e3250c9d00d293c394746e59ba2f40991d8db Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Fri, 2 Oct 2015 13:01:41 -0400
Subject: [PATCH 29/33] Adds research help contact to admin metadata display
 and edit views.

Closes #1434
---
 app/controllers/collections_controller.rb             |  3 +--
 .../dul_hydra/controller/repository_behavior.rb       |  6 ++++++
 app/helpers/application_helper.rb                     | 11 ++++++-----
 .../_research_help_contact.html.erb                   |  2 ++
 4 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 app/views/admin_metadata_form/_research_help_contact.html.erb

diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 8f13cb2c..14fa6ea4 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -7,7 +7,6 @@ class CollectionsController < ApplicationController
 
   before_action :set_desc_metadata, only: :create
   self.tabs << :tab_reports
-  helper_method :admin_metadata_fields
 
   def items
     get_children
@@ -34,7 +33,7 @@ def report
   protected
 
   def admin_metadata_fields
-    [:license, :local_id, :display_format, :admin_set, :ead_id]
+    super + [:admin_set, :research_help_contact]
   end
 
   def tab_reports
diff --git a/app/controllers/concerns/dul_hydra/controller/repository_behavior.rb b/app/controllers/concerns/dul_hydra/controller/repository_behavior.rb
index 9b96fc81..a240cc52 100644
--- a/app/controllers/concerns/dul_hydra/controller/repository_behavior.rb
+++ b/app/controllers/concerns/dul_hydra/controller/repository_behavior.rb
@@ -23,6 +23,7 @@ module RepositoryBehavior
         helper_method :current_document
         helper_method :current_bookmarks
         helper_method :get_solr_response_for_field_values
+        helper_method :admin_metadata_fields
 
         copy_blacklight_config_from CatalogController
       end
@@ -103,6 +104,11 @@ def admin_metadata
 
       protected
 
+      # Controls what fields are displayed on the admin metadata tab and edit form
+      def admin_metadata_fields
+        [:license, :local_id, :display_format, :ead_id]
+      end      
+
       def admin_metadata_params
         params.require(:adminMetadata).tap do |p|
           p.select  { |k, v| v == "" }.each { |k, v| p[k] = nil }
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ec86461c..d1fd9347 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,16 +1,17 @@
 module ApplicationHelper
 
-  # Controls what fields are displayed on the admin metadata tab and edit form
-  def admin_metadata_fields
-    [:license, :local_id, :display_format, :ead_id]
-  end
-
   def render_admin_metadata_field(field)
     render field.to_s
   rescue ActionView::MissingTemplate
     current_object.send(field)
   end
 
+  def research_help_contact_options_for_select
+    # FIXME https://github.com/duke-libraries/ddr-models/issues/394
+    Ddr::Contacts.load_contacts unless Ddr::Contacts.contacts 
+    options_from_collection_for_select(Ddr::Contacts.contacts.to_h.values, :slug, :name, current_object.research_help_contact)
+  end
+  
   def license_options_for_select
     options_from_collection_for_select(Ddr::Models::License.all, :url, :title, current_object.license)
   end
diff --git a/app/views/admin_metadata_form/_research_help_contact.html.erb b/app/views/admin_metadata_form/_research_help_contact.html.erb
new file mode 100644
index 00000000..f74cd8bf
--- /dev/null
+++ b/app/views/admin_metadata_form/_research_help_contact.html.erb
@@ -0,0 +1,2 @@
+<%= f.label :research_help_contact, "Research Help Contact" %>
+<%= f.select :research_help_contact, research_help_contact_options_for_select, {include_blank: "N/A"}, {class: "form-control"} %>

From c83b58d825931a9ac916cfcd7dd305c55e884df9 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Fri, 2 Oct 2015 13:20:01 -0400
Subject: [PATCH 30/33] Version 4.1.0.rc2

---
 lib/dul_hydra/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dul_hydra/version.rb b/lib/dul_hydra/version.rb
index 7e4d9c4e..38ec5653 100644
--- a/lib/dul_hydra/version.rb
+++ b/lib/dul_hydra/version.rb
@@ -1,3 +1,3 @@
 module DulHydra
-  VERSION = "4.1.0.rc1"
+  VERSION = "4.1.0.rc2"
 end

From ed8b162fea4e12e33ea3cc5218c68717033099e1 Mon Sep 17 00:00:00 2001
From: Jim Coble <jim.coble@duke.edu>
Date: Mon, 5 Oct 2015 16:58:41 -0400
Subject: [PATCH 31/33] upgrade ddr-batch; fix deprecation

---
 Gemfile                                          |  2 +-
 Gemfile.lock                                     |  6 +++---
 lib/dul_hydra/version.rb                         |  2 +-
 spec/features/export_sets/index.html.erb_spec.rb | 10 ++++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 17f46a53..6d207061 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'rails', '~> 4.1.6'
 gem 'hydra-head', '~> 7.2.0'
 gem 'ddr-alerts', '~> 1.0.0'
-gem 'ddr-batch', '1.0.0.rc1'
+gem 'ddr-batch', '1.0.0'
 gem 'ddr-models', '2.1.0'
 gem 'rubydora', '>= 1.8.1'
 gem 'devise'
diff --git a/Gemfile.lock b/Gemfile.lock
index 73c3fe86..d8269844 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -83,8 +83,8 @@ GEM
     ddr-antivirus (2.0.0)
     ddr-aux-client (1.2.1)
       hashie (~> 3.4)
-    ddr-batch (1.0.0.rc1)
-      ddr-models (~> 2.0)
+    ddr-batch (1.0.0)
+      ddr-models (~> 2.1.0)
       devise (~> 3.4)
       log4r
       paperclip (~> 4.2.0)
@@ -435,7 +435,7 @@ DEPENDENCIES
   capybara (~> 2.0)
   database_cleaner
   ddr-alerts (~> 1.0.0)
-  ddr-batch (= 1.0.0.rc1)
+  ddr-batch (= 1.0.0)
   ddr-models (= 2.1.0)
   deprecation
   devise
diff --git a/lib/dul_hydra/version.rb b/lib/dul_hydra/version.rb
index 38ec5653..177f911a 100644
--- a/lib/dul_hydra/version.rb
+++ b/lib/dul_hydra/version.rb
@@ -1,3 +1,3 @@
 module DulHydra
-  VERSION = "4.1.0.rc2"
+  VERSION = "4.1.0.rc3"
 end
diff --git a/spec/features/export_sets/index.html.erb_spec.rb b/spec/features/export_sets/index.html.erb_spec.rb
index 05c7b7a7..4cff12c7 100644
--- a/spec/features/export_sets/index.html.erb_spec.rb
+++ b/spec/features/export_sets/index.html.erb_spec.rb
@@ -12,8 +12,9 @@
   context "user has bookmarks" do
     let(:object) { FactoryGirl.create(:test_content) }
     before do
-      object.read_users = [user.user_key]
-      object.save
+      # object.read_users = [user.user_key]
+      # object.save
+      user.can :read, object
       user.bookmarks.create(document_id: object.pid)
     end
     it "should have a New Export Set->Content link" do
@@ -25,8 +26,9 @@
     let(:object) { FactoryGirl.create(:test_content) }
     let(:export_set) { ExportSet.new(user: user, pids: [object.pid], export_type: ExportSet::Types::CONTENT) }
     before do
-      object.read_users = [export_set.user.user_key]
-      object.save
+      # object.read_users = [export_set.user.user_key]
+      # object.save
+      user.can :read, object
       export_set.create_archive
     end
     it "should list the export set" do

From 038295c284644ace3b4a8ca67eb29616e34ce22c Mon Sep 17 00:00:00 2001
From: Jim Coble <jim.coble@duke.edu>
Date: Wed, 7 Oct 2015 08:46:21 -0400
Subject: [PATCH 32/33] upgrade ddr-models to 2.1.1

---
 Gemfile                  | 2 +-
 Gemfile.lock             | 4 ++--
 lib/dul_hydra/version.rb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6d207061..f21b1a2b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '~> 4.1.6'
 gem 'hydra-head', '~> 7.2.0'
 gem 'ddr-alerts', '~> 1.0.0'
 gem 'ddr-batch', '1.0.0'
-gem 'ddr-models', '2.1.0'
+gem 'ddr-models', '2.1.1'
 gem 'rubydora', '>= 1.8.1'
 gem 'devise'
 gem 'deprecation'
diff --git a/Gemfile.lock b/Gemfile.lock
index d8269844..fdb9453c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,7 +89,7 @@ GEM
       log4r
       paperclip (~> 4.2.0)
       rails (~> 4.1.13)
-    ddr-models (2.1.0)
+    ddr-models (2.1.1)
       active-fedora (~> 7.0)
       cancancan (~> 1.12)
       ddr-antivirus (= 2.0.0)
@@ -436,7 +436,7 @@ DEPENDENCIES
   database_cleaner
   ddr-alerts (~> 1.0.0)
   ddr-batch (= 1.0.0)
-  ddr-models (= 2.1.0)
+  ddr-models (= 2.1.1)
   deprecation
   devise
   equivalent-xml
diff --git a/lib/dul_hydra/version.rb b/lib/dul_hydra/version.rb
index 177f911a..090c6a10 100644
--- a/lib/dul_hydra/version.rb
+++ b/lib/dul_hydra/version.rb
@@ -1,3 +1,3 @@
 module DulHydra
-  VERSION = "4.1.0.rc3"
+  VERSION = "4.1.0.rc4"
 end

From 20145053fb0dee5c2ff7f367d4bd723149963e9c Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Wed, 7 Oct 2015 10:55:40 -0400
Subject: [PATCH 33/33] Version 4.1.0 (final)

---
 lib/dul_hydra/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/dul_hydra/version.rb b/lib/dul_hydra/version.rb
index 090c6a10..de3ec99d 100644
--- a/lib/dul_hydra/version.rb
+++ b/lib/dul_hydra/version.rb
@@ -1,3 +1,3 @@
 module DulHydra
-  VERSION = "4.1.0.rc4"
+  VERSION = "4.1.0"
 end