curation_concerns 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eb8f7385740c5fbbc0735eba71e83175368a313
-  data.tar.gz: d0715c82e683b32154dba32111d02b31e9101af6
+  metadata.gz: 91dd51748b5be3e045374bdf92ab07b0378f67f9
+  data.tar.gz: 92e499a69aa59d9bfce9f6b9adb654301fa86bde
 SHA512:
-  metadata.gz: 25e1d462f3f5db545779bd0a03a458ae4ad1f7b961163bb50d55a8a7537e70cbc343db5b9a26ea4c17dcaa8937266e41fc094b48b6fe7f7885b406db540e1e9b
-  data.tar.gz: 82f824c0adddcb8f722eb41a85876fea18c5e0b3045c1282ebd73eb176776303b1f7ce37fa59c1d4727ab7d9e152db3beb8df5d889503aa89e139a2c5bcc5856
+  metadata.gz: d99de5a52ae7f2dc56f2499243f858e5d5c29a2a540a2c2972235441f20e7b91286806c846d89ac9bd0f9da49f912d52e6fbc9a8c2e129e04542bab801f55737
+  data.tar.gz: 239ff60e74ce548ef485a4eb7de1c83803c931b9d254d8cbe50d3404a1fea434a0e5394e8c736252982f0946e89b721c3eb20d2682516d1489617260151b5b09

data/README.md

@@ -1,13 +1,17 @@
 # CurationConcerns
 
-[![Version](https://badge.fury.io/rb/curation_concerns.png)](http://badge.fury.io/rb/curation_concerns)
+Code: [![Version](https://badge.fury.io/rb/curation_concerns.png)](http://badge.fury.io/rb/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/curation_concerns/badge.svg?branch=master)](https://coveralls.io/r/projecthydra/curation_concerns?branch=master)
 [![Code Climate](https://codeclimate.com/github/projecthydra/curation_concerns/badges/gpa.svg)](https://codeclimate.com/github/projecthydra/curation_concerns)
-[![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE.txt)
+
+Docs: [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE.txt)
 [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
 [![API Docs](http://img.shields.io/badge/API-docs-blue.svg)](http://rubydoc.info/gems/curation_concerns)
 
+Join in: [![Slack Status](http://slack.projecthydra.org/badge.svg)](http://slack.projecthydra.org/) [![Ready](https://badge.waffle.io/projecthydra/curation_concerns.svg?label=ready&title=Ready)](http://waffle.io/projecthydra/curation_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/hydra-works)) and providing a generator for defining object types with custom workflows, views, access controls, etc.
 
 ## Prerequisites
@@ -16,40 +20,55 @@ 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)
+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. The `redlock` gem requires Redis >= 2.6.
+1. [ImageMagick](http://www.imagemagick.org/) with JPEG-2000 support.
+1. [LibreOffice](https://www.libreoffice.org/download/libreoffice-fresh/)
+1. [FITS](#fits) version 0.8.5.
+1. [FFMPEG](#ffmpeg)
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'curation_concerns'
+```ruby
+gem 'curation_concerns'
+```
 
-And then execute:
+Then execute:
 
-    $ bundle install
+```bash
+bundle install
+```
 
 Then run the install generator.  You will be prompted if you want to overwrite the default `app/controllers/catalog_controller.rb`, to which you should type `Y` (yes). If you don't want to be prompted on overwrite, you may run the generator with the `-f` (force) option.
 
-    $ rails generate curation_concerns:install
-    $ rake db:migrate
+```bash
+rails generate curation_concerns:install
+rake db:migrate
+```
 
-### FITS 0.8.5
+### FITS
 
-To install FITS:
- * Go to http://projects.iq.harvard.edu/fits/downloads, download __fits-0.8.5.zip__, and unpack it somewhere on your machine. You can also install FITS on OSX with homebrew: `brew install fits` (you may also have to create a symlink from fits.sh -> fits in the next step).
- * Mark fits.sh as executable (chmod a+x fits.sh)
- * Run "fits.sh -h" from the command line and see a help message to ensure FITS is properly installed
+To install FITS 0.8.5:
+ * Download [fits-0.8.5.zip](http://projects.iq.harvard.edu/files/fits/files/fits-0.8.5.zip) or possibly newer from the [project page](http://projects.iq.harvard.edu/fits/downloads). Unpack it somewhere on your machine. Alternatively, use homebrew on OSX: `brew install fits` (you may also have to create a symlink from fits.sh -> fits in the next step).
+ * Mark fits.sh as executable (`chmod a+x fits.sh`)
+ * Run `fits.sh -h` from the command line and see a help message to ensure FITS is properly installed
  * Give your app access to FITS by:
-     * Adding the full fits.sh path to your PATH (e.g., in your .bash_profile), OR
-     * Changing config/initializers/sufia.rb to point to your FITS location: config.fits_path = "/<your full path>/fits.sh"
+     * Adding the full **fits.sh** path to your PATH (e.g., in your **.bash_profile**), OR
+     * Changing **config/initializers/sufia.rb** to point to your FITS location: `config.fits_path = "/<your full path>/fits.sh"`
+
+## FFMPEG
+
+Curation Concerns includes support for transcoding audio and video files with ffmpeg > 1.0 installed.
 
-### Redis 2.6
+On OSX, you can use homebrew:
 
-The redlock gem requires Redis >= 2.6.
+```bash
+brew install ffmpeg --with-fdk-aac --with-libvpx --with-libvorbis
+```
+
+Otherwise, to compile ffmpeg yourself, see the [CompilationGuide](https://trac.ffmpeg.org/wiki/CompilationGuide).
 
 ## Usage
 
@@ -57,31 +76,39 @@ The redlock gem requires Redis >= 2.6.
 
 To generate a new object type, use the `curation_concerns:work` Rails generator.  Follow the usage instructions provided on the command line when you run:
 
-    $ rails generate curation_concerns:work
+```bash
+rails generate curation_concerns:work
+```
 
 ### Virus Detection
 
-To turn on virus detection, install clamav on your system and add the `clamav` gem to your Gemfile
+To turn on virus detection, install clamav on your system and add the `clamav` gem to your Gemfile:
 
-    gem 'clamav'
+```ruby
+gem 'clamav'
+```
 
 ## Testing
 
 If you are modifying the curation_concerns gem and want to run the test suite, follow these steps to set up the test environment.
 
-    $ rake ci
-    
+```bash
+rake ci
+```
+
 Or you can do all the steps manually:
 
-    $ solr_wrapper -p 8985 -d solr/config/ --collection_name hydra-test
-    
-    # in another window
-    $ fcrepo_wrapper -p 8986 --no-jms
-    
-    # in another window
-    $ rake engine_cart:generate
-    $ rake curation_concerns:spec
+```bash
+solr_wrapper -p 8985 -d solr/config/ --collection_name hydra-test
+
+# in another window
+fcrepo_wrapper -p 8986 --no-jms
+
+# 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).
+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/app/actors/curation_concerns/actors/add_to_collection_actor.rb

@@ -20,8 +20,7 @@ module CurationConcerns
         def add_to_collections(new_collection_ids)
           return true unless new_collection_ids
           # remove from old collections
-          # TODO: Implement in_collection_ids https://github.com/projecthydra-labs/hydra-pcdm/issues/157
-          (curation_concern.in_collections.map(&:id) - new_collection_ids).each do |old_id|
+          (curation_concern.in_collection_ids - new_collection_ids).each do |old_id|
             collection = ::Collection.find(old_id)
             collection.members.delete(curation_concern)
             collection.save

data/app/actors/curation_concerns/actors/apply_order_actor.rb

@@ -3,11 +3,27 @@ module CurationConcerns
     class ApplyOrderActor < AbstractActor
       def update(attributes)
         ordered_member_ids = attributes.delete(:ordered_member_ids)
+        sync_members(ordered_member_ids)
         apply_order(ordered_member_ids) && next_actor.update(attributes)
       end
 
       private
 
+        def sync_members(ordered_member_ids)
+          return true if ordered_member_ids.nil?
+          existing_members_ids = curation_concern.member_ids
+          (existing_members_ids - ordered_member_ids).each do |old_id|
+            work = ::ActiveFedora::Base.find(old_id)
+            curation_concern.ordered_members.delete(work)
+          end
+
+          (ordered_member_ids - existing_members_ids).each do |work_id|
+            work = ::ActiveFedora::Base.find(work_id)
+            curation_concern.ordered_members << work
+          end
+          true
+        end
+
         def apply_order(new_order)
           return true unless new_order
           curation_concern.ordered_member_proxies.each_with_index do |proxy, index|

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

@@ -7,16 +7,12 @@ module CurationConcerns
     included do
       helper CurationConcerns::MainAppHelpers
 
-      rescue_from ActiveFedora::ObjectNotFoundError do |_exception|
-        respond_to do |wants|
-          wants.json { render_json_response(response_type: :not_found) }
-          # default to HTML response, even for other non-HTML formats we don't
-          # neccesarily know about, seems to be consistent with what Rails4 does
-          # by default with uncaught ActiveRecord::RecordNotFound in production
-          wants.any do
-            render_404
-          end
-        end
+      rescue_from ActiveFedora::ObjectNotFoundError do |exception|
+        not_found_response(exception)
+      end
+
+      rescue_from Blacklight::Exceptions::InvalidSolrID do |exception|
+        not_found_response(exception)
       end
     end
 
@@ -60,5 +56,19 @@ module CurationConcerns
       json_body = CurationConcerns::API.generate_response_body(response_type: response_type, message: message, options: options)
       render json: json_body, status: response_type
     end
+
+    private
+
+      def not_found_response(_exception)
+        respond_to do |wants|
+          wants.json { render_json_response(response_type: :not_found) }
+          # default to HTML response, even for other non-HTML formats we don't
+          # neccesarily know about, seems to be consistent with what Rails4 does
+          # by default with uncaught ActiveRecord::RecordNotFound in production
+          wants.any do
+            render_404
+          end
+        end
+      end
   end
 end

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

@@ -35,10 +35,11 @@ module CurationConcerns
         { type: mime_type_for(file), disposition: 'inline' }
       end
 
-      # Customize the :download ability in your Ability class, or override this method
+      # Customize the :read ability in your Ability class, or override this method.
+      # Hydra::Ability#download_permissions can't be used in this case because it assumes
+      # that files are in a LDP basic container, and thus, included in the asset's uri.
       def authorize_download!
-        # authorize! :download, file # can't use this because Hydra::Ability#download_permissions assumes that files are in Basic Container (and thus include the asset's uri)
-        authorize! :read, asset
+        authorize! :read, params[asset_param_key]
       end
 
       # Overrides Hydra::Controller::DownloadBehavior#load_file, which is hard-coded to assume files are in BasicContainer.
@@ -51,7 +52,7 @@ module CurationConcerns
         file_reference = params[:file]
         return default_file unless file_reference
 
-        file_path = CurationConcerns::DerivativePath.derivative_path_for_reference(asset, file_reference)
+        file_path = CurationConcerns::DerivativePath.derivative_path_for_reference(params[asset_param_key], file_reference)
         File.exist?(file_path) ? file_path : nil
       end
 

data/app/helpers/curation_concerns/blacklight_overrides_helper.rb

@@ -0,0 +1,11 @@
+module CurationConcerns::BlacklightOverridesHelper
+  # Overrides Blacklight::BlacklightHelperBehavior
+  def presenter(document)
+    case action_name
+    when 'edit', 'update'
+      show_presenter(document)
+    else
+      super(document)
+    end
+  end
+end

data/app/helpers/curation_concerns/main_app_helpers.rb

@@ -10,4 +10,5 @@ module CurationConcerns::MainAppHelpers
   include CurationConcerns::CollectionsHelper
   include CurationConcerns::PermissionsHelper
   include CurationConcerns::RightsHelper
+  include CurationConcerns::BlacklightOverridesHelper
 end

data/app/indexers/curation_concerns/file_set_indexer.rb

@@ -13,7 +13,7 @@ module CurationConcerns
         solr_doc[Solrizer.solr_name('file_format')] = file_format
         solr_doc[Solrizer.solr_name('file_format', :facetable)] = file_format
         solr_doc[Solrizer.solr_name(:file_size, STORED_INTEGER)] = object.file_size[0]
-        solr_doc['all_text_timv'] = object.full_text.content
+        solr_doc['all_text_timv'] = object.extracted_text.content if object.extracted_text.present?
         solr_doc['height_is'] = Integer(object.height.first) if object.height.present?
         solr_doc['width_is'] = Integer(object.width.first) if object.width.present?
         solr_doc[Solrizer.solr_name('mime_type', :stored_sortable)] = object.mime_type

data/app/jobs/create_derivatives_job.rb

@@ -8,7 +8,9 @@ class CreateDerivativesJob < ActiveJob::Base
     filename = CurationConcerns::WorkingDirectory.find_or_retrieve(file_id, file_set.id)
 
     file_set.create_derivatives(filename)
-    # The thumbnail is indexed in the solr document, so reindex
+
+    # Reload from Fedora and reindex for thumbnail and extracted text
+    file_set.reload
     file_set.update_index
     file_set.parent.update_index if parent_needs_reindex?(file_set)
   end

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

@@ -11,7 +11,6 @@ module CurationConcerns
     include CurationConcerns::Noid
     include CurationConcerns::FileSet::Derivatives
     include CurationConcerns::Permissions
-    include CurationConcerns::FileSet::FullTextIndexing
     include CurationConcerns::FileSet::Indexing
     include CurationConcerns::FileSet::BelongsToWorks
     include CurationConcerns::FileSet::Querying

data/app/services/curation_concerns/derivative_path.rb

@@ -1,49 +1,67 @@
 module CurationConcerns
   class DerivativePath
+    attr_reader :id, :destination_name
+
     class << self
       # Path on file system where derivative file is stored
+      # @param [ActiveFedora::Base or String] object either the AF object or its id
+      # @param [String] destintation_name
       def derivative_path_for_reference(object, destination_name)
-        destination_name = destination_name.gsub(/^original_file_/, '')
-        derivative_path(object, extension_for(destination_name), destination_name)
+        new(object, destination_name).derivative_path
       end
 
+      # @param [ActiveFedora::Base or String] object either the AF object or its id
       # @return [Array<String>] Array of paths to derivatives for this object.
       def derivatives_for_reference(object)
-        Dir.glob(root_path(object).join("*")).select do |path|
-          path.start_with?(path_prefix(object).to_s)
-        end
+        new(object).all_paths
       end
+    end
 
-      private
+    # @param [ActiveFedora::Base, String] object either the AF object or its id
+    # @param [String] destination_name
+    def initialize(object, destination_name = nil)
+      @id = object.is_a?(String) ? object : object.id
+      @destination_name = destination_name.gsub(/^original_file_/, '') if destination_name
+    end
 
-        # @param [#id] object Object whose ID is used to generate root path
-        # @return [String] Returns the root path where derivatives will be generated into.
-        def root_path(object)
-          Pathname.new(derivative_path(object, "", "")).dirname
-        end
+    def derivative_path
+      "#{path_prefix}-#{file_name}"
+    end
 
-        # @return <Pathname> Full prefix of the path for object.
-        def path_prefix(object)
-          Pathname.new(CurationConcerns.config.derivatives_path).join(pair_path(object.id))
-        end
+    def all_paths
+      Dir.glob(root_path.join("*")).select do |path|
+        path.start_with?(path_prefix.to_s)
+      end
+    end
 
-        def derivative_path(object, extension, destination_name)
-          file_name = destination_name + extension
-          "#{path_prefix(object)}-#{file_name}"
-        end
+    private
 
-        def pair_path(id)
-          id.split('').each_slice(2).map(&:join).join('/')
-        end
+      # @return [String] Returns the root path where derivatives will be generated into.
+      def root_path
+        Pathname.new(derivative_path).dirname
+      end
+
+      # @return <Pathname> Full prefix of the path for object.
+      def path_prefix
+        Pathname.new(CurationConcerns.config.derivatives_path).join(pair_path)
+      end
+
+      def pair_path
+        id.split('').each_slice(2).map(&:join).join('/')
+      end
+
+      def file_name
+        return unless destination_name
+        destination_name + extension
+      end
 
-        def extension_for(destination_name)
-          case destination_name
-          when 'thumbnail'
-            ".#{MIME::Types.type_for('jpg').first.extensions.first}"
-          else
-            ".#{destination_name}"
-          end
+      def extension
+        case destination_name
+        when 'thumbnail'
+          ".#{MIME::Types.type_for('jpg').first.extensions.first}"
+        else
+          ".#{destination_name}"
         end
-    end
+      end
   end
 end

data/app/views/collections/_form_permission.html.erb

@@ -5,30 +5,18 @@
       <small>Who should be able to view your collection?</small>
     </legend>
 
-    <section class="help-block">
-      <p>
-        <strong>Please note</strong>, making something visible to the world (i.e.
-        marking this as <span class="label label-success">Open Access</span>) may be
-        viewed as publishing which could impact your ability to:
-      </p>
-      <ul>
-        <li>patent your work</li>
-        <li>publish your work in a journal</li>
-      </ul>
-    </section>
-
     <div class="form-group">
       <label class="radio">
         <input type="radio" id="visibility_open" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>" <% if @collection.open_access? %> checked="true"<% end %>/>
-        <span class="label label-success">Open Access</span> Visible to the world.
+        <%= t('curation_concerns.visibility.open.label_html', type: 'content') %>
       </label>
       <label class="radio">
         <input type="radio" id="visibility_registered" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>" <% if @collection.authenticated_only_access? %> checked="true"<% end %> />
-        <span class="label label-info"><%=t('curation_concerns.institution_name') %></span> Visible to all <%=t('curation_concerns.institution_name') %> users.
+        <%= t('curation_concerns.visibility.authenticated.label_html', institution: t('curation_concerns.institution.name')) %>
       </label>
       <label class="radio">
         <input type="radio" id="visibility_restricted" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE%>" <% if @collection.private_access? %> checked="true"<% end %>/>
-        <span class="label label-danger">Private</span> Only visible to you and your delegates.
+        <%= t('curation_concerns.visibility.private.label_html') %>
       </label>
     </div>
 

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

@@ -8,17 +8,12 @@
     <legend>
       Visibility
       <small>Who should be able to view or download this content?</small>
-      <span id="visibility_tooltip" class="h5">
-        <%= help_text 'visibility' %>
-      </span>
     </legend>
 
-    <%= render "form_permission_note" %>
-
     <div class="form-group">
       <label class="radio">
         <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC %>
-        <%= t('curation_concerns.visibility.open.label_html') %>
+        <%= t('curation_concerns.visibility.open.label_html', type: 'work') %>
       </label>
       <label class="radio">
         <%= f.radio_button :visibility, Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED %>

data/app/views/layouts/boilerplate.html.erb

@@ -11,7 +11,6 @@
     <%= csrf_meta_tag %>
     <%= stylesheet_link_tag 'application' %>
     <%= javascript_include_tag 'application' %>
-    <%= render partial: 'shared/ga', formats: [:html] %>
   </head>
   <body>
 

data/app/views/layouts/error.html.erb

@@ -9,8 +9,6 @@
 
     <!-- application js -->
     <%= javascript_include_tag 'application' %>
-
-    <%= render partial: 'shared/ga', formats: [:html] %>
   </head>
 
 <body>

data/config/locales/curation_concerns.en.yml

@@ -10,7 +10,6 @@ en:
       name: "Your Division at Institution"
       homepage_url: "#"
     document_language: "en"
-    google_analytics_id: ""
     institution:
       name: "Your Institution"
       homepage_url: "#"
@@ -95,11 +94,11 @@ en:
       open:
         text: "Open Access"
         class: "label-success"
-        label_html: <span class="label label-success">Open Access</span> Visible to the world.
+        label_html: <span class="label label-success">Open Access</span> Everyone. Check out <a href="">SHERPA/RoMEO</a> for specific publishers' copyright policies if you plan to patent and/or publish your %{type} in a journal.
       authenticated:
         text: *INSTITUTION_NAME
         class: "label-info"
-        label_html: "<span class=\"label label-info\">%{institution}</span> Visible to all %{institution} users."
+        label_html: "<span class=\"label label-info\">%{institution}</span> Only users who are logged in through %{institution}."
       embargo:
         text: "Embargo"
         class: "label-warning"
@@ -109,7 +108,7 @@ en:
         class: "label-warning"
         label_html: <span class="label label-warning">Lease</span>
       private:
-        label_html: <span class="label label-danger">Private</span> Only visible to you and your delegates.
+        label_html: <span class="label label-danger">Private</span> Only users and/or groups that have been given specific access in the "Share With" section.
       restricted:
         text: "Private"
         class: "label-danger"

data/curation_concerns.gemspec

@@ -19,18 +19,18 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'hydra-head', '>= 10.0.0', '< 11'
-  spec.add_dependency 'blacklight', '~> 6.1'
+  spec.add_dependency 'blacklight', '~> 6.3'
   spec.add_dependency "breadcrumbs_on_rails", "~> 2.3"
   spec.add_dependency "jquery-ui-rails"
   spec.add_dependency "simple_form", '~> 3.1'
-  spec.add_dependency 'hydra-editor', '~> 2.0'
+  spec.add_dependency 'hydra-editor', '>= 2', '< 4'
   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_dependency 'active_attr'
   spec.add_dependency 'hydra-works', '>= 0.12.0'
-  spec.add_dependency 'active_fedora-noid', '~> 1.0'
+  spec.add_dependency 'active_fedora-noid', '~> 2.0.0.beta1'
   spec.add_dependency 'qa', '~> 0.5'
   spec.add_dependency 'redlock', '~> 0.1.2'
   spec.add_dependency 'solrizer', '~> 3.4'
@@ -40,12 +40,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'awesome_nested_set', '~> 3.0'
   spec.add_dependency 'browse-everything', '~> 0.10'
 
-  spec.add_development_dependency 'solr_wrapper', '~> 0.4'
+  spec.add_development_dependency 'solr_wrapper', '~> 0.13', '>= 0.13.1'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.1'
   spec.add_development_dependency "devise", "~> 3.0"
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "engine_cart", "~> 0.8"
+  spec.add_development_dependency "engine_cart", "~> 0.9"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rspec-rails"

data/lib/curation_concerns/version.rb

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

data/lib/generators/curation_concerns/templates/config/curation_concerns.rb

@@ -14,9 +14,6 @@ CurationConcerns.configure do |config|
   # Requires a Google Analytics id and OAuth2 keyfile.  See README for more info
   # config.analytics = false
 
-  # Specify a Google Analytics tracking ID to gather usage statistics
-  # config.google_analytics_id = 'UA-99999999-1'
-
   # Specify a date you wish to start collecting Google Analytic statistics for.
   # config.analytic_start_date = DateTime.new(2014,9,10)
 

data/spec/actors/curation_concerns/apply_order_actor_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe CurationConcerns::Actors::ApplyOrderActor do
+  describe '#update' do
+    let(:curation_concern) { create(:work_with_two_children, user: user) }
+
+    let(:user) { create(:admin) }
+
+    subject do
+      CurationConcerns::Actors::ActorStack.new(curation_concern,
+                                               user,
+                                               [described_class,
+                                                CurationConcerns::Actors::GenericWorkActor])
+    end
+
+    context 'with ordered_member_ids that are already associated with the parent' do
+      let(:attributes) { { ordered_member_ids: ["Blah"] } }
+      let(:root_actor) { double }
+      before do
+        allow(CurationConcerns::Actors::RootActor).to receive(:new).and_return(root_actor)
+        allow(root_actor).to receive(:update).with({}).and_return(true)
+        curation_concern.apply_depositor_metadata(user.user_key)
+        curation_concern.save!
+      end
+      it "attaches the parent" do
+        expect(subject.update(attributes)).to be true
+      end
+    end
+  end
+
+  describe '#update' do
+    let(:user) { create(:admin) }
+    let(:curation_concern) { create(:work_with_one_child, user: user) }
+    let(:child) { GenericWork.new("Blah3") }
+
+    subject do
+      CurationConcerns::Actors::ActorStack.new(curation_concern,
+                                               user,
+                                               [described_class,
+                                                CurationConcerns::Actors::GenericWorkActor])
+    end
+
+    context 'with ordered_members_ids that arent associated with the curation concern yet.' do
+      let(:attributes) { { ordered_member_ids: ["Blah3"] } }
+      let(:root_actor) { double }
+      before do
+        allow(CurationConcerns::Actors::RootActor).to receive(:new).and_return(root_actor)
+        allow(root_actor).to receive(:update).with({}).and_return(true)
+        child.title = ["Generic Title"]
+        child.apply_depositor_metadata(user.user_key)
+        child.save!
+        curation_concern.apply_depositor_metadata(user.user_key)
+        curation_concern.save!
+      end
+      it "attaches the parent" do
+        expect(subject.update(attributes)).to be true
+      end
+    end
+  end
+end

data/spec/controllers/downloads_controller_spec.rb

@@ -29,6 +29,11 @@ describe DownloadsController do
         expect(response).to redirect_to new_user_session_path
         expect(flash['alert']).to eq 'You are not authorized to access this page.'
       end
+
+      it 'authorizes the resource using only the id' do
+        expect(controller).to receive(:authorize!).with(:read, file_set.id)
+        get :show, id: file_set.to_param
+      end
     end
 
     context "when the user has access" do
@@ -57,6 +62,11 @@ describe DownloadsController do
             expect(response.headers['Content-Length']).to eq "4218"
             expect(response.headers['Accept-Ranges']).to eq "bytes"
           end
+
+          it 'retrieves the thumbnail without contacting Fedora' do
+            expect(ActiveFedora::Base).not_to receive(:find).with(file_set.id)
+            get :show, id: file_set, file: 'thumbnail'
+          end
         end
 
         context "that isn't persisted" do

data/spec/factories/generic_works.rb

@@ -23,6 +23,19 @@ FactoryGirl.define do
       end
     end
 
+    factory :work_with_one_child do
+      before(:create) do |work, evaluator|
+        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user, title: ['A Contained Work'])
+      end
+    end
+
+    factory :work_with_two_children do
+      before(:create) do |work, evaluator|
+        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user, title: ['A Contained Work'], id: "Blah")
+        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user, title: ['Another Contained Work'], id: "Blah2")
+      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'])

data/spec/indexers/file_set_indexer_spec.rb

@@ -21,9 +21,7 @@ describe CurationConcerns::FileSetIndexer do
       resource_type: ['Book'],
       identifier: ['urn:isbn:1234567890'],
       based_near: ['Medina, Saudi Arabia'],
-      related_url: ['http://example.org/TheWork/']) do |gf|
-        gf.full_text.content = 'abcxyz'
-      end
+      related_url: ['http://example.org/TheWork/'])
   end
 
   let(:mock_file) do
@@ -37,6 +35,11 @@ describe CurationConcerns::FileSetIndexer do
       file_size: ['12']
     )
   end
+
+  let(:mock_text) do
+    mock_file_factory(content: "abcxyz")
+  end
+
   let(:indexer) { described_class.new(file_set) }
 
   describe '#generate_solr_document' do
@@ -44,6 +47,7 @@ describe CurationConcerns::FileSetIndexer do
       allow(file_set).to receive(:label).and_return('CastoriaAd.tiff')
       allow(CurationConcerns::ThumbnailPathService).to receive(:call).and_return('/downloads/foo123?file=thumbnail')
       allow(file_set).to receive(:original_file).and_return(mock_file)
+      allow(file_set).to receive(:extracted_text).and_return(mock_text)
     end
     subject { indexer.generate_solr_document }
 

data/spec/jobs/create_derivatives_job_spec.rb

@@ -1,61 +1,95 @@
 require 'spec_helper'
 
 describe CreateDerivativesJob do
-  let(:id) { '123' }
-
   before do
     @ffmpeg_enabled = CurationConcerns.config.enable_ffmpeg
     CurationConcerns.config.enable_ffmpeg = true
-    allow(FileSet).to receive(:find).with(id).and_return(file_set)
-    allow(file_set).to receive(:mime_type).and_return('audio/x-wav')
-    allow(file_set).to receive(:id).and_return(id)
   end
 
-  let(:file) do
-    Hydra::PCDM::File.new.tap do |f|
-      f.content = 'foo'
-      f.original_name = 'picture.png'
-      f.save!
-    end
-  end
+  after { CurationConcerns.config.enable_ffmpeg = @ffmpeg_enabled }
 
-  let(:file_set) { FileSet.new }
+  context "with an audio file" do
+    let(:id)       { '123' }
+    let(:file_set) { FileSet.new }
 
-  after do
-    CurationConcerns.config.enable_ffmpeg = @ffmpeg_enabled
-  end
-
-  context "with a file name" do
-    it 'calls create_derivatives and save on a file set' do
-      expect(Hydra::Derivatives::AudioDerivatives).to receive(:create)
-      expect(file_set).to receive(:update_index)
-      described_class.perform_now(file_set, file.id)
+    let(:file) do
+      Hydra::PCDM::File.new.tap do |f|
+        f.content = 'foo'
+        f.original_name = 'picture.png'
+        f.save!
+      end
     end
-  end
 
-  context 'with a parent object' do
     before do
-      allow(file_set).to receive(:parent).and_return(parent)
-      # Stub out the actual derivative creation
-      expect(file_set).to receive(:create_derivatives)
+      allow(FileSet).to receive(:find).with(id).and_return(file_set)
+      allow(file_set).to receive(:id).and_return(id)
+      allow(file_set).to receive(:mime_type).and_return('audio/x-wav')
     end
 
-    context 'when the file_set is the thumbnail of the parent' do
-      let(:parent) { GenericWork.new(thumbnail_id: id) }
-
-      it 'updates the index of the parent object' do
-        expect(parent).to receive(:update_index)
+    context "with a file name" do
+      it 'calls create_derivatives and save on a file set' do
+        expect(Hydra::Derivatives::AudioDerivatives).to receive(:create)
+        expect(file_set).to receive(:reload)
+        expect(file_set).to receive(:update_index)
         described_class.perform_now(file_set, file.id)
       end
     end
 
-    context "when the file_set isn't the parent's thumbnail" do
-      let(:parent) { GenericWork.new }
+    context 'with a parent object' do
+      before do
+        allow(file_set).to receive(:parent).and_return(parent)
+        # Stub out the actual derivative creation
+        allow(file_set).to receive(:create_derivatives)
+      end
 
-      it "doesn't update the parent's index" do
-        expect(parent).to_not receive(:update_index)
-        described_class.perform_now(file_set, file.id)
+      context 'when the file_set is the thumbnail of the parent' do
+        let(:parent) { GenericWork.new(thumbnail_id: id) }
+
+        it 'updates the index of the parent object' do
+          expect(file_set).to receive(:reload)
+          expect(parent).to receive(:update_index)
+          described_class.perform_now(file_set, file.id)
+        end
+      end
+
+      context "when the file_set isn't the parent's thumbnail" do
+        let(:parent) { GenericWork.new }
+
+        it "doesn't update the parent's index" do
+          expect(file_set).to receive(:reload)
+          expect(parent).to_not receive(:update_index)
+          described_class.perform_now(file_set, file.id)
+        end
       end
     end
   end
+
+  context "with a pdf file" do
+    let(:file_set) { create(:file_set) }
+    let(:params)   { { qt: "search", q: "CutePDF", qf: "all_text_timv" } }
+
+    let(:file) do
+      Hydra::PCDM::File.new.tap do |f|
+        f.content = File.open(File.join(fixture_path, "test.pdf")).read
+        f.original_name = 'test.pdf'
+        f.save!
+      end
+    end
+
+    let(:search_response) do
+      Blacklight::Solr::Response.new(
+        Blacklight.default_index.connection.get("select", params: params),
+        params
+      )
+    end
+
+    before do
+      allow(file_set).to receive(:mime_type).and_return('application/pdf')
+      described_class.perform_now(file_set, file.id)
+    end
+
+    it "searches the extracted content" do
+      expect(search_response.documents.count).to eq(1)
+    end
+  end
 end

data/spec/services/derivative_path_spec.rb

@@ -1,21 +1,33 @@
 require 'spec_helper'
 
 describe CurationConcerns::DerivativePath do
-  before do
-    allow(CurationConcerns.config).to receive(:derivatives_path).and_return('tmp')
-  end
+  let(:id)     { '123' }
+  let(:object) { double(id: id) }
 
-  describe '.derivative_path_for_reference' do
-    subject { described_class.derivative_path_for_reference(object, destination_name) }
+  before { allow(CurationConcerns.config).to receive(:derivatives_path).and_return('tmp') }
 
-    let(:object) { double(id: '123') }
+  context "for a single path" do
     let(:destination_name) { 'thumbnail' }
 
-    it { is_expected.to eq 'tmp/12/3-thumbnail.jpeg' }
+    describe '.derivative_path_for_reference' do
+      subject { described_class.derivative_path_for_reference(object, destination_name) }
+      it { is_expected.to eq('tmp/12/3-thumbnail.jpeg') }
+    end
+
+    describe '#derivative_path' do
+      context "with an object" do
+        subject { described_class.new(object, destination_name).derivative_path }
+        it { is_expected.to eq('tmp/12/3-thumbnail.jpeg') }
+      end
+
+      context "with an id" do
+        subject { described_class.new(id, destination_name).derivative_path }
+        it { is_expected.to eq('tmp/12/3-thumbnail.jpeg') }
+      end
+    end
   end
 
-  describe "#derivatives_for_reference" do
-    subject { described_class.derivatives_for_reference(object) }
+  context "for multiple paths" do
     before do
       FileUtils.mkdir_p("tmp/12")
       File.open("tmp/12/3-thumbnail.jpeg", 'w') do |f|
@@ -29,12 +41,21 @@ describe CurationConcerns::DerivativePath do
       FileUtils.rm_rf("tmp/12")
     end
 
-    let(:object) { double(id: '123') }
+    describe ".derivatives_for_reference" do
+      subject { described_class.derivatives_for_reference(object) }
+      it { is_expected.to eq(["tmp/12/3-thumbnail.jpeg"]) }
+    end
 
-    it "lists all the paths to derivatives" do
-      expect(subject).to eq [
-        "tmp/12/3-thumbnail.jpeg"
-      ]
+    describe "#all_paths" do
+      context "with an object" do
+        subject { described_class.new(object, nil).all_paths }
+        it { is_expected.to eq(["tmp/12/3-thumbnail.jpeg"]) }
+      end
+
+      context "with an id" do
+        subject { described_class.new(id, nil).all_paths }
+        it { is_expected.to eq(["tmp/12/3-thumbnail.jpeg"]) }
+      end
     end
   end
 end

data/spec/views/catalog/index.html.erb_spec.rb

@@ -12,6 +12,7 @@ describe 'catalog/index.html.erb' do
     view.extend CurationConcerns::CollectionsHelper
     view.extend CurationConcerns::CatalogHelper
 
+    allow(controller).to receive(:action_name).and_return('index')
     allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
     allow(view).to receive(:blacklight_configuration_context).and_return(blacklight_configuration_context)
     stub_template 'catalog/_search_sidebar.html.erb' => ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -38,14 +38,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: breadcrumbs_on_rails
   requirement: !ruby/object:Gem::Requirement
@@ -92,16 +92,22 @@ dependencies:
   name: hydra-editor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -192,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: qa
   requirement: !ruby/object:Gem::Requirement
@@ -318,14 +324,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -388,14 +400,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -705,6 +717,7 @@ files:
 - app/helpers/batch_select_helper.rb
 - app/helpers/collections_helper.rb
 - app/helpers/curation_concerns/ability_helper.rb
+- app/helpers/curation_concerns/blacklight_overrides_helper.rb
 - app/helpers/curation_concerns/catalog_helper.rb
 - app/helpers/curation_concerns/collections_helper.rb
 - app/helpers/curation_concerns/collections_helper_behavior.rb
@@ -740,7 +753,6 @@ files:
 - 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
 - app/models/concerns/curation_concerns/file_set/querying.rb
 - app/models/concerns/curation_concerns/file_set_behavior.rb
@@ -894,7 +906,6 @@ files:
 - app/views/curation_concerns/base/_form_permission.html.erb
 - app/views/curation_concerns/base/_form_permission_embargo.html.erb
 - app/views/curation_concerns/base/_form_permission_lease.html.erb
-- app/views/curation_concerns/base/_form_permission_note.html.erb
 - app/views/curation_concerns/base/_form_permission_under_embargo.html.erb
 - app/views/curation_concerns/base/_form_permission_under_lease.html.erb
 - app/views/curation_concerns/base/_form_representative.html.erb
@@ -909,7 +920,6 @@ files:
 - app/views/curation_concerns/base/_representative_media.html.erb
 - app/views/curation_concerns/base/_show_actions.html.erb
 - app/views/curation_concerns/base/_versioning.html.erb
-- app/views/curation_concerns/base/_visibility.html.erb
 - app/views/curation_concerns/base/edit.html.erb
 - app/views/curation_concerns/base/file_manager.html.erb
 - app/views/curation_concerns/base/new.html.erb
@@ -967,7 +977,6 @@ files:
 - app/views/shared/_brand_bar.html.erb
 - app/views/shared/_flash_message.html.erb
 - app/views/shared/_footer.html.erb
-- app/views/shared/_ga.html.erb
 - app/views/shared/_header.html.erb
 - app/views/shared/_my_actions.html.erb
 - app/views/shared/_site_actions.html.erb
@@ -1053,6 +1062,7 @@ files:
 - spec/abilities/generic_work_abilities_spec.rb
 - spec/abilities/operation_ability_spec.rb
 - spec/actors/curation_concerns/add_to_collections_actor_spec.rb
+- spec/actors/curation_concerns/apply_order_actor_spec.rb
 - spec/actors/curation_concerns/embargo_actor_spec.rb
 - spec/actors/curation_concerns/file_actor_spec.rb
 - spec/actors/curation_concerns/file_set_actor_spec.rb
@@ -1200,7 +1210,6 @@ files:
 - spec/views/catalog/index.html.erb_spec.rb
 - spec/views/collections/_sort_and_per_page.html.erb_spec.rb
 - spec/views/curation_concerns/base/_attributes.html.erb_spec.rb
-- spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_rights_spec.rb
 - spec/views/curation_concerns/base/_member.html.erb_spec.rb
 - spec/views/curation_concerns/base/_show_actions.html.erb_spec.rb
@@ -1246,7 +1255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 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
@@ -1258,6 +1267,7 @@ test_files:
 - spec/abilities/generic_work_abilities_spec.rb
 - spec/abilities/operation_ability_spec.rb
 - spec/actors/curation_concerns/add_to_collections_actor_spec.rb
+- spec/actors/curation_concerns/apply_order_actor_spec.rb
 - spec/actors/curation_concerns/embargo_actor_spec.rb
 - spec/actors/curation_concerns/file_actor_spec.rb
 - spec/actors/curation_concerns/file_set_actor_spec.rb
@@ -1405,7 +1415,6 @@ test_files:
 - spec/views/catalog/index.html.erb_spec.rb
 - spec/views/collections/_sort_and_per_page.html.erb_spec.rb
 - spec/views/curation_concerns/base/_attributes.html.erb_spec.rb
-- spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_rights_spec.rb
 - spec/views/curation_concerns/base/_member.html.erb_spec.rb
 - spec/views/curation_concerns/base/_show_actions.html.erb_spec.rb

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

@@ -1,11 +0,0 @@
-module CurationConcerns
-  module FileSet
-    module FullTextIndexing
-      extend ActiveSupport::Concern
-
-      included do
-        has_subresource 'full_text'
-      end
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-    <section class="help-block">
-      <p>
-        <strong>Please note</strong>, making something visible to the world (i.e.
-        marking this as <span class="label label-success">Open Access</span>) may be
-        viewed as publishing which could impact your ability to:
-      </p>
-      <ul>
-        <li>Patent your work</li>
-        <li>Publish your work in a journal</li>
-      </ul>
-      <p>
-        Check out <a href="http://www.sherpa.ac.uk/romeo/">SHERPA/RoMEO</a> for more
-        information about publisher copyright policies.
-      </p>
-    </section>

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

@@ -1,17 +0,0 @@
-<p>This setting will determine who can view your file, and the associated metadata. Setting
-  the visibility to <span class='label label-success'>Open Access</span> will allow your
-  content to be discovered in Google and viewed by anyone. The visibility setting
-  <span class='label label-info'><%=t('curation_concerns.institution_name') %></span> will only allow
-  users who are logged into <%=application_name %> (via WebAccess) to view the content.
-  Files that are marked <span class='label label-danger'>Private</span> are only able to be viewed
-  by users and/or groups that have been given specific access in the &quot;Share With&quot; section.
-</p>
-
-<p>
-  Permissions in <%=application_name %> are hierarchical. This means that you cannot set
-  the visibility of a file to <span class='label label-success'>Open Access</span> or
-  <span class='label label-info'><%=t('curation_concerns.institution_name') %></span> and simultaneously
-  try to restrict the access of a single user. However, you may mark the visibility of
-  a file as <span class='label label-danger'>Private</span> and then grant access to
-  particular users and/or groups for that file in the &quot;Share With&quot; section.
-</p>

data/app/views/shared/_ga.html.erb

@@ -1,6 +0,0 @@
-<script>
-  var _gaq=[['_setAccount','<%= t('curation_concerns.google_analytics_id', default: 'TRACKME') %>'],['_trackPageview']];
-  (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
-    g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
-    s.parentNode.insertBefore(g,s)}(document,'script'));
-</script>

data/spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe 'curation_concerns/base/_form_permission.html.erb' do
-  let(:curation_concern) { GenericWork.new }
-  before do
-    f = double('form', object: curation_concern,
-                       object_name: nil,
-                       input: nil,
-                       radio_button: nil)
-    render partial: "curation_concerns/base/form_permission", locals: { f: f }
-  end
-
-  it 'has a permissions note' do
-    expect(rendered).to have_content('Please note, making something visible to the world')
-  end
-end