sufia 1.2.0 → 1.3.0

data/app/helpers/generic_file_helper.rb

@@ -15,10 +15,7 @@
 
 module GenericFileHelper
   def display_title(gf)
-    title =  gf.title.join(' | ')
-    title = gf.label if title.blank?
-    title = 'No Title' if title.blank?
-    title
+    gf.to_s
   end
 
   def add_field (key)

data/app/models/checksum_audit_log.rb

@@ -29,7 +29,7 @@ class ChecksumAuditLog < ActiveRecord::Base
     logs = GenericFile.load_instance_from_solr(version.pid).logs(version.dsid)
     list = logs.limit(2)
     if list.size > 1 && (list[0].pass == 1) && (list[1].pass == 1)
-      list[0].delete
+      list[0].destroy
     end
   end
 end

data/app/views/_footer.html.erb

@@ -1,13 +1,11 @@
 <div id="footer-wrapper" class="row-fluid">
   <div id="footer">
     <div class="footer-logo">
-      <p class="fright">
-      <a href="/versions/"><%= Sufia::VERSION %></a></p>
-      <a href="/"></a>
+      <p class="fright"><%= Sufia::VERSION %></p>
       <p>A service of Project Hydra.</p>
     </div>
     <div class="footer-text">
-      <p><strong>Copyright &copy; 2012 Project Hydra</strong></p>
+      <p><strong>Copyright &copy; 2013 Project Hydra</strong> Licensed under the Apache License, Version 2.0</p>
       <ul>
         <li><a href="">One</a></li>
         <li><a href="">Two</a></li>

data/app/views/batch_edits/_check_all.html.erb

@@ -3,13 +3,8 @@
       <%= check_box_tag 'check_all', 'yes', @all_checked, :disabled => ((@batch_size_on_other_page + @document_list.count) > @max_batch_size) %>
       <a class="dropdown-toggle"  data-toggle="dropdown" href="#"><span class="icon-cog" title="click for selection options"></span></a>
       <ul class="dropdown-menu">
-        <li data-behavior="batch-edit-select-none" data-state="<%= @empty_batch ? 'on' : 'off' %>"><a href="#"><i class="<%= @empty_batch ? 'icon-ok' : '' %>"></i> Select None</a></li>
-        <li data-behavior="batch-edit-select-page" data-state="<%= @all_checked && !@batch_part_on_other_page ? 'on' : 'off' %>"><a href="#"><i class="<%= @all_checked && !@batch_part_on_other_page ? 'icon-ok' : '' %>"></i> Select Only Current Page</a></li>
-        <% if @result_set_size <= @max_batch_size %> 
-          <li data-behavior="batch-edit-select-all" data-state="<%= @entire_result_set_selected ? 'on' : 'off' %>"><a href="#"><i class="<%= @entire_result_set_selected ? 'icon-ok' : '' %>"></i> Select <em>All</em> Results</a></li>
-        <% else %>
-          <li data-behavior="batch-edit-select-all-disabled" data-state="'off' %>"><a href="#" onclick="return false;" disabled="true"> Result Set Too Big For Select All (><%=@max_batch_size%>)</a></li>
-        <% end %>                  
+        <li data-behavior="batch-edit-select-none" data-state="on"><a href="#"><i class="icon-ok"></i> Select None</a></li>
+        <li data-behavior="batch-edit-select-page" data-state="off"><a href="#"><i class=""></i> Select Current Page</a></li>
       </ul>
     </div>
-  <% end %>
+  <% end %>

data/app/views/batch_edits/_delete_selected.html.erb

@@ -1,5 +1,5 @@
 <%= form_tag(batch_edits_path, :method => :put, :class=> "batch-select-all hidden", "data-behavior" => 'batch-select-all') do -%>  
     <%= hidden_field_tag('update_type', 'delete_all') %>
-  <%= submit_tag("Delete Selected", :class=>'batch-all-button btn btn-primary', :data => { :confirm => "Deleting a file from #{t('sufia.product_name')} is permanent. Click OK to delete this file from #{t('sufia.product_name')}, or Cancel to cancel this operation"}) %>
+  <%= submit_tag("Delete Selected", :class=>'batch-all-button btn btn-primary submits-batches', :data => { :confirm => "Deleting a file from #{t('sufia.product_name')} is permanent. Click OK to delete this file from #{t('sufia.product_name')}, or Cancel to cancel this operation"}) %>
 <% end %>
 

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

@@ -207,7 +207,7 @@ $("a[rel=popover]").popover({ html: true });
                           <%= hidden_field_tag('key', term.to_s) %>
                           <%= render :partial => "generic_files/field_form", :locals => { :generic_file => @show_file, :f =>f, :render_req => false, :key => term } %>
                         <div class="row">
-                           <%= f.submit "Save changes", :class=>'btn btn-primary field-save' , :id=>term.to_s+'_save'%>
+                           <%= f.submit "Save changes", :class=>'btn btn-primary field-save updates-batches' , :id=>term.to_s+'_save'%>
                            <a class="accordion-toggle btn" data-toggle="collapse" data-parent="#row_<%=term.to_s%>" href="#collapse_<%=term.to_s%>">Cancel </a>
                            <div id="status_<%=term.to_s%>" class="status fleft"></div>
                         </div>
@@ -220,12 +220,11 @@ $("a[rel=popover]").popover({ html: true });
       </div><!-- /well -->
       <div id="permissions_display" class="tab-pane">
         <%= form_for @generic_file, :url=>batch_edits_path, :method=>:put, :remote => true, :html => { :id=>"form_permissions", :class=>"ajax-form"} do |f| %>
-           <%= hidden_field_tag('generic_file[terms_of_service]', '1') %>
            <%= hidden_field_tag('update_type', 'update') %>
            <%= hidden_field_tag('key', 'permissions') %>
            <%= render :partial => "generic_files/permission_form", :locals => { :gf => @show_file } %>
          <div class="row">
-            <%= f.submit "Save changes", :class=>'btn btn-primary', :id=>'permissions_save' %>
+            <%= f.submit "Save changes", :class=>'btn btn-primary updates-batches', :id=>'permissions_save' %>
             <a class="accordion-toggle btn" data-toggle="collapse" data-parent="#row_permissions" href="#collapse_permissions">Cancel </a>
             <div id="status_permissions" class="status fleft"></div>
          </div>

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

@@ -2,10 +2,10 @@
  It implements the facets in the same manner as blacklight does for the main catalog for the individual's dashbord 
 -->
     <div class="prev_next_links btn-group pull-left">
-      <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'btn' do %>
+      <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), :route_set=>sufia, :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'btn' do %>
        <span class="disabled btn"><%= raw(t('views.pagination.previous')) %></span>
      <% end %>
-      <%= link_to_next_page @pagination, raw(t('views.pagination.next')), :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'btn' do %>
+     <%= link_to_next_page @pagination, raw(t('views.pagination.next')), :route_set=>sufia, :params => params, :param_name => Blacklight::Solr::FacetPaginator.request_keys[:page], :class => 'btn' do %>
        
        <span class="disabled btn"><%= raw(t('views.pagination.next')) %></span>
       <% end %>

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

@@ -16,7 +16,7 @@ limitations under the License.
 
 The file(s)
 <% generic_files.first(20).each  do |gf|%>
-<%= link_to(display_title(gf), generic_file_url(gf.noid)) %><%= ',' unless gf == generic_files.last %>
+<%= link_to(gf, generic_file_url(gf.noid)) %><%= ',' unless gf == generic_files.last %>
 <% end %>
 <%= '...' if generic_files.length > 20 %>
  could not be updated.  You do not have sufficient privileges to edit it.

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

@@ -16,7 +16,7 @@ limitations under the License.
 
 The file(s)
 <% generic_files.first(20).each do |gf|%>
-<%= link_to(display_title(gf), generic_file_url(gf.noid)) %><%= ',' unless gf == generic_files.last %>
+<%= link_to(gf, generic_file_url(gf.noid)) %><%= ',' unless gf == generic_files.last %>
 <% end %>
 <%= '...' if generic_files.length > 20 %>
 have been saved.

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

@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 %>
 
-The file <%= link_to(display_title(generic_file), sufia.generic_file_url(generic_file.noid)) %> has been updated.
+The file <%= link_to(generic_file, sufia.generic_file_url(generic_file.noid)) %> has been updated.

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

@@ -25,7 +25,7 @@ limitations under the License.
 <% elsif @generic_file.audio? %>
   <audio controls="controls" class="video-js vjs-default-skin" data-setup="{}" preload="auto">
     <source src="<%= sufia.download_path(@generic_file, datastream_id: 'ogg') %>" type="audio/ogg" />
-    <source src="<%= sufia.download_path(@generic_file, datastream_id: 'mp3') %>" type="audio/mp3" />
+    <source src="<%= sufia.download_path(@generic_file, datastream_id: 'mp3') %>" type="audio/mpeg" />
     Your browser does not support the audio tag.
   </audio>
 <% elsif @generic_file.pdf?%>

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

@@ -43,7 +43,7 @@ $("a[rel=popover]").popover({ html: true });
 
 <%= render :partial => 'breadcrumbs' %>
 
-<h1 class="lower">Edit <%= display_title(@generic_file) %></h1>
+<h1 class="lower">Edit <%= @generic_file %></h1>
 
 <div class="row">
   <div class="span40">

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

@@ -28,7 +28,7 @@ limitations under the License.
 
 <%= render :partial => 'generic_files/breadcrumbs' %>
 
-<h1 class="lower"><%= display_title(@generic_file) %></h1>
+<h1 class="lower"><%= @generic_file %></h1>
 
 <div class="row">
   <div class="span40">

data/app/views/single_use_link/generate_download.html.erb

@@ -1,3 +1,3 @@
 <h1>Single Use Link</h1>
 <p>Anyone can use the following link once to download the file</p>
-<%= link_to display_title(@generic_file), @link %> <%= link_to raw('<i class="icon-link icon-large"></i>'), '#', :class => 'copypaste itemicon itemcode', :title => 'Copy File URL', :id => "copy_link_#{@generic_file.pid}" %>
+<%= link_to @generic_file, @link %> <%= link_to raw('<i class="icon-link icon-large"></i>'), '#', :class => 'copypaste itemicon itemcode', :title => 'Copy File URL', :id => "copy_link_#{@generic_file.pid}" %>

data/app/views/single_use_link/generate_show.html.erb

@@ -1,3 +1,3 @@
 <h1>Single Use Link</h1>
 <p>Anyone can use the following link once to view the file metadata</p>
-<%= link_to display_title(@generic_file), @link %>
+<%= link_to @generic_file, @link %>

data/app/views/single_use_link/show.html.erb

@@ -1,5 +1,5 @@
 <div >
-  <h1 class="lower"><%= display_title(@generic_file) %></h1>
+  <h1 class="lower"><%= @generic_file %></h1>
     <h2 class="non lower">Actions</h2>
     <p>
       <%= link_to "Download (can only be used once)", @download_link %>

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

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

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

@@ -40,7 +40,7 @@ limitations under the License.
       <dd><%= link_to_field('depositor', @user.to_s, GenericFile.where(:depositor => @user.to_s).count) %></dd>
       <dt><i class="icon-trophy trophy-on" ></i> Highlighted Files</dt>
       <% @trophies.each do |t| %>
-        <dd> <%= link_to display_title(t), sufia.generic_file_path(t) %></dd>
+        <dd> <%= link_to t, sufia.generic_file_path(t) %></dd>
       <% end %>
     </dl>
 

data/features/browse_dashboard_files.feature

@@ -11,9 +11,6 @@ Feature: Browse Dashboard files
   Scenario: Edit Dashboard File 
     Given I am logged in as "archivist2@example.com"
     And I follow "dashboard"
-    When I follow the link within
-    """
-    a[href="/files/test5/edit"]
-    """
+    When I follow the link within "a[href='/files/test5/edit']"
     Then I should see "Edit Test mp3"
 

data/features/display_dashboard.feature

@@ -37,9 +37,6 @@ Feature: As an authenticate and authorized
     And I am logged in as "archivist1@example.com"
     And I follow "dashboard"
     Then I should see "Test Document Text"
-    When I follow the link within
-    """
-    a[href="/files/test3"].itemtrash
-    """
+    When I follow the link within "a[href='/files/test3'].itemtrash"
     Then I should see "The file has been deleted"
 

data/features/step_definitions/scholarsphere.rb

@@ -34,7 +34,7 @@ Then /^I reset the mail server$/ do
   ContactForm.any_instance.unstub(:deliver)
 end
 
-When /^I follow the link within$/ do |selector|
+When /^I follow the link within "(.*?)"$/ do |selector|
   find(selector).click
 end
 

data/lib/sufia.rb

@@ -12,6 +12,8 @@ require 'nest'
 require 'RMagick'
 require 'activerecord-import'
 require 'rails_autolink'
+require 'sufia/dashboard_controller_behavior'
+require "sufia/contact_form_controller_behavior"
 
 autoload :Zip, 'zipruby'
 module Sufia
@@ -32,7 +34,8 @@ module Sufia
     config.temp_file_base = nil
     config.id_namespace = "sufia"
     config.fits_path = "fits.sh"
-
+    config.enable_contact_form_delivery = false
+ 
     config.autoload_paths += %W(
       #{config.root}/lib/sufia/jobs
       #{config.root}/app/controllers/concerns

data/lib/sufia/batch_edits_controller_behavior.rb

@@ -22,7 +22,7 @@ module Sufia
             h[key] ||= []
             h[key] = (h[key] + gf.send(key)).uniq
           end
-          @names << display_title(gf)
+          @names << gf.to_s
           permissions = (permissions + gf.permissions).uniq
        end
 
@@ -54,10 +54,9 @@ module Sufia
         super
       elsif type == "delete_all"
         batch.each do |doc_id|
-          gf = ::GenericFile.load_instance_from_solr(doc_id)
-          gf.delete
+          gf = ::GenericFile.find(doc_id)
+          gf.destroy
         end
-        clear_batch!
         after_update
       end
 

data/lib/sufia/contact_form_controller_behavior.rb

@@ -0,0 +1,45 @@
+# 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.
+
+module Sufia
+  module ContactFormControllerBehavior
+
+  def new
+    @contact_form = ContactForm.new
+  end
+
+  def create
+    @contact_form = ContactForm.new(params[:contact_form])
+    @contact_form.request = request
+    # not spam and a valid form
+    logger.warn "*** MARK ***"
+    if @contact_form.deliver
+      flash.now[:notice] = 'Thank you for your message!'
+      after_deliver
+      render :new
+    else
+      flash[:error] = 'Sorry, this message was not sent successfully. ' 
+      flash[:error] << @contact_form.errors.full_messages.map { |s| s.to_s }.join(",")
+      render :new
+    end
+  rescue 
+      flash[:error] = 'Sorry, this message was not delivered.'
+      render :new
+  end
+
+  def after_deliver
+     return unless Sufia::Engine.config.enable_contact_form_delivery
+  end
+  end
+end

data/lib/sufia/dashboard_controller_behavior.rb

@@ -0,0 +1,92 @@
+# -*- coding: utf-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.
+require 'blacklight/catalog'
+
+module Sufia
+  module DashboardControllerBehavior
+    extend ActiveSupport::Concern
+    include Hydra::BatchEditBehavior
+    include Blacklight::Catalog
+
+    included do
+      include Hydra::BatchEditBehavior
+      include Blacklight::Catalog
+      include Blacklight::Configurable # comply with BL 3.7
+      include ActionView::Helpers::DateHelper
+      include BlacklightAdvancedSearch::ParseBasicQ
+      include BlacklightAdvancedSearch::Controller
+    
+      # This is needed as of BL 3.7
+      self.copy_blacklight_config_from(CatalogController)
+    
+      before_filter :authenticate_user!
+      before_filter :enforce_show_permissions, :only=>:show
+      before_filter :enforce_viewing_context_for_show_requests, :only=>:show
+    
+      # This applies appropriate access controls to all solr queries (the internal method of this is overidden bellow to only include edit files)
+      self.solr_search_params_logic += [:add_access_controls_to_solr_params]
+      # This filters out objects that you want to exclude from search results, like FileAssets
+      self.solr_search_params_logic += [:exclude_unwanted_models]
+
+    end
+
+    def index
+      extra_head_content << view_context.auto_discovery_link_tag(:rss, sufia.url_for(params.merge(:format => 'rss')), :title => "RSS for results")
+      extra_head_content << view_context.auto_discovery_link_tag(:atom, sufia.url_for(params.merge(:format => 'atom')), :title => "Atom for results")
+      (@response, @document_list) = get_search_results
+      @user = current_user
+      @events = @user.events(100)
+      @last_event_timestamp = @user.events.first[:timestamp].to_i || 0 rescue 0
+      @filters = params[:f] || []
+  
+      # adding a key to the session so that the history will be saved so that batch_edits select all will work
+      search_session[:dashboard] = true 
+      respond_to do |format|
+        format.html { save_current_search_params }
+        format.rss  { render :layout => false }
+        format.atom { render :layout => false }
+      end
+  
+      # set up some parameters for allowing the batch controls to show appropiately
+      @max_batch_size = 80
+      count_on_page = @document_list.count {|doc| batch.index(doc.id)}
+      @disable_select_all = @document_list.count > @max_batch_size
+      batch_size = batch.uniq.size
+      @result_set_size = @response.response["numFound"]
+      @empty_batch = batch.empty?
+      @all_checked = (count_on_page == @document_list.count)
+      @entire_result_set_selected = @response.response["numFound"] == batch_size
+      @batch_size_on_other_page = batch_size - count_on_page
+      @batch_part_on_other_page = (@batch_size_on_other_page) > 0    
+    end
+      
+    def activity
+      # reverse events since we're prepending rows. without reverse, old events wind up first
+      events = current_user.events.reverse
+      # filter events to include only those that have occurred since params[:since]
+      events.select! { |event| event[:timestamp].to_i > params[:since].to_i } if params[:since]
+      # return the event, a formatted date string, and a numerical timestamp
+      render :json => events.map { |event| [event[:action], "#{time_ago_in_words(Time.at(event[:timestamp].to_i))} ago", event[:timestamp].to_i] }
+    rescue
+      render :json => [] 
+    end
+  
+    protected
+    # show only files with edit permissions in lib/hydra/access_controls_enforcement.rb apply_gated_discovery
+    def discovery_permissions
+      ["edit"]
+    end
+  end
+end

data/lib/sufia/downloads_controller_behavior.rb

@@ -15,6 +15,7 @@
 module Sufia
   module DownloadsControllerBehavior
     extend ActiveSupport::Concern
+    include Hydra::Controller::DownloadBehavior
 
     included do
       # module mixes in normalize_identifier method
@@ -24,47 +25,13 @@ module Sufia
       prepend_before_filter :normalize_identifier 
     end
     
-    def show
-      if can? :read, params[:id]
-        asset = ActiveFedora::Base.load_instance_from_solr(params[:id])
-        # we can now examine @asset and determine if we should send_content, or some other action.
-        send_content (asset)
-      else 
-        logger.info "Can not read #{params[:id]}"
-        raise Hydra::AccessDenied.new("You do not have sufficient access privileges to read this document, which has been marked private.", :read, params[:id])
-      end
-    end
-
-    protected
-
     def datastream_name
-      @datastream_name ||= params[:datastream_id] || DownloadsController.default_content_dsid
-    end
-
-    def send_content(asset)
-        opts = {disposition: 'inline'}
-        if default_datastream?
-          opts[:filename] = params["filename"] || asset.label
-        else
-          opts[:filename] = params[:datastream_id]
-        end
-        ds = asset.datastreams[datastream_name]
-        raise ActionController::RoutingError.new('Not Found') if ds.nil?
-        data = ds.content
-        opts[:type] = ds.mimeType
-        send_data data, opts
-    end
-    
-    def default_datastream?
-      datastream_name == self.class.default_content_dsid
-    end
-    
-    private 
-    
-    module ClassMethods
-      def default_content_dsid
-        "content"
+      if datastream.dsid == self.class.default_content_dsid
+        params[:filename] || asset.label
+      else
+        params[:datastream_id]
       end
     end
+
   end
 end