curation_concerns 1.0.0.beta2 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96756d166c6631a6999f710b4d914c1633bf87b6
-  data.tar.gz: 3a0dee7f354c71afc0b72844e3eb6a37cbc48b3e
+  metadata.gz: 479354206a40bb627e8757bf979959e1334a9d36
+  data.tar.gz: ba279782938b4e3a7e66bb03b9f932855f0afddd
 SHA512:
-  metadata.gz: 616e0cec3bf1225238270505c6966c83639857dd54b5fbcb500c9b677341d6e775ea6abec678dfe2a8e113644c51379fca9f9fc5df0bf61716c46a707df0b67a
-  data.tar.gz: 09ca08d9a68ef729446a05e92f4e604ce8b2b764e35a73dcb0b12c8876fc2c68b2cb2711a3c7580d6e2fdc6730f85c150bc49ad4b20a32a6f9438bb6f069a4cf
+  metadata.gz: 4e741f7d4aa0ecb1ecdcd5bf0e1d82788409196b74b37c94a22bba836eb85f4d74aa8add3d3c3a2f5b3a332dbec5009a1aee63deb7fc8527cf555320628c1900
+  data.tar.gz: 9a89a75c1178e14d566e980a39d1e7ef363a1ccc1e96a18f5e5bef8b2f53d4b44777a8ddcbb9c53e61f1ba1740a85ed4e50d502cf3ff9aa6157bd5e3fbf2d0af

data/README.md

@@ -1,7 +1,7 @@
 # CurationConcerns
 
 [![Version](https://badge.fury.io/rb/curation_concerns.png)](http://badge.fury.io/rb/curation_concerns)
-[![Build Status](https://travis-ci.org/projecthydra-labs/curation_concerns.svg?branch=master)](https://travis-ci.org/projecthydra-labs/curation_concerns)
+[![Build Status](https://travis-ci.org/projecthydra/curation_concerns.svg?branch=master)](https://travis-ci.org/projecthydra/curation_concerns)
 [![Coverage Status](https://coveralls.io/repos/projecthydra-labs/curation_concerns/badge.svg?branch=master)](https://coveralls.io/r/projecthydra-labs/curation_concerns?branch=master)
 [![Code Climate](https://codeclimate.com/github/projecthydra-labs/curation_concerns/badges/gpa.svg)](https://codeclimate.com/github/projecthydra-labs/curation_concerns)
 [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE.txt)
@@ -9,7 +9,7 @@
 [![API Docs](http://img.shields.io/badge/API-docs-blue.svg)](http://rubydoc.info/gems/curation_concerns)
 [![Stories in Ready](https://badge.waffle.io/projecthydra-labs/sufia-core.png?source=projecthydra-labs%2Fcuration_concerns&label=ready&title=Ready)](https://waffle.io/projecthydra-labs/sufia-core?source=projecthydra-labs%2Fcuration_concerns)
 
-A Hydra-based Rails Engine that extends an application, adding the ability to Create, Read, Update and Destroy (CRUD) objects (based on [Hydra::Works](http://github.com/projecthydra-labs/hydra-works)) and providing a generator for defining object types with custom workflows, views, access controls, etc.
+A Hydra-based Rails Engine that extends an application, adding the ability to Create, Read, Update and Destroy (CRUD) objects (based on [Hydra::Works](http://github.com/projecthydra/hydra-works)) and providing a generator for defining object types with custom workflows, views, access controls, etc.
 
 ## Prerequisites
 

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

@@ -14,8 +14,8 @@ module CurationConcerns
       end
 
       # Puts the uploaded content into a staging directory. Then kicks off a
-      # job to characterize and create derivatives with this on disk variant.
-      # Simultaneously moving a preservation copy to the repostiory.
+      # job to ingest the file into the repository, then characterize and
+      # create derivatives with this on disk variant.
       # TODO: create a job to monitor this directory and prune old files that
       # have made it to the repo
       # @param [File, ActionDigest::HTTP::UploadedFile, Tempfile] file the file to save in the repository
@@ -23,7 +23,6 @@ module CurationConcerns
         working_file = copy_file_to_working_directory(file, file_set.id)
         mime_type = file.respond_to?(:content_type) ? file.content_type : nil
         IngestFileJob.perform_later(file_set, working_file, mime_type, user, relation)
-        make_derivative(file_set, working_file)
         true
       end
 
@@ -35,20 +34,16 @@ module CurationConcerns
 
         CurationConcerns::VersioningService.create(repository_file, user)
 
-        # Retrieve a copy of the orginal file from the repository
+        # Retrieve a copy of the original file from the repository
         working_file = copy_repository_resource_to_working_directory(repository_file)
-        make_derivative(file_set, working_file)
+        CharacterizeJob.perform_later(file_set, working_file)
         true
       end
 
       private
 
-        def make_derivative(file_set, working_file)
-          CharacterizeJob.perform_later(file_set, working_file)
-        end
-
         # @param [File, ActionDispatch::Http::UploadedFile] file
-        # @param [String] id the identifer of the FileSet
+        # @param [String] id the identifier of the FileSet
         # @return [String] path of the working file
         def copy_file_to_working_directory(file, id)
           file_name = file.respond_to?(:original_filename) ? file.original_filename : ::File.basename(file)
@@ -61,7 +56,7 @@ module CurationConcerns
           copy_stream_to_working_directory(file_set.id, file.original_name, StringIO.new(file.content))
         end
 
-        # @param [String] id the identifer
+        # @param [String] id the identifier
         # @param [String] name the file name
         # @param [#read] stream the stream to copy to the working directory
         # @return [String] path of the working file

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

@@ -3,7 +3,7 @@ Blacklight.onLoad(function() {
   if(tools.length > 0) {
     tools.affix({
       offset: {
-        top: $("#file-manager-tools").parent().offset().top,
+        top: $("#file-manager-tools .actions").offset().top,
         bottom: function() {
           return $("#file-manager-extra-tools").outerHeight(true) + $("footer").outerHeight(true)
         }

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

@@ -102,7 +102,7 @@
     }
     @media (min-width: $screen-md-min) {
       &.affix {
-        top: 0;
+        top: -50px;
         width: 235px;
       }
     }

data/app/helpers/curation_concerns/file_set_helper.rb

@@ -7,9 +7,12 @@ module CurationConcerns::FileSetHelper
     end
   end
 
-  def media_display(file_set, locals = {})
-    render media_display_partial(file_set),
-           locals.merge(file_set: file_set)
+  # REVIEW: Since this media display could theoretically work for
+  #         any object that inplements to_s and the Mime Type methos (image? audio? ...),
+  #         Should this really be in file_set or could it be in it's own helper class like media_helper?
+  def media_display(presenter, locals = {})
+    render media_display_partial(presenter),
+           locals.merge(file_set: presenter)
   end
 
   def media_display_partial(file_set)

data/app/jobs/characterize_job.rb

@@ -2,9 +2,10 @@ class CharacterizeJob < ActiveJob::Base
   queue_as CurationConcerns.config.ingest_queue_name
 
   # @param [FileSet] file_set
-  # @param [String] filename a local path for the file to characterize. By using this, we don't have to pull a copy out of fedora.
+  # @param [String] filename a local path for the file to characterize so we don't have to pull a copy out of fedora.
   def perform(file_set, filename)
-    Hydra::Works::CharacterizationService.run(file_set, filename)
+    raise LoadError, "#{file_set.class.characterization_proxy} was not found" unless file_set.characterization_proxy?
+    Hydra::Works::CharacterizationService.run(file_set.characterization_proxy, filename)
     file_set.save!
     CreateDerivativesJob.perform_later(file_set, filename)
   end

data/app/jobs/ingest_file_job.rb

@@ -24,5 +24,6 @@ class IngestFileJob < ActiveJob::Base
 
     # Do post file ingest actions
     CurationConcerns::VersioningService.create(file_set.send(relation.to_sym), user)
+    CharacterizeJob.perform_later(file_set, filename)
   end
 end

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

@@ -0,0 +1,47 @@
+# This module points the FileSet to the location of the technical metdata.
+# By default, the file holding the metadata is :original_file and the terms
+# are listed under ::characterization_terms.
+# Implementations may define their own terms or use a different source file, but
+# any terms must be set on the ::characterization_proxy by the Hydra::Works::CharacterizationService
+#
+# class MyFileSet
+#   include CurationConcerns::FileSetBehavior
+# end
+#
+# MyFileSet.characterization_proxy = :master_file
+# MyFileSet.characterization_terms = [:term1, :term2, :term3]
+module CurationConcerns
+  module FileSet
+    module Characterization
+      extend ActiveSupport::Concern
+
+      included do
+        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
+        ]
+        self.characterization_proxy = :original_file
+
+        delegate(*characterization_terms, to: :characterization_proxy)
+
+        def characterization_proxy
+          send(self.class.characterization_proxy) || NullCharacterizationProxy.new
+        end
+
+        def characterization_proxy?
+          !characterization_proxy.is_a?(NullCharacterizationProxy)
+        end
+      end
+
+      class NullCharacterizationProxy
+        def method_missing(*_args)
+          []
+        end
+
+        def mime_type
+        end
+      end
+    end
+  end
+end

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

@@ -1,15 +1,11 @@
 module CurationConcerns
   module FileSetBehavior
     extend ActiveSupport::Concern
-    # BasicMetadata needs to be included before Characterization since
-    # both of them declare properties with the same predicate (dc:creator
-    # and dc:language.) Loading BasicMetadata first allows Characterization
-    # to detect the duplicate (via the AlreadyThereStrategy) and prevents
-    # the warning.
+
     include CurationConcerns::BasicMetadata
     include Hydra::Works::FileSetBehavior
     include Hydra::Works::VirusCheck
-    include CurationConcerns::Characterization
+    include CurationConcerns::FileSet::Characterization
     include Hydra::WithDepositor
     include CurationConcerns::Serializers
     include CurationConcerns::Noid

data/app/presenters/curation_concerns/collection_presenter.rb

@@ -17,7 +17,7 @@ module CurationConcerns
              :to_s, to: :solr_document
 
     # Metadata Methods
-    delegate :title, :description, :creator, :contributor, :subject, :publisher, :language,
+    delegate :title, :description, :creator, :contributor, :subject, :publisher, :keyword, :language,
              :embargo_release_date, :lease_expiration_date, :rights, :date_created, to: :solr_document
 
     def size

data/app/presenters/curation_concerns/work_show_presenter.rb

@@ -40,6 +40,12 @@ module CurationConcerns
       @file_set_presenters ||= member_presenters(ordered_ids & file_set_ids)
     end
 
+    # @return FileSetPresenter presenter for the representative FileSets
+    def representative_presenter
+      return nil if representative_id.blank?
+      @representative_presenter ||= member_presenters([representative_id]).first
+    end
+
     # @return [Array<WorkShowPresenter>] presenters for the ordered_members that are not FileSets
     def work_presenters
       @work_presenters ||= member_presenters(ordered_ids - file_set_ids, work_presenter_class)

data/app/views/curation_concerns/base/_representative_media.html.erb

@@ -1,5 +1,5 @@
-<% if presenter.representative_id.present? && (fs = ::FileSet.find(presenter.representative_id)) %>
-  <%= media_display fs %>
+<% if presenter.representative_id.present? %>
+  <%= media_display presenter.representative_presenter %>
 <% else %>
   <%= image_tag 'nope.png', class: "canonical-image" %>
 <% end %>

data/curation_concerns.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sprockets-es6'
   spec.add_dependency 'kaminari_route_prefix', '~> 0.0.1'
   spec.add_dependency 'active_attr'
-  spec.add_dependency 'hydra-works', '>= 0.10.0'
+  spec.add_dependency 'hydra-works', '>= 0.11.0'
   spec.add_dependency 'active_fedora-noid', '~> 1.0'
   spec.add_dependency 'qa', '~> 0.5'
   spec.add_dependency 'redlock', '~> 0.1.2'

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "1.0.0.beta2".freeze
+  VERSION = "1.0.0.beta3".freeze
 end

data/lib/generators/curation_concerns/work/templates/actor.rb.erb

@@ -1,6 +1,8 @@
 # Generated via
 #  `rails generate curation_concerns:work <%= class_name %>`
-module CurationConcerns::Actors
-  class <%= class_name %>Actor < CurationConcerns::Actors::BaseActor
+module CurationConcerns
+  module Actors
+    class <%= class_name %>Actor < CurationConcerns::Actors::BaseActor
+    end
   end
 end

data/lib/generators/curation_concerns/work/templates/controller.rb.erb

@@ -1,7 +1,9 @@
 # Generated via
 #  `rails generate curation_concerns:work <%= class_name %>`
 
-class CurationConcerns::<%= class_name.pluralize %>Controller < ApplicationController
-  include CurationConcerns::CurationConcernController
-  self.curation_concern_type = <%= class_name %>
+module CurationConcerns
+  class <%= class_name.pluralize %>Controller < ApplicationController
+    include CurationConcerns::CurationConcernController
+    self.curation_concern_type = <%= class_name %>
+  end
 end

data/spec/actors/curation_concerns/file_actor_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 
 describe CurationConcerns::Actors::FileActor do
   include ActionDispatch::TestProcess
+  include CurationConcerns::FactoryHelpers
+
   let(:user) { create(:user) }
   let(:file_set) { create(:file_set) }
   let(:relation) { create(:file_set) }
@@ -10,9 +12,25 @@ describe CurationConcerns::Actors::FileActor do
 
   describe '#ingest_file' do
     it 'calls ingest file job' do
-      expect(CharacterizeJob).to receive(:perform_later)
       expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user, 'remastered')
       actor.ingest_file(uploaded_file)
     end
   end
+
+  describe '#revert_to' do
+    let(:revision_id)      { 'asdf1234' }
+    let(:previous_version) { mock_file_factory }
+    let(:file_path)        { 'path/to/working_file' }
+    before do
+      allow(file_set).to receive(:remastered).and_return(previous_version)
+      allow(previous_version).to receive(:restore_version).with(revision_id)
+      allow(previous_version).to receive(:original_name).and_return('original_name')
+    end
+    it 'reverts to a previous version of a file' do
+      expect(CurationConcerns::VersioningService).to receive(:create).with(previous_version, user)
+      expect(actor).to receive(:copy_repository_resource_to_working_directory).with(previous_version).and_return(file_path)
+      expect(CharacterizeJob).to receive(:perform_later).with(file_set, file_path)
+      actor.revert_to(revision_id)
+    end
+  end
 end

data/spec/actors/curation_concerns/file_set_actor_spec.rb

@@ -21,7 +21,6 @@ describe CurationConcerns::Actors::FileSetActor do
     end
 
     before do
-      expect(CharacterizeJob).to receive(:perform_later)
       expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user, 'original_file')
       allow(actor).to receive(:acquire_lock_for).and_yield
       actor.create_metadata(work)
@@ -67,14 +66,12 @@ describe CurationConcerns::Actors::FileSetActor do
 
   describe '#create_content' do
     it 'calls ingest file job' do
-      expect(CharacterizeJob).to receive(:perform_later)
       expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user, 'original_file')
       actor.create_content(uploaded_file)
     end
 
     context 'when an alternative relationship is specified' do
       it 'calls ingest file job' do
-        expect(CharacterizeJob).to receive(:perform_later)
         expect(IngestFileJob).to receive(:perform_later).with(file_set, /world\.png$/, 'image/png', user, 'remastered')
         actor.create_content(uploaded_file, 'remastered')
       end
@@ -82,7 +79,6 @@ describe CurationConcerns::Actors::FileSetActor do
 
     context 'using ::File' do
       before do
-        allow(CharacterizeJob).to receive(:perform_later)
         allow(IngestFileJob).to receive(:perform_later)
         actor.create_content(local_file)
       end
@@ -104,7 +100,6 @@ describe CurationConcerns::Actors::FileSetActor do
       let(:actor)      { described_class.new(file_set, user) }
 
       before do
-        allow(CharacterizeJob).to receive(:perform_later)
         allow(IngestFileJob).to receive(:perform_later)
         allow(file_set).to receive(:label).and_return(short_name)
         # TODO: we should allow/expect call to IngestJob
@@ -129,7 +124,6 @@ describe CurationConcerns::Actors::FileSetActor do
 
       before do
         allow(IngestFileJob).to receive(:perform_later)
-        allow(CharacterizeJob).to receive(:perform_later)
         actor.create_content(fixture_file_upload(file))
       end
 

data/spec/controllers/curation_concerns/file_sets_controller_spec.rb

@@ -165,7 +165,6 @@ describe CurationConcerns::FileSetsController do
       context 'updating file content' do
         it 'is successful' do
           expect(IngestFileJob).to receive(:perform_later)
-          expect(CharacterizeJob).to receive(:perform_later).with(file_set, kind_of(String))
           post :update, id: file_set, file_set: { files: [file] }
           expect(response).to redirect_to main_app.curation_concerns_file_set_path(file_set)
         end

data/spec/factories/generic_works.rb

@@ -23,6 +23,13 @@ FactoryGirl.define do
       end
     end
 
+    factory :work_with_representative_file do
+      before(:create) do |work, evaluator|
+        work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user, title: ['A Contained FileSet'])
+        work.representative_id = work.members[0].id
+      end
+    end
+
     factory :work_with_file_and_work do
       before(:create) do |work, evaluator|
         work.ordered_members << FactoryGirl.create(:file_set, user: evaluator.user)

data/spec/jobs/characterize_job_spec.rb

@@ -1,18 +1,31 @@
 require 'spec_helper'
 
 describe CharacterizeJob do
-  let(:file_set) { FileSet.new(id: file_set_id) }
+  include CurationConcerns::FactoryHelpers
+
+  let(:file_set)    { FileSet.new(id: file_set_id) }
   let(:file_set_id) { 'abc123' }
-  let(:filename) { double }
+  let(:filename)    { double }
+  let(:file)        { mock_file_factory }
 
   before do
     allow(FileSet).to receive(:find).with(file_set_id).and_return(file_set)
+    allow(file_set).to receive(:original_file).and_return(file)
+  end
+
+  context 'when the characterization proxy content is present' do
+    it 'runs Hydra::Works::CharacterizationService and creates a CreateDerivativesJob' do
+      expect(Hydra::Works::CharacterizationService).to receive(:run).with(file, filename)
+      expect(file_set).to receive(:save!)
+      expect(CreateDerivativesJob).to receive(:perform_later).with(file_set, filename)
+      described_class.perform_now(file_set, filename)
+    end
   end
 
-  it 'runs Hydra::Works::CharacterizationService and creates a CreateDerivativesJob' do
-    expect(Hydra::Works::CharacterizationService).to receive(:run).with(file_set, filename)
-    expect(file_set).to receive(:save!)
-    expect(CreateDerivativesJob).to receive(:perform_later).with(file_set, filename)
-    described_class.perform_now file_set, filename
+  context 'when the characterization proxy content is absent' do
+    before { allow(file_set).to receive(:characterization_proxy?).and_return(false) }
+    it 'raises an error' do
+      expect { described_class.perform_now(file_set, filename) }.to raise_error(LoadError, 'original_file was not found')
+    end
   end
 end

data/spec/jobs/ingest_file_job_spec.rb

@@ -20,6 +20,7 @@ describe IngestFileJob do
       Object.send(:remove_const, :FileSetWithExtras)
     end
     it 'uses the provided relationship' do
+      expect(CharacterizeJob).to receive(:perform_later).with(file_set, filename)
       described_class.perform_now(file_set, filename, 'image/png', 'bob', 'remastered')
       expect(file_set.reload.remastered.mime_type).to eq 'image/png'
     end
@@ -27,6 +28,7 @@ describe IngestFileJob do
 
   context 'when given a mime_type' do
     it 'uses the provided mime_type' do
+      expect(CharacterizeJob).to receive(:perform_later).with(file_set, filename)
       described_class.perform_now(file_set, filename, 'image/png', 'bob')
       expect(file_set.reload.original_file.mime_type).to eq 'image/png'
     end
@@ -38,6 +40,7 @@ describe IngestFileJob do
       # The parameter versioning: false instructs the machinery in Hydra::Works NOT to do versioning. So it can be handled later on.
       allow(CurationConcerns::VersioningService).to receive(:create)
       expect(Hydra::Works::AddFileToFileSet).to receive(:call).with(file_set, instance_of(::File), :original_file, versioning: false)
+      expect(CharacterizeJob).to receive(:perform_later).with(file_set, filename)
       described_class.perform_now(file_set, filename, nil, 'bob')
     end
   end
@@ -49,6 +52,7 @@ describe IngestFileJob do
     let(:user2) { create(:user) }
 
     before do
+      allow(Hydra::Works::CharacterizationService).to receive(:run).with(any_args)
       described_class.perform_now(file_set, file1, 'image/png', user.user_key)
       described_class.perform_now(file_set, file2, 'text/plain', user2.user_key)
     end

data/spec/models/curation_concerns/file_set/characterization_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe CurationConcerns::FileSet do
+  include CurationConcerns::FactoryHelpers
+
+  let(:file_set) { create(:file_set) }
+  let(:file)     { mock_file_factory }
+
+  subject { file_set }
+
+  describe '::characterization_proxy' do
+    subject { file_set.class.characterization_proxy }
+    it { is_expected.to eq(:original_file) }
+  end
+
+  describe '::characterization_terms' do
+    subject { file_set.class.characterization_terms }
+    it { is_expected.to contain_exactly(:format_label, :file_size, :height, :width, :filename, :well_formed,
+                                        :page_count, :file_title, :last_modified, :original_checksum, :mime_type) }
+  end
+
+  describe 'characterization_proxy' do
+    subject { file_set.characterization_proxy }
+    context 'when no proxy is present' do
+      it { is_expected.to be_kind_of(CurationConcerns::FileSet::Characterization::NullCharacterizationProxy) }
+    end
+
+    context 'with a proxy' do
+      before { allow(file_set).to receive(:original_file).and_return(file) }
+      it { is_expected.to eq(file) }
+    end
+  end
+
+  describe '#characterization_proxy?' do
+    subject { file_set.characterization_proxy? }
+    context 'when no proxy is present' do
+      it { is_expected.to be false }
+    end
+
+    context 'with a proxy' do
+      before { allow(file_set).to receive(:original_file).and_return(file) }
+      it { is_expected.to be true }
+    end
+  end
+
+  context 'with a custom proxy' do
+    let(:custom_file_set) { build(:file_set) }
+    before  { FileSet.characterization_proxy = :custom_proxy }
+    after   { FileSet.characterization_proxy = :original_file }
+    subject { custom_file_set.class.characterization_proxy }
+    it      { is_expected.to eq(:custom_proxy) }
+  end
+end

data/spec/presenters/curation_concerns/collection_presenter_spec.rb

@@ -6,6 +6,7 @@ describe CurationConcerns::CollectionPresenter do
           id: 'adc12v',
           description: ['a nice collection'],
           title: ['A clever title'],
+          keyword: ['neologism'],
           date_created: ['some date'])
   end
   let(:work) { build(:work, title: ['unimaginitive title']) }
@@ -21,6 +22,11 @@ describe CurationConcerns::CollectionPresenter do
     it { is_expected.to eq ['A clever title'] }
   end
 
+  describe '#keyword' do
+    subject { presenter.keyword }
+    it { is_expected.to eq ['neologism'] }
+  end
+
   describe '#to_key' do
     subject { presenter.to_key }
     it { is_expected.to eq ['adc12v'] }

data/spec/presenters/curation_concerns/work_show_presenter_spec.rb

@@ -109,6 +109,20 @@ describe CurationConcerns::WorkShowPresenter do
     end
   end
 
+  describe "#representative_presenter" do
+    let(:obj) { create(:work_with_representative_file) }
+    let(:attributes) { obj.to_solr }
+    let(:presenter_class) { double }
+    before do
+      allow(presenter).to receive(:file_presenter_class).and_return(presenter_class)
+    end
+    it "has a representative" do
+      expect(CurationConcerns::PresenterFactory).to receive(:build_presenters)
+        .with([obj.members[0].id], presenter_class, ability).and_return ["abc"]
+      expect(presenter.representative_presenter).to eq("abc")
+    end
+  end
+
   describe "#collection_presenters" do
     let(:collection) { create(:collection) }
     let(:obj) { create(:work) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -178,14 +178,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: active_fedora-noid
   requirement: !ruby/object:Gem::Requirement
@@ -710,10 +710,10 @@ files:
 - app/models/collection.rb
 - app/models/concerns/curation_concerns/ability.rb
 - app/models/concerns/curation_concerns/basic_metadata.rb
-- app/models/concerns/curation_concerns/characterization.rb
 - app/models/concerns/curation_concerns/collection.rb
 - app/models/concerns/curation_concerns/collection_behavior.rb
 - app/models/concerns/curation_concerns/file_set/belongs_to_works.rb
+- app/models/concerns/curation_concerns/file_set/characterization.rb
 - app/models/concerns/curation_concerns/file_set/derivatives.rb
 - app/models/concerns/curation_concerns/file_set/full_text_indexing.rb
 - app/models/concerns/curation_concerns/file_set/indexing.rb
@@ -1102,6 +1102,7 @@ files:
 - spec/models/checksum_audit_log_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/curation_concerns/collection_behavior_spec.rb
+- spec/models/curation_concerns/file_set/characterization_spec.rb
 - spec/models/curation_concerns/file_set/derivatives_spec.rb
 - spec/models/curation_concerns/operation_spec.rb
 - spec/models/curation_concerns/work_behavior_spec.rb
@@ -1204,7 +1205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A Rails Engine that allows an application to CRUD CurationConcern objects
@@ -1303,6 +1304,7 @@ test_files:
 - spec/models/checksum_audit_log_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/curation_concerns/collection_behavior_spec.rb
+- spec/models/curation_concerns/file_set/characterization_spec.rb
 - spec/models/curation_concerns/file_set/derivatives_spec.rb
 - spec/models/curation_concerns/operation_spec.rb
 - spec/models/curation_concerns/work_behavior_spec.rb

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

@@ -1,41 +0,0 @@
-# This module points the FileSet to the location of the technical metdata.
-# By default, the file holding the metadata is :original_file and the terms
-# are listed under ::characterization_terms.
-# Implementations may define their own terms or use a different source file, but
-# any terms must be set on the ::characterization_proxy by the Hydra::Works::CharacterizationService
-#
-# class MyFileSet
-#   include CurationConcerns::FileSetBehavior
-# end
-#
-# MyFileSet.characterization_proxy = :master_file
-# MyFileSet.characterization_terms = [:term1, :term2, :term3]
-module CurationConcerns
-  module Characterization
-    extend ActiveSupport::Concern
-
-    included do
-      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
-      ]
-      self.characterization_proxy = :original_file
-
-      delegate(*characterization_terms, to: :characterization_proxy)
-
-      def characterization_proxy
-        send(self.class.characterization_proxy) || NullCharacterizationProxy.new
-      end
-    end
-
-    class NullCharacterizationProxy
-      def method_missing(*_args)
-        []
-      end
-
-      def mime_type
-      end
-    end
-  end
-end