sufia 4.0.0.rc2 → 4.0.0

data/app/views/users/_notify_link.html.erb

@@ -1,4 +1,5 @@
 <%= link_to sufia.notifications_path, id: "notify_link", class: "btn btn-default", title: "User Notifications" do %>
+ <span class="sr-only">click for notifications.</span>
  <%= render partial: 'users/notify_number' %>
 <% end %>  
 <div class='hide'> 

data/app/views/users/_notify_number.html.erb

@@ -1,4 +1,5 @@
 <i class="glyphicon glyphicon-bullhorn"></i>
 <% if @notify_number > 0 %>
-<span id="notify_number" class="overlay"> <%=@notify_number%></span>
-<% end %>                 
+  <span id="notify_number" class="overlay"> <%=@notify_number%></span>
+  <span class="sr-only">unread notifications</span>
+<% end %>

data/config/locales/sufia.en.yml

@@ -34,8 +34,11 @@ en:
         text: "Search"
     upload:
       my_computer:
+        sr_tab_label: "Access Files from"
         tab_label: "My Computer"
+        sr_instructions: "Agree to the deposit agreement and then select files.  Press the Start Upload Button once all files have been selected."
       browse_everything:
+        sr_tab_label: "Access Files from"
         tab_label: "Cloud Providers"
         browse_files_button: "Browse cloud files"
         files_selected: "files selected"
@@ -52,6 +55,10 @@ en:
       size:             "Size"
     homepage:
       featured_works:       'Featured Works'
+      recently_uploaded:    'Recently Uploaded'
+      explore:              'Explore'
+      sr_explore:           'Popular Keywords'
+      no_public:            'No public work has been contributed.'
     dashboard:
       title:                    "My Dashboard"
       greeting:                 "Hello, "
@@ -75,6 +82,12 @@ en:
         collections:  "My Collections"
         highlights:   "My Highlights"
         shares:       "Files Shared with Me"
+        filter:       "Filter your %{type}"
+        sr:
+          show_label:     "Display all details of"
+          detail_label:   "Display summary details of"
+          batch_checkbox: "Check to add to a collection or edit list"
+          check_all_label: "Select all files to be added to a collection or edited"
     file:
       collections_list:
         heading:   "This file is in the following collections:"
@@ -106,14 +119,17 @@ en:
       date_created: "The date on which the file was generated. Dates are accepted in the form YYYY-MM-DD, e.g. 1776-07-04."
       description: "Free-text notes about the file itself. Examples include abstracts of a paper, citation information for a journal article, or a tag indicating a larger collection to which the file belongs."
       identifier: "A unique handle describing the file. An example would be a DOI for a journal article, or an ISBN or OCLC number for a book."
-      language: " The language of the file content."
+      language: "The language of the file content."
       publisher: "The person or group making the file available. Generally this is the institution."
       rights: "Licensing and distribution information governing access to the file. Select from the provided drop-down list. <em>This is a required field</em>."
+    aria_label: 
+      default: "Usage information for %{title}"
+      based_near: "Usage information for location"
+      description: "Usage information for abstract or summary"
+      tag: "Usage information for keyword"
+      rightsModal: "Usage information for rights"
     background_attribution: "Background image courtesy of Penn State University"
     bread_crumb:
-      file_list: "Your File Listing"
-      collections_list: "Your Collections"
-      previous:  "Back to Previous"
       search_results: "Back to search results"
     visibility:
       open: "Open Access"
@@ -121,3 +137,7 @@ en:
     user_profile:
       no_followers: "No one is following you."
       no_following: "You are not following anyone."
+    batch:
+      help:
+        title: "Filename will be the default title. Please provide a more meaningful title, and filenames will still be preserved by the system."
+        resource_type: "You may select multiple types to apply to all files"

data/lib/sufia.rb

@@ -18,6 +18,8 @@ module Sufia
 
   class Engine < ::Rails::Engine
     engine_name 'sufia'
+    # Breadcrumbs on rails must be required outside of an initializer or it doesn't get loaded.
+    require 'breadcrumbs_on_rails'
 
     config.autoload_paths += %W(
       #{config.root}/app/controllers/concerns

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "4.0.0.rc2"
+  VERSION = "4.0.0"
 end

data/spec/actors/generic_file/actor_spec.rb

@@ -1,15 +1,17 @@
 require 'spec_helper'
 
 describe Sufia::GenericFile::Actor do
+
+  let(:user) { FactoryGirl.create(:user) }
+
   describe "#virus_check" do
     it "should return the results of running ClamAV scanfile method" do
-      ClamAV.instance.should_receive(:scanfile).and_return(1)
+      expect(ClamAV.instance).to receive(:scanfile).and_return(1)
       expect { Sufia::GenericFile::Actor.virus_check(File.new(fixture_path + '/world.png')) }.to raise_error(Sufia::VirusFoundError)
     end
   end
 
   describe "#featured_work" do
-    let(:user) { FactoryGirl.create(:user) }
     let(:gf) { FactoryGirl.create(:generic_file, visibility: 'open') }
     let(:actor) { Sufia::GenericFile::Actor.new(gf, user)}
 
@@ -24,4 +26,21 @@ describe Sufia::GenericFile::Actor do
     end
   end
 
+  context "when a label is already specified" do
+    let(:generic_file_with_label) do
+      GenericFile.new.tap do |f|
+        f.apply_depositor_metadata(user.user_key)
+        f.label = "test_file.name"
+      end
+    end
+
+    let(:actor) { Sufia::GenericFile::Actor.new(generic_file_with_label, user)}
+
+    it "uses the label instead of the path" do
+      allow(actor).to receive(:save_characterize_and_record_committer).and_return("true")
+      actor.create_content(Tempfile.new('foo'), 'tmp\foo', 'content')
+      expect(generic_file_with_label.content.dsLabel).to eq generic_file_with_label.label
+    end
+  end
+
 end

data/spec/controllers/batch_controller_spec.rb

@@ -84,7 +84,7 @@ describe BatchController do
         file.discover_groups.should == []
       end
       it "should set metadata like title" do
-        post :update, id: @batch.pid, "generic_file"=>{"tag"=>["footag", "bartag"]}, "title"=>{@file.pid=>"New Title"}
+        post :update, id: @batch.pid, "generic_file"=>{"tag"=>["footag", "bartag"]}, "title"=>{@file.pid=>["New Title"]}
         file = GenericFile.find(@file.pid)
         file.title.should == ["New Title"]
         file.tag.should == ["footag", "bartag"]
@@ -98,10 +98,10 @@ describe BatchController do
     describe "when user does not have edit permissions on a file" do
       it "should not modify the object" do
         file = GenericFile.find(@file2.pid)
-        file.title = "Original Title"
+        file.title = ["Original Title"]
         file.read_groups.should == []
         file.save
-        post :update, id: @batch.pid, "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}, "title"=>{@file2.pid=>"Title Wont Change"}
+        post :update, id: @batch.pid, "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}, "title"=>{@file2.pid=>["Title Wont Change"]}
         file = GenericFile.find(@file2.pid)
         file.title.should == ["Original Title"]
         file.read_groups.should == []

data/spec/controllers/batch_edits_controller_spec.rb

@@ -33,6 +33,10 @@ describe BatchEditsController do
       expect(assigns[:show_file].publisher).to eq ["Rand McNally"]
       expect(assigns[:show_file].language).to eq ["en"]
     end
+    it "should set the breadcrumb trail" do
+      expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
+      get :edit
+    end
   end
 
   describe "update" do

data/spec/controllers/catalog_controller_spec.rb

@@ -12,12 +12,12 @@ describe CatalogController do
   describe "#index" do
     before (:all) do
       @user = FactoryGirl.find_or_create(:jill)
-      @gf1 = GenericFile.new(title: 'Test Document PDF', filename: 'test.pdf', tag: 'rocks', read_groups: ['public']).tap do |f|
+      @gf1 = GenericFile.new(title: ['Test Document PDF'], filename: ['test.pdf'], tag: ['rocks'], read_groups: ['public']).tap do |f|
         f.apply_depositor_metadata('mjg36')
         f.save
       end
 
-      @gf2 = GenericFile.new(title: 'Test 2 Document', filename: 'test2.doc', tag: 'clouds', contributor: 'Contrib1', read_groups: ['public']).tap do |f|
+      @gf2 = GenericFile.new(title: ['Test 2 Document'], filename: ['test2.doc'], tag: ['clouds'], contributor: ['Contrib1'], read_groups: ['public']).tap do |f|
         f.apply_depositor_metadata('mjg36')
         f.full_text.content = 'full_textfull_text'
         f.save
@@ -68,7 +68,7 @@ describe CatalogController do
 
     context "with collections" do
       before do
-       @collection = Collection.new(title:"my collection", tag: 'rocks').tap do |c|
+       @collection = Collection.new(title: "my collection", tag: ['rocks']).tap do |c|
          c.apply_depositor_metadata('mjg36')
          c.save!
        end

data/spec/controllers/collections_controller_spec.rb

@@ -80,7 +80,7 @@ describe CollectionsController do
 
   describe "#update" do
     before do
-      @collection = Collection.new(title: ["Collection Title"])
+      @collection = Collection.new(title: "Collection Title")
       @collection.apply_depositor_metadata(user.user_key)
       @collection.save
       @asset1 = GenericFile.new(title: ["First of the Assets"])
@@ -157,6 +157,10 @@ describe CollectionsController do
         expect(ids).to include @asset1.pid, @asset2.pid, @asset3.pid
         expect(ids).to_not include @asset4.pid
       end
+      it "should set the breadcrumb trail" do
+        expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
+        get :show, id: @collection.id
+      end
     end
     context "not signed in" do
       it "should not show me files in the collection" do

data/spec/controllers/generic_files_controller_spec.rb

@@ -282,7 +282,6 @@ describe GenericFilesController do
 
     context 'when user has access to file' do
       before do
-        sign_in @user
         mock_query = double('query')
         allow(mock_query).to receive(:for_path).and_return([
             OpenStruct.new(date: '2014-01-01', pageviews: 4),
@@ -292,7 +291,7 @@ describe GenericFilesController do
             OpenStruct.new(date: '2014-01-05', pageviews: 2)])
         allow(mock_query).to receive(:map).and_return(mock_query.for_path.map(&:marshal_dump))
         profile = double('profile')
-        allow(profile).to receive(:pageview).and_return(mock_query)
+        allow(profile).to receive(:sufia__pageview).and_return(mock_query)
         allow(Sufia::Analytics).to receive(:profile).and_return(profile)
 
         download_query = double('query')
@@ -300,7 +299,7 @@ describe GenericFilesController do
           OpenStruct.new(eventCategory: "Files", eventAction: "Downloaded", eventLabel: "sufia:123456789", totalEvents: "3")
         ])
         allow(download_query).to receive(:map).and_return(download_query.for_file.map(&:marshal_dump))
-        allow(profile).to receive(:download).and_return(download_query)
+        allow(profile).to receive(:sufia__download).and_return(download_query)
       end
 
       it 'renders the stats view' do
@@ -308,6 +307,20 @@ describe GenericFilesController do
         expect(response).to be_success
         expect(response).to render_template(:stats)
       end
+
+      context "user is not signed in but the file is public" do
+        before do
+          sign_out @user
+          @generic_file.read_groups = ['public']
+          @generic_file.save
+        end
+
+        it 'renders the stats view' do
+          get :stats, id: @generic_file.noid
+          expect(response).to be_success
+          expect(response).to render_template(:stats)
+        end
+      end
     end
 
     context 'when user lacks access to file' do
@@ -341,7 +354,7 @@ describe GenericFilesController do
       Sufia.queue.should_receive(:push).with(s1).once
       @user = FactoryGirl.find_or_create(:jill)
       sign_in @user
-      post :update, id: generic_file, generic_file: {title: 'new_title', tag: [''], permissions: { new_user_name: {'archivist1'=>'edit'}}}
+      post :update, id: generic_file, generic_file: {title: ['new_title'], tag: [''], permissions: { new_user_name: {'archivist1'=>'edit'}}}
       @user.delete
     end
 
@@ -533,6 +546,10 @@ describe GenericFilesController do
         response.should_not redirect_to(action: 'show')
         flash[:alert].should be_nil
       end
+      it "should set the breadcrumbs" do
+        expect(controller).to receive(:add_breadcrumb).with(I18n.t('sufia.dashboard.title'), Sufia::Engine.routes.url_helpers.dashboard_index_path)
+        get :show, id: "test5"
+      end
     end
     describe "flash" do
       it "should not let the user submit if they logout" do

data/spec/controllers/homepage_controller_spec.rb

@@ -9,7 +9,7 @@ describe HomepageController do
       @gf1 = GenericFile.new(title:['Test Document PDF'], filename:['test.pdf'], tag:['rocks'], read_groups:['public'])
       @gf1.apply_depositor_metadata('mjg36')
       @gf1.save
-      @gf2 = GenericFile.new(title:['Test 2 Document'], filename:['test2.doc'], tag:['clouds'], contributor:['Contrib1'], read_groups:['public'])
+      @gf2 = GenericFile.new(title:['Test Private Document'], filename:['test2.doc'], tag:['clouds'], contributor:['Contrib1'], read_groups:['private'])
       @gf2.apply_depositor_metadata('mjg36')
       @gf2.save
     end
@@ -42,6 +42,13 @@ describe HomepageController do
       end
     end
 
+    it "should not include other user's private documents in recent documents" do
+      get :index
+      expect(response).to be_success
+      titles = assigns(:recent_documents).map {|d| d['desc_metadata__title_tesim'][0]}
+      expect(titles).to_not include('Test Private Document')
+    end    
+
     context "with a document not created this second" do
       before do
         gf3 = GenericFile.new(title:['Test 3 Document'], read_groups:['public'])

data/spec/features/browse_dashboard_files_spec.rb

@@ -47,7 +47,7 @@ describe "Browse Dashboard" do
       click_link "more Subjects"
       click_link "consectetur"
       within("#document_#{@fixtures[1].noid}") do
-        click_link "Test Document MP3.mp3"
+        click_link "Display all details of Test Document MP3.mp3"
       end
       expect(page).to have_content("File Details")
     end

data/spec/features/collection_spec.rb

@@ -97,7 +97,7 @@ describe 'collection' do
     it "should show a collection with a listing of Descriptive Metadata and catalog-style search results" do
       expect(page).to have_content(@collection.title)
       within('#document_'+@collection.noid) do
-        click_link("collection title")
+        click_link("Display all details of collection title")
       end
       expect(page).to have_content(@collection.title)
       expect(page).to have_content(@collection.description)
@@ -120,7 +120,7 @@ describe 'collection' do
       # URL: /dashboard/collections
       expect(page).to have_content(@collection.title)
       within("#document_#{@collection.noid}") do
-        click_link("collection title")
+        click_link("Display all details of collection title")
       end
       # URL: /collections/collection-id
       expect(page).to have_content(@collection.title)
@@ -232,7 +232,7 @@ describe 'collection' do
     it "should show a collection with a listing of Descriptive Metadata and catalog-style search results" do
       page.should have_content(@collection.title)
       within('#document_'+@collection.noid) do
-        click_link("collection title")
+        click_link("Display all details of collection title")
       end
       page.should have_css(".pager")
     end

data/spec/helpers/records_helper_spec.rb

@@ -1,38 +1,38 @@
 require 'spec_helper'
 
 describe RecordsHelper do
+  let(:adder) {
+    "<button class=\"adder btn\" id=\"additional_test_submit\" name=\"additional_test\"><span aria-hidden=\"true\">+</span><span class=\"sr-only\">add another test</span></button>"
+  }
+  let(:remover) {
+    "<button class=\"remover btn\" id=\"additional_test_submit\" name=\"additional_test\"><span aria-hidden=\"true\">-</span><span class=\"sr-only\">add another test</span></button>"    
+  }
   it "draws add button" do
-    helper.add_field(:test).should == 
-      "<button class=\"adder btn\" id=\"additional_test_submit\" name=\"additional_test\">+<span class=\"sr-only\">add another test</span></button>"
+    expect(helper.add_field(:test)).to eql(adder)
   end
 
   it "draws subtract button" do
-    helper.subtract_field(:test).should == 
-      "<button class=\"remover btn\" id=\"additional_test_submit\" name=\"additional_test\">-<span class=\"sr-only\">add another test</span></button>"
+    expect(helper.subtract_field(:test)).to eql(remover)
   end
 
   it "draws help_icon" do
     str = String.new(helper.help_icon(:tag))
     doc = Nokogiri::HTML(str)
     a = doc.xpath('//a').first
-    
-    a.attr('data-content').should == "Words or phrases you select to describe what the file is about. These are used to search for content. <em>This is a required field</em>."
-    a.attr('data-original-title').should == "Keyword"
-    a.attr('id').should == "generic_file_tag_help"
-    i = a.children.first
-    i.attr('class').should == 'glyphicon glyphicon-question-sign large-icon'
+    expect(a.attr('data-content')).to  eql("Words or phrases you select to describe what the file is about. These are used to search for content. <em>This is a required field</em>.")
+    expect(a.attr('data-original-title')).to  eql("Keyword")
+    expect(a.attr('id')).to  eql("generic_file_tag_help")
+    expect(a.children.first.attr('class')).to eql('help-icon')
   end
 
   specify "draws help_icon_modal" do
     str = String.new(helper.help_icon_modal('myModal'))
     doc = Nokogiri::HTML(str)
     a = doc.xpath('//a').first
-
     expect(a.attr('href')).to eq('#myModal')
     expect(a.attr('data-toggle')).to eq('modal')
     expect(a.attr('id')).to eq('generic_file_myModal_help_modal')
-    i = a.children.first
-    expect(i.attr('class')).to eq('glyphicon glyphicon-question-sign large-icon')
+    expect(a.children.first.attr('class')).to eq('help-icon')
   end
 
   describe "download links" do
@@ -42,32 +42,60 @@ describe RecordsHelper do
       assign :generic_file, @file
     end
 
+    let(:link_text) { helper.render_download_link("Download Fake") }
+    let(:icon_text) { helper.render_download_icon("Download the full-sized Fake") }
+ 
     describe "#render_download_link" do    
       it "has default text" do
-        helper.render_download_link.should have_selector("#file_download")
-        helper.render_download_link.should have_content("Download")
+        expect(helper.render_download_link).to have_selector("#file_download")
+        expect(helper.render_download_link).to have_content("Download")
       end
 
-      it "includes user-supplied text" do
-        content = helper.render_download_link("Download Fake")
-        content.should have_selector("#file_download")
-        content.should have_content("Download Fake")
+      it "includes user-supplied link text" do
+        expect(link_text).to have_selector("#file_download")
+        expect(link_text).to have_content("Download Fake")
       end
     end
 
     describe "#render_download_icon" do
       it "has default text" do
-        helper.render_download_icon.should have_selector("#file_download")
-        helper.render_download_icon.should match("Download the document")
+        expect(helper.render_download_icon).to have_selector("#file_download")
+        expect(helper.render_download_icon).to match("Download the document")
       end
 
-      it "includes user-supplied text" do
-        content = helper.render_download_icon("Download the full-sized Fake")
-        content.should have_selector("#file_download")
-        content.should match("Download the full-sized Fake")
+      it "includes user-supplied icon text" do
+        expect(icon_text).to have_selector("#file_download")
+        expect(icon_text).to match("Download the full-sized Fake")
       end
     end
 
   end
 
+  describe "#metadata_help" do
+    specify "default" do
+      expect(helper.metadata_help("foo")).to eql("Foo")
+    end
+    specify "using a key" do
+      expect(helper.metadata_help("language")).to eql("The language of the file content.")
+    end
+  end
+
+  describe "#get_label" do
+    specify "default" do
+      expect(helper.get_label("foo")).to eql("Foo")
+    end
+    specify "using a key" do
+      expect(helper.get_label("tag")).to eql("Keyword")
+    end
+  end
+
+  describe "#get_aria_label" do
+    specify "default" do
+      expect(helper.get_aria_label("foo")).to eql("Usage information for Foo")
+    end
+    specify "using a key" do
+      expect(helper.get_aria_label("tag")).to eql("Usage information for keyword")
+    end
+  end
+
 end