ddr-models 2.0.0.pre.4 → 2.0.0.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edec71f33dfe1094a8745e65ee9442145fff93c8
-  data.tar.gz: 4d4e93ebac4f35bdf3acd49b64feb90e6be9b7e5
+  metadata.gz: facb25169ffc7912ad207e33bfe63361d579589f
+  data.tar.gz: 8c4b9441dd3fbf698098c26729444f68cf400cef
 SHA512:
-  metadata.gz: d1f66ebd01130976ee83afdbf334058592da001d2616d566b2c874ed5ef5b60e2a832d13935b3f49552ec2e3feb859878a85561eb598c3bb828cb322dd9a5109
-  data.tar.gz: d88b98a85c9d7496530d07ee79ea036dbd58256b83667f701b688195a46186bfbd1c376890eac921441e232aa13c7d93e639c087a3cd298daff35aef12ee00fd
+  metadata.gz: f61cc78e2b0b3c43cfcf8df04b571afb25ac3ec2caa0c16a68d14b7dd2b03be74c0804d7d76e27192019bdff384451666ae4ba88f111690aa7d5fd143d7d1de0
+  data.tar.gz: 4357bf26040d884d7c4eccc0de7bbc6c975469e71488ab79b9c550aac37d39235793f63b3ed995e77c3d8013f73be861d4632f1ccf97bb17a636688c29d234bd

data/lib/ddr/contacts.rb

@@ -0,0 +1,25 @@
+module Ddr
+  module Contacts
+    extend ActiveSupport::Autoload
+
+    class << self
+      attr_accessor :contacts
+    end
+
+    def self.get(contact_slug)
+      load_contacts unless contacts
+      contacts[contact_slug]
+    end
+
+    def self.load_contacts
+      self.contacts = OpenStruct.new
+      contacts_file = File.join(Rails.root, 'config', 'contacts.yml')
+      YAML.load_file(contacts_file).each do |key, value|
+        contacts[key] = OpenStruct.new(value.merge('slug' => key))
+      end
+    rescue SystemCallError
+      Rails.logger.warn("Unable to load Contacts file: #{contacts_file}")
+    end
+
+  end
+end

data/lib/ddr/datastreams/administrative_metadata_datastream.rb

@@ -28,6 +28,8 @@ module Ddr
 
       property :display_format, predicate: Ddr::Vocab::Display.format
 
+      property :research_help_contact, predicate: Ddr::Vocab::Contact.assistance
+
     end
   end
 end

data/lib/ddr/index_fields.rb

@@ -50,6 +50,7 @@ module Ddr
     PERMANENT_ID                = solr_name :permanent_id, :stored_sortable, type: :string
     PERMANENT_URL               = solr_name :permanent_url, :stored_sortable, type: :string
     POLICY_ROLE                 = solr_name :policy_role, :facetable, type: :string
+    RESEARCH_HELP_CONTACT       = solr_name :research_help_contact, :stored_sortable
     RESOURCE_ROLE               = solr_name :resource_role, :facetable, type: :string
     STRUCT_MAPS                 = solr_name :struct_maps, :stored_sortable
     TITLE                       = solr_name :title, :stored_sortable

data/lib/ddr/models.rb

@@ -11,6 +11,7 @@ require 'hydra/validations'
 
 require 'ddr/actions'
 require 'ddr/auth'
+require 'ddr/contacts'
 require 'ddr/datastreams'
 require 'ddr/derivatives'
 require 'ddr/events'

data/lib/ddr/models/has_admin_metadata.rb

@@ -16,6 +16,7 @@ module Ddr
                        :local_id,
                        :permanent_id,
                        :permanent_url,
+                       :research_help_contact,
                        :workflow_state,
           datastream: "adminMetadata",
           multiple: false
@@ -56,6 +57,10 @@ module Ddr
         Ddr::Auth::EffectivePermissions.call(self, agents)
       end
 
+      def research_help
+        Ddr::Contacts.get(research_help_contact) if research_help_contact
+      end
+
       private
 
       def update_permanent_id_on_destroy

data/lib/ddr/models/indexing.rb

@@ -11,21 +11,22 @@ module Ddr
 
       def index_fields
         fields = {
-          TITLE             => title_display,
-          INTERNAL_URI      => internal_uri,
-          IDENTIFIER_ALL    => all_identifiers,
-          WORKFLOW_STATE    => workflow_state,
-          LOCAL_ID          => local_id,
-          ADMIN_SET         => admin_set,
-          DISPLAY_FORMAT    => display_format,
-          PERMANENT_ID      => permanent_id,
-          PERMANENT_URL     => permanent_url,
-          ACCESS_ROLE       => roles.to_json,
-          RESOURCE_ROLE     => roles.in_resource_scope.agents,
-          POLICY_ROLE       => roles.in_policy_scope.agents,
-          CREATOR_FACET     => creator,
-          DATE_FACET        => date,
-          DATE_SORT         => date_sort
+          TITLE                 => title_display,
+          INTERNAL_URI          => internal_uri,
+          IDENTIFIER_ALL        => all_identifiers,
+          WORKFLOW_STATE        => workflow_state,
+          LOCAL_ID              => local_id,
+          ADMIN_SET             => admin_set,
+          DISPLAY_FORMAT        => display_format,
+          PERMANENT_ID          => permanent_id,
+          PERMANENT_URL         => permanent_url,
+          ACCESS_ROLE           => roles.to_json,
+          RESOURCE_ROLE         => roles.in_resource_scope.agents,
+          POLICY_ROLE           => roles.in_policy_scope.agents,
+          CREATOR_FACET         => creator,
+          DATE_FACET            => date,
+          DATE_SORT             => date_sort,
+          RESEARCH_HELP_CONTACT => research_help_contact
         }
         if respond_to? :fixity_checks
           last_fixity_check = fixity_checks.last

data/lib/ddr/models/solr_document.rb

@@ -226,6 +226,15 @@ module Ddr
         Ddr::Auth::EffectivePermissions.call(self, agents)
       end
 
+      def display_format
+        get(Ddr::IndexFields::DISPLAY_FORMAT)
+      end
+
+      def research_help
+        research_help_contact = self[Ddr::IndexFields::RESEARCH_HELP_CONTACT] || inherited_research_help_contact
+        Ddr::Contacts.get(research_help_contact) if research_help_contact
+      end
+
       private
 
       def targets_query
@@ -252,6 +261,15 @@ module Ddr
         ActiveFedora::Base.pid_from_uri(get(field)) rescue nil
       end
 
+      def inherited_research_help_contact
+        if admin_policy_pid
+          query = ActiveFedora::SolrService.construct_query_for_pids([admin_policy_pid])
+          results = ActiveFedora::SolrService.query(query)
+          doc = results.map { |result| ::SolrDocument.new(result) }.first
+          doc[Ddr::IndexFields::RESEARCH_HELP_CONTACT].first
+        end
+      end
+
     end
   end
 end

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.0.0.pre.4"
+    VERSION = "2.0.0.pre.5"
   end
 end

data/lib/ddr/vocab.rb

@@ -13,6 +13,7 @@ module Ddr
              end
 
     autoload :Asset
+    autoload :Contact
     autoload :Display
     autoload :DukeTerms
     autoload :RDFVocabularyParser

data/lib/ddr/vocab/contact.rb

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

data/spec/contacts/contacts_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+module Ddr
+  RSpec.describe Contacts, contacts: true do
+
+    before do
+      allow(YAML).to receive(:load_file) { { 'a' => { 'name' => 'Contact A', 'short_name' => 'A' },
+                                             'b' => { 'name' => 'Contact B', 'short_name' => 'B' } } }
+      Contacts.load_contacts
+    end
+
+    describe "load_contacts" do
+      it "should load the contacts" do
+        expect(Contacts.contacts.to_h).to_not be_empty
+      end
+    end
+
+    describe "get" do
+      it "should return the appropriate contact" do
+        expect(Contacts.get('a').name).to eq('Contact A')
+        expect(Contacts.get('b').name).to eq('Contact B')
+      end
+    end
+
+  end
+end

data/spec/models/has_admin_metadata_spec.rb

@@ -3,7 +3,7 @@ require 'support/ezid_mock_identifier'
 
 module Ddr
   module Models
-    RSpec.describe HasAdminMetadata, type: :model do
+    RSpec.describe HasAdminMetadata, type: :model, contacts: true do
 
       describe "local id" do
         subject { FactoryGirl.build(:item) }
@@ -226,6 +226,20 @@ module Ddr
           end
         end
 
+        describe "contacts" do
+          before do
+            allow(YAML).to receive(:load_file) { { 'a' => { 'name' => 'Contact A', 'short_name' => 'A' },
+                                                   'b' => { 'name' => 'Contact B', 'short_name' => 'B' } } }
+            Ddr::Contacts.load_contacts
+          end
+          describe "#research_help" do
+            before { subject.research_help_contact = 'b' }
+            it "should return the appropriate contact" do
+              expect(subject.research_help.slug).to eq('b')
+            end
+          end
+        end
+
       end
     end
   end

data/spec/models/solr_document_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe SolrDocument, type: :model do
+RSpec.describe SolrDocument, type: :model, contacts: true do
 
   describe "#inherited_license" do
     let(:apo_solr_response) { [{"system_create_dtsi"=>"2015-03-10T15:20:16Z", "system_modified_dtsi"=>"2015-03-10T15:21:50Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Collection", "id"=>"changeme:224", "object_profile_ssm"=>["{\"datastreams\":{\"DC\":{\"dsLabel\":\"Dublin Core Record for this object\",\"dsVersionID\":\"DC1.0\",\"dsCreateDate\":\"2015-03-10T15:20:16Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":\"http://www.openarchives.org/OAI/2.0/oai_dc/\",\"dsControlGroup\":\"X\",\"dsSize\":341,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+DC+DC1.0\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"0555f020bbfc94c07745f530af4195fed9cf4e4ba539a30727f2d2d5743627be\"},\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-03-10T15:20:18Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":417,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"6a7c2621534cd1cb28d9cfa7e45bb128a1f3c05028e29def4dea479be9596d7d\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-03-10T15:20:18Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":80,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"bbba526a1ca47f19dfe110f25a0a721bda481dc414f7ec89e3f02c5562eaa9a2\"},\"rightsMetadata\":{\"dsLabel\":null,\"dsVersionID\":\"rightsMetadata.0\",\"dsCreateDate\":\"2015-03-10T15:20:17Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":550,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+rightsMetadata+rightsMetadata.0\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"210d5a228bd96e22b20723de1dd20ea8d897252063713d0815369c49045c5c05\"},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"defaultRights\":{\"dsLabel\":null,\"dsVersionID\":\"defaultRights.0\",\"dsCreateDate\":\"2015-03-10T15:21:50Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":634,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+defaultRights+defaultRights.0\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"1a2d9e665228d5e3cbf5f8ddd0d641172c20f98b4e05d62f741b7b9010696ad0\"}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/afmodel:Collection\",\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-03-10T15:20:16Z\",\"objLastModDate\":\"2015-03-10T15:20:18Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/changeme%3A224/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/changeme%3A224/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "title_tesim"=>["Test Collection"], "edit_access_person_ssim"=>["coblej@duke.edu"], "inheritable_read_access_group_ssim"=>["public"], "is_governed_by_ssim"=>["info:fedora/changeme:224"], "has_model_ssim"=>["info:fedora/afmodel:Collection"], "title_ssi"=>"Test Collection", "internal_uri_ssi"=>"info:fedora/changeme:224", "default_license_description_tesim"=>["Default License Description"], "default_license_title_tesim"=>["Default License Title"], "default_license_url_tesim"=>["http://test.license.org/"], "_version_"=>1495270331036729344, "timestamp"=>"2015-03-10T15:21:50.793Z"}] }
@@ -95,4 +95,42 @@ RSpec.describe SolrDocument, type: :model do
     end
   end
 
+  describe "#display_format" do
+    before { subject[Ddr::IndexFields::DISPLAY_FORMAT] = "Image" }
+    its(:display_format) { should eq("Image") }
+  end
+
+  describe "contacts" do
+    before do
+      allow(YAML).to receive(:load_file) { { 'a' => { 'name' => 'Contact A', 'short_name' => 'A' },
+                                             'b' => { 'name' => 'Contact B', 'short_name' => 'B' } } }
+      Ddr::Contacts.load_contacts
+    end
+    describe "#research_help" do
+      context "object has research help contact" do
+        before { subject[Ddr::IndexFields::RESEARCH_HELP_CONTACT] = 'b' }
+        it "should return the object's research help contact" do
+          expect(subject.research_help.slug).to eq('b')
+        end
+      end
+      context "object does not have research help contact" do
+        context "collection has research help contact" do
+          let(:apo_solr_response) { [{"system_create_dtsi"=>"2015-03-10T15:20:16Z", "system_modified_dtsi"=>"2015-03-10T15:21:50Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Collection", "id"=>"changeme:224", "object_profile_ssm"=>["{\"datastreams\":{\"DC\":{\"dsLabel\":\"Dublin Core Record for this object\",\"dsVersionID\":\"DC1.0\",\"dsCreateDate\":\"2015-03-10T15:20:16Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":\"http://www.openarchives.org/OAI/2.0/oai_dc/\",\"dsControlGroup\":\"X\",\"dsSize\":341,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+DC+DC1.0\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"0555f020bbfc94c07745f530af4195fed9cf4e4ba539a30727f2d2d5743627be\"},\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-03-10T15:20:18Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":417,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"6a7c2621534cd1cb28d9cfa7e45bb128a1f3c05028e29def4dea479be9596d7d\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-03-10T15:20:18Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":80,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"bbba526a1ca47f19dfe110f25a0a721bda481dc414f7ec89e3f02c5562eaa9a2\"},\"rightsMetadata\":{\"dsLabel\":null,\"dsVersionID\":\"rightsMetadata.0\",\"dsCreateDate\":\"2015-03-10T15:20:17Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":550,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+rightsMetadata+rightsMetadata.0\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"210d5a228bd96e22b20723de1dd20ea8d897252063713d0815369c49045c5c05\"},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"defaultRights\":{\"dsLabel\":null,\"dsVersionID\":\"defaultRights.0\",\"dsCreateDate\":\"2015-03-10T15:21:50Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":634,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+defaultRights+defaultRights.0\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"1a2d9e665228d5e3cbf5f8ddd0d641172c20f98b4e05d62f741b7b9010696ad0\"}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/afmodel:Collection\",\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-03-10T15:20:16Z\",\"objLastModDate\":\"2015-03-10T15:20:18Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/changeme%3A224/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/changeme%3A224/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "title_tesim"=>["Test Collection"], "edit_access_person_ssim"=>["coblej@duke.edu"], "inheritable_read_access_group_ssim"=>["public"], "is_governed_by_ssim"=>["info:fedora/changeme:224"], "has_model_ssim"=>["info:fedora/afmodel:Collection"], "title_ssi"=>"Test Collection", "internal_uri_ssi"=>"info:fedora/changeme:224", Ddr::IndexFields::RESEARCH_HELP_CONTACT=>["a"], "_version_"=>1495270331036729344, "timestamp"=>"2015-03-10T15:21:50.793Z"}] }
+          before do
+            allow(subject).to receive(:admin_policy_pid).and_return('changeme:224')
+            allow(ActiveFedora::SolrService).to receive(:query).and_return(apo_solr_response)
+          end
+          it "should return the collection's research help contact" do
+            expect(subject.research_help.slug).to eq("a")
+          end
+        end
+        context "collection does not have research help contact" do
+          it "should return nil" do
+            expect(subject.research_help).to be_nil
+          end
+        end
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.4
+  version: 2.0.0.pre.5
 platform: ruby
 authors:
 - Jim Coble
@@ -407,6 +407,7 @@ files:
 - lib/ddr/auth/test_helpers.rb
 - lib/ddr/auth/user.rb
 - lib/ddr/auth/web_auth_context.rb
+- lib/ddr/contacts.rb
 - lib/ddr/datastreams.rb
 - lib/ddr/datastreams/administrative_metadata_datastream.rb
 - lib/ddr/datastreams/datastream_behavior.rb
@@ -469,6 +470,7 @@ files:
 - lib/ddr/utils.rb
 - lib/ddr/vocab.rb
 - lib/ddr/vocab/asset.rb
+- lib/ddr/vocab/contact.rb
 - lib/ddr/vocab/display.rb
 - lib/ddr/vocab/duke_terms.rb
 - lib/ddr/vocab/rdf_vocabulary_parser.rb
@@ -497,6 +499,7 @@ files:
 - spec/auth/superuser_ability_spec.rb
 - spec/auth/user_spec.rb
 - spec/auth/web_auth_context_spec.rb
+- spec/contacts/contacts_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/including_role_based_access_controls_enforcement_spec.rb
 - spec/controllers/users/sessions_controller_spec.rb
@@ -624,7 +627,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository
@@ -651,6 +654,7 @@ test_files:
 - spec/auth/superuser_ability_spec.rb
 - spec/auth/user_spec.rb
 - spec/auth/web_auth_context_spec.rb
+- spec/contacts/contacts_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/including_role_based_access_controls_enforcement_spec.rb
 - spec/controllers/users/sessions_controller_spec.rb