ddr-models 3.0.0.beta.3 → 3.0.0.beta.4

data/lib/ddr/models/admin_set.rb

@@ -1,12 +1,16 @@
-require "ddr_aux/client"
+require "active_resource"
 
 module Ddr::Models
-  class AdminSet < DdrAux::Client::AdminSet
+  class AdminSet < ActiveResource::Base
+
+    self.site = ENV["DDR_AUX_API_URL"]
 
     def self.call(obj)
       if obj.admin_set
-        find(code: obj.admin_set)
+        new get(:find, code: obj.admin_set)
       end
+    rescue ActiveResource::ResourceNotFound => e
+      raise Ddr::Models::NotFoundError, e
     end
 
     def to_s

data/lib/ddr/models/contact.rb

@@ -0,0 +1,19 @@
+require "active_resource"
+
+module Ddr::Models
+  class Contact < ActiveResource::Base
+
+    self.site = ENV["DDR_AUX_API_URL"]
+
+    def self.call(slug)
+      new get(:find, slug: slug)
+    rescue ActiveResource::ResourceNotFound => e
+      raise Ddr::Models::NotFoundError, e
+    end
+
+    def to_s
+      name
+    end
+
+  end
+end

data/lib/ddr/models/error.rb

@@ -11,5 +11,8 @@ module Ddr
 
     # Content model casting error
     class ContentModelError < Error; end
+
+    # A model instance was not found
+    class NotFoundError < Error; end
   end
 end

data/lib/ddr/models/file_characterization.rb

@@ -0,0 +1,37 @@
+require "delegate"
+require "shellwords"
+
+module Ddr::Models
+  class FileCharacterization < SimpleDelegator
+
+    class FITSError < Error; end
+
+    def self.call(obj)
+      new(obj).call
+    end
+
+    def call
+      with_content_file do |path|
+        fits_output = run_fits(path)
+        reload
+        fits.content = fits_output
+        save!
+      end
+    end
+
+    private
+
+    def run_fits(path)
+      output = `#{fits_command} -i #{Shellwords.escape(path)}`
+      unless $?.success?
+        raise FITSError, output
+      end
+      output
+    end
+
+    def fits_command
+      File.join(Ddr::Models.fits_home, 'fits.sh')
+    end
+
+  end
+end

data/lib/ddr/models/finding_aid.rb

@@ -1,22 +1,55 @@
+require "nokogiri"
+
 module Ddr::Models
   class FindingAid
 
     attr_reader :ead_id
 
+    EAD_XMLNS = "urn:isbn:1-931666-22-9"
+
     def initialize(ead_id)
       @ead_id = ead_id
     end
 
     def url
-      @url ||= doc.css("eadid").attr("url").text
+      doc.css("eadid").attr("url").text
     end
 
+    # The finding aid title
     def title
-      @title ||= doc.css("titleproper").children.first.text.strip
+      doc.css("titleproper").children.first.text.strip
+    end
+
+    def repository
+      collection.xpath('ead:did/ead:repository/ead:corpname', ead: EAD_XMLNS).text
+    end
+
+    def collection_date_span
+      collection.xpath('ead:did/ead:unitdate[@type="inclusive"]', ead: EAD_XMLNS).text
+    end
+
+    def collection_number
+      collection.xpath('ead:did/ead:unitid', ead: EAD_XMLNS).text
+    end
+
+    def collection_title
+      collection.xpath('ead:did/ead:unittitle', ead: EAD_XMLNS).text
+    end
+
+    def extent
+      collection.xpath('ead:did/ead:physdesc/ead:extent', ead: EAD_XMLNS).map(&:text).join("; ")
+    end
+
+    def abstract
+      collection.xpath('ead:did/ead:abstract', ead: EAD_XMLNS).text
     end
 
     private
 
+    def collection
+      doc.xpath('//ead:archdesc[@level="collection"]', ead: EAD_XMLNS)
+    end
+
     # @raise [OpenURI::HTTPError] if 404, etc.
     def doc
       @doc ||= Nokogiri::XML(open(ead_xml_url))

data/lib/ddr/models/has_admin_metadata.rb

@@ -14,6 +14,10 @@ module Ddr::Models
                predicate: Ddr::Vocab::Asset.adminSet,
                multiple: false
 
+      property :aspace_id,
+               predicate: Ddr::Vocab::Asset.archivesSpaceId,
+               multiple: false
+
       property :depositor,
                predicate: RDF::Vocab::MARCRelators.dpt,
                multiple: false
@@ -98,7 +102,7 @@ module Ddr::Models
     end
 
     def research_help
-      Ddr::Contacts.get(research_help_contact) if research_help_contact
+      Ddr::Models::Contact.call(research_help_contact) if research_help_contact
     end
 
     def effective_license

data/lib/ddr/models/has_content.rb

@@ -1,5 +1,3 @@
-require 'openssl'
-
 module Ddr
   module Models
     module HasContent
@@ -107,6 +105,10 @@ module Ddr
         !extractedText.empty?
       end
 
+      def with_content_file(&block)
+        WithContentFile.new(self, &block)
+      end
+
       protected
 
       def update_derivatives

data/lib/ddr/models/indexing.rb

@@ -4,6 +4,10 @@ module Ddr
 
       include Ddr::Index::Fields
 
+      def self.const_missing(name)
+        Ddr::Index::Fields.const_missing(name)
+      end
+
       def to_solr(solr_doc=Hash.new, opts={})
         solr_doc = super(solr_doc, opts)
         solr_doc.merge index_fields
@@ -13,8 +17,10 @@ module Ddr
         fields = {
           ACCESS_ROLE           => roles.to_json,
           ADMIN_SET             => admin_set,
+          ASPACE_ID             => aspace_id,
           ATTACHED_FILES        => attached_files_profile.to_json,
           BOX_NUMBER_FACET      => desc_metadata_values('box_number'),
+          CONTRIBUTOR_FACET     => desc_metadata_values('contributor'),
           CREATOR_FACET         => descMetadata.creator,
           DATE_FACET            => descMetadata.date,
           DATE_SORT             => date_sort,
@@ -34,6 +40,7 @@ module Ddr
           RESOURCE_ROLE         => roles.in_resource_scope.agents,
           SERIES_FACET          => desc_metadata_values('series'),
           SPATIAL_FACET         => desc_metadata_values('spatial'),
+          SUBJECT_FACET         => desc_metadata_values('subject'),
           TITLE                 => title_display,
           TYPE_FACET            => descMetadata.type,
           WORKFLOW_STATE        => workflow_state,

data/lib/ddr/models/licenses/license.rb

@@ -1,17 +1,21 @@
-require "ddr_aux/client"
+require "active_resource"
 
 module Ddr::Models
-  class License < DdrAux::Client::License
+  class License < ActiveResource::Base
     extend Deprecation
 
+    self.site = ENV["DDR_AUX_API_URL"]
+
     attr_accessor :object_id
 
     def self.call(obj)
       if obj.license
-        license = find(url: obj.license)
+        license = new get(:find, url: obj.license)
         license.object_id = obj.id
         license
       end
+    rescue ActiveResource::ResourceNotFound => e
+      raise Ddr::Models::NotFoundError, e
     end
 
     def pid

data/lib/ddr/models/solr_document.rb

@@ -90,7 +90,7 @@ module Ddr::Models
     end
 
     def has_datastream?(dsID)
-      datastreams[dsID].present?
+      datastreams.key?(dsID) && datastreams[dsID]["size"].present?
     end
 
     def has_admin_policy?
@@ -200,7 +200,7 @@ module Ddr::Models
 
     def research_help
       research_help_contact = self[Ddr::Index::Fields::RESEARCH_HELP_CONTACT] || inherited_research_help_contact
-      Ddr::Contacts.get(research_help_contact) if research_help_contact
+      Ddr::Models::Contact.call(research_help_contact) if research_help_contact
     end
 
     def parent_uri

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "3.0.0.beta.3"
+    VERSION = "3.0.0.beta.4"
   end
 end

data/lib/ddr/models/with_content_file.rb

@@ -0,0 +1,37 @@
+require "tempfile"
+require "delegate"
+
+module Ddr::Models
+  class WithContentFile < SimpleDelegator
+
+    def initialize(obj, &block)
+      super(obj)
+      with_temp_file &block
+    end
+
+    # Yields path of tempfile containing content to block
+    # @yield [String] the path to the tempfile containing content
+    def with_temp_file
+      filename = original_filename || content.default_file_name
+      basename = [ File.basename(filename, ".*"), File.extname(filename) ]
+      infile = Tempfile.open(basename, Ddr::Models.tempdir, encoding: 'ascii-8bit')
+      begin
+        infile.write(content.content)
+        infile.close
+        verify_checksum!(infile)
+        yield infile.path
+      ensure
+        infile.close unless infile.closed?
+        File.unlink(infile)
+      end
+    end
+
+    def verify_checksum!(file)
+      digest = Ddr::Utils.digest(File.read(file), content.checksum.algorithm)
+      if digest != content.checksum.value
+        raise ChecksumInvalid, "The checksum of the downloaded file does not match the stored checksum of the content."
+      end
+    end
+
+  end
+end

data/lib/ddr/vocab/asset.rb

@@ -18,6 +18,9 @@
       property "eadId",
         label: "EAD ID"
 
+      property "archivesSpaceId",
+        label: "ArchivesSpace Identifier"
+
       property "multiresImageFilePath",
         label: "Multires Image File Path"
 

data/spec/derivatives/png_generator_spec.rb

@@ -16,7 +16,14 @@ module Ddr::Derivatives
           expect(File.size(output_path)).to be > 0
         end
       end
+      context "animated gif source" do
+        let(:source_path) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "arrow1rightred_e0.gif") }
+        it "should generate a non-empty file" do
+          generator.generate(source_path, output_path)
+          expect(File.size(output_path)).to be > 0
+        end
+      end
     end
 
   end
-end
+end

data/spec/index/fields_spec.rb

@@ -0,0 +1,197 @@
+module Ddr::Index
+  RSpec.describe Fields do
+
+    describe "module methods" do
+      specify {
+        expect(Fields.techmd).to contain_exactly(
+                                   Fields::TECHMD_COLOR_SPACE,
+                                   Fields::TECHMD_CREATING_APPLICATION,
+                                   Fields::TECHMD_CREATION_TIME,
+                                   Fields::TECHMD_FILE_SIZE,
+                                   Fields::TECHMD_FITS_VERSION,
+                                   Fields::TECHMD_FITS_DATETIME,
+                                   Fields::TECHMD_FORMAT_LABEL,
+                                   Fields::TECHMD_FORMAT_VERSION,
+                                   Fields::TECHMD_IMAGE_HEIGHT,
+                                   Fields::TECHMD_IMAGE_WIDTH,
+                                   Fields::TECHMD_MEDIA_TYPE,
+                                   Fields::TECHMD_MODIFICATION_TIME,
+                                   Fields::TECHMD_PRONOM_IDENTIFIER,
+                                   Fields::TECHMD_VALID,
+                                   Fields::TECHMD_WELL_FORMED
+                                 )
+      }
+    end
+
+    describe "constants" do
+      describe "ID" do
+        subject { Fields::ID }
+        its(:label) { is_expected.to eq "Fedora PID" }
+        its(:heading) { is_expected.to eq "pid" }
+      end
+
+      describe "PID" do
+        subject { Fields::PID }
+        its(:label) { is_expected.to eq "Fedora PID" }
+        its(:heading) { is_expected.to eq "pid" }
+      end
+
+      describe "ACCESS_ROLE" do
+        subject { Fields::ACCESS_ROLE }
+        its(:label) { is_expected.to eq "Access Role" }
+        its(:heading) { is_expected.to eq "access_role" }
+      end
+
+      describe "ACTIVE_FEDORA_MODEL" do
+        subject { Fields::ACTIVE_FEDORA_MODEL }
+        its(:label) { is_expected.to eq "Model" }
+        its(:heading) { is_expected.to eq "model" }
+      end
+
+      describe "ADMIN_SET" do
+        subject { Fields::ADMIN_SET }
+        its(:label) { is_expected.to eq "Admin Set" }
+        its(:heading) { is_expected.to eq "admin_set" }
+      end
+
+      describe "ASPACE_ID" do
+        subject { Fields::ASPACE_ID }
+        its(:label) { is_expected.to eq "ArchivesSpace ID" }
+        its(:heading) { is_expected.to eq "aspace_id" }
+      end
+
+      describe "DOI" do
+        subject { Fields::DOI }
+        its(:label) { is_expected.to eq "DOI" }
+        its(:heading) { is_expected.to eq "doi" }
+      end
+
+      describe "EAD_ID" do
+        subject { Fields::EAD_ID }
+        its(:label) { is_expected.to eq "EAD ID" }
+        its(:heading) { is_expected.to eq "ead_id" }
+      end
+
+      describe "LOCAL_ID" do
+        subject { Fields::LOCAL_ID }
+        its(:label) { is_expected.to eq "Local ID" }
+        its(:heading) { is_expected.to eq "local_id" }
+      end
+
+      describe "OBJECT_CREATE_DATE" do
+        subject { Fields::OBJECT_CREATE_DATE }
+        its(:label) { is_expected.to eq "Creation Date" }
+        its(:heading) { is_expected.to eq "creation_date" }
+      end
+
+      describe "OBJECT_MODIFIED_DATE" do
+        subject { Fields::OBJECT_MODIFIED_DATE }
+        its(:label) { is_expected.to eq "Modification Date" }
+        its(:heading) { is_expected.to eq "modification_date" }
+      end
+
+      describe "PERMANENT_ID" do
+        subject { Fields::PERMANENT_ID }
+        its(:label) { is_expected.to eq "Permanent ID" }
+        its(:heading) { is_expected.to eq "permanent_id" }
+      end
+
+      describe "PERMANENT_URL" do
+        subject { Fields::PERMANENT_URL }
+        its(:label) { is_expected.to eq "Permanent URL" }
+        its(:heading) { is_expected.to eq "permanent_url" }
+      end
+
+      describe "TECHMD_COLOR_SPACE" do
+        subject { Fields::TECHMD_COLOR_SPACE }
+        its(:label) { is_expected.to eq "Color Space" }
+        its(:heading) { is_expected.to eq "color_space" }
+      end
+
+      describe "TECHMD_CREATING_APPLICATION" do
+        subject { Fields::TECHMD_CREATING_APPLICATION }
+        its(:label) { is_expected.to eq "Creating Application" }
+        its(:heading) { is_expected.to eq "creating_application" }
+      end
+
+      describe "TECHMD_CREATION_TIME" do
+        subject { Fields::TECHMD_CREATION_TIME }
+        its(:label) { is_expected.to eq "Creation Time" }
+        its(:heading) { is_expected.to eq "creation_time" }
+      end
+
+      describe "TECHMD_FILE_SIZE" do
+        subject { Fields::TECHMD_FILE_SIZE }
+        its(:label) { is_expected.to eq "File Size" }
+        its(:heading) { is_expected.to eq "file_size" }
+      end
+
+      describe "TECHMD_FITS_VERSION" do
+        subject { Fields::TECHMD_FITS_VERSION }
+        its(:label) { is_expected.to eq "FITS Version" }
+        its(:heading) { is_expected.to eq "fits_version" }
+      end
+
+      describe "TECHMD_FITS_DATETIME" do
+        subject { Fields::TECHMD_FITS_DATETIME }
+        its(:label) { is_expected.to eq "FITS Run At" }
+        its(:heading) { is_expected.to eq "fits_datetime" }
+      end
+
+      describe "TECHMD_FORMAT_LABEL" do
+        subject { Fields::TECHMD_FORMAT_LABEL }
+        its(:label) { is_expected.to eq "Format Label" }
+        its(:heading) { is_expected.to eq "format_label" }
+      end
+
+      describe "TECHMD_FORMAT_VERSION" do
+        subject { Fields::TECHMD_FORMAT_VERSION }
+        its(:label) { is_expected.to eq "Format Version" }
+        its(:heading) { is_expected.to eq "format_version" }
+      end
+
+      describe "TECHMD_IMAGE_HEIGHT" do
+        subject { Fields::TECHMD_IMAGE_HEIGHT }
+        its(:label) { is_expected.to eq "Image Height" }
+        its(:heading) { is_expected.to eq "image_height" }
+      end
+
+      describe "TECHMD_IMAGE_WIDTH" do
+        subject { Fields::TECHMD_IMAGE_WIDTH }
+        its(:label) { is_expected.to eq "Image Width" }
+        its(:heading) { is_expected.to eq "image_width" }
+      end
+
+      describe "TECHMD_MEDIA_TYPE" do
+        subject { Fields::TECHMD_MEDIA_TYPE }
+        its(:label) { is_expected.to eq "Media Type" }
+        its(:heading) { is_expected.to eq "media_type" }
+      end
+
+      describe "TECHMD_MODIFICATION_TIME" do
+        subject { Fields::TECHMD_MODIFICATION_TIME }
+        its(:label) { is_expected.to eq "Modification Time" }
+        its(:heading) { is_expected.to eq "modification_time" }
+      end
+
+      describe "TECHMD_PRONOM_IDENTIFIER" do
+        subject { Fields::TECHMD_PRONOM_IDENTIFIER }
+        its(:label) { is_expected.to eq "PRONOM Unique ID" }
+        its(:heading) { is_expected.to eq "pronom_uid" }
+      end
+
+      describe "TECHMD_VALID" do
+        subject { Fields::TECHMD_VALID }
+        its(:label) { is_expected.to eq "Valid" }
+        its(:heading) { is_expected.to eq "valid" }
+      end
+
+      describe "TECHMD_WELL_FORMED" do
+        subject { Fields::TECHMD_WELL_FORMED }
+        its(:label) { is_expected.to eq "Well-formed" }
+        its(:heading) { is_expected.to eq "well_formed" }
+      end
+    end
+
+  end
+end