ddr-models 2.11.0 → 3.0.0.alpha.1

data/lib/ddr/auth/grouper_gateway.rb

@@ -4,20 +4,10 @@ require "delegate"
 module Ddr
   module Auth
     class GrouperGateway < SimpleDelegator
-      extend Deprecation
 
       SUBJECT_ID_RE = Regexp.new('[^@]+(?=@duke\.edu)')
       DEFAULT_TIMEOUT = 5
 
-      def self.const_missing(name)
-        if name == :REPOSITORY_GROUP_FILTER
-          Deprecation.warn(self, "The constant `#{name}` is deprecated and will be removed in ddr-models 3.0." \
-                                 " Use `Ddr::Auth.repository_group_filter` instead.")
-          return Ddr::Auth.repository_group_filter
-        end
-        super
-      end
-
       def self.repository_groups(*args)
         new.repository_groups(*args)
       end
@@ -46,13 +36,6 @@ module Ddr
         end
       end
 
-      # @deprecated Use {#repository_groups} instead.
-      def repository_group_names
-        Deprecation.warn(self.class, "`Ddr::Auth::GrouperGateway#repository_group_names` is deprecated." \
-                                     " Use `#repository_groups` instead.")
-        repository_groups
-      end
-
       def user_groups(user, raw = false)
         groups = []
         subject_id = user.principal_name.scan(SUBJECT_ID_RE).first
@@ -82,13 +65,6 @@ module Ddr
         end
       end
 
-      # @deprecated Use {#user_groups} instead.
-      def user_group_names(user)
-        Deprecation.warn(self.class, "`Ddr::Auth::GrouperGateway#user_group_names` is deprecated." \
-                                     " Use `#user_groups` instead.")
-        user_groups(user)
-      end
-
     end
   end
 end

data/lib/ddr/auth/permissions.rb

@@ -1,6 +1,5 @@
 module Ddr::Auth
   class Permissions
-    extend Deprecation
 
     READ         = :read
     DOWNLOAD     = :download
@@ -8,20 +7,10 @@ module Ddr::Auth
     UPDATE       = :update
     REPLACE      = :replace
     ARRANGE      = :arrange
-    PUBLISH      = :publish
-    UNPUBLISH    = :unpublish
     AUDIT        = :audit
     GRANT        = :grant
 
-    ALL = [ READ, DOWNLOAD, ADD_CHILDREN, UPDATE, REPLACE, ARRANGE, PUBLISH, UNPUBLISH, AUDIT, GRANT ]
-
-    def self.const_missing(name)
-      if name == :EDIT
-        Deprecation.warn(self, "`EDIT` is deprecated. Use `UPDATE` instead.")
-        return UPDATE
-      end
-      super
-    end
+    ALL = [ READ, DOWNLOAD, ADD_CHILDREN, UPDATE, REPLACE, ARRANGE, AUDIT, GRANT ]
 
   end
 end

data/lib/ddr/auth/role_based_access_controls_enforcement.rb

@@ -17,22 +17,22 @@ module Ddr
         @current_ability ||= AbilityFactory.call(current_user, request.env)
       end
 
-      # List of URIs for policies on which any of the current user's agent has a role in policy scope
+      # List of IDs for policies on which any of the current user's agent has a role in policy scope
       def policy_role_policies
         @policy_role_policies ||= Array.new.tap do |uris|
           filters = current_ability.agents.map do |agent|
             "#{Ddr::Index::Fields::POLICY_ROLE}:\"#{agent}\""
           end.join(" OR ")
           query = "#{Ddr::Index::Fields::ACTIVE_FEDORA_MODEL}:Collection AND (#{filters})"
-          results = ActiveFedora::SolrService.query(query, rows: Collection.count, fl: Ddr::Index::Fields::INTERNAL_URI)
-          results.each_with_object(uris) { |r, memo| memo << r[Ddr::Index::Fields::INTERNAL_URI] }
+          results = ActiveFedora::SolrService.query(query, rows: Collection.count, fl: Ddr::Index::Fields::ID)
+          results.each_with_object(uris) { |r, memo| memo << r[Ddr::Index::Fields::ID] }
         end
       end
 
       def policy_role_filters
         if policy_role_policies.present?
-          rels = policy_role_policies.map { |pid| [:is_governed_by, pid] }
-          ActiveFedora::SolrService.construct_query_for_rel(rels, "OR")
+          rels = policy_role_policies.map { |pid| [:isGovernedBy, pid] }
+          ActiveFedora::SolrService.construct_query_for_rel(rels, " OR ")
         end
       end
 

data/lib/ddr/auth/roles.rb

@@ -1,13 +1,13 @@
 module Ddr::Auth
   module Roles
     extend ActiveSupport::Autoload
-    extend Deprecation
 
     autoload :DetachedRoleSet
     autoload :PropertyRoleSet
     autoload :Role
     autoload :RoleSet
     autoload :RoleSetQuery
+    autoload :RolesDatastream
     autoload :RoleType
     autoload :RoleTypes
 
@@ -19,16 +19,6 @@ module Ddr::Auth
 
     class << self
 
-      def const_missing(name)
-        if name == :ArrayRoleSet
-          Deprecation.warn(Ddr::Auth::Roles, "`Ddr::Auth::Roles::ArrayRoleSet` is deprecated." \
-                                             " Use `Ddr::Auth::Roles::DetachedRoleSet` instead.")
-          DetachedRoleSet
-        else
-          super
-        end
-      end
-      
       def type_map
         @type_map ||= role_types.map { |role_type| [role_type.to_s, role_type] }.to_h
       end

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

@@ -1,6 +1,5 @@
 module Ddr::Auth
   module Roles
-    extend Deprecation
     #
     # Wraps a set of Roles
     #
@@ -21,12 +20,6 @@ module Ddr::Auth
         @role_set = role_set
       end
 
-      def granted
-        Deprecation.warn(self.class, "`granted` is deprecated." \
-                                     " Use the RoleSet object directly.")
-        self
-      end
-
       # Grants roles - i.e., adds them to the role set
       # @example - default scope ("resource")
       #   grant type: "Curator", agent: "bob"

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

@@ -0,0 +1,9 @@
+module Ddr::Auth::Roles
+  class RolesDatastream < ActiveFedora::NtriplesRDFDatastream
+
+    property :roles,
+             predicate: Ddr::Vocab::Roles.hasRole,
+             class_name: Ddr::Auth::Roles::Role
+
+  end
+end

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

@@ -4,22 +4,16 @@ module Ddr
   module Datastreams
     extend ActiveSupport::Autoload
 
-    ADMIN_METADATA    = "adminMetadata"
-    CAPTION           = "caption"
-    CONTENT           = "content"
-    DC                = "DC"
-    DESC_METADATA     = "descMetadata"
-    EXTRACTED_TEXT    = "extractedText"
-    FITS              = "fits".freeze
-    INTERMEDIATE_FILE = "intermediateFile".freeze
-    MULTIRES_IMAGE    = "multiresImage"
-    RELS_EXT          = "RELS-EXT"
-    STREAMABLE_MEDIA  = "streamableMedia"
-    STRUCT_METADATA   = "structMetadata"
-    THUMBNAIL         = "thumbnail"
-
-    SAVE = "save.repo_file"
-    DELETE = "delete.repo_file"
+    CONTENT = "content"
+    DC = "DC"
+    DEFAULT_RIGHTS = "defaultRights"
+    DESC_METADATA = "descMetadata"
+    EXTRACTED_TEXT = "extractedText"
+    FITS = "fits".freeze
+    RELS_EXT = "RELS-EXT"
+    RIGHTS_METADATA = "rightsMetadata"
+    STRUCT_METADATA = "structMetadata"
+    THUMBNAIL = "thumbnail"
 
     CHECKSUM_TYPE_MD5 = "MD5"
     CHECKSUM_TYPE_SHA1 = "SHA-1"
@@ -29,24 +23,12 @@ module Ddr
 
     CHECKSUM_TYPES = [ CHECKSUM_TYPE_MD5, CHECKSUM_TYPE_SHA1, CHECKSUM_TYPE_SHA256, CHECKSUM_TYPE_SHA384, CHECKSUM_TYPE_SHA512 ]
 
-    autoload :AdministrativeMetadataDatastream
-    autoload :CaptionDatastream
-    autoload :ContentDatastream
     autoload :DatastreamBehavior
-    autoload :DeleteExternalFiles
     autoload :DescriptiveMetadataDatastream
-    autoload :ExternalFileDatastream
     autoload :FitsDatastream
-    autoload :IntermediateFileDatastream
     autoload :MetadataDatastream
-    autoload :MultiresImageDatastream
     autoload :PlainTextDatastream
-    autoload :StreamableMediaDatastream
     autoload :StructuralMetadataDatastream
 
-    mattr_accessor :update_derivatives_on_changed do
-      [ CONTENT, INTERMEDIATE_FILE ]
-    end
-
   end
 end

data/lib/ddr/datastreams/datastream_behavior.rb

@@ -1,92 +1,54 @@
 module Ddr
   module Datastreams
     module DatastreamBehavior
-      extend ActiveSupport::Concern
 
       DEFAULT_FILE_EXTENSION = "bin"
-
       STRFTIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%LZ"
 
-      included do
-        around_save :notify_save
-        around_destroy :notify_delete
-      end
-
-      def validate_checksum! checksum, checksum_type=nil
-        raise Ddr::Models::Error, "Checksum cannot be validated on new datastream." if new?
-        raise Ddr::Models::Error, "Checksum cannot be validated on unpersisted content." if content_changed?
-        raise Ddr::Models::ChecksumInvalid, "The repository internal checksum validation failed." unless dsChecksumValid
-        algorithm = checksum_type || self.checksumType
-        ds_checksum = if !external? && algorithm == self.checksumType
-                        self.checksum
-                      else
-                        content_digest(algorithm)
-                      end
-        if checksum == ds_checksum
-          "The checksum [#{algorithm}]#{checksum} is valid for datastream #{version_info}."
-        else
-          raise Ddr::Models::ChecksumInvalid, "The checksum [#{algorithm}]#{checksum} is not valid for datastream #{version_info}."
+      def dsid
+        warn "[DEPRECATION] `dsid` is no longer a datastream/file method." \
+             " Use `File.basename(id)`."
+        if id
+          ::File.basename(id)
         end
       end
 
-      def version_history
-        versions.map(&:profile)
-      end
-
-      def version_uri
-        # E.g., info:fedora/duke:1/content/content.0
-        ["info:fedora", pid, dsid, dsVersionID].join("/") unless new?
-      end
-
-      def version_info
-        # E.g., info:fedora/duke:1/content/content.0 [2013-09-26T20:00:03.357Z]
-        "#{version_uri} [#{Ddr::Utils.ds_as_of_date_time(self)}]" unless new?
+      def dsCreateDate
+        warn "[DEPRECATION] `dsCreateDate` is no longer a datastream/file method." \
+             " Use `create_date` instead."
+        create_date
       end
 
-      def create_date_string
-        dsCreateDate.strftime(STRFTIME_FORMAT) if dsCreateDate
-      end
-
-      def content_digest algorithm
-        Ddr::Utils.digest(self.content, algorithm)
-      end
-
-      def file_paths
-        if new?
-          return Array(file_path)
+      def validate_checksum!(checksum_value, checksum_type=nil)
+        raise Ddr::Models::Error, "Checksum cannot be validated on new datastream." if new_record?
+        raise Ddr::Models::Error, "Checksum cannot be validated on unpersisted content." if content_changed?
+        raise Ddr::Models::ChecksumInvalid, "The repository internal checksum validation failed." unless check_fixity
+        algorithm = checksum_type || checksum.algorithm
+        calculated_checksum = if algorithm == checksum.algorithm
+                                checksum.value
+                              else
+                                content_digest(algorithm)
+                              end
+        if checksum_value == calculated_checksum
+          "The checksum #{algorithm}:#{checksum_value} is valid for datastream #{dsid}."
         else
-          versions.map(&:file_path).compact
+          raise Ddr::Models::ChecksumInvalid, "The checksum #{algorithm}:#{checksum_value} is not valid for datastream #{dsid}."
         end
       end
 
-      def file_path
-        if external? && dsLocation.present? && dsLocation.start_with?("file:")
-          Ddr::Utils.path_from_uri(dsLocation)
-        end
-      end
-
-      def file_name
-        if path = file_path
-          File.basename(path)
-        end
+      def create_date_string
+        dsCreateDate.strftime(STRFTIME_FORMAT) if dsCreateDate
       end
 
-      # Returns the size of the external file for the datastream.
-      def file_size
-        if external?
-          if path = file_path
-            File.size(path)
-          end
-        else
-          dsSize
-        end
+      def content_digest(algorithm)
+        Ddr::Utils.digest(content, algorithm)
       end
 
       # Return default file extension for datastream based on MIME type
       def default_file_extension
-        mimetypes = MIME::Types[mimeType]
+        mimetypes = MIME::Types[mime_type]
         return mimetypes.first.extensions.first unless mimetypes.empty?
-        case mimeType
+        case mime_type
         when 'application/n-triples'
           'txt'
         else
@@ -94,14 +56,13 @@ module Ddr
         end
       end
 
-      # Return default file name prefix based on object PID
       def default_file_prefix
-        [pid.sub(/:/, '_'), dsid].join("_")
+        (id && id.gsub(/\//, "_")) || "NEW"
       end
 
       # Return default file name
       def default_file_name
-        [default_file_prefix, default_file_extension].join(".")
+        [ default_file_prefix, default_file_extension ].join(".")
       end
 
       def tempfile(prefix: nil, suffix: nil)
@@ -117,37 +78,6 @@ module Ddr
         end
       end
 
-      private
-
-      def default_notification_payload
-        { pid: pid, file_id: dsid, control_group: controlGroup }
-      end
-
-      def delete_notification_payload
-        default_notification_payload.merge(
-          profile: profile.dup,
-          version_history: version_history
-        )
-      end
-
-      def notify_save
-        ActiveSupport::Notifications.instrument(
-          Ddr::Datastreams::SAVE,
-          default_notification_payload.merge(attributes_changed: changes)
-        ) do |payload|
-          yield
-          payload[:profile] = profile.dup
-        end
-      end
-
-      def notify_delete
-        ActiveSupport::Notifications.instrument(
-          Ddr::Datastreams::DELETE, delete_notification_payload
-        ) do |payload|
-          yield
-        end
-      end
-
     end
   end
 end

data/lib/ddr/datastreams/descriptive_metadata_datastream.rb

@@ -1,46 +1,43 @@
-require "rdf/vocab"
+module Ddr
+  module Datastreams
+    class DescriptiveMetadataDatastream < MetadataDatastream
 
-module Ddr::Datastreams
-  class DescriptiveMetadataDatastream < MetadataDatastream
+      class_attribute :vocabularies
+      self.vocabularies = [RDF::DC, Ddr::Vocab::DukeTerms].freeze
 
-    class_attribute :vocabularies
-    self.vocabularies = [RDF::Vocab::DC, Ddr::Vocab::DukeTerms].freeze
-
-    def self.default_attributes
-      super.merge(:mimeType => 'application/n-triples')
-    end
+      def self.default_attributes
+        super.merge(:mimeType => 'application/n-triples')
+      end
 
-    def self.indexers
-      # Add term_name => [indexers] mapping to customize indexing
-      {}
-    end
+      def self.indexers
+        # Add term_name => [indexers] mapping to customize indexing
+        {}
+      end
 
-    def self.default_indexers
-      [:stored_searchable]
-    end
+      def self.default_indexers
+        [:stored_searchable]
+      end
 
-    def self.indexers_for(term_name)
-      indexers.fetch(term_name, default_indexers)
-    end
+      def self.indexers_for(term_name)
+        indexers.fetch(term_name, default_indexers)
+      end
 
-    # Add terms from the vocabularies as properties
-    vocabularies.each do |vocab|
-      Ddr::Vocab::Vocabulary.property_terms(vocab).each do |term|
-        term_name = Ddr::Vocab::Vocabulary.term_name(vocab, term)
-        # Do not include :license as a descriptive metadata property
-        unless term_name == :license
+      # Add terms from the vocabularies as properties
+      vocabularies.each do |vocab|
+        Ddr::Vocab::Vocabulary.property_terms(vocab).each do |term|
+          term_name = Ddr::Vocab::Vocabulary.term_name(vocab, term)
           property term_name, predicate: term do |index|
             index.as *indexers_for(term_name)
           end
         end
       end
-    end
 
-    # Override ActiveFedora::Rdf::Indexing#apply_prefix(name) to not
-    # prepend the index field name with a string based on the datastream id.
-    def apply_prefix(name)
-      name
-    end
+      # Override ActiveFedora::Rdf::Indexing#apply_prefix(name) to not
+      # prepend the index field name with a string based on the datastream id.
+      def apply_prefix(name)
+        name
+      end
 
+    end
   end
 end