curation_concerns-models 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b866be7465155c67d0157b20159c75f53cc6d2c
-  data.tar.gz: def664a51f3bff81f3ca2396787883ae6b3142cc
+  metadata.gz: bf5fe8cfb43b91b4bf4b0603bfdbf427c872e442
+  data.tar.gz: da3f9e9f7e522fcce530eb0aa5f0d26289ff6b28
 SHA512:
-  metadata.gz: 399bdc3d1ea0bb4722605fa486662e1e33b4c01872f0fe3fe47d7edd36583c0a744a4bfa0198f39e288f4943c69ac00ec712e5ca985cfde379770c510c052516
-  data.tar.gz: 1bc3ca8a712bb6d141d4c8411c959db37c66931b86b0c1e3a7a969d42d41402ffb59397ab7d5da1e1c4eec84228a09c50fd9dce5932d37344368193f5a03ea86
+  metadata.gz: b190960f8aee8224d04d027a23347dc487efeb83bf86f752c8f5eae55c79488b3a1a8d85ba1109b9fa08a1fceed7ab87dbbef6da63666fdcbd88772e8e1e48dc
+  data.tar.gz: e1f4a3d671a906437afec2d3d8c331b60d1bfce1d9407d6742c98bacb6c4ff736ec2facd7afe002a81fff49f66b77941103d6470e66d97e513bca33aeb8dbd78

data/app/actors/curation_concerns/file_set_actor.rb

@@ -167,6 +167,9 @@ module CurationConcerns
             copy_visibility(work, file_set)
           end
           work.ordered_members << file_set
+          set_representative(work, file_set)
+          set_thumbnail(work, file_set)
+
           # Save the work so the association between the work and the file_set is persisted (head_id)
           work.save
         end
@@ -196,5 +199,15 @@ module CurationConcerns
       def copy_visibility(source_concern, destination_concern)
         destination_concern.visibility =  source_concern.visibility
       end
+
+      def set_representative(work, file_set)
+        return unless work.representative_id.blank?
+        work.representative = file_set
+      end
+
+      def set_thumbnail(work, file_set)
+        return unless work.thumbnail_id.blank?
+        work.thumbnail = file_set
+      end
   end
 end

data/app/indexers/curation_concerns/work_indexing_service.rb

@@ -7,7 +7,7 @@ module CurationConcerns
         # member_ids which requires fewer Fedora API calls than file_set_ids.
         # file_set_ids requires loading all the members from Fedora but member_ids
         # looks just at solr
-        solr_doc[Solrizer.solr_name('file_set_ids', :symbol)] = object.member_ids
+        solr_doc[Solrizer.solr_name('member_ids', :symbol)] = object.member_ids
         Solrizer.set_field(solr_doc, 'generic_type', 'Work', :facetable)
         solr_doc['thumbnail_path_ss'] = thumbnail_path
       end

data/app/jobs/create_derivatives_job.rb

@@ -8,5 +8,13 @@ class CreateDerivativesJob < ActiveFedoraIdBasedJob
     file_set.create_derivatives(file_name)
     # The thumbnail is indexed in the solr document, so reindex
     file_set.update_index
+    file_set.parent.update_index if parent_needs_reindex?
+  end
+
+  # If this file_set is the thumbnail for the parent work,
+  # then the parent also needs to be reindexed.
+  def parent_needs_reindex?
+    return false unless file_set.parent
+    file_set.parent.thumbnail_id == file_set.id
   end
 end

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

@@ -2,7 +2,7 @@ module CurationConcerns
   module Ability
     extend ActiveSupport::Concern
     included do
-      self.ability_logic += [:curation_concerns_permissions]
+      self.ability_logic += [:curation_concerns_permissions, :add_to_collection]
     end
 
     def curation_concerns_permissions
@@ -19,8 +19,6 @@ module CurationConcerns
         cannot :index, Hydra::AccessControls::Embargo
         cannot :index, Hydra::AccessControls::Lease
       end
-
-      can :collect, :all
     end
 
     def admin_permissions
@@ -31,6 +29,11 @@ module CurationConcerns
       user_groups.include? 'admin'
     end
 
+    def add_to_collection
+      return if current_user.new_record?
+      can :collect, :all
+    end
+
     # Add this to your ability_logic if you want all logged in users to be able
     # to submit content
     def everyone_can_create_curation_concerns

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

@@ -15,33 +15,33 @@ module CurationConcerns
         index.as :symbol
       end
 
-      property :part_of, predicate: ::RDF::DC.isPartOf
-      property :resource_type, predicate: ::RDF::DC.type do |index|
+      property :part_of, predicate: ::RDF::Vocab::DC.isPartOf
+      property :resource_type, predicate: ::RDF::Vocab::DC.type do |index|
         index.as :stored_searchable, :facetable
       end
-      property :title, predicate: ::RDF::DC.title do |index|
+      property :title, predicate: ::RDF::Vocab::DC.title do |index|
         index.as :stored_searchable, :facetable
       end
-      property :creator, predicate: ::RDF::DC.creator do |index|
+      property :creator, predicate: ::RDF::Vocab::DC.creator do |index|
         index.as :stored_searchable, :facetable
       end
-      property :contributor, predicate: ::RDF::DC.contributor do |index|
+      property :contributor, predicate: ::RDF::Vocab::DC.contributor do |index|
         index.as :stored_searchable, :facetable
       end
-      property :description, predicate: ::RDF::DC.description do |index|
+      property :description, predicate: ::RDF::Vocab::DC.description do |index|
         index.type :text
         index.as :stored_searchable
       end
-      property :tag, predicate: ::RDF::DC.relation do |index|
+      property :tag, predicate: ::RDF::Vocab::DC.relation do |index|
         index.as :stored_searchable, :facetable
       end
-      property :rights, predicate: ::RDF::DC.rights do |index|
+      property :rights, predicate: ::RDF::Vocab::DC.rights do |index|
         index.as :stored_searchable
       end
-      property :publisher, predicate: ::RDF::DC.publisher do |index|
+      property :publisher, predicate: ::RDF::Vocab::DC.publisher do |index|
         index.as :stored_searchable, :facetable
       end
-      property :date_created, predicate: ::RDF::DC.created do |index|
+      property :date_created, predicate: ::RDF::Vocab::DC.created do |index|
         index.as :stored_searchable
       end
 
@@ -50,34 +50,34 @@ module CurationConcerns
       # fedora's system created date will reflect the date when the record
       # was created in fedora4, but the date_uploaded will preserve the
       # original creation date from the old repository.
-      property :date_uploaded, predicate: ::RDF::DC.dateSubmitted, multiple: false do |index|
+      property :date_uploaded, predicate: ::RDF::Vocab::DC.dateSubmitted, multiple: false do |index|
         index.type :date
         index.as :stored_sortable
       end
 
-      property :date_modified, predicate: ::RDF::DC.modified, multiple: false do |index|
+      property :date_modified, predicate: ::RDF::Vocab::DC.modified, multiple: false do |index|
         index.type :date
         index.as :stored_sortable
       end
-      property :subject, predicate: ::RDF::DC.subject do |index|
+      property :subject, predicate: ::RDF::Vocab::DC.subject do |index|
         index.as :stored_searchable, :facetable
       end
-      property :language, predicate: ::RDF::DC.language do |index|
+      property :language, predicate: ::RDF::Vocab::DC.language do |index|
         index.as :stored_searchable, :facetable
       end
-      property :identifier, predicate: ::RDF::DC.identifier do |index|
+      property :identifier, predicate: ::RDF::Vocab::DC.identifier do |index|
         index.as :stored_searchable
       end
-      property :based_near, predicate: ::RDF::FOAF.based_near do |index|
+      property :based_near, predicate: ::RDF::Vocab::FOAF.based_near do |index|
         index.as :stored_searchable, :facetable
       end
       property :related_url, predicate: ::RDF::RDFS.seeAlso do |index|
         index.as :stored_searchable
       end
-      property :bibliographic_citation, predicate: ::RDF::DC.bibliographicCitation do |index|
+      property :bibliographic_citation, predicate: ::RDF::Vocab::DC.bibliographicCitation do |index|
         index.as :stored_searchable
       end
-      property :source, predicate: ::RDF::DC.source do |index|
+      property :source, predicate: ::RDF::Vocab::DC.source do |index|
         index.as :stored_searchable
       end
     end

data/lib/curation_concerns/models/version.rb

@@ -1,5 +1,5 @@
 module CurationConcerns
   module Models
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/generators/curation_concerns/models/install_generator.rb

@@ -7,7 +7,7 @@ class CurationConcerns::Models::InstallGenerator < CurationConcerns::Models::Abs
 This generator makes the following changes to your application:
  1. Creates several database migrations if they do not exist in /db/migrate
  2. Creates the curation_concerns.rb configuration file and several others
- 3. Creates the file_set.rb, generic_work.rb and collection.rb models
+ 3. Creates the file_set.rb and collection.rb models
  4. Runs full-text generator
        "''
   def banner

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns-models
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr