ddr-core 1.2.0.rc2 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d6925972d1974e35d35effa69d27a8b8764006e1a7554236325956ab31b674d
-  data.tar.gz: 2e1e0c7b49694c06c031bbd44736f6a567590b1fed08a48a7e76bac31d494f22
+  metadata.gz: de74f6e1a261f454f1bd81773d68fa839bc9afd3e923b0c1688a6aa0baf825ea
+  data.tar.gz: 9081c1706672122549c6c160bdcec55d636e68f8563f087b58ca1a1bab113511
 SHA512:
-  metadata.gz: 5646fab91d66b7c9c96a2ee38d5cc86abd0052337e2b0b3bd79a53c4b8dbbfefc0db8f61eee33261d95d898a06d5c47aa865e605dbf1aea64d5d2319d68ad6ce
-  data.tar.gz: 650f2186d40227f43b7a6e5ba6734d3358006f103bf7dc4f472a174202e866c9660969e092f92bc8f011b0d7073ef0dc4c63ba4b4d3eb10a1d51845ea942030e
+  metadata.gz: 060a285208fca0a6c9c672443635637b5e79d6843504fbe6ea904b73d4af3162fb90606d3c67ee152ac364cbb7a9761a0cd775930d73d08c7d3316c15107ecb8
+  data.tar.gz: 71639b72040c74505c198b50408868403da5c2e1ff9d5d85969027869c57838eea1aad2f36f9de6e2544f694bfab64a4547e774a48675dbe5b73f1a195a703bd

data/Rakefile

@@ -28,3 +28,8 @@ begin
   task default: :spec
 rescue LoadError
 end
+
+# This allows our s2i builder image to work more smoothly
+task 'tmp:create' do
+  Rake::Task['app:tmp:create'].invoke
+end

data/app/models/concerns/ddr/embargoable.rb

@@ -0,0 +1,28 @@
+module Ddr
+  module Embargoable
+    extend ActiveSupport::Concern
+
+    def embargo
+      result = available.present? ? available : parent&.available
+      normalize(result)
+    end
+
+    def embargoed?
+      !embargo.nil? && embargo > DateTime.now
+    end
+
+    private
+
+    def normalize(value)
+      case value
+      when ::Time
+        value.to_datetime
+      when ::Array
+        value.first
+      else
+        value
+      end
+    end
+
+  end
+end

data/app/models/concerns/ddr/solr_document_behavior.rb

@@ -21,6 +21,9 @@ module Ddr
       end
 
       def find_by_permanent_id(ark)
+        if ark.blank?
+          raise ArgumentError, "ARK argument must be present."
+        end
         query = Ddr::Index::Query.new do
           q *:*
           where permanent_id: ark
@@ -294,6 +297,14 @@ module Ddr
       resource.children
     end
 
+    def embargo
+      resource.embargo
+    end
+
+    def embargoed?
+      resource.embargoed?
+    end
+
     private
 
     def query_service

data/app/models/ddr/component.rb

@@ -2,6 +2,7 @@ module Ddr
   class Component < Resource
 
     include Captionable
+    include Embargoable
     include HasContent
     include HasExtractedText
     include HasIntermediateFile

data/app/models/ddr/finding_aid.rb

@@ -1,61 +1,53 @@
-# TODO: 'https://duldev.atlassian.net/browse/DDR-1755'
-
 module Ddr
   class FindingAid
     attr_reader :ead_id
 
-    EAD_XMLNS = "urn:isbn:1-931666-22-9"
-
     def initialize(ead_id)
       @ead_id = ead_id
     end
 
+    # TODO: use permalinks in the future when all finding aids have ARKs
     def url
-      doc.css("eadid").attr("url").text
+      [Ddr.finding_aid_base_url, '/catalog/', ead_id].join
     end
 
-    # The finding aid title
     def title
-      doc.css("titleproper").children.first.text.strip
+      doc.fetch('normalized_title_ssm',[])&.first
     end
 
     def repository
-      collection.xpath('ead:did/ead:repository/ead:corpname', ead: EAD_XMLNS).text
+      doc.fetch('repository_ssm',[])&.first
     end
 
     def collection_date_span
-      collection.xpath('ead:did/ead:unitdate[@type="inclusive"]', ead: EAD_XMLNS).text
+      doc.fetch('normalized_date_ssm',[])&.first
     end
 
     def collection_number
-      collection.xpath('ead:did/ead:unitid', ead: EAD_XMLNS).text
+      doc.fetch('unitid_ssm',[])&.first
     end
 
     def collection_title
-      collection.xpath('ead:did/ead:unittitle', ead: EAD_XMLNS).text
+      doc.fetch('title_ssm',[])&.first
     end
 
     def extent
-      collection.xpath('ead:did/ead:physdesc/ead:extent', ead: EAD_XMLNS).map(&:text).join("; ")
+      doc.fetch('extent_ssm',[]).join("; ")
     end
 
     def abstract
-      collection.xpath('ead:did/ead:abstract', ead: EAD_XMLNS).text
+      first_abstract = doc.fetch('abstract_tesim',[])&.first
+      ActionController::Base.helpers.strip_tags(first_abstract)
     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))
+      @doc ||= JSON.parse(open(arclight_collection_data_url).read)
     end
 
-    def ead_xml_url
-      Ddr.ead_xml_base_url + ead_id + ".xml"
+    def arclight_collection_data_url
+      [Ddr.finding_aid_base_url, '/catalog/', ead_id, '/raw.json'].join
     end
   end
 end

data/app/models/ddr/item.rb

@@ -1,6 +1,7 @@
 module Ddr
   class Item < Resource
 
+    include Embargoable
     include HasChildren
     include HasParent
     include HasStructMetadata

data/app/models/ddr/resource.rb

@@ -98,6 +98,15 @@ module Ddr
       false
     end
 
+    # Embargoes are enforced by the `Embargoable` concern, which overrides the `embargo` and `embargoed?` methods
+    def embargo
+      nil
+    end
+
+    def embargoed?
+      false
+    end
+
     def has_admin_policy?
       governable? && admin_policy_id.present?
     end

data/lib/ddr/auth.rb

@@ -35,6 +35,7 @@ module Ddr
       autoload :CollectionAbilityDefinitions
       autoload :ComponentAbilityDefinitions
       autoload :ItemAbilityDefinitions
+      autoload :EmbargoAbilityDefinitions
       autoload :PublicationAbilityDefinitions
       autoload :LockAbilityDefinitions
       autoload :RoleBasedAbilityDefinitions

data/lib/ddr/auth/ability.rb

@@ -8,6 +8,7 @@ module Ddr
                                    ComponentAbilityDefinitions,
                                    AttachmentAbilityDefinitions,
                                    RoleBasedAbilityDefinitions,
+                                   EmbargoAbilityDefinitions,
                                    PublicationAbilityDefinitions,
                                    LockAbilityDefinitions,
                                    AdminSetAbilityDefinitions,

data/lib/ddr/auth/ability_definitions/embargo_ability_definitions.rb

@@ -0,0 +1,18 @@
+module Ddr
+  module Auth
+    class EmbargoAbilityDefinitions < AbilityDefinitions
+
+      def call
+        cannot :read, [::SolrDocument, Ddr::Resource] do |obj|
+          obj.embargoed? && cannot?(:update, obj)
+        end
+
+        cannot :download, [::SolrDocument, Ddr::Resource] do |obj|
+          obj.embargoed? && cannot?(:update, obj)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/ddr/auth/ability_definitions/publication_ability_definitions.rb

@@ -11,7 +11,7 @@ module Ddr
           obj.published? || !obj.publishable?
         end
         cannot :unpublish, Ddr::Resource do |obj|
-          !obj.published?
+          !obj.published? && !obj.nonpublishable?
         end
         cannot :make_nonpublishable, Ddr::Resource do |obj|
           obj.published? || !obj.publishable?

data/lib/ddr/auth/roles/role_types.rb

@@ -23,7 +23,8 @@ module Ddr
           "MetadataEditor",
           "The Metadata Editor role conveys responsibility for " \
           "managing the description of a resource.",
-          [ Permissions::DISCOVER, Permissions::READ, Permissions::DOWNLOAD, Permissions::UPDATE ]
+          [ Permissions::DISCOVER, Permissions::READ, Permissions::DOWNLOAD, 
+            Permissions::UPDATE ]
         )
 
         CONTRIBUTOR = RoleType.new(
@@ -49,7 +50,7 @@ module Ddr
 
         METADATA_VIEWER = RoleType.new(
           "MetadataViewer",
-          "The MetadataViewer role coveys access to the description of a resource.",
+          "The MetadataViewer role conveys access to the description of a resource.",
           [ Permissions::DISCOVER ]
         )
 

data/lib/ddr/core.rb

@@ -84,10 +84,13 @@ module Ddr
         '.aac'  => 'audio/mp4',
         '.f4a'  => 'audio/mp4',
         '.flv'  => 'video/flv',
+        '.m2t'  => 'video/vnd.dlna.mpeg-tts',
+        '.m2ts' => 'video/m2ts',
         '.m4a'  => 'audio/mp4',
         '.mov'  => 'video/quicktime',
         '.mp3'  => 'audio/mpeg',
         '.mp4'  => 'video/mp4',
+        '.mts'  => 'video/vnd.dlna.mpeg-tts',
         '.oga'  => 'audio/ogg',
         '.ogg'  => 'audio/ogg',
         '.srt'  => 'text/plain',
@@ -108,10 +111,15 @@ module Ddr
     ENV["DDR_AUX_API_URL"]
   end
 
+  # Deprecated in ddr-core 1.2.0. Remove in future.
   mattr_accessor :ead_xml_base_url do
     ENV["EAD_XML_BASE_URL"]
   end
 
+  mattr_accessor :finding_aid_base_url do
+    ENV["FINDING_AID_BASE_URL"] || 'https://archives.lib.duke.edu'
+  end
+
   module Core
 
   end

data/lib/ddr/core/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Core
-    VERSION = '1.2.0.rc2'
+    VERSION = '1.4.2'
   end
 end

data/lib/ddr/index/fields.rb

@@ -16,6 +16,7 @@ module Ddr::Index
     ASPACE_ID                     = Field.new :aspace_id, :stored_sortable
     ATTACHED_FILES_HAVING_CONTENT = Field.new :attached_files_having_content, :symbol
     ATTACHED_TO_ID                = Field.new :attached_to_id, :symbol
+    AVAILABLE                     = Field.new :available, :symbol
     BIBLICAL_BOOK_FACET           = Field.new :biblical_book_facet, :facetable
     BOX_NUMBER_FACET              = Field.new :box_number_facet, :facetable
     CATEGORY_FACET                = Field.new :category_facet, :facetable

data/lib/ddr/index/query_clause.rb

@@ -16,9 +16,9 @@ module Ddr::Index
 
     values do
       attribute :field,       FieldAttribute
-      attribute :value,       String
-      attribute :quote_value, Boolean, default: false
-      attribute :template,    String,  default: STANDARD_QUERY
+      attribute :value,       String,  required: true
+      attribute :quote_value, Boolean, default:  false
+      attribute :template,    String,  default:  STANDARD_QUERY
     end
 
     def to_s
@@ -46,7 +46,7 @@ module Ddr::Index
       alias_method :id, :unique_key
 
       def where(field, value)
-         values = Array(value)
+        values = Array(value)
         if values.size > 1
           disjunction(field, values)
         else

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc2
+  version: 1.4.2
 platform: ruby
 authors:
 - Jim Coble
 - David Chandek-Stark
 - Ayse Durmaz
 - Hugh Cayless
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -306,9 +306,9 @@ files:
 - app/assets/config/ddr_core_manifest.js
 - app/controllers/users/omniauth_callbacks_controller.rb
 - app/controllers/users/sessions_controller.rb
-- app/models/concerns/ddr/#search_builder_behavior.rb#
 - app/models/concerns/ddr/captionable.rb
 - app/models/concerns/ddr/describable.rb
+- app/models/concerns/ddr/embargoable.rb
 - app/models/concerns/ddr/governable.rb
 - app/models/concerns/ddr/has_admin_metadata.rb
 - app/models/concerns/ddr/has_attachments.rb
@@ -320,17 +320,12 @@ files:
 - app/models/concerns/ddr/has_parent.rb
 - app/models/concerns/ddr/has_struct_metadata.rb
 - app/models/concerns/ddr/has_thumbnail.rb
-- app/models/concerns/ddr/search_builder_behavior.rb~
 - app/models/concerns/ddr/solr_document_behavior.rb
 - app/models/concerns/ddr/streamable.rb
-- app/models/ddr/#admin_set.rb#
-- app/models/ddr/#auxiliary_resource_cache.rb#
 - app/models/ddr/admin_set.rb
 - app/models/ddr/alert.rb
 - app/models/ddr/attachment.rb
 - app/models/ddr/auxiliary_resource.rb
-- app/models/ddr/auxiliary_resource.rb~
-- app/models/ddr/cacheable_auxiliary_resource.rb~
 - app/models/ddr/collection.rb
 - app/models/ddr/component.rb
 - app/models/ddr/contact.rb
@@ -351,7 +346,6 @@ files:
 - db/migrate/20200207194453_add_default_to_lock_version.rb
 - lib/ddr-core.rb
 - lib/ddr/auth.rb
-- lib/ddr/auth/#duke_person.rb#
 - lib/ddr/auth/ability.rb
 - lib/ddr/auth/ability_definitions.rb
 - lib/ddr/auth/ability_definitions/admin_set_ability_definitions.rb
@@ -359,6 +353,7 @@ files:
 - lib/ddr/auth/ability_definitions/attachment_ability_definitions.rb
 - lib/ddr/auth/ability_definitions/collection_ability_definitions.rb
 - lib/ddr/auth/ability_definitions/component_ability_definitions.rb
+- lib/ddr/auth/ability_definitions/embargo_ability_definitions.rb
 - lib/ddr/auth/ability_definitions/item_ability_definitions.rb
 - lib/ddr/auth/ability_definitions/lock_ability_definitions.rb
 - lib/ddr/auth/ability_definitions/publication_ability_definitions.rb
@@ -372,7 +367,6 @@ files:
 - lib/ddr/auth/auth_context.rb
 - lib/ddr/auth/auth_context_factory.rb
 - lib/ddr/auth/detached_auth_context.rb
-- lib/ddr/auth/duke_directory.rb~
 - lib/ddr/auth/dynamic_groups.rb
 - lib/ddr/auth/effective_permissions.rb
 - lib/ddr/auth/effective_roles.rb
@@ -447,7 +441,7 @@ licenses:
 - BSD-3-Clause
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -458,12 +452,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Models used in the Duke Digital Repository
 test_files: []

data/app/models/concerns/ddr/#search_builder_behavior.rb#

@@ -1,10 +0,0 @@
-module Ddr
-  module SearchBuilderBehavior
-
-    def effective_role_filter(agents)
-      # https://lucene.apache.org/solr/guide/7_7/other-parsers.html#term-query-parser
-      "{!terms f=#{Ddr::Index::Fields::EFFECTIVE_ROLE} method=booleanQuery}#{agents.join(',')}"
-    end
-
-  end
-end

data/app/models/concerns/ddr/search_builder_behavior.rb~

@@ -1,9 +0,0 @@
-module Ddr
-  module SearchBuilderBehavior
-
-    def effective_role_filter
-
-    end
-
-  end
-end

data/app/models/ddr/#admin_set.rb#

@@ -1,26 +0,0 @@
-module Ddr
-  class AdminSet < AuxiliaryResource
-
-    def self.call(obj)
-      find_by_code(obj.admin_set)
-    rescue ActiveResource::ResourceNotFound => e
-      raise Ddr::NotFoundError, e
-    end
-
-    def self.find_by_code(code)
-      return unless code
-      new get(:find, code: code)
-    end
-
-    def self.keys
-      with_cache("keys") do
-        all.map(&:code)
-      end
-    end
-
-    def to_s
-      title
-    end
-
-  end
-end

data/app/models/ddr/#auxiliary_resource_cache.rb#

@@ -1,34 +0,0 @@
-require 'active_resource'
-
-module Ddr
-  class AuxiliaryResourceCache < ActiveSupport::Cache::MemoryStore
-
-    def initialize
-      @_cache = 
-    end
-
-    def with(key, &block)
-      begin
-        cache.set(key, block.call)
-      rescue ActiveResource::ServerError => e
-        if cache.key?(key)
-          Rails.logger.error(e)
-          cache.get(key)
-        else
-          raise
-        end
-      end
-    end
-
-    private
-
-    def get(key)
-      @_cache[key]
-    end
-
-    def set(key, value)
-      @_cache[key] = value
-    end
-
-  end
-end

data/app/models/ddr/auxiliary_resource.rb~

@@ -1,13 +0,0 @@
-require 'active_resource'
-
-module Ddr
-  #
-  # Abstract superclass for resources bound to ddr-aux API data
-  #
-  class AuxiliaryResource < ActiveResource::Base
-
-    # ActiveResource freezes `site` in subclasses
-    self.site = Ddr.ddr_aux_api_url
-
-  end
-end

data/app/models/ddr/cacheable_auxiliary_resource.rb~

@@ -1,20 +0,0 @@
-module Ddr
-  module CacheableAuxiliaryResource
-
-    def with_cache(key, &block)
-      block.call.tap { |value| cache.write(key, value) }
-    rescue ActiveResource::ServerError => e
-      if value = cache.fetch(key)
-        logger.error(e) if logger
-        value
-      else
-        raise
-      end
-    end
-
-    def cache
-      @cache ||= ActiveSupport::Cache::MemoryStore.new
-    end
-
-  end
-end

data/lib/ddr/auth/#duke_person.rb#

@@ -1,9 +0,0 @@
-module Ddr::Auth
-  class DukePerson
-
-    def self.get(user)
-      
-    end
-
-  end
-end

data/lib/ddr/auth/duke_directory.rb~

@@ -1,7 +0,0 @@
-module Ddr::Auth
-  class DukeDirectory
-
-
-
-  end
-end