curation_concerns 0.10.0 → 0.11.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 942802ebcf7c7e14d4ee9470a4a3a215af0bca4d
-  data.tar.gz: 468ff214bd88dcc7ec4d226d51974e16061fccde
+  metadata.gz: 4c78f15b06d8b5d61d52a99b9498950819fffdc9
+  data.tar.gz: 79effc2f8a6b6ecec62815cbe91e5a5f0987f239
 SHA512:
-  metadata.gz: 031509db45e6bd7c1bedb70cc4be63c0cf42ef0d5516178c8462534a51c45fc0c82259ce95ab4724d0216cd7fe529f2e256dc074367096074a680b539bc810ba
-  data.tar.gz: be8bd2e85ac10c0c98b3ad0194e9f1db681028b5999ad754b97026ac15fa3fe958065115711bdd12ab57e2f77d67d4faa7ba3c9c66e3af90e8a789a34b3bb8c6
+  metadata.gz: ad7c5e7f4605f50a235bd79d2fce714e59fb3febd3f26f17e20fe3d21bf2aafa378dd3d44a8ce9dcb480f74e62d01640cbb0e0cebd5c5a6819848f0cab06a7eb
+  data.tar.gz: 4f736f41c13de86dd6ed2004c35407024efbac2e8b3a6114dac7674e20fa61d04ea2811b1fa0fc89b325dc6fec9dff6c6f7c0ffa7b487abe789f94cc50c908ed

data/.rubocop.yml

@@ -1,5 +1,4 @@
 require: rubocop-rspec
-
 AllCops:
   DisplayCopNames: true
   Include:
@@ -178,9 +177,7 @@ RSpec/DescribeClass:
   Exclude:
     - 'spec/javascripts/jasmine_spec.rb'
     - 'spec/tasks/rake_spec.rb'
-    - 'spec/jobs/event_jobs_spec.rb'
     - 'spec/abilities/**/*'
-    - 'spec/features/**/*'
     - 'spec/views/**/*'
     - 'spec/routing/**/*'
     - 'spec/inputs/**/*'

data/CONTRIBUTING.md

@@ -0,0 +1,111 @@
+# How to Contribute
+
+We want your help to make Project Hydra great.
+There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+
+## Hydra Project Intellectual Property Licensing and Ownership
+
+All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group.
+If the contributor works for an institution, the institution must have a Corporate Contributor License Agreement (cCLA) on file.
+
+https://wiki.duraspace.org/display/hydra/Hydra+Project+Intellectual+Property+Licensing+and+Ownership
+
+## Contribution Tasks
+
+* Reporting Issues
+* Making Changes
+* Submitting Changes
+* Merging Changes
+
+### Reporting Issues
+
+* Make sure you have a [GitHub account](https://github.com/signup/free)
+* Submit a [Github issue](./issues) by:
+  * Clearly describing the issue
+    * Provide a descriptive summary
+    * Explain the expected behavior
+    * Explain the actual behavior
+    * Provide steps to reproduce the actual behavior
+
+### Making Changes
+
+* Fork the repository on GitHub
+* Create a topic branch from where you want to base your work.
+  * This is usually the master branch.
+  * To quickly create a topic branch based on master; `git branch fix/master/my_contribution master`
+  * Then checkout the new branch with `git checkout fix/master/my_contribution`.
+  * Please avoid working directly on the `master` branch.
+  * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
+* Make commits of logical units.
+  * Your commit should include a high level description of your work in HISTORY.textile 
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+* If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
+
+```
+    Present tense short summary (50 characters or less)
+
+    More detailed description, if necessary. It should be wrapped to 72
+    characters. Try to be as descriptive as you can, even if you think that
+    the commit content is obvious, it may not be obvious to others. You
+    should add such description also if it's already present in bug tracker,
+    it should not be necessary to visit a webpage to check the history.
+
+    Include Closes #<issue-number> when relavent.
+
+    Description can have multiple paragraphs and you can use code examples
+    inside, just indent it with 4 spaces:
+
+        class PostsController
+          def index
+            respond_with Post.limit(10)
+          end
+        end
+
+    You can also add bullet points:
+
+    - you can use dashes or asterisks
+
+    - also, try to indent next line of a point for readability, if it's too
+      long to fit in 72 characters
+```
+
+* Make sure you have added the necessary tests for your changes.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+* When you are ready to submit a pull request
+
+### Submitting Changes
+
+[Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
+
+* Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
+* Make sure your branch is up to date with its parent branch (i.e. master)
+  * `git checkout master`
+  * `git pull --rebase`
+  * `git checkout <your-branch>`
+  * `git rebase master`
+  * It is likely a good idea to run your tests again.
+* Squash the commits for your branch into one commit
+  * `git rebase --interactive HEAD~<number-of-commits>` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * To determine the number of commits on your branch: `git log master..<your-branch> --oneline | wc -l`
+  * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
+* Push your changes to a topic branch in your fork of the repository.
+* Submit a pull request from your fork to the project.
+
+### Merging Changes
+
+* It is considered "poor from" to merge your own request.
+* Please take the time to review the changes and get a sense of what is being changed. Things to consider:
+  * Does the commit message explain what is going on?
+  * Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
+  * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
+  * Did the Travis tests complete successfully?
+* If you are uncertain, bring other contributors into the conversation by creating a comment that includes their @username.
+* If you like the pull request, but want others to chime in, create a +1 comment and tag a user.
+
+# Additional Resources
+
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
+* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/Gemfile

@@ -6,7 +6,7 @@ gemspec
 gem 'curation_concerns-models', path: './curation_concerns-models'
 
 group :development, :test do
-  gem 'rubocop', require: false
+  gem 'rubocop', '~> 0.37.0', require: false
   gem 'rubocop-rspec', '~> 1.3.1', require: false
   gem 'simplecov', '~> 0.9', require: false
   gem 'coveralls', require: false

data/README.md

@@ -11,6 +11,18 @@
 
 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.
 
+## Prerequisites
+
+Curation Concerns requires the following software to work:
+
+1. Solr
+1. [Fedora Commons](http://www.fedora-commons.org/) digital repository
+1. A SQL RDBMS (MySQL, PostgreSQL), though **note** that SQLite will be used by default if you're looking to get up and running quickly
+1. [Redis](http://redis.io/), a key-value store
+1. [ImageMagick](http://www.imagemagick.org/) with JPEG-2000 support
+1. [FITS](#characterization) version 0.6.x
+1. [LibreOffice](#derivatives)
+
 ## Installation
 
 Checkout the dependencies for [curation_concerns-models](https://github.com/projecthydra-labs/curation_concerns/tree/master/curation_concerns-models#dependencies), which is installed as part of curation_concerns.
@@ -58,3 +70,7 @@ Or you can do all the steps manually:
     # in another window
     $ rake engine_cart:generate
     $ rake curation_concerns:spec
+
+## Help
+
+If you have questions or need help, please email [the Hydra community tech list](mailto:hydra-tech@googlegroups.com) or stop by [the Hydra community IRC channel](irc://irc.freenode.net/projecthydra).

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.11.0.rc1

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

@@ -5,7 +5,7 @@ class SaveManager {
   }
 
   override_save_button() {
-    jQuery(() => {
+    Blacklight.onLoad(() => {
       this.save_button.click(this.clicked_save)
     })
   }

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

@@ -1,7 +1,3 @@
-body {
-  padding:0 1em 1em;
-}
-
 #brand-bar-wrapper, #title-bar-wrapper {
   margin-left:-1em;
   margin-right:-1em;

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

@@ -14,10 +14,6 @@ module CurationConcerns::CatalogController
   end
 
   module ClassMethods
-    def t(*args)
-      I18n.translate(*args)
-    end
-
     def uploaded_field
       #  system_create_dtsi
       solr_name('date_uploaded', :stored_sortable, type: :date)
@@ -28,6 +24,7 @@ module CurationConcerns::CatalogController
     end
 
     def search_config
+      ActiveSupport::Deprecation.warn("#{self.class}.search_config is deprecated and will be removed in CurationConcerns 1.0")
       { 'qf' => %w(title_tesim name_tesim), 'qt' => 'search', 'rows' => 10 }
     end
   end

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

@@ -8,6 +8,10 @@ module CurationConcerns
       before_action :filter_docs_with_read_access!, except: :show
       layout 'curation_concerns/1_column'
       skip_load_and_authorize_resource only: :show
+
+      class_attribute :presenter_class, :form_class
+      self.presenter_class = CurationConcerns::CollectionPresenter
+      self.form_class = CurationConcerns::Forms::CollectionEditForm
     end
 
     def new
@@ -65,10 +69,6 @@ module CurationConcerns
         end
       end
 
-      def presenter_class
-        CurationConcerns::CollectionPresenter
-      end
-
       def collection_search_builder_class
         CurationConcerns::WorkSearchBuilder
       end
@@ -97,10 +97,6 @@ module CurationConcerns
         @form ||= form_class.new(@collection)
       end
 
-      def form_class
-        CurationConcerns::Forms::CollectionEditForm
-      end
-
       # Include 'catalog' and 'curation_concerns/base' in the search path for views
       def _prefixes
         @_prefixes ||= super + ['catalog', 'curation_concerns/base']

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

@@ -9,17 +9,27 @@ module CurationConcerns::CurationConcernController
     with_themed_layout '1_column'
     helper CurationConcerns::AbilityHelper
 
-    class_attribute :curation_concern_type
+    class_attribute :_curation_concern_type, :show_presenter
+    self.show_presenter = CurationConcerns::WorkShowPresenter
     attr_accessor :curation_concern
     helper_method :curation_concern
   end
 
   module ClassMethods
     def set_curation_concern_type(curation_concern_type)
-      load_and_authorize_resource class: curation_concern_type, instance_name: :curation_concern, except: [:show, :file_manager]
+      Deprecation.warn self, "set_curation_concern_type is deprecated and will be removed in curation_concerns 1.0. Use self.curation_concern_type = #{curation_concern_type} instead."
       self.curation_concern_type = curation_concern_type
     end
 
+    def curation_concern_type=(curation_concern_type)
+      load_and_authorize_resource class: curation_concern_type, instance_name: :curation_concern, except: [:show, :file_manager]
+      self._curation_concern_type = curation_concern_type
+    end
+
+    def curation_concern_type
+      _curation_concern_type
+    end
+
     def cancan_resource_class
       CurationConcerns::ControllerResource
     end
@@ -54,7 +64,7 @@ module CurationConcerns::CurationConcernController
         # load and authorize @curation_concern manually because it's skipped for html
         # This has to use #find instead of #load_instance_from_solr because
         # we want to return values like file_set_ids in the json
-        @curation_concern = curation_concern_type.find(params[:id]) unless curation_concern
+        @curation_concern = _curation_concern_type.find(params[:id]) unless curation_concern
         authorize! :show, @curation_concern
         render :show, status: :ok
       end
@@ -94,16 +104,10 @@ module CurationConcerns::CurationConcernController
 
   protected
 
-    # Gives the class of the show presenter. Override this if you want
-    # to use a different presenter.
-    def show_presenter
-      CurationConcerns::WorkShowPresenter
-    end
-
     # Gives the class of the form. Override this if you want
     # to use a different form.
     def form_class
-      CurationConcerns.const_get("#{self.class.curation_concern_type.to_s.demodulize}Form")
+      CurationConcerns.const_get("#{_curation_concern_type.to_s.demodulize}Form")
     end
 
     def build_form
@@ -154,7 +158,7 @@ module CurationConcerns::CurationConcernController
     end
 
     def hash_key_for_curation_concern
-      self.class.curation_concern_type.model_name.param_key
+      _curation_concern_type.model_name.param_key
     end
 
     # Override this method to add additional response

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

@@ -11,6 +11,10 @@ module CurationConcerns
       helper_method :curation_concern
       include CurationConcerns::ParentContainer
       copy_blacklight_config_from(::CatalogController)
+
+      class_attribute :show_presenter, :form_class
+      self.show_presenter = CurationConcerns::FileSetPresenter
+      self.form_class = CurationConcerns::Forms::FileSetEditForm
     end
 
     def curation_concern
@@ -65,18 +69,6 @@ module CurationConcerns
       end
     end
 
-    # Gives the class of the show presenter. Override this if you want
-    # to use a different presenter.
-    def show_presenter
-      CurationConcerns::FileSetPresenter
-    end
-
-    # Gives the class of the form. Override this if you want
-    # to use a different form.
-    def form_class
-      CurationConcerns::Forms::FileSetEditForm
-    end
-
     def destroy
       parent = @file_set.in_works.first
       actor.destroy
@@ -211,7 +203,7 @@ module CurationConcerns
         else
           msg = @file_set.errors.full_messages.join(', ')
           flash[:error] = msg
-          json_error "Error creating generic file: #{msg}"
+          json_error "Error creating generic file #{file.original_filename}: #{msg}"
         end
       end
 

data/app/controllers/curation_concerns/permissions_controller.rb

@@ -1,18 +1,18 @@
 class CurationConcerns::PermissionsController < ApplicationController
   include CurationConcerns::CurationConcernController
   with_themed_layout '1_column'
-  self.curation_concern_type = ActiveFedora::Base
 
   def confirm
   end
 
   def copy
-    VisibilityCopyJob.perform_later(curation_concern.id)
+    authorize! :edit, curation_concern
+    VisibilityCopyJob.perform_later(curation_concern)
     flash_message = 'Updating file permissions. This may take a few minutes. You may want to refresh your browser or return to this record later to see the updated file permissions.'
     redirect_to [main_app, curation_concern], notice: flash_message
   end
 
   def curation_concern
-    @curation_concern ||= curation_concern_type.find(params[:id], cast: true)
+    @curation_concern ||= ActiveFedora::Base.find(params[:id])
   end
 end

data/app/forms/curation_concerns/forms/collection_edit_form.rb

@@ -55,7 +55,7 @@ module CurationConcerns
       private
 
         def all_files
-          member_presenters.flat_map(&:file_presenters).map { |x| [x.to_s, x.id] }
+          member_presenters.flat_map(&:file_set_presenters).map { |x| [x.to_s, x.id] }
         end
 
         def member_presenters

data/app/forms/curation_concerns/forms/work_form.rb

@@ -16,6 +16,8 @@ module CurationConcerns
                     :visibility_during_lease, :lease_expiration_date, :visibility_after_lease,
                     :visibility, :ordered_member_ids]
 
+      self.required_fields = [:title]
+
       # @param [ActiveFedora::Base,#member_ids] model
       # @param [Ability] current_ability
       def initialize(model, current_ability)

data/app/helpers/curation_concerns/collections_helper.rb

@@ -47,10 +47,27 @@ module CurationConcerns::CollectionsHelper
     # If you have implement User.collections, the results of that will be used.
     def current_users_collections
       if current_user.respond_to?(:collections)
-        current_user.collections.map { |c| [c.title.join(', '), c.id] }
-      else
-        query = ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: Collection.to_class_uri)
-        ActiveFedora::SolrService.query(query, fl: 'title_tesim id', rows: 1000).map { |r| [r['title_tesim'].join(', '), r['id']] }.sort { |a, b| a.first <=> b.first }
+        return current_user.collections.map { |c| [c.title.join(', '), c.id] }
       end
+      query = ActiveFedora::SolrQueryBuilder
+              .construct_query_for_rel(
+                has_model: Collection.to_class_uri)
+      convert_solr_docs_to_select_options(
+        ActiveFedora::SolrService.query(query,
+                                        fl: 'title_tesim id',
+                                        rows: 1000)
+      )
+    end
+
+    def convert_solr_docs_to_select_options(results)
+      results
+        .map { |r| [SolrDocument.new(r).title, r['id']] }
+        .sort do |a, b|
+          if a.first && b.first
+            a.first <=> b.first
+          else
+            a.first ? -1 : 1
+          end
+        end
     end
 end

data/app/jobs/visibility_copy_job.rb

@@ -1,9 +1,7 @@
-class VisibilityCopyJob < ActiveFedoraIdBasedJob
+class VisibilityCopyJob < ActiveJob::Base
   queue_as :permissions
 
-  def perform(id)
-    @id = id
-    work = object
+  def perform(work)
     work.file_sets.each do |file|
       file.visibility = work.visibility # visibility must come first, because it can clear an embargo/lease
       if work.lease

data/app/presenters/curation_concerns/collection_presenter.rb

@@ -21,7 +21,7 @@ module CurationConcerns
              :embargo_release_date, :lease_expiration_date, :rights, :date_created, to: :solr_document
 
     def size
-      number_to_human_size(@solr_document['bytes_is'])
+      number_to_human_size(@solr_document['bytes_lts'])
     end
 
     def total_items

data/app/presenters/curation_concerns/work_show_presenter.rb

@@ -24,20 +24,43 @@ module CurationConcerns
              :creator, :contributor, :subject, :publisher, :language, :embargo_release_date,
              :lease_expiration_date, :rights, to: :solr_document
 
+    # @return [Array<FileSetPresenter>] presenters for the orderd_members that are FileSets
+    def file_set_presenters
+      @file_set_presenters ||= member_presenters(ordered_ids & file_set_ids)
+    end
+
+    # @deprecated
+    # @return [Array<FileSetPresenter>] presenters for the orderd_members that are FileSets
     def file_presenters
-      @file_sets ||= PresenterFactory.build_presenters(ordered_ids,
-                                                       file_presenter_class,
-                                                       current_ability)
+      Deprecation.warn WorkShowPresenter, "file_presenters is deprecated and will be removed in CurationConcerns 1.0. Use file_set_presenters or member_presenters instead."
+      member_presenters
+    end
+
+    # @return [Array<FileSetPresenter>] presenters for the ordered_members (not filtered by class)
+    def member_presenters(ids = ordered_ids)
+      PresenterFactory.build_presenters(ids,
+                                        file_presenter_class,
+                                        current_ability)
     end
 
     private
 
       # TODO: Extract this to ActiveFedora::Aggregations::ListSource
       def ordered_ids
-        ActiveFedora::SolrService.query("proxy_in_ssi:#{id}", fl: "ordered_targets_ssim")
+        ActiveFedora::SolrService.query("proxy_in_ssi:#{id}",
+                                        fl: "ordered_targets_ssim")
                                  .flat_map { |x| x.fetch("ordered_targets_ssim", []) }
       end
 
+      # These are the file sets that belong to this work, but not necessarily
+      # in order.
+      def file_set_ids
+        ActiveFedora::SolrService.query("{!field f=has_model_ssim}FileSet",
+                                        fl: "id",
+                                        fq: "{!join from=ordered_targets_ssim to=id}id:\"#{id}/list_source\"")
+                                 .flat_map { |x| x.fetch("id", []) }
+      end
+
       # Override this method if you want to use an alternate presenter class for the files
       def file_presenter_class
         FileSetPresenter

data/app/search_builders/curation_concerns/filter_by_type.rb

@@ -14,9 +14,16 @@ module CurationConcerns
 
     private
 
+      # Override this method if you want to limit some of the registered
+      # types from appearing in search results
+      # @returns [Array<Class>] the list of work types to include in searches
+      def work_types
+        CurationConcerns.config.curation_concerns
+      end
+
       def work_clauses
         return [] if blacklight_params.key?(:f) && Array(blacklight_params[:f][:generic_type_sim]).include?('Collection')
-        CurationConcerns.config.registered_curation_concern_types.map(&:constantize).map do |klass|
+        work_types.map do |klass|
           ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: klass.to_class_uri)
         end
       end

data/app/search_builders/curation_concerns/search_builder.rb

@@ -1,17 +1,10 @@
-class CurationConcerns::SearchBuilder < Hydra::SearchBuilder
-  include BlacklightAdvancedSearch::AdvancedSearchBuilder
-  include CurationConcerns::FilterByType
-
-  # Override Hydra::AccessControlsEnforcement (or Hydra::PolicyAwareAccessControlsEnforcement)
-  # Allows admin users to see everything (don't apply any gated_discovery_filters for those users)
-  def gated_discovery_filters(permission_types = discovery_permissions, ability = current_ability)
-    return [] if ability.current_user.groups.include? 'admin'
-    super
-  end
-
-  # show only files with edit permissions in lib/hydra/access_controls_enforcement.rb apply_gated_discovery
-  def discovery_permissions
-    return ['edit'] if blacklight_params[:works] == 'mine'
+class CurationConcerns::SearchBuilder < Blacklight::SearchBuilder
+  include Blacklight::Solr::SearchBuilderBehavior
+  include Hydra::AccessControlsEnforcement
+  include CurationConcerns::SearchFilters
+  extend Deprecation
+  def initialize(*)
+    Deprecation.warn CurationConcerns::SearchBuilder, "CurationConcerns::SearchBuilder is deprecated and will be removed in CurationConcerns 1.0. Add CurationConcerns::SearchFilters to your own SearchBuilder instead"
     super
   end
 end

data/app/search_builders/curation_concerns/search_filters.rb

@@ -0,0 +1,18 @@
+module CurationConcerns::SearchFilters
+  extend ActiveSupport::Concern
+  include BlacklightAdvancedSearch::AdvancedSearchBuilder
+  include CurationConcerns::FilterByType
+
+  # Override Hydra::AccessControlsEnforcement (or Hydra::PolicyAwareAccessControlsEnforcement)
+  # Allows admin users to see everything (don't apply any gated_discovery_filters for those users)
+  def gated_discovery_filters(permission_types = discovery_permissions, ability = current_ability)
+    return [] if ability.current_user.groups.include? 'admin'
+    super
+  end
+
+  # show only files with edit permissions in lib/hydra/access_controls_enforcement.rb apply_gated_discovery
+  def discovery_permissions
+    return ['edit'] if blacklight_params[:works] == 'mine'
+    super
+  end
+end

data/app/search_builders/curation_concerns/single_result.rb

@@ -7,7 +7,7 @@ module CurationConcerns
     end
 
     def find_one(solr_parameters)
-      solr_parameters[:fq] << "_query_:\"{!raw f=id}#{blacklight_params.fetch(:id)}\""
+      solr_parameters[:fq] << "_query_:\"{!field f=id}#{blacklight_params.fetch(:id)}\""
     end
   end
 end

data/app/search_builders/curation_concerns/single_use_link_search_builder.rb

@@ -1,5 +1,5 @@
 module CurationConcerns
-  class SingleUseLinkSearchBuilder < CurationConcerns::SearchBuilder
+  class SingleUseLinkSearchBuilder < ::SearchBuilder
     include CurationConcerns::SingleResult
     self.default_processor_chain = [:find_one]
   end

data/app/search_builders/curation_concerns/work_search_builder.rb

@@ -1,5 +1,5 @@
 module CurationConcerns
-  class WorkSearchBuilder < CurationConcerns::SearchBuilder
+  class WorkSearchBuilder < ::SearchBuilder
     include CurationConcerns::SingleResult
   end
 end

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

@@ -0,0 +1,12 @@
+<tr class="<%= dom_class(member) %> attributes">
+  <td class="thumbnail">
+    <%= render_thumbnail_tag member %>
+  </td>
+  <td class="attribute filename"><%= link_to(member.link_name, main_app.curation_concerns_file_set_path(member)) %></td>
+  <td class="attribute date_uploaded"><%= member.date_uploaded %></td>
+  <td class="attribute permission"><%= member.permission_badge %></td>
+  <td>
+    <%= render 'curation_concerns/file_sets/actions', file_set: member %>
+  </td>
+</tr>
+

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

@@ -1,4 +1,4 @@
-<% if presenter.file_presenters.present? %>
+<% if presenter.file_set_presenters.present? %>
 <div class="panel panel-default related_files">
   <div class="panel-heading">
     <h2>Files</h2>
@@ -14,7 +14,7 @@
       </tr>
     </thead>
     <tbody>
-      <%= render presenter.file_presenters %>
+      <%= render partial: 'member', collection: presenter.file_set_presenters %>
     </tbody>
   </table>
 </div>

data/curation_concerns.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'hydra-head', '~> 9.6'
+  spec.add_dependency 'hydra-head', '~> 9.9'
   spec.add_dependency 'blacklight', '~> 6.0'
   spec.add_dependency "breadcrumbs_on_rails", "~> 2.3"
   spec.add_dependency "jquery-ui-rails"
@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'blacklight_advanced_search', '~> 6.0'
   spec.add_dependency 'rails_autolink'
   spec.add_dependency 'sprockets-es6'
+  spec.add_dependency 'kaminari_route_prefix', '~> 0.0.1'
 
   spec.add_development_dependency 'solr_wrapper', '~> 0.4'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1'

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.10.0".freeze
+  VERSION = "0.11.0.rc1".freeze
 end