ddr-core 1.1.0 → 1.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2980acae3687c900a17820e18c76a457973e9fc0a73faea81a09942c22a3237b
-  data.tar.gz: 4f0375fe9b08f0854b67259cf727403649cdbcc1027693f0a5d4feaef3ecf381
+  metadata.gz: 3ebab371e1259e1586c6965ab7178a509be2ee2213267ccfd15122ec1a970890
+  data.tar.gz: 9d108eb264f17016ef13103568fcf569887883f3b902d272deba1af26a8787db
 SHA512:
-  metadata.gz: 1ed2da3e1e0ba370aaa6102eb714a7f6713182a47a06ed9e595d1a8f9e9e9a6783e906930594eb4d1b776261368699187bce444981ea75478827f6ca90954cd5
-  data.tar.gz: 406314ef9112235a737c0e1c56479b28bdbe4c1660757eb4b5784750cfb2ed7feab91b3655607e23fb0f8b3eb02dd6aba3481dbd171287ecb22e8085238b3732
+  metadata.gz: c59868928e54535e9ed804ef93c60a867c9ec00bdb2f69e5a63874cf5b59e37dcc5796fcbc2c8e59d06b1e29957086aa2360b92cb351b8b02badce21b1ddefdc
+  data.tar.gz: bd67b175ee5cff3e11f8eb7867b95124ab6dff4f954d17cf528ab3708e2aacb23c3f4fda5ee57563af258849b1ad215ea9e1041dfdc10a1183c77b0e3c58683b

data/README.md

@@ -6,7 +6,7 @@ A port of ddr-models based on Valkyrie.
 
 Install docker (Docker for Mac includes all the required components).
 
-Change to the `.docker`  directory.
+Change to the `.docker` directory.
 
 Start the *development* stack:
 

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

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

@@ -15,6 +15,8 @@ module Ddr
       term_names
     end
 
+    # Dublin Core vocabulary comes from the rdf-vocab gem (https://github.com/ruby-rdf/rdf-vocab)
+    # DDR vocabulary is defined locally
     def self.vocabularies
       [RDF::Vocab::DC, Ddr::Vocab::DukeTerms].freeze
     end
@@ -34,7 +36,11 @@ module Ddr
 
     included do
       Ddr::Describable.term_names.each do |term_name|
-        attribute term_name, Valkyrie::Types::Set
+        if term_name == :available # Intercept dcterms:available and set it to a single date so it can be used for embargoes
+          attribute term_name, Valkyrie::Types::DateTime.optional
+        else
+          attribute term_name, Valkyrie::Types::Set
+        end
       end
     end
 
@@ -53,7 +59,7 @@ module Ddr
       arg = args.pop
       terms = case arg.to_sym
               when :empty
-                desc_metadata_terms.select { |t| values(t).empty? }
+                desc_metadata_terms.select { |t| values(t).nil? || values(t).empty? }
               when :present
                 desc_metadata_terms.select { |t| values(t).present? }
               when :defined_attributes
@@ -94,15 +100,5 @@ module Ddr
       desc_metadata_terms.each { |t| set_desc_metadata_values(t, term_values_hash[t]) }
     end
 
-    ################
-    # I do not believe this method is needed any longer since I can't find any usage of it in ddr-models, ddr-batch,
-    # dul-hydra, ddr-public, or ddr-portals
-    ################
-    # module ClassMethods
-    #   def find_by_identifier(identifier)
-    #     find(Ddr::Index::Fields::IDENTIFIER_ALL => identifier)
-    #   end
-    # end
-
   end
 end

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

@@ -7,6 +7,7 @@ module Ddr
               affiliation:            Valkyrie::Types::Set,
               aleph_id:               Valkyrie::Types::Strict::String.optional,
               aspace_id:              Valkyrie::Types::Strict::String.optional,
+              contentdm_id:           Valkyrie::Types::Strict::String.optional,
               depositor:              Valkyrie::Types::Strict::String.optional,
               display_format:         Valkyrie::Types::Strict::String.optional,
               doi:                    Valkyrie::Types::Strict::String.optional,
@@ -54,6 +55,11 @@ module Ddr
       workflow_state == Ddr::Workflow::UNPUBLISHED
     end
 
+    # Usually won't be called directly. See `publishable?` on Resource and its derivatives
+    def nonpublishable?
+      workflow_state == Ddr::Workflow::NONPUBLISHABLE
+    end
+
     def resource_roles
       roles.select(&:in_resource_scope?)
     end

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

@@ -7,12 +7,24 @@ module Ddr
       attribute :parent_id, Valkyrie::Types::ID.optional
     end
 
+    def has_parent?
+      parent_id.present?
+    end
+
     def parent
-      Ddr.query_service.find_by(id: parent_id) if parent_id
+      Ddr.query_service.find_by(id: parent_id) if has_parent?
     end
 
+    # Resources with parents (currently, Items and Components) are publishable only if they have not been marked
+    # nonpublishable and their parent is published
     def publishable?
-      parent&.published? || false
+      !nonpublishable? && parental_publication_guard
+    end
+
+    private
+
+    def parental_publication_guard
+      parent.present? && parent.published?
     end
 
   end

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

@@ -0,0 +1,9 @@
+module Ddr
+  module SearchBuilderBehavior
+
+    def effective_role_filter
+
+    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

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/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/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/resource.rb

@@ -1,6 +1,8 @@
 module Ddr
   class Resource < Valkyrie::Resource
 
+    enable_optimistic_locking
+
     include Describable
     include Governable
     include HasAdminMetadata
@@ -88,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/config/locales/ddr-core.en.yml

@@ -18,6 +18,8 @@ en:
         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,12 +2,19 @@ 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?
         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?
         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

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

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

data/lib/ddr/auth/effective_roles.rb

@@ -2,7 +2,7 @@ module Ddr::Auth
   class EffectiveRoles
 
     def self.call(obj, agents = nil)
-      ( obj.resource_roles | obj.inherited_roles ).tap do |roles|
+      ( obj.roles | obj.inherited_roles ).tap do |roles|
         if agents
           roles.select! { |r| agents.include?(r.agent) }
         end

data/lib/ddr/auth/permissions.rb

@@ -1,18 +1,21 @@
 module Ddr::Auth
   class Permissions
 
-    READ         = :read
-    DOWNLOAD     = :download
-    ADD_CHILDREN = :add_children
-    UPDATE       = :update
-    REPLACE      = :replace
-    ARRANGE      = :arrange
-    PUBLISH      = :publish
-    UNPUBLISH    = :unpublish
-    AUDIT        = :audit
-    GRANT        = :grant
+    DISCOVER            = :discover
+    READ                = :read
+    DOWNLOAD            = :download
+    ADD_CHILDREN        = :add_children
+    UPDATE              = :update
+    REPLACE             = :replace
+    ARRANGE             = :arrange
+    PUBLISH             = :publish
+    UNPUBLISH           = :unpublish
+    MAKE_NONPUBLISHABLE = :make_nonpublishable
+    AUDIT               = :audit
+    GRANT               = :grant
 
-    ALL = [ READ, DOWNLOAD, ADD_CHILDREN, UPDATE, REPLACE, ARRANGE, PUBLISH, UNPUBLISH, AUDIT, GRANT ]
+    ALL = [ DISCOVER, READ, DOWNLOAD, ADD_CHILDREN, UPDATE,
+            REPLACE, ARRANGE, PUBLISH, UNPUBLISH, MAKE_NONPUBLISHABLE, AUDIT, GRANT ]
 
   end
 end

data/lib/ddr/auth/role_based_access_controls_enforcement.rb

@@ -12,7 +12,7 @@ module Ddr
       end
 
       def enforce_show_permissions
-        authorize! :read, params[:id]
+        authorize! Permissions::DISCOVER, params[:id]
       end
 
     end

data/lib/ddr/auth/roles.rb

@@ -10,18 +10,30 @@ module Ddr::Auth
 
     RESOURCE_SCOPE = "resource".freeze
     POLICY_SCOPE = "policy".freeze
-    SCOPES = [RESOURCE_SCOPE, POLICY_SCOPE].freeze
+    SCOPES = [ RESOURCE_SCOPE, POLICY_SCOPE ].freeze
+
+    ORDERED_ROLE_TYPES = [
+      CURATOR,
+      EDITOR,
+      METADATA_EDITOR,
+      CONTRIBUTOR,
+      DOWNLOADER,
+      VIEWER,
+      METADATA_VIEWER
+    ]
 
     class << self
-
       def type_map
         @type_map ||= role_types.map { |role_type| [role_type.to_s, role_type] }.to_h
       end
 
       def role_types
-        @role_types ||= RoleTypes.constants(false).map { |const| RoleTypes.const_get(const) }
+        ORDERED_ROLE_TYPES
       end
 
+      def titles
+        @titles ||= role_types.map(&:title)
+      end
     end
 
   end

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

@@ -8,35 +8,38 @@ module Ddr
 
         DEFAULT_SCOPE = Roles::RESOURCE_SCOPE
 
-        ValidScope = Valkyrie::Types::Strict::String.enum(*(Roles::SCOPES))
-        ValidRoleType = Valkyrie::Types::Strict::String.enum(*(Roles::role_types.map(&:title)))
+        ValidScope = Valkyrie::Types::Coercible::String.default(DEFAULT_SCOPE).enum(*(Roles::SCOPES))
+        ValidRoleType = Valkyrie::Types::Strict::String.enum(*(Roles.titles))
+        ValidAgent = Valkyrie::Types::Coercible::String.constrained(min_size: 1)
 
-        attribute :agent, Valkyrie::Types::Strict::String.constrained(min_size: 1)
-        attribute :role_type, ValidRoleType
-        attribute :scope, ValidScope
-
-        class << self
-
-          # Build a Role instance from hash attributes
-          # @param args [Hash] the attributes
-          # @return [Role] the role
-          # @example
-          #   Role.build type: "Curator", agent: "bob", scope: "resource"
-          def build(args={})
-            new.tap do |role|
-              args[:role_type] ||= args.delete(:type)
-              args[:agent] ||= nil # Triggers a constraint error
-              args[:agent] = args[:agent].to_s # Coerce Ddr::Auth:Group to string
-
-              args.each do |attr, val|
-                role.set_value(attr, val)
-              end
+        # Symbolize input keys
+        # https://dry-rb.org/gems/dry-struct/1.0/recipes/#symbolize-input-keys
+        transform_keys do |key|
+          _k = key.to_sym
+          # For backwards compat allow :type as an alias for :role_type
+          _k == :type ? :role_type : _k
+        end
 
-              role.scope ||= DEFAULT_SCOPE
+        # Make nils use default values
+        # https://dry-rb.org/gems/dry-struct/1.0/recipes/#resolving-default-values-on-code-nil-code
+        transform_types do |type|
+          if type.default?
+            type.constructor do |value|
+              value.nil? ? Dry::Types::Undefined : value
             end
+          else
+            type
           end
+        end
 
-        end # class << self
+        attribute :agent, ValidAgent
+        attribute :role_type, ValidRoleType
+        attribute :scope, ValidScope
+
+        # DEPRECATED: Use constructor
+        def self.build(args={})
+          new(args)
+        end
 
         # Roles are considered equal (==) if they
         # are of the same type and have the same agent and scope.

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

@@ -14,36 +14,43 @@ module Ddr
           "Editor",
           "The Editor role conveys reponsibility for managing the content, " \
           "description and structural arrangement of a resource.",
-          [ Permissions::READ, Permissions::DOWNLOAD, Permissions::ADD_CHILDREN,
-            Permissions::UPDATE, Permissions::REPLACE, Permissions::ARRANGE ]
+          [ Permissions::DISCOVER, Permissions::READ, Permissions::DOWNLOAD,
+            Permissions::ADD_CHILDREN, Permissions::UPDATE,
+            Permissions::REPLACE, Permissions::ARRANGE ]
         )
 
         METADATA_EDITOR = RoleType.new(
           "MetadataEditor",
           "The Metadata Editor role conveys responsibility for " \
           "managing the description of a resource.",
-          [ Permissions::READ, Permissions::DOWNLOAD, Permissions::UPDATE ]
+          [ Permissions::DISCOVER, Permissions::READ, Permissions::DOWNLOAD, Permissions::UPDATE ]
         )
 
         CONTRIBUTOR = RoleType.new(
           "Contributor",
           "The Contributor role conveys responsibility for adding related " \
           "resources to a resource, such as works to a collection.",
-          [ Permissions::READ, Permissions::ADD_CHILDREN ]
+          [ Permissions::DISCOVER, Permissions::READ, Permissions::ADD_CHILDREN ]
         )
 
         DOWNLOADER = RoleType.new(
           "Downloader",
           "The Downloader role conveys access to the \"master\" file " \
           "(original content bitstream) of a resource.",
-          [ Permissions::READ, Permissions::DOWNLOAD ]
+          [ Permissions::DISCOVER, Permissions::READ, Permissions::DOWNLOAD ]
         )
 
         VIEWER = RoleType.new(
           "Viewer",
           "The Viewer role conveys access to the description and \"access\" " \
           "files (e.g., derivative bitstreams) of a resource.",
-          [ Permissions::READ ]
+          [ Permissions::DISCOVER, Permissions::READ ]
+        )
+
+        METADATA_VIEWER = RoleType.new(
+          "MetadataViewer",
+          "The MetadataViewer role coveys access to the description of a resource.",
+          [ Permissions::DISCOVER ]
         )
 
       end

data/lib/ddr/auth/web_auth_context.rb

@@ -11,12 +11,16 @@ module Ddr::Auth
 
     # @return [Array<String>]
     def affiliation
-      split_env("affiliation").map { |a| a.sub(/@duke\.edu\z/, "") }
+      if anonymous?
+        super
+      else
+        split_env("affiliation").map { |a| a.sub(/@duke\.edu\z/, "") }
+      end
     end
 
     # @return [Array<String>]
     def ismemberof
-      split_env("isMemberOf")
+      anonymous? ? super : split_env("isMemberOf")
     end
 
     private

data/lib/ddr/core.rb

@@ -108,10 +108,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.1.0'
+    VERSION = '1.2.0.rc3'
   end
 end

data/lib/ddr/index/csv_query_result.rb

@@ -6,8 +6,35 @@ module Ddr::Index
     MAX_ROWS         = 10**8 # Just set to a really high number :)
     CSV_MV_SEPARATOR = ";"
 
+    DEFAULT_CSV_OPTIONS = {
+      headers:        :first_row,
+      return_headers: false,
+      write_headers:  true,
+      converters:     [
+        # convert semicolons
+        lambda { |f| f.gsub(/\\#{CSV_MV_SEPARATOR}/, CSV_MV_SEPARATOR) rescue f },
+        # convert escaped newlines
+        lambda { |f| f.gsub(/\\r/, "\r").gsub(/\\n/, "\n") rescue f }
+      ],
+    }.freeze
+
     delegate :headers, :to_s, :to_csv, to: :table
 
+    attr_reader :csv_opts
+
+    #
+    # See Ruby docs on CSV::new for details on available keys
+    # and values for the optional `csv_options' Hash parameter.
+    #
+    # N.B. If you want to *add* a converter and retain the
+    # default converters, append DEFAULT_CSV_OPTIONS[:converters]
+    # to your Array of converters.
+    #
+    def initialize(query, csv_opts: {})
+      super(query)
+      @csv_opts = DEFAULT_CSV_OPTIONS.merge(csv_opts)
+    end
+
     def delete_empty_columns!
       table.by_col!.delete_if { |c, vals| vals.all?(&:nil?) }
     end
@@ -24,14 +51,6 @@ module Ddr::Index
       @table ||= CSV.parse(data, csv_opts)
     end
 
-    def csv_opts
-      { headers:        csv_headers,
-        converters:     [convert_semicolons, convert_escaped_newlines],
-        return_headers: false,
-        write_headers:  true,
-      }
-    end
-
     def solr_csv_opts
       { "csv.mv.separator" => CSV_MV_SEPARATOR,
         "csv.header"       => solr_csv_header?,
@@ -44,10 +63,6 @@ module Ddr::Index
       query.fields.map { |f| f.respond_to?(:heading) ? f.heading : f.to_s }
     end
 
-    def csv_headers
-      :first_row
-    end
-
     def solr_csv_header?
       query.fields.empty?
     end
@@ -72,13 +87,5 @@ module Ddr::Index
       Connection.get("select", params: solr_csv_params)
     end
 
-    def convert_semicolons
-      lambda { |f| f.gsub(/\\#{CSV_MV_SEPARATOR}/, CSV_MV_SEPARATOR) rescue f }
-    end
-
-    def convert_escaped_newlines
-      lambda { |f| f.gsub(/\\r/, "\r").gsub(/\\n/, "\n") rescue f }
-    end
-
   end
 end

data/lib/ddr/index/fields.rb

@@ -29,12 +29,16 @@ module Ddr::Index
     CONTENT_CREATE_DATE           = Field.new :content_create_date, :stored_sortable, type: :date
     CONTENT_SIZE                  = Field.new :content_size, solr_name: "content_size_lsi"
     CONTENT_SIZE_HUMAN            = Field.new :content_size_human, :symbol
+    CONTENTDM_ID                  = Field.new :contentdm_id, :stored_sortable
     CONTRIBUTOR_FACET             = Field.new :contributor_facet, :facetable
     CREATOR_FACET                 = Field.new :creator_facet, :facetable
     DATE_FACET                    = Field.new :date_facet, :facetable
     DATE_SORT                     = Field.new :date_sort, :sortable
     DC_IS_PART_OF                 = Field.new :isPartOf, :symbol
     DEPOSITOR                     = Field.new :depositor, :stored_sortable
+    # DDR-1997 - description should always be indexed as _tesim regardless of length - Valkyrie indexes fields > 1000
+    # characters in length as _tsim only
+    DESCRIPTION                   = Field.new :description, :stored_searchable # stored_searchable produces _tesim
     DISPLAY_FORMAT                = Field.new :display_format, :stored_sortable
     DOI                           = Field.new :doi, :symbol
     EAD_ID                        = Field.new :ead_id, :stored_sortable

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

data/lib/ddr/vocab/asset.rb

@@ -47,5 +47,9 @@ module Ddr::Vocab
              label: "Nested Path",
              comment: "The nested/tree path to the object to be reflected in structural metadata."
 
+    property "contentdmId",
+             label: "CONTENTdm ID"
+             comment: "The CONTENTdm reference corresponding to the object."
+
   end
 end

data/lib/ddr/workflow.rb

@@ -3,6 +3,7 @@ module Ddr
 
     PUBLISHED = 'published'
     UNPUBLISHED = 'unpublished'
+    NONPUBLISHABLE = 'nonpublishable'
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.rc3
 platform: ruby
 authors:
 - Jim Coble
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -89,14 +89,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: grouper-rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -306,6 +306,7 @@ 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/governable.rb
@@ -319,12 +320,17 @@ 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
@@ -342,8 +348,10 @@ files:
 - config/routes.rb
 - db/migrate/20141104181418_create_users.rb
 - db/migrate/20141107124012_add_columns_to_user.rb
+- 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
@@ -364,6 +372,7 @@ 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
@@ -449,11 +458,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository