ddr-core 0.3.0 → 1.2.0.rc1

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

@@ -0,0 +1,26 @@
+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#

@@ -0,0 +1,34 @@
+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/admin_set.rb

@@ -1,9 +1,5 @@
-require "active_resource"
-
 module Ddr
-  class AdminSet < ActiveResource::Base
-
-    self.site = ENV["DDR_AUX_API_URL"]
+  class AdminSet < AuxiliaryResource
 
     def self.call(obj)
       find_by_code(obj.admin_set)
@@ -13,11 +9,11 @@ module Ddr
 
     def self.find_by_code(code)
       return unless code
-      new get(:find, code: code)
+      fetch(code) { new get(:find, code: code) }
     end
 
     def self.keys
-      all.map(&:code)
+      fetch("codes") { all.map(&:code) }
     end
 
     def to_s

data/app/models/ddr/alert.rb

@@ -0,0 +1,16 @@
+module Ddr
+  class Alert < AuxiliaryResource
+
+    ADMIN_SITE = 'admin'
+    PUBLIC_SITE = 'public'
+
+    # @param [String] the application ('admin' or 'public') for which to return active alerts
+    # @return [Array] the active alerts for the requested application site
+    def self.call(site)
+      get(:active, site: site).map { |resp| new(resp) }
+    rescue ActiveResource::ServerError => e
+      []
+    end
+
+  end
+end

data/app/models/ddr/auxiliary_resource.rb

@@ -0,0 +1,24 @@
+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
+
+    class_attribute :cache_expiry, instance_accessor: false
+    self.cache_expiry = 1.hour
+    
+    def self.fetch(value_key, &block)
+      Rails.cache.fetch(cache_key(value_key), expires_in: cache_expiry, &block)
+    end
+    
+    def self.cache_key(suffix)
+      [ model_name.cache_key, suffix ].join('/')
+    end
+
+  end
+end

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

@@ -0,0 +1,13 @@
+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~

@@ -0,0 +1,20 @@
+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/app/models/ddr/collection.rb

@@ -16,12 +16,13 @@ module Ddr
       query.docs
     end
 
-    def targets
-      Ddr.query_service.find_inverse_references_by(resource: self, property: 'for_collection_id')
+    # Collection resources are publishable unless they have been marked nonpublishable
+    def publishable?
+      !nonpublishable?
     end
 
-    def publishable?
-      true
+    def targets
+      Ddr.query_service.find_inverse_references_by(resource: self, property: 'for_collection_id')
     end
 
   end

data/app/models/ddr/component.rb

@@ -29,5 +29,13 @@ module Ddr
       Ddr.query_service.find_by(id: target_id) if target_id
     end
 
+    def inherited_roles
+      if has_parent?
+        super | parent.policy_roles
+      else
+        super
+      end
+    end
+
   end
 end

data/app/models/ddr/contact.rb

@@ -1,9 +1,5 @@
-require 'activeresource'
-
 module Ddr
-  class Contact < ActiveResource::Base
-
-    self.site = ENV["DDR_AUX_API_URL"]
+  class Contact < AuxiliaryResource
 
     def self.call(slug)
       new get(:find, slug: slug)

data/app/models/ddr/finding_aid.rb

@@ -0,0 +1,61 @@
+# 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
+
+    def url
+      doc.css("eadid").attr("url").text
+    end
+
+    # The finding aid title
+    def title
+      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))
+    end
+
+    def ead_xml_url
+      Ddr.ead_xml_base_url + ead_id + ".xml"
+    end
+  end
+end

data/app/models/ddr/item.rb

@@ -12,25 +12,11 @@ module Ddr
 
     self.parent_class = Ddr::Collection
 
-    ### DDRevo #####################
-    # TODO: We may want to revisit this alternate implementation once ddr-core is more fully baked
-    # or it may be fine just as it is
-    ### DDRevo #####################
     def children_having_extracted_text
-      # Ddr::Index::Query.build(self) do |item|
-      #   is_part_of item
-      #   where attached_files_having_content: "extractedText"
-      #   fields :id, :extracted_text
-      # end
       children.select { |child| child.attached_files_having_content.include?(:extracted_text) }
     end
 
-    ### DDRevo #####################
-    # TODO: We may want to revisit this alternate implementation once ddr-core is more fully baked
-    # or it may be fine just as it is
-    ### DDRevo #####################
     def all_text
-      # children_having_extracted_text.docs.map(&:extracted_text).flatten
       children_having_extracted_text.map { |child| child.extracted_text.content }.to_a.flatten
     end
 

data/app/models/ddr/language.rb

@@ -1,9 +1,5 @@
-require "active_resource"
-
 module Ddr
-  class Language < ActiveResource::Base
-
-    self.site = ENV["DDR_AUX_API_URL"]
+  class Language < AuxiliaryResource
 
     def self.call(obj)
       obj.language.map do |lang|
@@ -28,4 +24,3 @@ module Ddr
 
   end
 end
-

data/app/models/ddr/resource.rb

@@ -1,6 +1,8 @@
 module Ddr
   class Resource < Valkyrie::Resource
 
+    enable_optimistic_locking
+
     include Describable
     include Governable
     include HasAdminMetadata
@@ -47,6 +49,10 @@ module Ddr
       can_have_streamable_media?
     end
 
+    def self.canonical_model_name(model_name)
+      model_name.starts_with?('Ddr::') ? model_name : "Ddr::#{model_name}"
+    end
+
     def self.common_model_name
       name.split('::').last
     end
@@ -65,6 +71,10 @@ module Ddr
     alias_method :new_record?, :new_record
     alias_method :resource_model, :internal_resource
 
+    def rights_statement
+      RightsStatement.call(self)
+    end
+
     def title_display
       return title.first if title.present?
       return identifier.first if identifier.present?
@@ -80,6 +90,10 @@ module Ddr
       send(f)&.file_identifier.present?
     end
 
+    # By default, no resources are publishable.  To enable publication of a particular class of resource, (1) include
+    # the `HasAdminMetadata` concern in the model class, which defines a `nonpublishable?` method which returns true 
+    # if the workflow_state is "nonpublishable" and (2) override the `publishable?` method to provide the logic
+    # for determining if a particular resource is publishable.
     def publishable?
       false
     end

data/app/models/ddr/rights_statement.rb

@@ -1,9 +1,5 @@
-require "active_resource"
-
 module Ddr
-  class RightsStatement < ActiveResource::Base
-
-    self.site = ENV["DDR_AUX_API_URL"]
+  class RightsStatement < AuxiliaryResource
 
     def self.call(obj)
       if obj.rights.present?
@@ -22,4 +18,4 @@ module Ddr
     end
 
   end
-end
+end

data/config/locales/ddr-core.en.yml

@@ -16,7 +16,10 @@ en:
         aspace_id:
           label: "ArchivesSpace ID"
         common_model_name:
-          label: "Common Model Name"
+          label: Model
+          heading: model
+        contentdm_id:
+          label: "CONTENTdm ID"
         doi:
           label: DOI
         ead_id:

data/db/migrate/20200207194453_add_default_to_lock_version.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class AddDefaultToLockVersion < ActiveRecord::Migration[5.2]
+  def change
+    change_column_default :orm_resources, :lock_version, from: nil, to: 0
+  end
+end

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

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

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

@@ -2,6 +2,10 @@ module Ddr
   module Auth
     class PublicationAbilityDefinitions < AbilityDefinitions
 
+      # An object can't be published if it's already published or not publishable
+      # It can't be unpublished if it's already unpublished
+      # It can't be made nonpublishable if it's already published (must be unpublished 
+      # first) or already nonpublishable
       def call
         cannot :publish, Ddr::Resource do |obj|
           obj.published? || !obj.publishable?
@@ -9,6 +13,9 @@ module Ddr
         cannot :unpublish, Ddr::Resource do |obj|
           !obj.published?
         end
+        cannot :make_nonpublishable, Ddr::Resource do |obj|
+          obj.published? || !obj.publishable?
+        end
       end
 
     end

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

@@ -30,8 +30,8 @@ module Ddr
         end
       end
 
-      def cached_permissions(pid, &block)
-        cache[pid] ||= block.call
+      def cached_permissions(id, &block)
+        cache[id] ||= block.call
       end
 
     end

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

@@ -1,6 +1,9 @@
 module Ddr::Auth
   class SuperuserAbilityDefinitions < AbilityDefinitions
 
+    # This bypasses all checks, including ones that look at whether an
+    # action is possible, not just allowed. So superusers may initiate
+    # actions which will fail.
     def call
       can :manage, :all
     end