curation_concerns 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7cfdad9a9be43d5356653c2f33b2366241c07b8
-  data.tar.gz: fc51ce634c3532c0956d2822f8dcb36f381ab577
+  metadata.gz: c3c778b10ded8ecbde18b513c114091bd5db0f03
+  data.tar.gz: 7665059aa1ca3e90ac806048ec6e5d05d9336514
 SHA512:
-  metadata.gz: 29f30a7c5a4d29c69b1feb098b918b1a5319025a8f38f811a3699745ace59c3fae94f2341e2950b3b4f134c7552e50ff1a85c02bc28e43b213c6cf5d16e80f93
-  data.tar.gz: df6588bfae1ec8231c6d39853f6bf22e9dfff09705e56d7390049631d5fcd969d2787414257ec35f2ef6c18aed154718408403420ae72a637bc79b03eafaad7d
+  metadata.gz: ce3acb4259faa827a4c98563a10f13d492388ae5815f5160a5505a053b8a18ed655928dacbb298a8b2e4cf701ec9280c41efd1d28d05a9a0abc57fb78f65751e
+  data.tar.gz: 7d4ccf6d0e886559560ffc178cba90eeb27d6654d6871905f5bdd79128b688d6a3eff8c1414bf8c89d138d8ecc90e1c34a435c3770c39e540a0c31c4d7382696

data/.gitignore

@@ -13,3 +13,4 @@ solr_conf/
 spec/mock_upload_directory
 fcrepo4-data
 fcrepo4-test-data
+/spec/examples.txt

data/.travis.yml

@@ -8,7 +8,9 @@ env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
     - RAILS_VERSION=4.2.7
+      RDF_VERSION=1.99.1
     - RAILS_VERSION=5.0.0
+      RDF_VERSION=2.1.0
 notifications:
   irc:
     channels:

data/Gemfile

@@ -3,6 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in curation_concerns.gemspec
 gemspec
 
+if ENV['RDF_VERSION']
+  gem 'rdf', ENV['RDF_VERSION']
+end
+
 group :development, :test do
   gem 'simplecov', '~> 0.9', require: false
   gem 'coveralls', require: false

data/Rakefile

@@ -28,10 +28,10 @@ namespace :curation_concerns do
 end
 
 desc 'Run test suite and style checker'
-task spec: ['curation_concerns:rubocop', 'curation_concerns:spec']
+task spec: ['curation_concerns:spec']
 
 desc 'Spin up Solr & Fedora and run the test suite'
-task ci: ['engine_cart:generate'] do
+task ci: ['curation_concerns:rubocop', 'engine_cart:generate'] do
   Rake::Task['spec'].invoke
 end
 

data/app/actors/curation_concerns/actors/file_actor.rb

@@ -34,9 +34,8 @@ module CurationConcerns
 
         CurationConcerns::VersioningService.create(repository_file, user)
 
-        # Retrieve a copy of the original file from the repository
-        working_file = WorkingDirectory.copy_repository_resource_to_working_directory(repository_file, file_set.id)
-        CharacterizeJob.perform_later(file_set, working_file)
+        # Characterize the original file from the repository
+        CharacterizeJob.perform_later(file_set, repository_file.id)
         true
       end
     end

data/app/assets/javascripts/curation_concerns/file_manager.es6

@@ -1,12 +1,14 @@
 import SaveManager from 'curation_concerns/file_manager/save_manager'
 import SortManager from 'curation_concerns/file_manager/sorting'
-import {FileManagerMember} from 'curation_concerns/file_manager/member'
+import {InputTracker, FileManagerMember} from 'curation_concerns/file_manager/member'
 export default class FileManager {
   constructor() {
     this.save_manager = this.initialize_save_manager()
     this.sorting()
     this.save_affix()
     this.member_tracking()
+    this.sortable_placeholder()
+    this.resource_form()
   }
 
   initialize_save_manager() {
@@ -38,4 +40,33 @@ export default class FileManager {
       $(element).data("file_manager_member", manager_member)
     })
   }
+
+  // Initialize a form that represents the parent resource as a whole.
+  // For the purpose of CC, this only comes with a thumbnail_id hidden field
+  // which is synchronized with the radio buttons on each member and then
+  // submitted with the SaveManager.
+  resource_form() {
+    let manager = new FileManagerMember($("#resource-form").parent(), this.save_manager)
+    $("#resource-form").parent().data("file_manager_member", manager)
+    // Track thumbnail ID hidden field
+    new InputTracker($("*[data-member-link=thumbnail_id]"), manager)
+    $("#sortable *[name=thumbnail_id]").change(function() {
+      let val = $("#sortable *[name=thumbnail_id]:checked").val()
+      $("*[data-member-link=thumbnail_id]").val(val)
+      $("*[data-member-link=thumbnail_id]").change()
+    })
+  }
+
+  // Keep the ui/sortable placeholder the right size.
+  // This keeps the grid a consistent height so when the
+  // last row contains 1 object,
+  // - an element can be moved into the last spot, and
+  // - the footer doesn't jump up.
+  sortable_placeholder() {
+    $( "#sortable" ).on( "sortstart", function( event, ui ) {
+      let found_element = $("#sortable").children("li[data-reorder-id]").first()
+      ui.placeholder.width(found_element.width())
+      ui.placeholder.height(found_element.height())
+    })
+  }
 }

data/app/assets/javascripts/curation_concerns/file_manager/member.es6

@@ -75,6 +75,12 @@ export class FileManagerMember {
         this.element.removeClass("success")
         this.element.removeClass("pending")
       })
+      // unset the callbacks after they've run so they don't build up
+      // and consume memory
+      deferred.always(function() {
+        form.off('ajax:success')
+        form.off('ajax:error')
+      })
       form.submit()
       return deferred
     } else {

data/app/assets/stylesheets/curation_concerns/_positioning.scss

@@ -134,6 +134,7 @@ legend + .form-group {
   }
 }
 
-.img-responsive, figure {
-  display: inline-block;
+.representative-media {
+  display: block;
+  padding: 0.5em 0;
 }

data/app/assets/stylesheets/curation_concerns/modules/file_manager.scss

@@ -35,6 +35,13 @@
       .attributes {
         @extend .col-xs-12;
       }
+      .member_resource_options {
+        @extend .col-xs-12;
+        float: none;
+        input[type=radio] {
+          margin-left: 1px;
+        }
+      }
       .order-title {
         width: 85%;
       }
@@ -59,6 +66,13 @@
       .attributes {
         @extend .col-xs-6;
       }
+      .member_resource_options {
+        @extend .col-xs-12;
+        float: none;
+        input[type=radio] {
+          margin-left: 1px;
+        }
+      }
       .order-title {
         width: 49%;
         display: inline-block;

data/app/controllers/concerns/curation_concerns/curation_concern_controller.rb

@@ -62,13 +62,13 @@ module CurationConcerns::CurationConcernController
       end
       additional_response_formats(wants)
       wants.ttl do
-        render text: presenter.export_as_ttl
+        render body: presenter.export_as_ttl, content_type: 'text/turtle'
       end
       wants.jsonld do
-        render text: presenter.export_as_jsonld
+        render body: presenter.export_as_jsonld, content_type: 'application/ld+json'
       end
       wants.nt do
-        render text: presenter.export_as_nt
+        render body: presenter.export_as_nt, content_type: 'application/n-triples'
       end
     end
   end

data/app/controllers/concerns/curation_concerns/single_use_links_controller_behavior.rb

@@ -20,12 +20,12 @@ module CurationConcerns
 
     def create_download
       @su = SingleUseLink.create itemId: params[:id], path: main_app.download_path(id: params[:id])
-      render text: curation_concerns.download_single_use_link_url(@su.downloadKey)
+      render plain: curation_concerns.download_single_use_link_url(@su.downloadKey)
     end
 
     def create_show
       @su = SingleUseLink.create(itemId: params[:id], path: asset_show_path)
-      render text: curation_concerns.show_single_use_link_url(@su.downloadKey)
+      render plain: curation_concerns.show_single_use_link_url(@su.downloadKey)
     end
 
     def index

data/app/indexers/curation_concerns/admin_set_indexer.rb

@@ -0,0 +1,13 @@
+module CurationConcerns
+  class AdminSetIndexer < ActiveFedora::IndexingService
+    include IndexesThumbnails
+
+    def generate_solr_document
+      super.tap do |solr_doc|
+        # Makes Admin Sets show under the "Admin Sets" tab
+        Solrizer.set_field(solr_doc, 'generic_type', 'Admin Set', :facetable)
+        solr_doc['thumbnail_path_ss'] = thumbnail_path
+      end
+    end
+  end
+end

data/app/indexers/curation_concerns/file_set_indexer.rb

@@ -22,6 +22,11 @@ module CurationConcerns
         # between files on disk (in fcrepo.binary-store-path) and objects
         # in the repository.
         solr_doc[Solrizer.solr_name('digest', :symbol)] = digest_from_content
+        solr_doc[Solrizer.solr_name('page_count')] = object.page_count
+        solr_doc[Solrizer.solr_name('file_title')] = object.file_title
+        solr_doc[Solrizer.solr_name('duration')] = object.duration
+        solr_doc[Solrizer.solr_name('sample_rate')] = object.sample_rate
+        solr_doc[Solrizer.solr_name('original_checksum')] = object.original_checksum
       end
     end
 

data/app/indexers/curation_concerns/work_indexer.rb

@@ -1,10 +1,13 @@
 module CurationConcerns
   class WorkIndexer < ActiveFedora::IndexingService
     include IndexesThumbnails
+    STORED_BOOL = Solrizer::Descriptor.new(:boolean, :stored, :indexed)
+
     def generate_solr_document
       super.tap do |solr_doc|
         solr_doc[Solrizer.solr_name('member_ids', :symbol)] = object.member_ids
         Solrizer.set_field(solr_doc, 'generic_type', 'Work', :facetable)
+        solr_doc[Solrizer.solr_name('suppressed', STORED_BOOL)] = object.suppressed?
       end
     end
   end

data/app/models/admin_set.rb

@@ -0,0 +1,3 @@
+class AdminSet < ActiveFedora::Base
+  include CurationConcerns::AdminSetBehavior
+end

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

@@ -0,0 +1,29 @@
+module CurationConcerns
+  module AdminSetBehavior
+    extend ActiveSupport::Concern
+
+    include Hydra::AccessControls::WithAccessRight
+    include CurationConcerns::Noid
+    include CurationConcerns::HumanReadableType
+    include CurationConcerns::HasRepresentative
+
+    included do
+      validates_with HasOneTitleValidator
+      class_attribute :human_readable_short_description, :indexer
+      self.indexer = CurationConcerns::AdminSetIndexer
+      property :title, predicate: ::RDF::Vocab::DC.title do |index|
+        index.as :stored_searchable, :facetable
+      end
+      property :description, predicate: ::RDF::Vocab::DC.description do |index|
+        index.as :stored_searchable
+      end
+      has_many :members,
+               predicate: ::RDF::Vocab::DC.isPartOf,
+               class_name: 'ActiveFedora::Base'
+    end
+
+    def to_s
+      title.present? ? title : 'No Title'
+    end
+  end
+end

data/app/models/concerns/curation_concerns/file_set/characterization.rb

@@ -19,7 +19,8 @@ module CurationConcerns
         class_attribute :characterization_terms, :characterization_proxy
         self.characterization_terms = [
           :format_label, :file_size, :height, :width, :filename, :well_formed,
-          :page_count, :file_title, :last_modified, :original_checksum, :mime_type
+          :page_count, :file_title, :last_modified, :original_checksum, :mime_type,
+          :duration, :sample_rate
         ]
         self.characterization_proxy = :original_file
 

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

@@ -0,0 +1,9 @@
+module CurationConcerns
+  module InAdminSet
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :admin_set, predicate: ::RDF::Vocab::DC.isPartOf
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module CurationConcerns
+  module Publishable
+    extend ActiveSupport::Concern
+
+    included do
+      # This holds the workflow state
+      property :state, predicate: Vocab::FedoraResourceStatus.objState, multiple: false
+
+      class_attribute :state_workflow, instance_writer: false
+      self.state_workflow = StateWorkflow
+    end
+
+    # Override this method if you have some critera by which records should not
+    # display in the search results.
+    def suppressed?
+      state_workflow.new(state).pending?
+    end
+  end
+end

data/app/models/concerns/curation_concerns/solr_behavior/characterization.rb

@@ -0,0 +1,106 @@
+module CurationConcerns
+  module SolrBehavior
+    # TODO: aside from height and width, I don't think any of these other terms are indexed by default. - Justin 3/2016
+    module Characterization
+      def format_label
+        self[Solrizer.solr_name("format_label")]
+      end
+
+      def file_size
+        self[Solrizer.solr_name("file_size")]
+      end
+
+      def filename
+        self[Solrizer.solr_name("filename")]
+      end
+
+      def well_formed
+        self[Solrizer.solr_name("well_formed")]
+      end
+
+      def byte_order
+        self[Solrizer.solr_name("byte_order")]
+      end
+
+      def capture_device
+        self[Solrizer.solr_name("capture_device")]
+      end
+
+      def color_map
+        self[Solrizer.solr_name("color_map")]
+      end
+
+      def color_space
+        self[Solrizer.solr_name("color_space")]
+      end
+
+      def compression
+        self[Solrizer.solr_name("compression")]
+      end
+
+      def gps_timestamp
+        self[Solrizer.solr_name("gps_timestamp")]
+      end
+
+      def height
+        self['height_is']
+      end
+
+      def image_producer
+        self[Solrizer.solr_name("image_producer")]
+      end
+
+      def latitude
+        self[Solrizer.solr_name("latitude")]
+      end
+
+      def longitude
+        self[Solrizer.solr_name("longitude")]
+      end
+
+      def orientation
+        self[Solrizer.solr_name("orientation")]
+      end
+
+      def profile_name
+        self[Solrizer.solr_name("profile_name")]
+      end
+
+      def profile_version
+        self[Solrizer.solr_name("profile_version")]
+      end
+
+      def scanning_software
+        self[Solrizer.solr_name("scanning_software")]
+      end
+
+      def width
+        self['width_is']
+      end
+
+      def page_count
+        self[Solrizer.solr_name("page_count")]
+      end
+
+      def file_title
+        self[Solrizer.solr_name("file_title")]
+      end
+
+      def duration
+        self[Solrizer.solr_name("duration")]
+      end
+
+      def sample_rate
+        self[Solrizer.solr_name("sample_rate")]
+      end
+
+      def last_modified
+        self[Solrizer.solr_name("last_modified")]
+      end
+
+      def original_checksum
+        self[Solrizer.solr_name("original_checksum")]
+      end
+    end
+  end
+end

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

@@ -2,6 +2,7 @@ module CurationConcerns
   module SolrDocumentBehavior
     extend ActiveSupport::Concern
     include Hydra::Works::MimeTypes
+    include CurationConcerns::SolrBehavior::Characterization
 
     def title_or_label
       return label if title.blank?
@@ -64,6 +65,10 @@ module CurationConcerns
       first(Solrizer.solr_name('hasRelatedMediaFragment', :symbol))
     end
 
+    def thumbnail_id
+      first(Solrizer.solr_name('thumbnail_id', :symbol))
+    end
+
     # Date created is indexed as a string. This allows users to enter values like: 'Circa 1840-1844'
     def date_created
       first(Solrizer.solr_name("date_created"))