ddr-models 2.0.1 → 2.1.0.rc1

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.0.1"
+    VERSION = "2.1.0.rc1"
   end
 end

data/lib/ddr/models/year_facet.rb

@@ -0,0 +1,154 @@
+require "date"
+
+module Ddr::Models
+  class YearFacet
+
+    EARLIEST_YEAR = 1000
+
+    # Between 1965 and 1968
+    BETWEEN = Regexp.new '\A([Bb]etween\s+)(\d{4})(\s+and\s+)(\d{4})\??\z'
+
+    # YYYx (192x)
+    # YYYX (192X)
+    # YYY? (192?)
+    # YYY- (192-)
+    # YYY-? (192-?)
+    IN_DECADE = Regexp.new '\A(\d{3})([xX\-]\??|\?)\z'
+
+    # YYxx (19xx)
+    IN_CENTURY = Regexp.new '\A(\d{2})xx\z'
+
+    # YYY0s (1920s)
+    # YYY0s? (1920s?)
+    DECADE = Regexp.new '\A(\d{3}0)s\??\z'
+
+    # YYYY-MM (2010-01)
+    # YYYY/MM (2010/01)
+    YEAR_MONTH = Regexp.new '\A(\d{4})[/-](0[1-9]|1[0-2])\z'
+
+    # YYYY-YYYY (1935-2010)
+    # YYYY/YYYY (1935/2010)
+    YEAR_RANGE = Regexp.new '\A(\d{4})[/-](\d{4})\z'
+
+    # YYYY (1979)
+    YEAR = Regexp.new '\A\d{4}\z'
+
+    SQUARE_BRACKETS = Regexp.new '[\[\]]'
+
+    # c. 1920
+    # ca. 1920
+    # c1920
+    CIRCA = Regexp.new '\b(circa\s+|ca?\.\s*|c(?=\d{4}[^\d]*))'
+
+    class << self
+      def call(obj)
+        new(obj).values
+      end
+    end
+
+    attr_reader :obj, :values
+
+    def initialize(obj)
+      @obj = obj
+      @values = []
+      facet_values
+    end
+
+    def facet_values
+      obj.date.each do |date|
+        date.split(/;/).each do |value|
+          clean! value
+          years = extract_years(value)
+          validate! years
+          values.push *years
+        end
+      end
+    end
+
+    def extract_years(value)
+      years = match_years(value) || parse_year(value)
+      Array(years)
+    end
+
+    def clean!(value)
+      value.strip!
+      value.gsub! SQUARE_BRACKETS, ""
+      value.gsub! CIRCA, ""
+    end
+
+    def validate!(years)
+      years = years & valid_years.to_a
+    end
+
+    def parse_year(value)
+      Date.parse(value).year
+    rescue ArgumentError
+      nil
+    end
+
+    def valid_years
+      (EARLIEST_YEAR..latest_year)
+    end
+
+    def latest_year
+      Date.today.year + 100
+    end
+
+    def match_years(value)
+      result = match_year_range(value) ||
+               match_year_month(value) ||
+               match_year(value) ||
+               match_in_decade(value) ||
+               match_in_century(value) ||
+               match_decade(value) ||
+               match_between(value)
+      first_year, last_year = Array(result).map(&:to_i)
+      last_year ? (first_year..last_year) : first_year
+    end
+
+    def match_year_range(value)
+      if m = YEAR_RANGE.match(value)
+        m[1, 2]
+      end
+    end
+
+    def match_year_month(value)
+      if m = YEAR_MONTH.match(value)
+        m[1]
+      end
+    end
+
+    def match_year(value)
+      if m = YEAR.match(value)
+        value
+      end
+    end
+
+    def match_in_decade(value)
+      if m = IN_DECADE.match(value)
+        [ "#{m[1]}0", "#{m[1]}9" ]
+      end
+    end
+
+    def match_in_century(value)
+      if m = IN_CENTURY.match(value)
+        [ "#{m[1]}00", "#{m[1]}99" ]
+      end
+    end
+
+    def match_decade(value)
+      if m = DECADE.match(value)
+        [ m[1], m[1].sub(/0\z/, "9") ]
+      end
+    end
+
+    def match_between(value)
+      if m = BETWEEN.match(value)
+        value.sub! m[1], ""  # [Bb]etween
+        value.sub! m[3], "-" # and
+        match_year_range(value)
+      end
+    end
+
+  end
+end

data/lib/ddr/utils.rb

@@ -93,7 +93,7 @@ module Ddr::Utils
     model = opts.fetch(:model, nil)
     collection = opts.fetch(:collection, nil)
     objs = []
-    ActiveFedora::Base.find_each( { Ddr::IndexFields::IDENTIFIER_ALL => identifier }, { :cast => true } ) { |o| objs << o }
+    ActiveFedora::Base.find_each( { Ddr::Index::Fields::IDENTIFIER_ALL => identifier }, { :cast => true } ) { |o| objs << o }
     pids = []
     objs.each { |obj| pids << obj.pid }
     if model.present?
@@ -157,4 +157,16 @@ module Ddr::Utils
     return klass
   end
 
+  # Returns a string suitable to index as a Solr date
+  # @param dt [Date, DateTime, Time] the date/time
+  # @return [String]
+  def self.solr_date(dt)
+    return if dt.nil?
+    dt.to_time.utc.iso8601
+  end
+
+  def self.solr_dates(dts)
+    dts.map { |dt| solr_date(dt) }
+  end
+
 end

data/lib/ddr/vocab/roles.rb

@@ -2,8 +2,6 @@ module Ddr
   module Vocab
     class Roles < RDF::StrictVocabulary("http://repository.lib.duke.edu/vocab/roles/")
 
-      LEGACY_ROLES = [:administrator, :editor, :contributor, :downloader]
-
       term :Role,
         label: "Role",
         comment: "An assertion of a role granted to an agent."
@@ -24,14 +22,6 @@ module Ddr
         label: "Scope",
         comment: "The scope within which the role applies."
 
-      #
-      # Deprecated terms
-      #
-
-      LEGACY_ROLES.each do |legacy_role|
-        term legacy_role, label: legacy_role.to_s.capitalize
-      end
-
     end
   end
 end

data/spec/controllers/including_role_based_access_controls_enforcement_spec.rb

@@ -14,9 +14,9 @@ RSpec.describe ApplicationController, type: :controller do
   describe "#resource_role_filters" do
     it "should include clauses for each agent for the current ability" do
       expect(subject.resource_role_filters.split(" OR "))
-        .to contain_exactly("_query_:\"{!raw f=#{Ddr::IndexFields::RESOURCE_ROLE}}foo\"",
-                            "_query_:\"{!raw f=#{Ddr::IndexFields::RESOURCE_ROLE}}bar\"",
-                            "_query_:\"{!raw f=#{Ddr::IndexFields::RESOURCE_ROLE}}#{user.agent}\"")
+        .to contain_exactly("_query_:\"{!raw f=#{Ddr::Index::Fields::RESOURCE_ROLE}}foo\"",
+                            "_query_:\"{!raw f=#{Ddr::Index::Fields::RESOURCE_ROLE}}bar\"",
+                            "_query_:\"{!raw f=#{Ddr::Index::Fields::RESOURCE_ROLE}}#{user.agent}\"")
     end
   end
 
@@ -41,7 +41,7 @@ RSpec.describe ApplicationController, type: :controller do
       allow(subject).to receive(:policy_role_policies) { ["info:fedora/test:13", "info:fedora/test:45"] }
     end
     it "should include clauses for is_governed_by relationships to the #policy_role_policies" do
-      expect(subject.policy_role_filters).to eq("_query_:\"{!raw f=#{Ddr::IndexFields::IS_GOVERNED_BY}}info:fedora/test:13\" OR _query_:\"{!raw f=#{Ddr::IndexFields::IS_GOVERNED_BY}}info:fedora/test:45\"")
+      expect(subject.policy_role_filters).to eq("_query_:\"{!raw f=#{Ddr::Index::Fields::IS_GOVERNED_BY}}info:fedora/test:13\" OR _query_:\"{!raw f=#{Ddr::Index::Fields::IS_GOVERNED_BY}}info:fedora/test:45\"")
     end
   end
 

data/spec/datastreams/fits_datastream_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+module Ddr::Datastreams
+  RSpec.describe FitsDatastream do
+
+    let(:fits_xml) do
+      <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<fits xmlns="http://hul.harvard.edu/ois/xml/ns/fits/fits_output" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd" version="0.8.5" timestamp="7/3/15 8:29 PM">
+  <identification>
+    <identity format="Portable Document Format" mimetype="application/pdf" toolname="FITS" toolversion="0.8.5">
+      <tool toolname="Jhove" toolversion="1.5" />
+      <tool toolname="file utility" toolversion="5.04" />
+      <tool toolname="Exiftool" toolversion="9.13" />
+      <tool toolname="Droid" toolversion="6.1.3" />
+      <tool toolname="NLNZ Metadata Extractor" toolversion="3.4GA" />
+      <tool toolname="ffident" toolversion="0.2" />
+      <tool toolname="Tika" toolversion="1.3" />
+      <version toolname="Jhove" toolversion="1.5">1.6</version>
+      <externalIdentifier toolname="Droid" toolversion="6.1.3" type="puid">fmt/20</externalIdentifier>
+    </identity>
+  </identification>
+  <fileinfo>
+    <size toolname="Jhove" toolversion="1.5">3786205</size>
+    <creatingApplicationName toolname="Exiftool" toolversion="9.13" status="CONFLICT">Adobe Acrobat Pro 11.0.3 Paper Capture Plug-in/PREMIS Editorial Committee</creatingApplicationName>
+    <creatingApplicationName toolname="NLNZ Metadata Extractor" toolversion="3.4GA" status="CONFLICT">Adobe Acrobat Pro 11.0.3 Paper Capture Plug-in/Acrobat PDFMaker 11 for Word</creatingApplicationName>
+    <lastmodified toolname="Exiftool" toolversion="9.13" status="CONFLICT">2015:06:25 21:45:24-04:00</lastmodified>
+    <lastmodified toolname="Tika" toolversion="1.3" status="CONFLICT">2015-06-08T21:22:35Z</lastmodified>
+    <created toolname="Exiftool" toolversion="9.13" status="SINGLE_RESULT">2015:06:05 15:16:23-04:00</created>
+    <filepath toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">/Users/dc/Downloads/premis-3-0-final.pdf</filepath>
+    <filename toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">premis-3-0-final.pdf</filename>
+    <md5checksum toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">432ab76d650bfdc8f8d4a98cea9634bb</md5checksum>
+    <fslastmodified toolname="OIS File Information" toolversion="0.2" status="SINGLE_RESULT">1435283124000</fslastmodified>
+  </fileinfo>
+  <filestatus>
+    <well-formed toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">true</well-formed>
+    <valid toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">false</valid>
+    <message toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">Invalid page tree node offset=390028</message>
+    <message toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">Outlines contain recursive references.</message>
+  </filestatus>
+  <metadata>
+    <document>
+      <title toolname="Jhove" toolversion="1.5" status="CONFLICT">CONTENTS</title>
+      <title toolname="Exiftool" toolversion="9.13" status="CONFLICT">PREMIS Data Dictionary for Preservation Metadata, Version 3.0</title>
+      <author toolname="Exiftool" toolversion="9.13">PREMIS Editorial Committee</author>
+      <language toolname="Jhove" toolversion="1.5">en</language>
+      <pageCount toolname="Exiftool" toolversion="9.13">282</pageCount>
+      <isTagged toolname="Jhove" toolversion="1.5" status="CONFLICT">no</isTagged>
+      <isTagged toolname="NLNZ Metadata Extractor" toolversion="3.4GA" status="CONFLICT">yes</isTagged>
+      <hasOutline toolname="Jhove" toolversion="1.5">yes</hasOutline>
+      <hasAnnotations toolname="Jhove" toolversion="1.5" status="SINGLE_RESULT">no</hasAnnotations>
+      <isRightsManaged toolname="Exiftool" toolversion="9.13" status="SINGLE_RESULT">no</isRightsManaged>
+      <isProtected toolname="Exiftool" toolversion="9.13">no</isProtected>
+      <hasForms toolname="NLNZ Metadata Extractor" toolversion="3.4GA" status="SINGLE_RESULT">yes</hasForms>
+      <subject toolname="Tika" toolversion="1.3" status="SINGLE_RESULT">PREMIS</subject>
+    </document>
+  </metadata>
+  <statistics fitsExecutionTime="2977">
+    <tool toolname="OIS Audio Information" toolversion="0.1" status="did not run" />
+    <tool toolname="ADL Tool" toolversion="0.1" status="did not run" />
+    <tool toolname="Jhove" toolversion="1.5" executionTime="1034" />
+    <tool toolname="file utility" toolversion="5.04" executionTime="912" />
+    <tool toolname="Exiftool" toolversion="9.13" executionTime="842" />
+    <tool toolname="Droid" toolversion="6.1.3" executionTime="336" />
+    <tool toolname="NLNZ Metadata Extractor" toolversion="3.4GA" executionTime="2192" />
+    <tool toolname="OIS File Information" toolversion="0.2" executionTime="351" />
+    <tool toolname="OIS XML Metadata" toolversion="0.2" status="did not run" />
+    <tool toolname="ffident" toolversion="0.2" executionTime="410" />
+    <tool toolname="Tika" toolversion="1.3" executionTime="2911" />
+  </statistics>
+</fits>
+XML
+    end
+
+    before do
+      subject.content = fits_xml
+    end
+
+    it "should exclude Exiftool from modified" do
+      expect(subject.modified).to eq(["2015-06-08T21:22:35Z"])
+    end
+
+  end
+end

data/spec/fixtures/fits/document.xml

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

data/spec/fixtures/fits/image.xml

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

data/spec/index/filter_spec.rb

@@ -0,0 +1,47 @@
+module Ddr::Index
+  RSpec.describe Filter do
+
+    describe "#where(conditions)" do
+      it "should add raw query filters for the field, value hash of conditions" do
+        subject.where("foo"=>"bar", "spam"=>"eggs", "stuff"=>["dog", "cat", "bird"])
+        expect(subject.clauses).to eq(["{!term f=foo}bar", "{!term f=spam}eggs", "stuff:(dog OR cat OR bird)"])
+      end
+    end
+
+    describe "#raw(*clauses)" do
+      it "should add the clauses w/o escaping" do
+        subject.raw("foo:bar", "spam:eggs")
+        expect(subject.clauses).to eq(["foo:bar", "spam:eggs"])
+      end
+    end
+
+    describe "#present(field)" do
+      it "should add a \"field present\" clause" do
+        subject.present("foo")
+        expect(subject.clauses).to eq(["foo:[* TO *]"])
+      end
+    end
+
+    describe "#absent(field)" do
+      it "should add a \"field not present\" clause" do
+        subject.absent("foo")
+        expect(subject.clauses).to eq(["-foo:[* TO *]"])
+      end
+    end
+
+    describe "#before_days(field, days)" do
+      it "should add a date range query clause" do
+        subject.before_days("foo", 60)
+        expect(subject.clauses).to eq(["foo:[* TO NOW-60DAYS]"])
+      end
+    end
+
+    describe "#before(field, date_time)" do
+      it "should add a date range query clause" do
+        subject.before("foo", DateTime.parse("Thu, 27 Aug 2015 17:42:34 -0400"))
+        expect(subject.clauses).to eq(["foo:[* TO 2015-08-27T21:42:34Z]"])
+      end
+    end
+
+  end
+end