ddr-models 2.6.2 → 2.7.0.rc1

data/lib/ddr/vocab.rb

@@ -1,24 +1,22 @@
 require "rdf/vocab"
 
-module Ddr
-  module Vocab
-    extend ActiveSupport::Autoload
+module Ddr::Vocab
+  extend ActiveSupport::Autoload
 
-    BASE_URI = "http://repository.lib.duke.edu/vocab"
+  BASE_URI = "http://repository.lib.duke.edu/vocab"
 
-    PREMIS = begin
-               RDF::Vocab::PREMIS::V1
-             rescue NameError
-               RDF::Vocab::PREMIS
-             end
+  PREMIS = begin
+             RDF::Vocab::PREMIS::V1
+           rescue NameError
+             RDF::Vocab::PREMIS
+           end
 
-    autoload :Asset
-    autoload :Contact
-    autoload :Display
-    autoload :DukeTerms
-    autoload :RDFVocabularyParser
-    autoload :Roles
-    autoload :Vocabulary
+  autoload :Asset
+  autoload :Contact
+  autoload :Display
+  autoload :DukeTerms
+  autoload :RDFVocabularyParser
+  autoload :Roles
+  autoload :Vocabulary
 
-  end
 end

data/lib/ddr/vocab/asset.rb

@@ -1,29 +1,39 @@
- module Ddr
-  module Vocab
-    class Asset < RDF::StrictVocabulary("http://repository.lib.duke.edu/vocab/asset/")
+module Ddr::Vocab
+  class Asset < RDF::StrictVocabulary("http://repository.lib.duke.edu/vocab/asset/")
 
-      property "permanentId",
-        label: "Permanent Identifier"
+    property "permanentId",
+             label: "Permanent Identifier"
 
-      property "permanentUrl",
-        label: "Permanent URL"
+    property "permanentUrl",
+             label: "Permanent URL"
 
-      property "workflowState",
-        label: "Workflow State"
+    property "workflowState",
+             label: "Workflow State"
 
-      property "adminSet",
-        label: "Administrative Set",
-        comment: "A name under which objects (principally collections) are grouped for administrative purposes."
+    property "adminSet",
+             label: "Administrative Set",
+             comment: "A name under which objects (principally collections) are grouped for administrative purposes."
 
-      property "eadId",
-        label: "EAD ID"
+    property "eadId",
+             label: "EAD ID"
 
-      property "archivesSpaceId",
-        label: "ArchivesSpace Identifier"
+    property "archivesSpaceId",
+             label: "ArchivesSpace Identifier"
 
-      property "isLocked",
-        label: "Is Locked?"
+    property "isLocked",
+             label: "Is Locked?"
+
+    property "ingestedBy",
+             label: "Ingested By",
+             comment: "The agent (person or software) that initiated or performed the ingestion of the object."
+
+    property "ingestionDate",
+             label: "Ingestion Date",
+             comment: "The date/time at which the object was originally ingested into the repository."
+
+    property "rightsNote",
+             label: "Rights Note",
+             comment: "Free-text statement about the rights status of the resource."
 
-    end
   end
 end

data/lib/ddr/vocab/contact.rb

@@ -1,11 +1,9 @@
-module Ddr
-  module Vocab
-    class Contact < RDF::StrictVocabulary("http://repository.lib.duke.edu/vocab/contact/")
+module Ddr::Vocab
+  class Contact < RDF::StrictVocabulary("#{BASE_URI}/contact/")
 
-      property "assistance",
-        label: "Research Assistance",
-        comment: "Contact for research assistance with this object."
+    property "assistance",
+             label: "Research Assistance",
+             comment: "Contact for research assistance with this object."
 
-    end
   end
 end

data/lib/ddr/vocab/display.rb

@@ -1,11 +1,9 @@
-module Ddr
-  module Vocab
-    class Display < RDF::StrictVocabulary("http://repository.lib.duke.edu/vocab/display/")
+module Ddr::Vocab
+  class Display < RDF::StrictVocabulary("#{BASE_URI}/display/")
 
-      property "format",
-        label: "Display Format",
-        comment: "Format to use when displaying the object."
+    property "format",
+             label: "Display Format",
+             comment: "Format to use when displaying the object."
 
-    end
   end
-end
+end

data/lib/ddr/vocab/duke_terms.rb

@@ -1,15 +1,13 @@
-module Ddr
-  module Vocab
+module Ddr::Vocab
 
-    class DukeTerms < RDF::StrictVocabulary("http://library.duke.edu/metadata/terms/")
-
-      RDFVocabularyParser.new(
-              File.join(File.dirname( __FILE__ ), "sources", "duketerms.rdf"),
-              "http://library.duke.edu/metadata/terms/").
-              term_symbols.sort.each do |term|
-        property term, type: "rdf:Property".freeze
-      end
+  class DukeTerms < RDF::StrictVocabulary("http://library.duke.edu/metadata/terms/")
 
+    RDFVocabularyParser.new(
+      File.join(File.dirname( __FILE__ ), "sources", "duketerms.rdf"),
+      "http://library.duke.edu/metadata/terms/").
+      term_symbols.sort.each do |term|
+      property term, type: "rdf:Property".freeze
     end
+
   end
 end

data/lib/ddr/vocab/rdf_vocabulary_parser.rb

@@ -1,45 +1,43 @@
 require 'rdf/rdfxml'
 
-module Ddr
-  module Vocab
-    class RDFVocabularyParser
-
-      attr_reader :source, :prefix
-
-      def initialize(source, prefix = "")
-        @source = source
-        @prefix = prefix
-      end
-
-      def term_names
-        @term_names ||= terms.collect { |t| t[:resource].to_s.sub(prefix, "") }.freeze
-      end
-
-      def term_symbols
-        term_names.map(&:to_sym)
-      end
-
-      def terms
-        properties.map(&:to_hash)
-      end
-
-      def properties
-        RDF::Query.execute(graph, properties_query)
-      end
-
-      def properties_query
-        {:resource => {
-            RDF.type => RDF.Property,
-            RDF::RDFS.label => :label,
-            RDF::RDFS.comment => :comment
-          }
-        }
-      end
-
-      def graph
-        @graph ||= RDF::Graph.load(source).freeze
-      end
+module Ddr::Vocab
+  class RDFVocabularyParser
 
+    attr_reader :source, :prefix
+
+    def initialize(source, prefix = "")
+      @source = source
+      @prefix = prefix
+    end
+
+    def term_names
+      @term_names ||= terms.collect { |t| t[:resource].to_s.sub(prefix, "") }.freeze
+    end
+
+    def term_symbols
+      term_names.map(&:to_sym)
+    end
+
+    def terms
+      properties.map(&:to_hash)
     end
+
+    def properties
+      RDF::Query.execute(graph, properties_query)
+    end
+
+    def properties_query
+      {:resource => {
+         RDF.type => RDF.Property,
+         RDF::RDFS.label => :label,
+         RDF::RDFS.comment => :comment
+       }
+      }
+    end
+
+    def graph
+      @graph ||= RDF::Graph.load(source).freeze
+    end
+
   end
 end

data/lib/ddr/vocab/roles.rb

@@ -1,27 +1,25 @@
-module Ddr
-  module Vocab
-    class Roles < RDF::StrictVocabulary("http://repository.lib.duke.edu/vocab/roles/")
+module Ddr::Vocab
+  class Roles < RDF::StrictVocabulary("#{BASE_URI}/roles/")
 
-      term :Role,
-        label: "Role",
-        comment: "An assertion of a role granted to an agent."
+    term :Role,
+         label: "Role",
+         comment: "An assertion of a role granted to an agent."
 
-      property :hasRole,
-        label: "Has Role",
-        comment: "Asserts the granting of a role on the subject to an agent."
+    property :hasRole,
+             label: "Has Role",
+             comment: "Asserts the granting of a role on the subject to an agent."
 
-      property :type,
-        label: "Type",
-        comment: "The type of role granted to the agent."
+    property :type,
+             label: "Type",
+             comment: "The type of role granted to the agent."
 
-      property :agent,
-        label: "Agent",
-        comment: "The agent to whom the role is granted."
+    property :agent,
+             label: "Agent",
+             comment: "The agent to whom the role is granted."
 
-      property :scope,
-        label: "Scope",
-        comment: "The scope within which the role applies."
+    property :scope,
+             label: "Scope",
+             comment: "The scope within which the role applies."
 
-    end
   end
 end

data/lib/ddr/vocab/vocabulary.rb

@@ -1,37 +1,37 @@
-module Ddr
-  module Vocab
-    class Vocabulary
+require 'rdf/vocab'
 
-      def self.label(rdf_vocabulary)
-        case rdf_vocabulary.to_uri
-        when RDF::DC.to_uri
-          "DC Terms"
-        when DukeTerms.to_uri
-          "Duke Terms"
-        end
-      end
+module Ddr::Vocab
+  class Vocabulary
 
-      def self.namespace_prefix(rdf_vocabulary)
-        case rdf_vocabulary.to_uri
-        when RDF::DC.to_uri
-          "dcterms"
-        when DukeTerms.to_uri
-          "duke"
-        end
+    def self.label(rdf_vocabulary)
+      case rdf_vocabulary.to_uri
+      when RDF::Vocab::DC.to_uri
+        "DC Terms"
+      when DukeTerms.to_uri
+        "Duke Terms"
       end
+    end
 
-      def self.property_terms(rdf_vocabulary)
-        rdf_vocabulary.properties.select { |p| p.type.include?("http://www.w3.org/1999/02/22-rdf-syntax-ns#Property") }
+    def self.namespace_prefix(rdf_vocabulary)
+      case rdf_vocabulary.to_uri
+      when RDF::Vocab::DC.to_uri
+        "dcterms"
+      when DukeTerms.to_uri
+        "duke"
       end
+    end
 
-      def self.term_names(rdf_vocabulary)
-        self.property_terms(rdf_vocabulary).map { |term| self.term_name(rdf_vocabulary, term) }
-      end
+    def self.property_terms(rdf_vocabulary)
+      rdf_vocabulary.properties.select { |p| p.type.include?("http://www.w3.org/1999/02/22-rdf-syntax-ns#Property") }
+    end
 
-      def self.term_name(rdf_vocabulary, term)
-        term.to_s.gsub(rdf_vocabulary.to_uri.to_s, "").to_sym
-      end
+    def self.term_names(rdf_vocabulary)
+      self.property_terms(rdf_vocabulary).map { |term| self.term_name(rdf_vocabulary, term) }
+    end
 
+    def self.term_name(rdf_vocabulary, term)
+      term.to_s.gsub(rdf_vocabulary.to_uri.to_s, "").to_sym
     end
+
   end
 end

data/spec/datastreams/external_file_datastream_spec.rb

@@ -0,0 +1,37 @@
+module Ddr::Datastreams
+  RSpec.describe ExternalFileDatastream do
+
+    let(:obj) { Component.new }
+    let(:file1) { fixture_file_upload("sample.pdf", "application/pdf") }
+    let(:file2) { fixture_file_upload("sample.docx") }
+
+    subject { obj.content }
+
+    its(:file_size) { is_expected.to be_nil }
+    its(:file_path) { is_expected.to be_nil }
+    its(:file_paths) { is_expected.to be_empty }
+
+    specify {
+      subject.add_file(file1.path, mime_type: file1.content_type)
+      obj.save!
+      path1 = subject.file_path
+      expect(::File.exist?(path1)).to be true
+      expect(subject.file_size).to eq 83777
+      expect(subject.mimeType).to eq "application/pdf"
+      subject.add_file(file2.path)
+      obj.save!
+      path2 = subject.file_path
+      expect(::File.exist?(path2)).to be true
+      expect(subject.file_size).to eq 12552
+      expect(subject.mimeType).to eq "application/octet-stream"
+      expect(subject.file_paths).to contain_exactly(path1, path2)
+      subject.delete
+      expect(::File.exist?(path1)).to be false
+      expect(::File.exist?(path2)).to be false
+      expect(subject.file_size).to be_nil
+      expect(subject.dsLocation).to be_nil
+      expect(subject.file_path).to be_nil
+    }
+
+  end
+end

data/spec/derivatives/png_generator_spec.rb

@@ -1,31 +1,27 @@
-require 'spec_helper'
+module Ddr::Derivatives
+  RSpec.describe PngGenerator do
 
-module Ddr
-  module Derivatives
-    RSpec.describe PngGenerator do
-
-      describe "generate" do
-        let(:tempdir) { Dir.mktmpdir }
-        let(:output_file) { File.new(File.join(tempdir, "output.png"), 'wb') }
-        let(:options) { "-resize '100x100>'" }
-        let(:generator) { described_class.new(source, output_file.path, options) }
-        after { FileUtils.rmdir(tempdir) }
-        context "tiff source" do
-          let(:source) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "imageA.tif") }
-          it "should generate a non-empty file" do
-            generator.generate
-            expect(File.size(output_file.path)).to be > 0
-          end
+    describe "generate" do
+      let(:tempdir) { Dir.mktmpdir }
+      let(:output_file) { File.new(File.join(tempdir, "output.png"), 'wb') }
+      let(:options) { "-resize '100x100>'" }
+      let(:generator) { described_class.new(source, output_file.path, options) }
+      after { FileUtils.rmdir(tempdir) }
+      context "tiff source" do
+        let(:source) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "imageA.tif") }
+        it "should generate a non-empty file" do
+          generator.generate
+          expect(File.size(output_file.path)).to be > 0
         end
-        context "animated gif source" do
-          let(:source) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "arrow1rightred_e0.gif") }
-          it "should generate a non-empty file" do
-            generator.generate
-            expect(File.size(output_file.path)).to be > 0
-          end
+      end
+      context "animated gif source" do
+        let(:source) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "arrow1rightred_e0.gif") }
+        it "should generate a non-empty file" do
+          generator.generate
+          expect(File.size(output_file.path)).to be > 0
         end
       end
-
     end
+
   end
-end
+end