ddr-models 3.0.0.alpha.4 → 3.0.0.beta.1

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

@@ -0,0 +1,68 @@
+module Ddr::Auth
+  module Roles
+    class RoleSetManager
+
+      attr_reader :object
+      attr_accessor :role_set
+
+      def initialize(object)
+        @object = object
+        load
+      end
+
+      def grant(*roles)
+        granted = RoleSet.new(roles: roles)
+        role_set.merge(granted)
+        persist
+      end
+
+      def granted?(role)
+        if role.is_a?(Role)
+          role_set.include?(role)
+        else
+          !where(role).empty?
+        end
+      end
+
+      def revoke(*roles)
+        revoked = RoleSet.new(roles: roles)
+        role_set.roles -= revoked.roles
+        persist
+      end
+
+      def revoke_all
+        role_set.clear
+        persist
+      end
+
+      def replace(*roles)
+        self.role_set = RoleSet.new(roles: roles)
+        persist
+      end
+
+      protected
+
+      def respond_to_missing?(name, include_all=false)
+        role_set.respond_to?(name, include_all)
+      end
+
+      def method_missing(name, *args, &block)
+        if role_set.respond_to?(name)
+          return role_set.send(name, *args, &block)
+        end
+        super
+      end
+
+      private
+
+      def persist
+        object.access_roles = role_set.to_json
+      end
+
+      def load
+        self.role_set = RoleSet.from_json(object.access_roles)
+      end
+
+    end
+  end
+end

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

@@ -8,14 +8,13 @@ module Ddr::Auth
     class RoleSetQuery
       include Enumerable
 
-      attr_reader :role_set
+      attr_reader :criteria, :role_set
+
+      delegate :each, :agents, :permissions, :empty?, to: :result
 
       def initialize(role_set)
         @role_set = role_set
-      end
-
-      def criteria
-        @criteria ||= {}
+        @criteria = {}
       end
 
       def where(conditions={})
@@ -45,24 +44,13 @@ module Ddr::Auth
       end
       alias_method :type, :role_type
 
-      def each(&block)
-        role_set.select { |role| matches_all?(role) }.each(&block)
-      end
-
-      # Return the list of agents for the Roles matching the criteria.
-      # @return [Array] the agents
-      def agents
-        map { |role| role.agent.first }
-      end
-
-      # Return a list of the permissions granted to the Roles matching the criteria.
-      # @return [Array<Symbol>] the permissions
-      def permissions
-        map(&:permissions).flatten.uniq
+      def merge(other_query)
+        where(other_query.criteria)
       end
 
-      def detach
-        DetachedRoleSet.new(self)
+      def result
+        matching_roles = role_set.select { |role| matches_all?(role) }
+        RoleSet.new(roles: matching_roles)
       end
 
       private
@@ -77,7 +65,7 @@ module Ddr::Auth
       end
 
       def matches_one?(role, key, value)
-        Array(value).include?(role.send(key).first)
+        Array(value).include? role.send(key)
       end
 
     end

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

@@ -16,6 +16,7 @@ module Ddr
         def to_s
           title
         end
+        # alias_method :to_str, :to_s
 
       end
     end

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

@@ -0,0 +1,11 @@
+module Ddr::Auth
+  module Roles
+    class RoleValidator < Ddr::Models::Validator
+
+      validates :agent, presence: true
+      validates :role_type, inclusion: { in: Roles.type_map.keys }
+      validates :scope, inclusion: { in: Roles::SCOPES }
+
+    end
+  end
+end

data/lib/ddr/models.rb

@@ -34,7 +34,6 @@ module Ddr
     autoload :ChecksumInvalid, 'ddr/models/error'
     autoload :ContentModelError, 'ddr/models/error'
     autoload :DerivativeGenerationFailure, 'ddr/models/error'
-    autoload :Describable
     autoload :Error
     autoload :EventLoggable
     autoload :FileManagement
@@ -54,6 +53,8 @@ module Ddr
     autoload :StructDiv
     autoload :Structure
     autoload :UrlSafeId
+    autoload :Validatable
+    autoload :Validator
     autoload :YearFacet
 
     autoload_under "licenses" do

data/lib/ddr/models/base.rb

@@ -3,7 +3,6 @@ module Ddr::Models
     extend Deprecation
 
     include ObjectApi
-    include Describable
     include Governable
     include HasThumbnail
     include EventLoggable
@@ -17,20 +16,18 @@ module Ddr::Models
       notify_event :deletion
     end
 
-    def inspect
-      "#<#{model_and_id}, uri: \"#{uri}\">"
-    end
-
-    def attached_files_profile
-      AttachedFilesProfile.new(attached_files)
+    DescriptiveMetadata.mapping.each do |name, term|
+      property name, predicate: term.predicate do |index|
+        index.as :stored_searchable
+      end
     end
 
-    def copy_admin_policy_or_roles_from(other)
-      copy_admin_policy_from(other) || copy_resource_roles_from(other)
+    def self.find_by_identifier(identifier)
+      find(Ddr::Index::Fields::IDENTIFIER_ALL => identifier)
     end
 
-    def association_query(association)
-      raise NotImplementedError, "The previous implementation does not work with ActiveFedora 9."
+    def inspect
+      "#<#{model_and_id}, uri: \"#{uri}\">"
     end
 
     def model_and_id
@@ -42,12 +39,76 @@ module Ddr::Models
       model_and_id
     end
 
-    # @override ActiveFedora::Core
-    # See ActiveFedora overrides in engine initializers
-    def adapt_to_cmodel
-      super
-    rescue ::TypeError
-      raise ContentModelError, "Cannot adapt to nil content model."
+    def descMetadata
+      Deprecation.warn(Base, "`descMetadata` is deprecated; use `desc_metadata` instead.")
+      desc_metadata
+    end
+
+    def desc_metadata
+      @desc_metadata ||= DescriptiveMetadata.new(self)
+    end
+
+    def has_desc_metadata?
+      desc_metadata.has_content?
+    end
+
+    def desc_metadata_terms(*args)
+      return DescriptiveMetadata.unqualified_names.sort if args.empty?
+      arg = args.pop
+      terms = case arg.to_sym
+              when :empty
+                desc_metadata_terms.select { |t| desc_metadata_values(t).empty? }
+              when :present
+                desc_metadata_terms.select { |t| desc_metadata_values(t).present? }
+              when :defined_attributes
+                desc_metadata_terms & desc_metadata_attributes
+              when :required
+                desc_metadata_terms(:defined_attributes).select {|t| required? t}
+              when :dcterms
+                MetadataMapping.dc11.unqualified_names +
+                  (MetadataMapping.dcterms.unqualified_names - MetadataMapping.dc11.unqualified_names)
+              when :dcterms_elements11
+                Ddr::Vocab::Vocabulary.term_names(::RDF::DC11)
+              when :duke
+                Ddr::Vocab::Vocabulary.term_names(Ddr::Vocab::DukeTerms)
+              else
+                raise ArgumentError, "Invalid argument: #{arg.inspect}"
+              end
+      if args.empty?
+        terms
+      else
+        terms | desc_metadata_terms(*args)
+      end
+    end
+    deprecation_deprecate :desc_metadata_terms
+
+    def desc_metadata_attributes
+      MetadataMapping.dc11.unqualified_names
+    end
+    deprecation_deprecate :desc_metadata_attributes
+
+    def desc_metadata_values(term)
+      Deprecation.warn(Base, "`desc_metadata_values` is deprecated; use `desc_metadata.values` instead.")
+      desc_metadata.values(term)
+    end
+
+    def set_desc_metadata_values(term, values)
+      Deprecation.warn(Base, "`set_desc_metadata_values` is deprecated; use `desc_metadata.set_values` instead.")
+      desc_metadata.set_values(term, values)
+    end
+
+    # Update all descMetadata terms with values in hash
+    # Note that term not having key in hash will be set to nil!
+    def set_desc_metadata(term_values_hash)
+      desc_metadata_terms.each { |t| set_desc_metadata_values(t, term_values_hash[t]) }
+    end
+
+    def attached_files_profile
+      AttachedFilesProfile.new(attached_files)
+    end
+
+    def copy_admin_policy_or_roles_from(other)
+      copy_admin_policy_from(other) || copy_resource_roles_from(other)
     end
 
     def has_extracted_text?

data/lib/ddr/models/has_admin_metadata.rb

@@ -6,7 +6,9 @@ module Ddr::Models
     extend ActiveSupport::Concern
 
     included do
-      contains "accessRoles", class_name: "Ddr::Auth::Roles::RolesDatastream"
+      property :access_roles,
+               predicate: Ddr::Vocab::Roles.roleSet,
+               multiple: false
 
       property :admin_set,
                predicate: Ddr::Vocab::Asset.adminSet,
@@ -62,7 +64,7 @@ module Ddr::Models
     end
 
     def roles
-      Ddr::Auth::Roles::PropertyRoleSet.new(accessRoles.roles)
+      Ddr::Auth::Roles::RoleSetManager.new(self)
     end
 
     def inherited_roles
@@ -78,13 +80,13 @@ module Ddr::Models
     end
 
     def grant_roles_to_creator(creator)
-      roles.grant type: Ddr::Auth::Roles::EDITOR,
+      roles.grant role_type: Ddr::Auth::Roles::EDITOR,
                   agent: creator,
                   scope: Ddr::Auth::Roles::RESOURCE_SCOPE
     end
 
     def copy_resource_roles_from(other)
-      roles.grant *(other.roles.in_resource_scope)
+      roles.grant *(Ddr::Auth::ResourceRoles.call(other))
     end
 
     def effective_permissions(agents)

data/lib/ddr/models/has_content.rb

@@ -6,16 +6,6 @@ module Ddr
       extend ActiveSupport::Concern
       extend Deprecation
 
-      MASTER_FILE_TYPES = [ "image/tiff" ]
-
-      def master_file?
-        if respond_to?(:file_use) && file_use.present?
-          file_use == Ddr::Models::HasStructMetadata::FILE_USE_MASTER
-        else
-          MASTER_FILE_TYPES.include?(content_type)
-        end
-      end
-
       included do
         contains Ddr::Datastreams::CONTENT
         contains Ddr::Datastreams::EXTRACTED_TEXT, class_name: 'Ddr::Datastreams::PlainTextDatastream'

data/lib/ddr/models/solr_document.rb

@@ -19,7 +19,7 @@ module Ddr::Models
     end
 
     def pid
-      Deprecation.warn(SolrDocument, "Use `id` instead.")
+      Deprecation.warn(SolrDocument, "`pid` is deprecated; use `id` instead.")
       id
     end
 
@@ -52,6 +52,10 @@ module Ddr::Models
       id.sub(/:/, "-")
     end
 
+    def access_roles
+      get(Ddr::Index::Fields::ACCESS_ROLE)
+    end
+
     def object_profile
       @object_profile ||= get_json(Ddr::Index::Fields::OBJECT_PROFILE)
     end
@@ -177,7 +181,7 @@ module Ddr::Models
     end
 
     def roles
-      @roles ||= Ddr::Auth::Roles::DetachedRoleSet.from_json(access_role)
+      @roles ||= Ddr::Auth::Roles::RoleSetManager.new(self)
     end
 
     def struct_maps

data/lib/ddr/models/validatable.rb

@@ -0,0 +1,20 @@
+require "forwardable"
+
+module Ddr::Models
+  module Validatable
+
+    def self.included(base)
+      base.extend Forwardable
+      base.def_delegators :validator, :valid?, :invalid?, :errors
+
+      class << base
+        attr_accessor :validator
+      end
+    end
+
+    def validator
+      @validator ||= self.class.validator.new(self)
+    end
+
+  end
+end

data/lib/ddr/models/validator.rb

@@ -0,0 +1,8 @@
+require "delegate"
+
+module Ddr::Models
+  class Validator < SimpleDelegator
+    include ActiveModel::Validations
+
+  end
+end

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "3.0.0.alpha.4"
+    VERSION = "3.0.0.beta.1"
   end
 end

data/lib/ddr/vocab/roles.rb

@@ -3,24 +3,28 @@ module Ddr
     class Roles < RDF::StrictVocabulary("http://repository.lib.duke.edu/vocab/roles/")
 
       term :Role,
-        label: "Role",
-        comment: "An assertion of a role granted to an agent."
+           label: "Role",
+           comment: "An assertion of a role granted to an agent."
 
       property :hasRole,
-        label: "Has Role",
-        comment: "Asserts the granting of a role on the subject to an agent."
+               label: "Has Role",
+               comment: "Asserts the granting of a role on the subject to an agent."
 
       property :type,
-        label: "Type",
-        comment: "The type of role granted to the agent."
+               label: "Type",
+               comment: "The type of role granted to the agent."
 
       property :agent,
-        label: "Agent",
-        comment: "The agent to whom the role is granted."
+               label: "Agent",
+               comment: "The agent to whom the role is granted."
 
       property :scope,
-        label: "Scope",
-        comment: "The scope within which the role applies."
+               label: "Scope",
+               comment: "The scope within which the role applies."
+
+      property :roleSet,
+               label: "Role Set",
+               comment: "A set of roles asserted on the subject"
 
     end
   end

data/spec/auth/effective_permissions_spec.rb

@@ -8,7 +8,7 @@ module Ddr::Auth
     before do
       resource.admin_policy = policy
       resource.roles.grant FactoryGirl.build(:role, :downloader, :public)
-      policy.roles.grant type: "Editor", agent: "Editors", scope: "policy"
+      policy.roles.grant role_type: "Editor", agent: "Editors", scope: "policy"
     end
 
     it "should return the list of permissions granted to the agents on the resource in resource scope, plus the permissions granted to the agents on the resource's policy in policy scope" do