curation_concerns-models 0.1.0 → 0.2.0

data/app/models/concerns/curation_concerns/has_representative.rb

@@ -2,13 +2,12 @@ module CurationConcerns::HasRepresentative
   extend ActiveSupport::Concern
 
   included do
-    property :representative, predicate: RDF::URI.new('http://opaquenamespace.org/ns/hydra/representative'), multiple: false
-  end
+    belongs_to :representative,
+               predicate: ::RDF::Vocab::EBUCore.hasRelatedMediaFragment,
+               class_name: 'ActiveFedora::Base'
 
-  def to_solr(solr_doc={})
-    super.tap do |solr_doc|
-      solr_doc[Solrizer.solr_name('representative', :stored_searchable)] = representative
-    end
+    belongs_to :thumbnail,
+               predicate: ::RDF::Vocab::EBUCore.hasRelatedImage,
+               class_name: 'ActiveFedora::Base'
   end
-
 end

data/app/models/concerns/curation_concerns/human_readable_type.rb

@@ -1,5 +1,5 @@
 module CurationConcerns
-   module HumanReadableType
+  module HumanReadableType
     extend ActiveSupport::Concern
 
     included do
@@ -11,13 +11,11 @@ module CurationConcerns
       self.class.human_readable_type
     end
 
-    def to_solr(solr_doc={})
-      super(solr_doc).tap do |solr_doc|
-        solr_doc[Solrizer.solr_name('human_readable_type',:facetable)] = human_readable_type
-        solr_doc[Solrizer.solr_name('human_readable_type', :stored_searchable)] = human_readable_type
+    def to_solr(solr_doc = {})
+      super(solr_doc).tap do |doc|
+        doc[Solrizer.solr_name('human_readable_type', :facetable)] = human_readable_type
+        doc[Solrizer.solr_name('human_readable_type', :stored_searchable)] = human_readable_type
       end
     end
-
   end
 end
-

data/app/models/concerns/curation_concerns/permissions.rb

@@ -1,7 +1,7 @@
 module CurationConcerns
   module Permissions
     extend ActiveSupport::Concern
-      include CurationConcerns::Permissions::Writable
-	    include CurationConcerns::Permissions::Readable
+    include CurationConcerns::Permissions::Writable
+    include CurationConcerns::Permissions::Readable
   end
 end

data/app/models/concerns/curation_concerns/permissions/readable.rb

@@ -13,7 +13,6 @@ module CurationConcerns
       def private?
         !(public? || registered?)
       end
-
     end
   end
 end

data/app/models/concerns/curation_concerns/permissions/writable.rb

@@ -3,7 +3,7 @@ module CurationConcerns
     module Writable
       extend ActiveSupport::Concern
 
-      #we're overriding the permissions= method which is in Hydra::AccessControls::Permissions
+      # we're overriding the permissions= method which is in Hydra::AccessControls::Permissions
       include Hydra::AccessControls::Permissions
       include Hydra::AccessControls::Visibility
 
@@ -14,62 +14,21 @@ module CurationConcerns
       def paranoid_permissions
         valid = true
         paranoid_edit_permissions.each do |validation|
-          if validation[:condition].call(self)
-            errors[validation[:key]] ||= []
-            errors[validation[:key]] << validation[:message]
-            valid = false
-          end
+          next unless validation[:condition].call(self)
+          errors[validation[:key]] ||= []
+          errors[validation[:key]] << validation[:message]
+          valid = false
         end
-        return valid
+        valid
       end
 
       def paranoid_edit_permissions
         [
-            {key: :edit_users, message: 'Depositor must have edit access', condition: lambda { |obj| !obj.edit_users.include?(obj.depositor) }},
-            {key: :edit_groups, message: 'Public cannot have edit access', condition: lambda { |obj| obj.edit_groups.include?('public') }},
-            {key: :edit_groups, message: 'Registered cannot have edit access', condition: lambda { |obj| obj.edit_groups.include?('registered') }}
+          { key: :edit_users, message: 'Depositor must have edit access', condition: ->(obj) { !obj.edit_users.include?(obj.depositor) } },
+          { key: :edit_groups, message: 'Public cannot have edit access', condition: ->(obj) { obj.edit_groups.include?('public') } },
+          { key: :edit_groups, message: 'Registered cannot have edit access', condition: ->(obj) { obj.edit_groups.include?('registered') } }
         ]
       end
-
-      def clear_permissions!
-        self.permissions = []
-      end
-
-      ## Updates those permissions that are provided to it. Does not replace any permissions unless they are provided
-      # def permissions=(params)
-      #   raise "Fixme #{params}"
-      #   perm_hash = permission_hash
-      #   params[:new_user_name].each { |name, access| perm_hash['person'][name] = access } if params[:new_user_name].present?
-      #   params[:new_group_name].each { |name, access| perm_hash['group'][name] = access } if params[:new_group_name].present?
-
-      #   params[:user].each { |name, access| perm_hash['person'][name] = access} if params[:user]
-      #   params[:group].each { |name, access| perm_hash['group'][name] = access if ['read', 'edit'].include?(access)} if params[:group]
-
-      #   # rightsMetadata.update_permissions(perm_hash)
-      # end
-
-      # def permissions
-      #   raise "Fixme "
-      #   perms = super
-      #   perms.map {|p| { name: p.name, access: p.access, type:p.type } }
-      # end
-
-      private
-
-      def permission_hash
-        old_perms = self.permissions
-        user_perms =  {}
-        old_perms.select{|r| r[:type] == 'user'}.each do |r|
-          user_perms[r[:name]] = r[:access]
-        end
-        user_perms
-        group_perms =  {}
-        old_perms.select{|r| r[:type] == 'group'}.each do |r|
-          group_perms[r[:name]] = r[:access]
-        end
-        {'person'=>user_perms, 'group'=>group_perms}
-      end
-
     end
   end
-end
+end

data/app/models/concerns/curation_concerns/serializers.rb

@@ -1,15 +1,13 @@
 module CurationConcerns
   module Serializers
-
     def to_s
       if title.present?
-        Array(title).join(" | ")
+        Array(title).join(' | ')
       elsif label.present?
-        Array(label).join(" | ")
+        Array(label).join(' | ')
       else
-        "No Title"
+        'No Title'
       end
     end
-
   end
 end

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

@@ -1,15 +1,12 @@
 module CurationConcerns
   module SolrDocumentBehavior
+    extend ActiveSupport::Concern
+    include Hydra::Works::MimeTypes
+
     def title_or_label
       title || label
     end
 
-    ##
-    # Give our SolrDocument an ActiveModel::Naming appropriate route_key
-    def route_key
-      get(Solrizer.solr_name('has_model', :symbol)).split(':').last.downcase
-    end
-
     def to_param
       id
     end
@@ -43,12 +40,12 @@ module CurationConcerns
       Array(self[Solrizer.solr_name('human_readable_type', :stored_searchable)]).first
     end
 
-    def representative
-      Array(self[Solrizer.solr_name('representative', :stored_searchable)]).first
+    def representative_id
+      fetch(Solrizer.solr_name('hasRelatedMediaFragment', :symbol), []).first
     end
 
     def date_uploaded
-      field = self[Solrizer.solr_name("date_uploaded", :stored_sortable, type: :date)]
+      field = self[Solrizer.solr_name('date_uploaded', :stored_sortable, type: :date)]
       return unless field.present?
       begin
         Date.parse(field).to_formatted_s(:standard)
@@ -58,7 +55,7 @@ module CurationConcerns
     end
 
     def depositor(default = '')
-      val = Array(self[Solrizer.solr_name("depositor")]).first
+      val = Array(self[Solrizer.solr_name('depositor')]).first
       val.present? ? val : default
     end
 
@@ -75,61 +72,61 @@ module CurationConcerns
     end
 
     def file_format
-       Array(self[Solrizer.solr_name('file_format')]).first
+      Array(self[Solrizer.solr_name('file_format')]).first
     end
 
     def creator
-      Array(self[Solrizer.solr_name("creator")]).first
-    end
-
-    def tags
-      Array(self[Solrizer.solr_name("tag")])
+      fetch(Solrizer.solr_name('creator'), [])
     end
 
-    def resource_type
-      Array(self[Solrizer.solr_name("resource_type")])
+    def contributor
+      fetch(Solrizer.solr_name('contributor'), [])
     end
 
-    def mime_type
-      Array(self[Solrizer.solr_name("mime_type")]).first
+    def subject
+      fetch(Solrizer.solr_name('subject'), [])
     end
 
-    def read_groups
-      Array(self[::Ability.read_group_field])
+    def publisher
+      fetch(Solrizer.solr_name('publisher'), [])
     end
 
-    def edit_groups
-      Array(self[::Ability.edit_group_field])
+    def language
+      fetch(Solrizer.solr_name('language'), [])
     end
 
-    def edit_people
-      Array(self[::Ability.edit_user_field])
+    def tags
+      fetch(Solrizer.solr_name('tag'), [])
     end
 
-    def public?
-      read_groups.include?('public')
+    def embargo_release_date
+      self[Hydra.config.permissions.embargo.release_date]
     end
 
-    def registered?
-      read_groups.include?('registered')
+    def lease_expiration_date
+      self[Hydra.config.permissions.lease.expiration_date]
     end
 
-    def pdf?
-      ['application/pdf'].include? self.mime_type
+    def rights
+      self[Solrizer.solr_name('rights')]
     end
 
-    def image?
-      ['image/png','image/jpeg', 'image/jpg', 'image/jp2', 'image/bmp', 'image/gif', 'image/tiff'].include? self.mime_type
+    def mime_type
+      self[Solrizer.solr_name('mime_type', :stored_sortable)]
     end
 
-    def video?
-      ['video/mpeg', 'video/mp4', 'video/webm', 'video/x-msvideo', 'video/avi', 'video/quicktime', 'application/mxf'].include? self.mime_type
+    def read_groups
+      fetch(Hydra.config.permissions.read.group, [])
     end
 
-    def audio?
-      # audio/x-wave is the mime type that fits 0.6.0 returns for a wav file.
-      # audio/mpeg is the mime type that fits 0.6.0 returns for an mp3 file.
-      ['audio/mp3', 'audio/mpeg', 'audio/x-wave', 'audio/x-wav', 'audio/ogg'].include? self.mime_type
+    def visibility
+      @visibility ||= if read_groups.include? Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC
+                        Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+                      elsif read_groups.include? Hydra::AccessControls::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED
+                        Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+                      else
+                        Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+                      end
     end
   end
 end

data/app/models/concerns/curation_concerns/upload_set_behavior.rb

@@ -0,0 +1,38 @@
+module CurationConcerns
+  module UploadSetBehavior
+    extend ActiveSupport::Concern
+    include Hydra::AccessControls::Permissions
+    include CurationConcerns::Noid
+
+    included do
+      has_many :file_sets, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
+
+      property :creator, predicate: ::RDF::DC.creator
+      property :title, predicate: ::RDF::DC.title
+      property :status, predicate: ::RDF::DC.type
+    end
+
+    module ClassMethods
+      def find_or_create(id)
+        UploadSet.find(id)
+      rescue ActiveFedora::ObjectNotFoundError
+        safe_create(id)
+      end
+
+      private
+
+        # This method handles most race conditions gracefully.
+        # If an upload_set with the same ID is created by another thread
+        # we fetch the upload_set that was created (rather than throwing
+        # an error) and continute.
+        def safe_create(id)
+          UploadSet.create(id: id)
+        rescue ActiveFedora::IllegalOperation
+          # This is the exception thrown by LDP when we attempt to
+          # create a duplicate object. If we can find the object
+          # then we are good to go.
+          UploadSet.find(id)
+        end
+    end
+  end
+end

data/app/models/concerns/curation_concerns/user.rb

@@ -1,65 +1,18 @@
 module CurationConcerns::User
   extend ActiveSupport::Concern
-
-  # Copied piecemeal from the pcdm branch of sufia-models. More may yet be necessary.
-
   included do
-    # Connects this user object to Blacklight's Bookmarks and Folders.
-    include Blacklight::User
-    include Hydra::User
-
     delegate :can?, :cannot?, to: :ability
-
-    attr_accessor :update_directory
-  end
-
-  # Format the json for select2 which requires just an id and a field called text.
-  # If we need an alternate format we should probably look at a json template gem
-  def as_json(opts = nil)
-    { id: user_key, text: display_name ? "#{display_name} (#{user_key})" : user_key }
-  end
-
-  # Populate user instance with attributes from remote system (e.g., LDAP)
-  # There is no default implementation -- override this in your application
-  # def populate_attributes
-  # end
-
-  def email_address
-    self.email
-  end
-
-  def name
-    self.display_name.titleize || raise
-  rescue
-    self.user_key
   end
 
   # Redefine this for more intuitive keys in Redis
   def to_param
-    # hack because rails doesn't like periods in urls.
+    # HACK: because rails doesn't like periods in urls.
     user_key.gsub(/\./, '-dot-')
   end
 
-  # The basic groups method, override or will fallback to S ufia::Ldap::User
-  # def groups
-  #   @groups ||= self.group_list ? self.group_list.split(";?;") : []
-  # end
-
-  def ability
-    @ability ||= ::Ability.new(self)
-  end
-
-  module ClassMethods
-    def current
-      Thread.current[:user]
-    end
+  private
 
-    def current=(user)
-      Thread.current[:user] = user
+    def ability
+      @ability ||= ::Ability.new(self)
     end
-
-    # def from_url_component(component)
-    #   User.find_by_user_key(component.gsub(/-dot-/, '.'))
-    # end
-  end
 end

data/app/models/concerns/curation_concerns/with_file_sets.rb

@@ -0,0 +1,28 @@
+# Copied from Curate
+module CurationConcerns
+  module WithFileSets
+    extend ActiveSupport::Concern
+
+    included do
+      # The file_sets association and its accessor methods comes from Hydra::Works::AggregatesFileSets
+      before_destroy :before_destroy_cleanup_file_sets
+    end
+
+    # Stopgap unil ActiveFedora ContainerAssociation includes an *_ids accessor.
+    # At the moment, this is no more efficient than calling file_sets, but hopefully that will change in the future.
+    def file_set_ids
+      file_sets.map(&:id)
+    end
+
+    def before_destroy_cleanup_file_sets
+      file_sets.each(&:destroy)
+    end
+
+    def copy_visibility_to_files
+      file_sets.each do |fs|
+        fs.visibility = visibility
+        fs.save!
+      end
+    end
+  end
+end

data/app/models/concerns/curation_concerns/{generic_work_behavior.rb → work_behavior.rb}

@@ -1,7 +1,7 @@
-module CurationConcerns::GenericWorkBehavior
+module CurationConcerns::WorkBehavior
   extend ActiveSupport::Concern
 
-  include Hydra::Works::GenericWorkBehavior
+  include Hydra::Works::WorkBehavior
   include ::CurationConcerns::HumanReadableType
   include CurationConcerns::Noid
   include CurationConcerns::Permissions
@@ -9,7 +9,7 @@ module CurationConcerns::GenericWorkBehavior
   include Hydra::WithDepositor
   include Solrizer::Common
   include ::CurationConcerns::HasRepresentative
-  include ::CurationConcerns::WithGenericFiles
+  include ::CurationConcerns::WithFileSets
   include Hydra::AccessControls::Embargoable
 
   included do
@@ -19,12 +19,18 @@ module CurationConcerns::GenericWorkBehavior
 
   module ClassMethods
     def indexer
-      CurationConcerns::GenericWorkIndexingService
+      CurationConcerns::WorkIndexingService
     end
   end
 
   def to_s
-    title.join(', ')
+    if title.present?
+      Array(title).join(' | ')
+    elsif label.present?
+      Array(label).join(' | ')
+    else
+      'No Title'
+    end
   end
 
   # Returns a string identifying the path associated with the object. ActionPack uses this to find a suitable partial to represent the object.
@@ -32,7 +38,7 @@ module CurationConcerns::GenericWorkBehavior
     "curation_concerns/#{super}"
   end
 
-  def can_be_member_of_collection?(collection)
+  def can_be_member_of_collection?(_collection)
     true
   end
 end