sufia 7.0.0.beta2 → 7.0.0.beta3

data/app/views/sufia/homepage/_sortable_featured.html.erb

@@ -1,26 +1,26 @@
-<% featured = f.object.generic_work_solr_document %>
-<li class="dd-item dd3-item featured-item" data-id="<%= featured.id %>">
+<% presenter = f.object.presenter %>
+<li class="dd-item dd3-item featured-item" data-id="<%= presenter.id %>">
   <div class="dd-handle dd3-handle"><%= t :drag %></div>
   <div class="dd3-content panel panel-default">
     <%= f.hidden_field :id %>
-    <%= f.hidden_field :order, data: {property: "order"} %>
+    <%= f.hidden_field :order, data: { property: "order" } %>
     <div class="main row">
       <div class="col-sm-3">
-        <%= link_to curation_concerns_generic_work_path(featured) do %>
-          <%= render_thumbnail_tag featured, {width: 90} %>
+        <%= link_to presenter do %>
+          <%= render_thumbnail_tag presenter, width: 90 %>
         <% end %>
       </div>
       <div class="col-sm-9">
         <% if can? :destroy, FeaturedWork %>
           <h3 class="pull-right">
-            <%= link_to sufia.featured_work_path(featured, format: :json),
+            <%= link_to sufia.featured_work_path(presenter, format: :json),
               title: "Remove work from feature section",
               data: {behavior: 'unfeature'} do %>
               <i class='glyphicon glyphicon-remove'></i>
             <% end %>
           </h3>
         <% end %>
-        <%= render partial: 'sufia/homepage/featured_fields', locals: {featured: featured} %>
+        <%= render 'sufia/homepage/featured_fields', featured: presenter %>
       </div>
     </div>
   </div>

data/app/views/transfers/index.html.erb

@@ -1,7 +1,7 @@
-<h1>Transfer of Ownership</h1>
+<h1><%= t("sufia.dashboard.transfer_of_ownership") %></h1>
 
-<h2>Sent</h2>
+<h2><%= t("sufia.dashboard.transfers_sent") %></h2>
 <%= render_sent_transfers %>
 
-<h2>Received</h2>
+<h2><%= t("sufia.dashboard.transfers_received") %></h2>
 <%= render_received_transfers %>

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

@@ -4,12 +4,12 @@
       <% @trophies.each do |t| %>
         <tr id="trophyrow_<%= t.id %>">
           <td>
-            <%= link_to curation_concerns_generic_work_path(t) do %>
+            <%= link_to t do %>
               <%= image_tag t.indexing_service.thumbnail_path, { width: 90 } %>
             <% end %>
           </td>
           <td>
-            <%= link_to t.to_s, curation_concerns_generic_work_path(t) %>
+            <%= link_to t.to_s, t %>
             <% if current_user == @user %>
               <%= display_trophy_link current_user, t.id, class: 'glyphicon glyphicon-star', data: {removerow: true} do %>
                 <i class='trophy-on glyphicon glyphicon-remove'></i>

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

@@ -6,7 +6,7 @@
   <dl>
     <% trophies.each do |t| %>
       <dd>
-        <%= link_to t, curation_concerns_generic_work_path(t) %>
+        <%= link_to t, t %>
         <label class="checkbox fleft">
           <%= check_box_tag "remove_trophy_#{t.id}" %> Yes &nbsp;
         </label>

data/config/locales/sufia.en.yml

@@ -73,6 +73,25 @@ en:
         details:            'Details'
         tab_label:          'Recently Uploaded'
         no_public:          'No public work has been contributed.'
+    toolbar:
+      admin:
+        menu: "Admin"
+        statistics: "Repository Statistics"
+      dashboard:
+        menu: "Dashboard"
+        my: "My Dashboard"
+        highlights: "Highlights"
+        transfers: "Transfers"
+        shares: "Shares"
+      works:
+        menu: "Works"
+        new: "New"
+        my: "My Works"
+        batch: "Batch Create"
+      collections:
+        menu: "Collections"
+        my: "My Collections"
+        new: "New Collection"
     dashboard:
       title:                    "My Dashboard"
       view_collections:         "View Collections"
@@ -85,8 +104,14 @@ en:
       user_notifications:       "User Notifications"
       no_notifications:         "User has no notifications"
       additional_notifications: "See all notifications"
+      manage_proxies:           "Manage Proxies"
       proxy_activity:           "Proxy Activity"
+      authorize_proxies:        "Authorize Proxies"
+      current_proxies:          "Current Proxies"
+      proxy_user:               "Proxy User"
       transfer_of_ownership:    "Transfer of Ownership"
+      transfers_sent:           "Sent"
+      transfers_received:       "Received"
       transfer_works_link:      "Select works to transfer"
       no_transfer_requests:     "You haven't received any work transfer requests"
       no_transfers:             "You haven't transferred any work"
@@ -110,10 +135,32 @@ en:
           shared:      "Filter your shares"
           works:       "Filter your works"
         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"
+          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"
+          listing:          "Listing of items you have deposited in"
+          press_to:         "Press to"
+        heading:
+          title:          "Title"
+          date_uploaded:  "Date Uploaded"
+          visibility:     "Visibility"
+          action:         "Action"
+        collection_list:
+          description:    "Description:"
+          edit_access:    "Edit Access:"
+          groups:         "Groups:"
+          users:          "Users:"
+        action:
+          select:                  "Select an action"
+          edit_collection:         "Edit Collection"
+          delete_collection:       "Delete Collection"
+          edit_work:               "Edit Work"
+          delete_work:             "Delete Work"
+          transfer:                "Transfer Ownership of Work"
+          work_confirmation:       "Deleting a work from %{application_name} is permanent. Click OK to delete this work from %{application_name}, or Cancel to cancel this operation"
+          collection_confirmation: "Deleting a collection from %{application_name} is permanent. Click OK to delete this collection from %{application_name}, or Cancel to cancel this operation"
+
     messages:
       success:
         single: "has been saved."
@@ -160,8 +207,17 @@ en:
     generic_works:
       new:
         header: Add New Work
+        in_collections: This Work in Collections
+        after_create_html: "Your files are being processed by %{application_name} in the background. The metadata and access controls you specified are being applied. Files will be marked <span class=\"label label-danger\" title=\"Private\">Private</span> until this process is complete (shouldn't take too long, hang in there!). You may need to refresh this page to see these updates."
       edit:
         header: Edit Work
+        in_collections: This Work in Collections
+        additional_fields: "Additional fields"
+        tab:
+          metadata:      "Descriptions"
+          files:         "Files"
+          relationships: "Relationships"
+          share:         "Share"
       progress:
         header: Save Work
       show:
@@ -169,15 +225,33 @@ en:
     batch_uploads:
       new:
         header: Batch Create New Works
+        in_collections: These Works in Collections
       progress:
         header: Save Works
       files:
         instructions: Each file will be uploaded to a separate new work resulting in one work per uploaded file.
     collection:
-      no_visible_works: "The collection is either empty or does not contain items to which you have access."
       is_part_of: "Is part of"
-      add_work:        "Add Work"
-      select_works:    "Select Works"
+      browse_view: "Browse View"
+      actions:
+        header: "Actions"
+        edit:
+          label: "Edit"
+          desc: "Edit this collection"
+        add_works:
+          label: "Add works"
+          desc: "Add works to this Collection"
+        delete:
+          label: "Delete"
+          desc: "Delete this collection"
+          confirmation: "Delete this collection?"
+      edit:
+        manage_items: "Manage Items in this Collection"
+        description: "Descriptions"
+        additional_fields: "Additional fields"
+      document_list:
+        edit: "Edit"
+        no_visible_works: "The collection is either empty or does not contain items to which you have access."
       select_form:
         title: "Add to collection"
         no_collections: "You do not have access to any existing collections. You may create a new collection."
@@ -186,15 +260,6 @@ en:
         create: "Create Collection"
         update: "Update Collection"
         create_new: "Add to new Collection"
-
-      manage_items: "Manage Items in this Collection"
-      metadata:
-        add_another_keyword: "add another Keyword"
-        add_another_creator: "add another Creator"
-        add_another_rights: "add another Rights"
-      generic_work:
-        edit: "Edit"
-      browse_view: "Browse View"
     mailbox:
       date:     'Date'
       subject:  'Subject'
@@ -269,14 +334,6 @@ en:
         publisher: "The person or group making the collection available. Generally this is the institution."
         rights: "Licensing and distribution information governing access to the collection. Select from the provided drop-down list."
 
-    aria_label:
-      upload_set:
-        default:     "Usage information for %{title}"
-        based_near:  "Usage information for location"
-        description: "Usage information for abstract or summary"
-        keyword:     "Usage information for keyword"
-        rights:      "Usage information for rights"
-
   curation_concerns:
     base:
       relationships:
@@ -284,7 +341,7 @@ en:
         empty:       "This %{type} is not currently in any collections."
         collections: "In collections:"
       metadata:
-        header: Metadata
+        header: Descriptions
         attribute_name_label: Attribute Name
         attribute_values_label: Values
       items:

data/config/routes.rb

@@ -128,7 +128,7 @@ Sufia::Engine.routes.draw do
 
   # Permissions routes
   namespace :curation_concerns, path: :concern do
-    resources(:permissions, only: []) do
+    resources :permissions, only: [] do
       member do
         get :confirm
         post :copy
@@ -150,12 +150,8 @@ Sufia::Engine.routes.draw do
     end
   end
 
-  if defined?(Sufia::StatsAdmin)
-    namespace :admin do
-      constraints Sufia::StatsAdmin do
-        get 'stats' => 'stats#index', as: :stats
-      end
-    end
+  namespace :admin do
+    get 'stats' => 'stats#index', as: :stats
   end
 
   resources :content_blocks, only: ['create', 'update']

data/lib/generators/sufia/assets_generator.rb

@@ -8,6 +8,10 @@ class Sufia::AssetsGenerator < Rails::Generators::Base
 
   source_root File.expand_path('../templates', __FILE__)
 
+  def remove_blacklight_css
+    remove_file "app/assets/stylesheets/blacklight.scss"
+  end
+
   def inject_css
     copy_file "sufia.scss", "app/assets/stylesheets/sufia.scss"
   end

data/lib/generators/sufia/install_generator.rb

@@ -23,8 +23,10 @@ module Sufia
    4. Adds controller behavior to the application controller
    5. Copies the catalog controller into the local app
    6. Adds Sufia::SolrDocumentBehavior to app/models/solr_document.rb
-   7. Updates simple_form to use browser validations
-   8. Installs Blacklight gallery
+   7. Installs sufia assets
+   8. Installs hydra:batch_edit
+   9. Updates simple_form to use browser validations
+   10. Installs Blacklight gallery (and removes it's scss)
          """
 
     def banner
@@ -205,6 +207,14 @@ module Sufia
       generate "sufia:upgrade700"
     end
 
+    def install_assets
+      generate "sufia:assets"
+    end
+
+    def install_batch_edit
+      generate "hydra_batch_edit:install"
+    end
+
     def use_browser_validations
       gsub_file 'config/initializers/simple_form.rb',
                 /browser_validations = false/,
@@ -213,6 +223,9 @@ module Sufia
 
     def install_blacklight_gallery
       generate "blacklight_gallery:install"
+      # This was pulling in an extra copy of bootstrap, so we added the needed
+      # includes to sufia.scss
+      remove_file 'app/assets/stylesheets/blacklight_gallery.css.scss'
     end
   end
 end

data/lib/generators/sufia/templates/sufia.scss

@@ -6,5 +6,10 @@
 
 @import "bootstrap-sprockets";
 @import 'bootstrap';
+@import 'blacklight/blacklight';
 @import "font-awesome";
+@import "blacklight_gallery/gallery";
+@import "blacklight_gallery/masonry";
+@import "blacklight_gallery/slideshow";
+@import "blacklight_gallery/osd_viewer";
 @import 'sufia/sufia';

data/lib/generators/sufia/upgrade700_generator.rb

@@ -45,12 +45,4 @@ This generator for upgrading sufia from 6.0.0 to 7.0 makes the following changes
       puts "     \e[31mFailure\e[0m  Sufia requires a CurationConcerns::GenericWorksController object. This generator assumes that the model is defined in the file #{file_path}, which does not exist."
     end
   end
-
-  def install_assets
-    generate "sufia:assets"
-  end
-
-  def install_batch_edit
-    generate "hydra_batch_edit:install"
-  end
 end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "7.0.0.beta2".freeze
+  VERSION = "7.0.0.beta3".freeze
 end

data/spec/controllers/admin_stats_controller_spec.rb

@@ -1,20 +1,27 @@
 describe Admin::StatsController, type: :controller do
-  let(:user1) { create(:user) }
+  let(:user) { create(:user) }
 
-  before do
-    allow(user1).to receive(:groups).and_return(['admin'])
+  context "a non admin" do
+    describe "#index" do
+      it 'is unauthorized' do
+        get :index
+        expect(response).to be_redirect
+      end
+    end
   end
 
-  describe "#index" do
+  context "as an admin" do
     before do
-      sign_in user1
+      allow(controller).to receive(:authorize!).and_return(true)
     end
 
-    it 'allows an authorized user to view the page' do
-      expect(Sufia::AdminStatsPresenter).to receive(:new).with({}, 5).and_call_original
-      get :index
-      expect(response).to be_success
-      expect(assigns[:presenter]).to be_kind_of Sufia::AdminStatsPresenter
+    describe "#index" do
+      it 'allows an authorized user to view the page' do
+        expect(Sufia::AdminStatsPresenter).to receive(:new).with({}, 5).and_call_original
+        get :index
+        expect(response).to be_success
+        expect(assigns[:presenter]).to be_kind_of Sufia::AdminStatsPresenter
+      end
     end
   end
 end

data/spec/controllers/generic_works_controller_spec.rb

@@ -106,7 +106,7 @@ describe CurationConcerns::GenericWorksController do
       post :create, generic_work: { title: ["First title"],
                                     visibility: 'open' },
                     uploaded_files: ['777', '888']
-      expect(flash[:notice]).to eq "Your files are being processed by Sufia in the background. The metadata and access controls you specified are being applied. Files will be marked <span class=\"label label-danger\" title=\"Private\">Private</span> until this process is complete (shouldn't take too long, hang in there!). You may need to refresh your dashboard to see these updates."
+      expect(flash[:notice]).to eq "Your files are being processed by Sufia in the background. The metadata and access controls you specified are being applied. Files will be marked <span class=\"label label-danger\" title=\"Private\">Private</span> until this process is complete (shouldn't take too long, hang in there!). You may need to refresh this page to see these updates."
       expect(response).to redirect_to main_app.curation_concerns_generic_work_path(work)
     end
 
@@ -156,7 +156,7 @@ describe CurationConcerns::GenericWorksController do
                         uploaded_files: uploaded_files,
                         parent_id: work.id,
                         generic_work: { title: ['First title'] }
-          expect(flash[:notice]).to eq "Your files are being processed by Sufia in the background. The metadata and access controls you specified are being applied. Files will be marked <span class=\"label label-danger\" title=\"Private\">Private</span> until this process is complete (shouldn't take too long, hang in there!). You may need to refresh your dashboard to see these updates."
+          expect(flash[:notice]).to eq "Your files are being processed by Sufia in the background. The metadata and access controls you specified are being applied. Files will be marked <span class=\"label label-danger\" title=\"Private\">Private</span> until this process is complete (shouldn't take too long, hang in there!). You may need to refresh this page to see these updates."
           expect(response).to redirect_to main_app.curation_concerns_generic_work_path(work)
         end
       end

data/spec/features/collection_spec.rb

@@ -18,7 +18,7 @@ describe 'collection', type: :feature do
       visit '/dashboard'
       first('#hydra-collection-add').click
       expect(page).to have_content 'Create New Collection'
-
+      click_link('Additional fields')
       # Creator is a multi-value field, so it should have button to add more fields
       expect(page).to have_selector "div.collection_creator .input-append button.add"
 
@@ -176,14 +176,14 @@ describe 'collection', type: :feature do
 
     it "preselects the collection we are adding works to" do
       visit "/collections/#{collection1.id}"
-      click_link 'Add files'
+      click_link 'Add works'
       first('input#check_all').click
       click_button "Add to Collection"
       expect(page).to have_css("input#id_#{collection1.id}[checked='checked']")
       expect(page).not_to have_css("input#id_#{collection2.id}[checked='checked']")
 
       visit "/collections/#{collection2.id}"
-      click_link 'Add files'
+      click_link 'Add works'
       first('input#check_all').click
       click_button "Add to Collection"
       expect(page).not_to have_css("input#id_#{collection1.id}[checked='checked']")

data/spec/features/edit_file_spec.rb

@@ -2,17 +2,19 @@ describe "Editing a file:", type: :feature do
   let(:user) { create(:user) }
   let(:file_title) { 'Some kind of title' }
   let(:work) { build(:work, user: user) }
-  let(:file) { work.members.first }
+  let(:file_set) { create(:file_set, user: user, title: [file_title]) }
+  let(:file) { File.open(fixture_path + '/world.png') }
 
   before do
     sign_in user
-    work.ordered_members << create(:file_set, user: user, title: [file_title])
+    Hydra::Works::AddFileToFileSet.call(file_set, file, :original_file)
+    work.ordered_members << file_set
     work.save!
   end
 
   context 'when the user tries to update file content, but forgets to select a file:' do
     it 'shows the edit page again' do
-      visit edit_curation_concerns_file_set_path(file)
+      visit edit_curation_concerns_file_set_path(file_set)
       click_link 'Versions'
       click_button 'Upload New Version'
       expect(page).to have_content "Edit #{file_title}"