curation_concerns 1.4.0 → 1.5.0

data/app/views/curation_concerns/file_sets/media_display/_office_document.html.erb

@@ -1,16 +1,21 @@
 <% if CurationConcerns.config.display_media_download_link %>
-    <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the document" do %>
-        <figure>
-            <%= image_tag thumbnail_url(file_set),
-                          class: "img-responsive",
-                          alt: "Download the document #{file_set.to_s}" %>
-            <figcaption>Download the document</figcaption>
-        </figure>
-    <% end %>
+    <div>
+      <h2 class="sr-only"><%= t('curation_concerns.show.downloadable_content.heading') %></h2>
+      <%= image_tag thumbnail_url(file_set),
+                    class: "representative-media",
+                    alt: "",
+                    role: "presentation" %>
+      <%= link_to main_app.download_path(file_set),
+                  target: "_new",
+                  class: "btn btn-default" do %>
+          <%= t('curation_concerns.show.downloadable_content.office_link') %>
+      <% end %>
+    </div>
 <% else %>
-    <figure>
-        <%= image_tag thumbnail_url(file_set),
-                      class: "img-responsive",
-                      alt: "Thumbnail of #{file_set.to_s}" %>
-    </figure>
+    <div>
+      <%= image_tag thumbnail_url(file_set),
+                    class: "representative-media",
+                    alt: "",
+                    role: "presentation" %>
+    </div>
 <% end %>

data/app/views/curation_concerns/file_sets/media_display/_pdf.html.erb

@@ -1,16 +1,21 @@
 <% if CurationConcerns.config.display_media_download_link %>
-    <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the full-sized PDF" do %>
-        <figure>
-            <%= image_tag thumbnail_url(file_set),
-                          class: "img-responsive",
-                          alt: "Download the full-sized PDF of #{file_set.to_s}" %>
-            <figcaption>Download the full-sized PDF</figcaption>
-        </figure>
-    <% end %>
+    <div>
+      <h2 class="sr-only"><%= t('curation_concerns.show.downloadable_content.heading') %></h2>
+      <%= image_tag thumbnail_url(file_set),
+                    class: "representative-media",
+                    alt: "",
+                    role: "presentation" %>
+      <%= link_to main_app.download_path(file_set),
+                  target: "_new",
+                  class: "btn btn-default" do %>
+          <%= t('curation_concerns.show.downloadable_content.pdf_link') %>
+      <% end %>
+    </div>
 <% else %>
-    <figure>
-        <%= image_tag thumbnail_url(file_set),
-                      class: "img-responsive",
-                      alt: "Thumbnail of #{file_set.to_s}" %>
-    </figure>
+    <div>
+      <%= image_tag thumbnail_url(file_set),
+                    class: "representative-media",
+                    alt: "",
+                    role: "presentation" %>
+    </div>
 <% end %>

data/config/locales/curation_concerns.en.yml

@@ -16,6 +16,12 @@ en:
     show:
       related_files:
         heading: 'Members'
+      downloadable_content:
+        heading: 'Downloadable Content'
+        default_link: 'Download file'
+        image_link: 'Download image'
+        office_link: 'Download file'
+        pdf_link: 'Download PDF'
     search:
       form:
         q:

data/curation_concerns.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'hydra-head', '>= 10.0.0', '< 11'
-  spec.add_dependency 'active-fedora', '>= 11.0.0.rc6'
+  spec.add_dependency 'active-fedora', '>= 10.3.0.rc1'
   spec.add_dependency 'blacklight', '~> 6.3'
-  spec.add_dependency 'breadcrumbs_on_rails', '>= 2.3', '< 4'
+  spec.add_dependency 'breadcrumbs_on_rails', '>= 3.0.1', '< 4'
   spec.add_dependency 'jquery-ui-rails'
   spec.add_dependency 'simple_form', '~> 3.1'
   spec.add_dependency 'hydra-editor', '>= 2', '< 4'

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.5.0'.freeze
 end

data/lib/generators/curation_concerns/install_generator.rb

@@ -15,9 +15,8 @@ module CurationConcerns
    5. Adds CurationConcerns abilities into the Ability class
    6. Copies the catalog controller into the local app
    7. Adds CurationConcerns::SolrDocumentBehavior to app/models/solr_document.rb
-   8. Adds config/authorities/rights.yml to the application
-   9. Adds config/authorities/resource_types.yml to the application
-   10. Copies modified simple_form initializers
+   8. Adds local authority files to the application
+   9. Copies modified simple_form initializers
          '
 
     def run_required_generators
@@ -93,12 +92,10 @@ module CurationConcerns
       copy_file 'curation_concerns_helper.rb', 'app/helpers/curation_concerns_helper.rb'
     end
 
-    def rights_config
-      copy_file "config/authorities/rights.yml", "config/authorities/rights.yml"
-    end
-
-    def resource_types_config
-      copy_file "config/authorities/resource_types.yml", "config/authorities/resource_types.yml"
+    def local_authorities
+      copy_file "config/authorities/licenses.yml"
+      copy_file "config/authorities/rights_statements.yml"
+      copy_file "config/authorities/resource_types.yml"
     end
 
     def simple_form_initializers

data/lib/generators/curation_concerns/templates/config/authorities/rights_statements.yml

@@ -0,0 +1,37 @@
+terms:
+- id: http://rightsstatements.org/vocab/InC/1.0/
+  term: "In Copyright"
+  active: true
+- id: http://rightsstatements.org/vocab/InC-OW-EU/1.0/
+  term: "In Copyright - EU Orphan Work"
+  active: true
+- id: http://rightsstatements.org/vocab/InC-EDU/1.0/
+  term: "In Copyright - Educational Use Permitted"
+  active: true
+- id: http://rightsstatements.org/vocab/InC-NC/1.0/
+  term: "In Copyright - Non-Commercial Use Permitted"
+  active: true
+- id: http://rightsstatements.org/vocab/InC-RUU/1.0/
+  term: "In Copyright - Rights-holder(s) Unlocatable or Unidentifiable"
+  active: true
+- id: http://rightsstatements.org/vocab/NoC-CR/1.0/
+  term: "No Copyright - Contractual Restrictions"
+  active: true
+- id: http://rightsstatements.org/vocab/NoC-NC/1.0/
+  term: "No Copyright - Non-Commercial Use Only "
+  active: true
+- id: http://rightsstatements.org/vocab/NoC-OKLR/1.0/
+  term: "No Copyright - Other Known Legal Restrictions"
+  active: true
+- id: http://rightsstatements.org/vocab/NoC-US/1.0/
+  term: "No Copyright - United States"
+  active: true
+- id: http://rightsstatements.org/vocab/CNE/1.0/
+  term: "Copyright Not Evaluated"
+  active: true
+- id: http://rightsstatements.org/vocab/UND/1.0/
+  term: "Copyright Undetermined"
+  active: true
+- id: http://rightsstatements.org/vocab/NKC/1.0/
+  term: "No Known Copyright"
+  active: true

data/spec/abilities/admin_set_abilities_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'cancan/matchers'
+
+describe 'User Abilities' do
+  subject { ability }
+  let(:ability) { Ability.new(current_user) }
+  let(:user) { create(:user) }
+  let(:current_user) { user }
+  let(:admin_set) { create(:admin_set, edit_users: [user]) }
+
+  it "allows the edit_users to edit and read" do
+    is_expected.to be_able_to(:read, admin_set)
+    is_expected.to be_able_to(:edit, admin_set)
+  end
+end

data/spec/actors/curation_concerns/file_actor_spec.rb

@@ -30,8 +30,7 @@ describe CurationConcerns::Actors::FileActor do
 
     it 'reverts to a previous version of a file' do
       expect(CurationConcerns::VersioningService).to receive(:create).with(previous_version, user)
-      expect(CurationConcerns::WorkingDirectory).to receive(:copy_repository_resource_to_working_directory).with(previous_version, file_set.id).and_return(file_path)
-      expect(CharacterizeJob).to receive(:perform_later).with(file_set, file_path)
+      expect(CharacterizeJob).to receive(:perform_later).with(file_set, previous_version.id)
       actor.revert_to(revision_id)
     end
   end

data/spec/controllers/catalog_controller_spec.rb

@@ -35,18 +35,16 @@ describe CatalogController do
 
     context 'Searching all works' do
       it 'returns all the works' do
-        get 'index', 'f' => { 'generic_type_sim' => 'Work' }
+        get 'index', params: { 'f' => { 'generic_type_sim' => 'Work' } }
         expect(response).to be_successful
         expect(assigns(:document_list).count).to eq 2
-        [work1.id, work2.id].each do |work_id|
-          expect(assigns(:document_list).map(&:id)).to include(work_id)
-        end
+        expect(assigns(:document_list).map(&:id)).to include(work1.id, work2.id)
       end
     end
 
     context 'Searching all collections' do
       it 'returns all the works' do
-        get 'index', 'f' => { 'generic_type_sim' => 'Collection' }
+        get 'index', params: { 'f' => { 'generic_type_sim' => 'Collection' } }
         expect(response).to be_successful
         expect(assigns(:document_list).map(&:id)).to eq [collection.id]
       end
@@ -54,7 +52,7 @@ describe CatalogController do
 
     context 'searching just my works' do
       it 'returns just my works' do
-        get 'index', works: 'mine', 'f' => { 'generic_type_sim' => 'Work' }
+        get 'index', params: { works: 'mine', 'f' => { 'generic_type_sim' => 'Work' } }
         expect(response).to be_successful
         expect(assigns(:document_list).map(&:id)).to eq [work1.id]
       end
@@ -62,7 +60,7 @@ describe CatalogController do
 
     context 'searching for one kind of work' do
       it 'returns just the specified type' do
-        get 'index', 'f' => { 'human_readable_type_sim' => 'Generic Work' }
+        get 'index', params: { 'f' => { 'human_readable_type_sim' => 'Generic Work' } }
         expect(response).to be_successful
         expect(assigns(:document_list).map(&:id)).to include(work1.id, work2.id)
       end
@@ -72,7 +70,7 @@ describe CatalogController do
       let!(:work) { FactoryGirl.create(:generic_work, user: user, title: ["All my #{srand}"]) }
       render_views
       it 'returns json' do
-        xhr :get, :index, format: :json, q: work.title.first
+        get :index, xhr: true, params: { format: :json, q: work.title.first }
         json = JSON.parse(response.body)
         # Grab the doc corresponding to work and inspect the json
         work_json = json['docs'].first
@@ -95,17 +93,17 @@ describe CatalogController do
 
     context 'searching all works' do
       it "returns other users' private works" do
-        get 'index', 'f' => { 'generic_type_sim' => 'Work' }
+        get 'index', params: { 'f' => { 'generic_type_sim' => 'Work' } }
         expect(response).to be_successful
         expect(assigns(:document_list).map(&:id)).to include(work1.id)
       end
       it "returns other users' embargoed works" do
-        get 'index', 'f' => { 'generic_type_sim' => 'Work' }
+        get 'index', params: { 'f' => { 'generic_type_sim' => 'Work' } }
         expect(response).to be_successful
         expect(assigns(:document_list).map(&:id)).to include(work2.id)
       end
       it "returns other users' private collections" do
-        get 'index', 'f' => { 'generic_type_sim' => 'Collection' }
+        get 'index', params: { 'f' => { 'generic_type_sim' => 'Collection' } }
         expect(response).to be_successful
         expect(assigns(:document_list).map(&:id)).to include(collection.id)
       end

data/spec/controllers/curation_concerns/classify_concerns_controller_spec.rb

@@ -19,7 +19,7 @@ describe CurationConcerns::ClassifyConcernsController do
   describe '#create' do
     context 'without logging in' do
       it 'redirect to login page if user is not logged in' do
-        post :create, classify: { curation_concern_type: 'GenericWork' }
+        post :create, params: { classify: { curation_concern_type: 'GenericWork' } }
         expect(response).to redirect_to(main_app.user_session_path)
       end
     end
@@ -34,7 +34,7 @@ describe CurationConcerns::ClassifyConcernsController do
       let(:new_curation_concern_generic_work_path) { '/stub/path' }
 
       it 'requires authentication' do
-        post :create, classify_concern: { curation_concern_type: 'GenericWork' }
+        post :create, params: { classify_concern: { curation_concern_type: 'GenericWork' } }
         expect(response).to redirect_to(main_app.new_curation_concerns_generic_work_path)
       end
     end

data/spec/controllers/curation_concerns/collections_controller_spec.rb

@@ -25,9 +25,7 @@ describe CollectionsController do
   let(:collection) { create(:collection, title: ['Collection Title'], user: user) }
 
   describe '#new' do
-    before do
-      sign_in user
-    end
+    before { sign_in user }
 
     it 'assigns @collection' do
       get :new
@@ -36,20 +34,18 @@ describe CollectionsController do
   end
 
   describe '#create' do
-    before do
-      sign_in user
-    end
+    before { sign_in user }
 
     it 'creates a Collection' do
       expect do
-        post :create, collection: collection_attrs.merge(visibility: 'open')
+        post :create, params: { collection: collection_attrs.merge(visibility: 'open') }
       end.to change { Collection.count }.by(1)
       expect(assigns[:collection].visibility).to eq 'open'
     end
 
     it 'removes blank strings from params before creating Collection' do
       expect do
-        post :create, collection: collection_attrs.merge(creator: [''])
+        post :create, params: { collection: collection_attrs.merge(creator: ['']) }
       end.to change { Collection.count }.by(1)
       expect(assigns[:collection].title).to eq ['My First Collection']
       expect(assigns[:collection].creator).to eq([])
@@ -58,8 +54,9 @@ describe CollectionsController do
     it 'creates a Collection with files I can access' do
       [asset1, asset2].map(&:save) # bogus_depositor_asset is already saved
       expect do
-        post :create, collection: collection_attrs,
-                      batch_document_ids: [asset1.id, asset2.id, bogus_depositor_asset.id]
+        post :create, params: { collection: collection_attrs,
+                                batch_document_ids: [asset1.id, asset2.id, bogus_depositor_asset.id]
+                              }
       end.to change { Collection.count }.by(1)
       collection = assigns(:collection)
       expect(collection.members).to match_array [asset1, asset2]
@@ -67,7 +64,7 @@ describe CollectionsController do
 
     it 'adds docs to the collection if a batch id is provided and add the collection id to the documents in the collection' do
       asset1.save
-      post :create, batch_document_ids: [asset1.id], collection: collection_attrs
+      post :create, params: { batch_document_ids: [asset1.id], collection: collection_attrs }
       expect(assigns[:collection].members).to eq [asset1]
 
       asset_results = ActiveFedora::SolrService.instance.conn.get 'select', params: { fq: ["id:\"#{asset1.id}\""], fl: ['id'] }
@@ -106,9 +103,10 @@ describe CollectionsController do
       xit 'appends members to the collection in order, allowing duplicates' do
         # TODO: Using size until count is fixed https://github.com/projecthydra-labs/activefedora-aggregation/issues/78
         expect {
-          put :update, id: collection,
-                       collection: { members: 'add' },
-                       batch_document_ids: [asset2.id, asset1.id]
+          put :update, params: { id: collection,
+                                 collection: { members: 'add' },
+                                 batch_document_ids: [asset2.id, asset1.id]
+                               }
         }.to change { collection.reload.members.size }.by(2)
         expect(response).to redirect_to routes.url_helpers.collection_path(collection)
         expect(assigns[:collection].members).to eq [asset1, asset2, asset2, asset1]
@@ -122,9 +120,10 @@ describe CollectionsController do
 
       it "adds members to the collection" do
         expect {
-          put :update, id: collection,
-                       collection: { members: 'add' },
-                       batch_document_ids: [asset4.id]
+          put :update, params: { id: collection,
+                                 collection: { members: 'add' },
+                                 batch_document_ids: [asset4.id]
+                               }
         }.to change { collection.reload.members.size }.by(1)
         expect(response).to redirect_to routes.url_helpers.collection_path(collection)
         expect(assigns[:collection].members).to match_array [asset1, asset2, asset4]
@@ -139,9 +138,10 @@ describe CollectionsController do
       it "removes members from the collection" do
         # TODO: Using size until count is fixed https://github.com/projecthydra-labs/activefedora-aggregation/issues/78
         expect {
-          put :update, id: collection,
-                       collection: { members: 'remove' },
-                       batch_document_ids: [asset2]
+          put :update, params: { id: collection,
+                                 collection: { members: 'remove' },
+                                 batch_document_ids: [asset2]
+                               }
         }.to change { collection.reload.members.size }.by(-1)
         asset_results = ActiveFedora::SolrService.instance.conn.get 'select', params: { fq: ["id:\"#{asset2.id}\""], fl: ['id'] }
         expect(asset_results['response']['numFound']).to eq 1
@@ -155,19 +155,24 @@ describe CollectionsController do
       let(:asset1) { create(:generic_work, user: user) }
       let(:asset2) { create(:generic_work, user: user) }
       let(:asset3) { create(:generic_work, user: user) }
-      before do
-        collection.members = [asset1, asset2, asset3]
-        collection.save!
-      end
       let(:collection2) do
         Collection.create(title: ['Some Collection']) do |col|
           col.apply_depositor_metadata(user.user_key)
         end
       end
+      before do
+        collection.members = [asset1, asset2, asset3]
+        collection.save!
+      end
 
       it 'moves the members' do
-        put :update, id: collection, collection: { members: 'move' },
-                     destination_collection_id: collection2, batch_document_ids: [asset2, asset3]
+        put :update,
+            params: {
+              id: collection,
+              collection: { members: 'move' },
+              destination_collection_id: collection2,
+              batch_document_ids: [asset2, asset3]
+            }
         expect(collection.reload.members).to eq [asset1]
         expect(collection2.reload.members).to match_array [asset2, asset3]
       end
@@ -175,14 +180,14 @@ describe CollectionsController do
 
     context 'updating a collections metadata' do
       it 'saves the metadata' do
-        put :update, id: collection, collection: { creator: ['Emily'], visibility: 'open' }
+        put :update, params: { id: collection, collection: { creator: ['Emily'], visibility: 'open' } }
         collection.reload
         expect(collection.creator).to eq ['Emily']
         expect(collection.visibility).to eq 'open'
       end
 
       it 'removes blank strings from params before updating Collection metadata' do
-        put :update, id: collection, collection: collection_attrs.merge(creator: [''])
+        put :update, params: { id: collection, collection: collection_attrs.merge(creator: ['']) }
         expect(assigns[:collection].title).to eq ['My First Collection']
         expect(assigns[:collection].creator).to eq([])
       end
@@ -202,7 +207,7 @@ describe CollectionsController do
       end
 
       it 'returns the collection and its members' do
-        get :show, id: collection
+        get :show, params: { id: collection }
         expect(response).to be_successful
         expect(assigns[:presenter]).to be_kind_of CurationConcerns::CollectionPresenter
         expect(assigns[:presenter].to_s).to eq 'Collection Title'
@@ -211,15 +216,16 @@ describe CollectionsController do
 
       context 'when the q parameter is passed' do
         it 'loads the collection (paying no attention to the q param)' do
-          get :show, id: collection, q: 'no matches'
+          get :show, params: { id: collection, q: 'no matches' }
           expect(response).to be_successful
           expect(assigns[:presenter]).to be_kind_of CurationConcerns::CollectionPresenter
           expect(assigns[:presenter].to_s).to eq 'Collection Title'
         end
       end
+
       context 'when the page parameter is passed' do
         it 'loads the collection (paying no attention to the page param)' do
-          get :show, id: collection, page: '2'
+          get :show, params: { id: collection, page: '2' }
           expect(response).to be_successful
           expect(assigns[:presenter]).to be_kind_of CurationConcerns::CollectionPresenter
           expect(assigns[:presenter].to_s).to eq 'Collection Title'
@@ -233,7 +239,7 @@ describe CollectionsController do
         collection.save
       end
       it 'forces me to log in' do
-        get :show, id: collection
+        get :show, params: { id: collection }
         expect(response).to redirect_to(main_app.new_user_session_path)
       end
     end
@@ -243,7 +249,7 @@ describe CollectionsController do
     before { sign_in user }
 
     it 'does not show flash' do
-      get :edit, id: collection
+      get :edit, params: { id: collection }
       expect(flash[:notice]).to be_nil
     end
   end