sufia 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77cd255a8ab67cb2bcbd0bbfe17a9920d853251b
-  data.tar.gz: 528e7ca2aeb61cf7bcf5b10e370fcbfd8a51a1fc
+  metadata.gz: 600ffd64ac5050922d558df0919adff82b5c86e9
+  data.tar.gz: 1c3206cbd65b85dfdbc75c37a0fd539aa577518e
 SHA512:
-  metadata.gz: acc4acc8293673da4aba37329ab6321be93241c9dfd2fd712a4bf5a3cf7218bfe25d5d6d8a99b1a45eb91934903dc31caacce9d7aa8311ebdfa9965075c5df4e
-  data.tar.gz: 656b6f49ed4a1a4a603cae1b40a3c9320ac42a3aa4e806ba228439442ba87168fa8e0ed2b60e7957014b9297d1221ca9e97ad77605379402f2ffa472af2f816b
+  metadata.gz: f5b565ade76f51e2b2a89d291c0bea3413c90c4e7a3769fdf5d87baa16d727aa7bc3bd76719cb8722975402540187c703ec7df09adbc1d8f8c30a0eec84b25b6
+  data.tar.gz: 40a89c2d24aa9a953991eeb6d7453ab3de9e4e935445a122680f791172c45aa85971c6ec977f84dfe010bf0817cf51668bdd264174f15e529847b14b4272baa4

data/.gitignore

@@ -86,9 +86,6 @@ db/schema.rb
 
 ## PROJECT::SPECIFIC
 
-## fixtures for dev
-spec/fixtures/sufia/sufia_sufia1.*
-
 ## ASSET PIPELINE
 .sass-cache/
 public/assets/

data/.travis.yml

@@ -1,17 +1,17 @@
 language: ruby
 before_install:
-  - sudo apt-get install libclamav-dev clamav-data
+  - sudo apt-get install libclamav-dev clamav-data clamav-daemon
+  - sudo freshclam -v
 rvm:
-  - "1.9.3"
   - "2.0.0"
+  - "2.1.0-preview2"
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 notifications:
   email:
     recipients:
-      - "ul-dlt-applications@lists.psu.edu"
-      - "michael@psu.edu"
+      - "ul-dlt-hydra@lists.psu.edu"
     on_success: "change"
     on_failure: "always"
   irc:

data/README.md

@@ -132,20 +132,11 @@ See https://ffmpeg.org/trac/ffmpeg/wiki/UbuntuCompilationGuide
 
 ## Developers:
 This information is for people who want to modify the engine itself, not an application that uses the engine:
-### Create fixtures
-```
-# configure jetty & start jetty (if you haven't already)
-rake jetty:config
-rake jetty:start
-
-# load sufia fixtures
-rake sufia:fixtures:create sufia:fixtures:generate
-rake fixtures
 
 # run the tests
 rake clean spec
-bundle exec cucumber features
 ```
+
 ### Change validation behavior
 
 To change what happens to files that fail validation add an after_validation hook

data/SUFIA_VERSION

@@ -1 +1 @@
-3.5.0
+3.6.0

data/app/assets/javascripts/sufia/trophy.js

@@ -8,15 +8,21 @@ $(function() {
          type:"post",
          data: "file_id="+this.id,
          success:function(data) {
-           var oldclass = $('#'+data.trophy.generic_file_id).find('i').attr("class");
+           gid = data.generic_file_id;
+           var oldclass = $('#'+gid).find('i').attr("class");
            if (oldclass.indexOf("trophy-on") != -1){
-             $('#'+data.trophy.generic_file_id).find('i').attr("title", "Highlight work");
+             $('#'+gid).find('i').attr("title", "Highlight work");
            } else {
-             $('#'+data.trophy.generic_file_id).find('i').attr("title", "Unhighlight work");
+             $('#'+gid).find('i').attr("title", "Unhighlight work");
            }
 
-           $('#'+data.trophy.generic_file_id).find('i').toggleClass("trophy-on");
-           $('#'+data.trophy.generic_file_id).find('i').toggleClass("trophy-off");
+           $('#'+gid).find('i').toggleClass("trophy-on");
+           $('#'+gid).find('i').toggleClass("trophy-off");
+           if ($('#'+gid).data('removerow')) {
+             $('#trophyrow_'+gid).fadeOut(1000, function() {
+              $('#trophyrow_'+gid).remove();
+              });
+           }
          }
       })
     });

data/app/controllers/single_use_links_controller.rb

@@ -28,9 +28,19 @@ class SingleUseLinksController < ApplicationController
     end
   end
 
+  # Catch permission errors
+  rescue_from Hydra::AccessDenied, CanCan::AccessDenied do |exception|
+    if current_user and current_user.persisted?
+      redirect_to root_url, :alert => "You do not have sufficient privileges to create links to this document"
+    else
+      session["user_return_to"] = request.url
+      redirect_to new_user_session_url, :alert => exception.message
+    end
+  end
+
   protected
   def authorize_user!
-    authorize! :read, @asset
+    authorize! :edit, @asset
   end
 
   def load_asset

data/app/helpers/facets_helper.rb

@@ -0,0 +1,3 @@
+module FacetsHelper
+  include Sufia::FacetsHelperBehavior
+end

data/app/helpers/sufia/facets_helper_behavior.rb

@@ -0,0 +1,23 @@
+module Sufia
+  module FacetsHelperBehavior
+    include Hydra::FacetsHelperBehavior
+
+    # Override to remove the label class (easier integration with bootstrap)
+    # and handles arrays
+    def render_facet_value(facet_solr_field, item, options ={})
+      logger.warn "display value #{ facet_display_value(facet_solr_field, item)}"
+      if item.is_a? Array
+        render_array_facet_value(facet_solr_field, item, options)
+      end
+      if params[:controller] == "dashboard"
+        path = sufia.url_for(add_facet_params_and_redirect(facet_solr_field,item.value ).merge(:only_path=>true))
+        (link_to_unless(options[:suppress_link], facet_display_value(facet_solr_field, item), path, :class=>"facet_select") + " " + render_facet_count(item.hits)).html_safe
+      else
+        # This is for controllers that use this helper method that are defined outside Sufia
+        path = url_for(add_facet_params_and_redirect(facet_solr_field, item.value).merge(:only_path=>true))
+        (link_to_unless(options[:suppress_link], facet_display_value(facet_solr_field, item), path, :class=>"facet_select") + " " + render_facet_count(item.hits)).html_safe
+      end
+    end
+
+  end
+end

data/app/helpers/sufia_helper.rb

@@ -1,4 +1,3 @@
-
 module SufiaHelper
 
   # link_back_to_dashboard(:label=>'Back to Search')
@@ -26,7 +25,7 @@ module SufiaHelper
   end
 
   def number_of_deposits(user)
-    ActiveFedora::SolrService.query("#{Solrizer.solr_name('depositor', :stored_searchable, :type => :string)}:#{user.user_key}").count
+    ActiveFedora::Base.where(Solrizer.solr_name('depositor', :stored_searchable) => user.user_key).count
   end
 
   def link_to_facet(field, field_string)
@@ -76,26 +75,9 @@ module SufiaHelper
     end
   end
 
-  # Override to remove the label class (easier integration with bootstrap)
-  # and handles arrays
-  def render_facet_value(facet_solr_field, item, options ={})
-    logger.warn "display value #{ facet_display_value(facet_solr_field, item)}"
-    if item.is_a? Array
-      render_array_facet_value(facet_solr_field, item, options)
-    end
-    if params[:controller] == "dashboard"
-      path = sufia.url_for(add_facet_params_and_redirect(facet_solr_field,item.value ).merge(:only_path=>true))
-      path = sufia.url_for(add_facet_params_and_redirect(facet_solr_field,item.value ).merge(:only_path=>true))
-      (link_to_unless(options[:suppress_link], facet_display_value(facet_solr_field, item), path, :class=>"facet_select") + " " + render_facet_count(item.hits)).html_safe
-    else
-      # This is for controllers that use this helper method that are defined outside Sufia
-      path = url_for(add_facet_params_and_redirect(facet_solr_field, item.value).merge(:only_path=>true))
-      (link_to_unless(options[:suppress_link], facet_display_value(facet_solr_field, item), path, :class=>"facet_select") + " " + render_facet_count(item.hits)).html_safe
-    end
-  end
-
-    # link_back_to_catalog(:label=>'Back to Search')
   # Create a link back to the index screen, keeping the user's facet, query and paging choices intact by using session.
+  # @example
+  #   link_back_to_catalog(:label=>'Back to Search')
   def link_back_to_catalog(opts={:label=>t('blacklight.back_to_search')})
     query_params = session[:search] ? session[:search].dup : {}
     query_params.delete :counter

data/app/views/dashboard/_facet_limit.html.erb

@@ -1,23 +1,5 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
-  <% paginator =    
-      Blacklight::Solr::FacetPaginator.new(display_facet.items,        
-        :limit => facet_limit_for(solr_field))
-      %>
+<% paginator = Blacklight::Solr::FacetPaginator.new(display_facet.items,        
+        limit: facet_limit_for(solr_field)) %>
 <ul class="slide-list">
   <% paginator.items.each do |item| -%>
     <li>

data/app/views/dashboard/_index_partials/_thumbnail_display.html.erb

@@ -1,6 +1,8 @@
 <% width = 36 if width.blank? %>
-<%  if document.image? || document.pdf? || document.video? %>
-  <% path = sufia.download_path(document["id"], {datastream_id: 'thumbnail'}) %>
+<% if document.image? || document.pdf? || document.video? %>
+  <% path = sufia.download_path(document.noid, {datastream_id: 'thumbnail'}) %>
+<% elsif document.audio? %>
+  <% path = "/assets/audio.png" %>
 <% else %>
   <% path = "/assets/default.png" %>
 <% end %>

data/app/views/generic_files/_descriptions.html.erb

@@ -1,24 +1,8 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <%# convert class variable to a local variable if the local hasn't been set %>
-<% generic_file = @generic_file unless generic_file  %>
+<% generic_file ||= @generic_file %>
 
 <div id="descriptions_display" class="tab-pane active">
-  <%= form_for generic_file, :url => sufia.generic_file_path, :html => {:multipart => true, :class => 'form-horizontal'} do |f| %>
+  <%= form_for generic_file, :url => sufia.generic_file_path(@generic_file), :html => {:multipart => true, :class => 'form-horizontal'} do |f| %>
     <%= hidden_field_tag('redirect_tab', 'descriptions') %>
     <h2 class="non lower">Descriptions <small class="pull-right"><span class="error">*</span> indicates required fields</small> </h2>
       <div class="well">

data/app/views/generic_files/_field_form.html.erb

@@ -8,7 +8,12 @@
     <%= f.label key, get_label(key), :class=>"control-label"%>
   <% end %>
 
-  <% vals.to_ary.each_with_index do |v, index| %>
-    <%= render_edit_field_partial(key, record: generic_file, f:f,  v: v, index: index, render_req: render_req) %>
+  <% if key == :resource_type %>
+    <%# resource_type is a multiselect box, so don't render one row for each %>
+    <%= render_edit_field_partial(key, record: generic_file, f:f, render_req: render_req) %>
+  <% else %>
+    <% vals.to_ary.each_with_index do |v, index| %>
+      <%= render_edit_field_partial(key, record: generic_file, f:f,  v: v, index: index, render_req: render_req) %>
+    <% end %>
   <% end %>
  </div><!-- /control-group -->

data/app/views/generic_files/_media_display.html.erb

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <% if @generic_file.image? %>
   <a href="<%= sufia.download_path(@generic_file) %>" target="_new" title="Download the full-sized image"><img src="<%= sufia.download_path(@generic_file, {:datastream_id => 'thumbnail'}) %>" width="338" alt="Download the full-sized image of <%= @generic_file.title.first %>"/>Download the full-sized image</a>
 <% elsif @generic_file.video? %>

data/app/views/generic_files/_permission.html.erb

@@ -1,21 +1,5 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
   <div id="permissions_display" class="tab-pane">
-    <%= form_for @generic_file, :url => sufia.generic_file_path, :html => {:multipart => true, :class => 'form-horizontal', :id => 'permission'} do |f| %>
+    <%= form_for @generic_file, :url => sufia.generic_file_path(@generic_file), :html => {:multipart => true, :class => 'form-horizontal', :id => 'permission'} do |f| %>
       <%= hidden_field_tag('redirect_tab', 'permissions') %>
       <%= render :partial => "generic_files/permission_form", :locals => { :gf => @generic_file, :f=> f } %>
       <div class="row form-actions" id="permissions_submit">

data/app/views/generic_files/_permission_form.html.erb

@@ -87,7 +87,7 @@
   <div class="row control-group">
     <div id="new-group" >
       <div class="input-append">
-        <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + groups), :class => 'span38' %>
+        <%= select_tag 'new_group_name_skel', options_for_select(["Select a group"] + current_user.groups), :class => 'span38' %>
         <%= select_tag 'new_group_permission_skel', options_for_select(Sufia.config.permission_levels), :class => 'span17' %>
         <button class="btn btn-mini btn-inverse" id="add_new_group_skel" ><i class="icon-plus-sign"></i> Add</button>
         <br /><span id="directory_group_result"></span>

data/app/views/generic_files/_show_actions.html.erb

@@ -1,11 +1,9 @@
     <h2 class="non lower">Actions</h2>
     <p>
       <%= link_to "Download", sufia.download_path(@generic_file.noid) %>
-      <!-- &nbsp;|&nbsp; -->
-      <%# link_to "Cite", citation_generic_file_path, {:id => 'citeLink', :name => 'citation', :class => 'lightboxLink'}, :action => 'citation' %>
       <% if can? :edit, @generic_file %>
           &nbsp;|&nbsp;
-          <%= link_to "Edit", sufia.edit_generic_file_path unless @generic_file.processing?   %>
+          <%= link_to "Edit", sufia.edit_generic_file_path(@generic_file) unless @generic_file.processing?   %>
           <%= "File is being processed you may edit once it is complete" if @generic_file.processing?   %>
       <%end %>
     </p>
@@ -15,11 +13,6 @@
       <%= link_to 'Zotero', sufia.static_path('zotero'), {:id => 'zoteroLink', :name =>    'zotero', :class => 'lightboxLink'} %>
       &nbsp;|&nbsp;
       <%= link_to 'Mendeley', sufia.static_path('mendeley'), {:id => 'mendeleyLink', :name =>    'mendeley', :class => 'lightboxLink'} %>
-      <!-- Disabling RefWorks export due to stakeholder deprioritization -->
-      <%# link_to 'RefWorks', refworks_export_url(:id => @generic_file.noid) %>
-      <!-- &nbsp;|&nbsp; -->
-      <!-- Disabling Email This and SMS This links due to lack of use cases -->
-      <%# link_to 'Email This', email_catalog_path(:id => @generic_file.persistent_url), {:id => 'emailLink', :name => 'email', :class => 'lightboxLink'} %>
     </p>
     <!-- AddThis Button BEGIN -->
     <div class="addthis_toolbox addthis_default_style">

data/app/views/generic_files/_versioning.html.erb

@@ -1,23 +1,7 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <div id="versioning_display" class="tab-pane">
   <h2 class="non lower">Versions</h2>
   <div class="well">
-    <%= form_for @generic_file, :url => sufia.generic_file_path, :html => {:multipart => true, :class => 'form-horizontal'} do |f| %>
+    <%= form_for @generic_file, :url => sufia.generic_file_path(@generic_file), :html => {:multipart => true, :class => 'form-horizontal'} do |f| %>
       <%= hidden_field_tag('redirect_tab', 'versions') %>
     <h3>Upload New Version</h3>
     <p>Upload a new version of this file from your computer.</p>

data/app/views/generic_files/edit.html.erb

@@ -1,19 +1,3 @@
-<%#
-Copyright © 2012 The Pennsylvania State University
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-%>
-
 <% content_for :local_js do %>
    if (navigator.userAgent.match("MSIE")){
       $("form").validate();
@@ -51,7 +35,7 @@ $("a[rel=popover]").popover({ html: true });
   </div>
   <div class="span2">&nbsp;</div>
   <div class="span68">
-    <%= link_to "&lt;&lt;Browse view".html_safe, sufia.generic_file_path %></li>
+    <%= link_to "&lt;&lt;Browse view".html_safe, sufia.generic_file_path(@generic_file) %></li>
     <ul class="nav nav-tabs">
       <li id="edit_descriptions_link" class="active"><a href="#descriptions_display" data-toggle="tab"><i class="icon-tags"></i> Descriptions</a></li>
       <li id="edit_versioning_link"><a href="#versioning_display" data-toggle="tab"><i class="icon-sitemap"></i> Versions</a></li>

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

@@ -5,14 +5,16 @@
 <div id="Data">
     <table class="table table-striped"> 
         <thead> 
-            <tr> 
-                <th>Subject</th> 
+            <tr>
+                <th>Date</th>
+                <th>Subject</th>
                 <th>Message</th> 
             </tr> 
         </thead> 
         <tbody> 
             <% @messages.each do |msg| %> 
-                <tr class="<%= cycle("","zebra") %>"> 
+                <tr class="<%= cycle("","zebra") %>">
+                   <td><%= time_ago_in_words(msg.last_message.created_at) %> ago </td>
                    <td><%= msg.last_message.subject.html_safe  %></td> 
                    <td><%= msg.last_message.body.html_safe  %></td> 
                    <td><%= link_to raw('<i class="icon-trash icon-large"></i>'),

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

@@ -0,0 +1,3 @@
+        <div class="tab-pane" id="activity_log">
+          <%= render :partial => 'users/activity_log', :locals => {:events => @events} %>
+        </div>