sufia 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c1ede98424a5850d9fc61805d683d009adc137f
-  data.tar.gz: b4b58df9eb918d41e5852a5afd4917f7771849d8
+  metadata.gz: c996c5fa4051c743da19c5d5f6bb7a9cc68d696e
+  data.tar.gz: 6254959c903a88cfb98bd79cad26bbd34a9c6d6d
 SHA512:
-  metadata.gz: a15c15aa6703dfe883f75db875fa8362f6fb3dc3b5589549a75475dfc2b5fbfb7a8ee41bb9bcabadf1c8dbc3f2ef5fb3c41517a60ea046382afdc3f5f81ba291
-  data.tar.gz: 6af364e8b6a156ca8fdbbe0dcee00c994192e088fb9a662b087dfb47de2386975534d3c96fa769fcc2bcc61644b78416dc73e0fbc279db85f687ed861e68c235
+  metadata.gz: a53f0c3971b91c537eb2df04cc6bd007936aedb42369ea39eab11c3257f8ecdd64be4e7ccb4b16dc20c0aa3b119e7fefbcaf7d32c4553e380192b4374093f4d2
+  data.tar.gz: dc0110f641efaf867351a92ca8377b1af250faedf4bf4923560df235cb05b5424eb3837849f04485eeb0175341bce4b6e44c0b298f6010d0febbc652a057938f

data/Gemfile

@@ -10,13 +10,13 @@ group :development, :test do
   gem 'activerecord-import', '0.3.0'
   gem 'sqlite3'
   gem 'selenium-webdriver'
-  gem 'rspec-rails', '~> 2.12.0'
+  gem 'rspec-rails', '~> 2.13.1'
   gem 'cucumber-rails', '~> 1.0', :require => false
   gem 'database_cleaner'
   gem 'devise'
-  gem 'capybara', '~>1.1.3'
+  gem 'capybara', '~>2.1.0'
   gem 'bcrypt-ruby'
   gem "jettywrapper"
-  gem "factory_girl_rails", "~> 4.1.0"
+  gem "factory_girl_rails", "~> 4.2.1"
   gem "simplecov", :require => false
 end # (leave this comment here to catch a stray line inserted by blacklight!)

data/History.md

@@ -1,5 +1,21 @@
 # History of Sufia releases
 
+## 1.3.0
+* Depends on Hydra::Controller::DownloadBehavior
+* Upgraded to hydra-batch-edit 1.1 which includes session-less batches in hydra-collections
+* Moved most of the Dashboard behavior into Sufia::DashboardBehavior to enable overriding
+* Added Model to_s instead of using display_title
+* Added after delivery hook to contact form controller
+* Removed the version page
+* various bug fixes
+
+
+## 1.2.0
+* DownloadController uses load_instance_from_solr for speed improvement
+* Raise a AccessDenied error if a download is not allowed rather than show an image.
+* Autoload the datastreams directory
+* Set default variables (fits_path, id_namespace) in the engine config.
+
 ## 1.1.0
 * Allows a user to deposit on behalf of another user
 * Tweaks dashboard UI to be less busy: actions now in dropdown button

data/app/assets/javascripts/sufia.js

@@ -44,6 +44,8 @@ limitations under the License.
 //= require sufia/batch_select_all
 //= require sufia/multiForm
 //= require sufia/edit_metadata
+//= require hydra/batch_select
+//= require hydra_collections
 
 //over ride the blacklight default to submit
 //form when sort by or show per page change

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

@@ -2,7 +2,7 @@
   function toggleButtons(forceOn, otherPage ){
     forceOn = typeof forceOn !== 'undefined' ? forceOn : false
     otherPage = typeof otherPage !== 'undefined' ? otherPage : !window.batch_part_on_other_page;
-    var n = $(".batch_toggle:checked").length;
+    var n = $(".batch_document_selector:checked").length;
     if ((n>0) || (forceOn)) {
         $('.batch-select-all').show();
         $('#batch-edit').show();
@@ -13,8 +13,16 @@
     $("body").css("cursor", "auto");
   }
 
+
+  // change the state of a cog menu item and add or remove the check beside it
+  // using on or off instead of true or false
   function toggleState (obj, state) {
-    if (state == 'on'){
+    toggleStateBool(obj, state == 'on');
+  }
+
+  // change the state of a cog menu item and add or remove the check beside it
+  function toggleStateBool (obj, state) {
+    if (state){
       obj.attr("data-state", 'on');
       obj.find('a i').addClass('icon-ok');
     }else {
@@ -24,148 +32,70 @@
 
   }
 
-  function check_all_page(e) {
-     var checked = $("#check_all")[0]['checked'];
-
-     // only check the current page
-     var timeout = 0;
-     var timeoutInc = 60;
-     
-     $("input[type='checkbox'].batch_toggle").each(function(index, value) {
-        // check each individual box
-        var ck = value['checked'];
-        console.log("status for ");
-        console.log(value);
-        // not the same state click the box
-        if (checked != ck) {
-          console.log("click it");
-          window.parent.setTimeout(function(){value.click();},timeout);
-        }
-        timeout+=timeoutInc; 
-     });
-     window.parent.setTimeout(toggleButtons,timeout+500);     
-     $("#check_all").attr('checked', checked);
-  }
 
-  function clear_batch () {
-    var url = '<%=clear_batch_edits_path %>';
-    var clearState = $.ajax({
-      headers: {           
-           Accept : "application/javascript",          
-       },      
-      type: 'PUT',
-      url: url,
-      async: false,
+  // check all the check boxes on the page
+  function check_all_page(e) {
+    // get the check box state
+    var checked = $("#check_all")[0]['checked'];
+    
+    // check each individual box
+    $("input[type='checkbox'].batch_document_selector").each(function(index, value) {
+       value['checked'] = checked;
     });
-
+    toggleButtons();     
+ 
+    // set menu check marks
+    toggleStateBool($("[data-behavior='batch-edit-select-page']"),checked);    
+    toggleStateBool($("[data-behavior='batch-edit-select-none']"),!checked);    
+ 
   }
-  
-  function set_all_checkboxes(checked){
-    $("input[type='checkbox'].batch_toggle").each(function(){
-      $(this).attr('checked', checked);   
-      
-      // make sure the form is set correctly
-      form = $($(this).parent()[0]);      
-      if (checked) {
-        form.find("input[name=_method]").val("delete");
-
-      } else {
-        form.find("input[name=_method]").val("put");
-      }
-    });
-    
+
+  // turn page selection on or off
+  // state == true for on
+  function select_page ( state) {
+    // check everything on the current page on or off based on state
+    $("#check_all").attr('checked', state);
+    check_all_page();  
   }
- 
 
 $(document).ready(function() { 
 
+  // check the select all page cog menu item and select the entire page
   $("[data-behavior='batch-edit-select-page']").bind('click', function(e) {
-    $("body").css("cursor", "progress");
     e.preventDefault();
-    $("#check_all").attr('checked', true);
-    toggleState($(this),'on');    
-    toggleState($("[data-behavior='batch-edit-select-all']"),'off');    
-    toggleState($("[data-behavior='batch-edit-select-none']"),'off');    
-    clear_batch();
-    
-    // uncheck everything on the current page
-    set_all_checkboxes(false);
-    
-    // check everything on the current page
-    check_all_page();
-    
-  });
-
-  $("[data-behavior='batch-edit-select-all']").bind('click', function(e) {
-    $("body").css("cursor", "progress");
-    e.preventDefault();
-    $("#check_all").attr('checked', true);
-    toggleState($(this), 'on');    
-    toggleState($("[data-behavior='batch-edit-select-page']"),'off');    
-    toggleState($("[data-behavior='batch-edit-select-none']"),'off');    
-    var url =  '<%=all_batch_edits_path %>';
-    var clearState = $.ajax({
-      headers: {           
-           Accept : "application/javascript",          
-       },      
-      type: 'PUT',
-      url: url,
-      async: false,
-    });
-    
-    // show that update on the local screen
-    set_all_checkboxes(true)
-    $("body").css("cursor", "auto");
-    toggleButtons(true);
+    select_page(true);
   });
 
+  // check the select none cog menu item and de-select the entire page
   $("[data-behavior='batch-edit-select-none']").bind('click', function(e) {
-    $("body").css("cursor", "progress");
-    e.preventDefault();
-    $("#check_all").attr('checked', false);
-    toggleState($(this), 'on');    
-    toggleState($("[data-behavior='batch-edit-select-page']"),'off');    
-    toggleState($("[data-behavior='batch-edit-select-all']"),'off');  
-    clear_batch();  
-
-    // show that update on the local screen
-    set_all_checkboxes(false)
-    $("body").css("cursor", "auto");
-    toggleButtons(false, true);
+    e.preventDefault();    
+    select_page(false);
   });
-
   
-  
-  // check all buttons
+  // check all check boxes
   $("#check_all").bind('click', check_all_page);
-  
 
-  $(".batch_toggle").bind('click', function(e) {
-
-      // if we are unchecking a box remove the group selections
-      if ($(e.currentTarget).attr('checked') != "checked") {
-        toggleState($("[data-behavior='batch-edit-select-all']"),'off');    
-        toggleState($("[data-behavior='batch-edit-select-page']"),'off');    
-        toggleState($("[data-behavior='batch-edit-select-none']"),'off');
-        $("#check_all").attr('checked', false);
-      }
-      // checking a single box see if we need to turn on one of the groups    
-      else {
-        var n = $(".batch_toggle:checked").length;
-        if (n == window.document_list_count) {
-            $("#check_all").attr('checked', true);
-            if (!window.batch_part_on_other_page) {
-              toggleState($("[data-behavior='batch-edit-select-page']"),'on');    
-            } else if ((n + window.batch_size_on_other_page) == window.result_set_size){
-              toggleState($("[data-behavior='batch-edit-select-all']"),'on');    
-            }
-        } else {            
-            if ((n + window.batch_size_on_other_page) == 0){
-              toggleState($("[data-behavior='batch-edit-select-none']"),'on');                 
-            }
-        }
-      }
+  // toggle button on or off based on boxes being clicked  
+  $(".batch_document_selector").bind('click', function(e) {
+     toggleButtons();
+  });
+
+  // toggle the state of the select boxes in the cog menu if all buttons are 
+  $(".batch_document_selector").bind('click', function(e) {
+
+      // count the check boxes currently checked
+      var selectedCount = $(".batch_document_selector:checked").length;
+
+      // toggle the cog menu check boxes
+      toggleStateBool($("[data-behavior='batch-edit-select-page']"),selectedCount == window.document_list_count);    
+      toggleStateBool($("[data-behavior='batch-edit-select-none']"),selectedCount == 0);    
+
+      // toggle the check all check box
+      $("#check_all").attr('checked', (selectedCount == window.document_list_count));
+      
     });
+    
+    if ($("#check_all").length > 0) select_page(false);
   
 });
 
@@ -173,7 +103,6 @@ $(document).ready(function() {
   function setup_buttontoggle(checkbox) {
     checkbox.bind('click', function(e) {
          e.preventDefault();
-         toggleButtons();
      });  
   }
 

data/app/controllers/batch_controller.rb

@@ -25,7 +25,7 @@ class BatchController < ApplicationController
     @generic_file = GenericFile.new
     @generic_file.creator = current_user.name
     @generic_file.title =  @batch.generic_files.map(&:label)
-    initialize_fields(@generic_file)
+    @generic_file.initialize_fields
   end
 
   def update
@@ -42,9 +42,8 @@ class BatchController < ApplicationController
 
   # override this method if you need to initialize more complex RDF assertions (b-nodes)
   def initialize_fields(file)
-    file.terms_for_editing.each do |key|
-      # if value is empty, we create an one element array to loop over for output 
-      file[key] = [''] if file[key].empty?
-    end
+    file.initialize_fields
   end
+
+  ActiveSupport::Deprecation.deprecate_methods(BatchController, :initialize_fields)
 end

data/app/controllers/concerns/sufia/users_controller_behavior.rb

@@ -55,7 +55,7 @@ module Sufia::UsersControllerBehavior
     delete_trophy = params.keys.reject{|k,v|k.slice(0,'remove_trophy'.length)!='remove_trophy'}
     delete_trophy = delete_trophy.map{|v| v.slice('remove_trophy_'.length..-1)}
     delete_trophy.each do | smash_trophy |
-      Trophy.where(user_id: current_user.id, generic_file_id: smash_trophy.slice("#{Sufia::Engine.config.id_namespace}:".length..-1)).each.map(&:delete)
+      Trophy.where(user_id: current_user.id, generic_file_id: smash_trophy).each.map(&:delete)
     end
     Sufia.queue.push(UserEditProfileEventJob.new(@user.user_key))
     redirect_to sufia.profile_path(URI.escape(@user.to_s,'@.')), notice: "Your profile has been updated"
@@ -74,7 +74,7 @@ module Sufia::UsersControllerBehavior
        t = Trophy.create(:generic_file_id => params[:file_id], :user_id => current_user.id)
        return false unless t.persisted?
      else
-       t.delete  
+       t.destroy  
        #TODO do this better says Mike
        return false if t.persisted?  
      end

data/app/controllers/contact_form_controller.rb

@@ -13,27 +13,5 @@
 # limitations under the License.
 
 class ContactFormController < ApplicationController
-
-  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!'
-      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
-
-end
+  include Sufia::ContactFormControllerBehavior
+end 

data/app/controllers/dashboard_controller.rb

@@ -14,70 +14,5 @@
 
 require 'blacklight/catalog'
 class DashboardController < ApplicationController
-  include Hydra::BatchEditBehavior
-  include Blacklight::Catalog
-  include Blacklight::Configurable # comply with BL 3.7
-  include Hydra::Controller::ControllerBehavior
-  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)
-  DashboardController.solr_search_params_logic += [:add_access_controls_to_solr_params]
-  # This filters out objects that you want to exclude from search results, like FileAssets
-  DashboardController.solr_search_params_logic += [:exclude_unwanted_models]
-
-  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
+  include  Sufia::DashboardControllerBehavior
 end

data/app/controllers/single_use_link_controller.rb

@@ -4,7 +4,7 @@ class SingleUseLinkController < DownloadsController
   before_filter :authenticate_user!, :except => [:download, :show]
   before_filter :find_file, :only => [:generate_download, :generate_show]
   before_filter :authorize_user!, :only => [:generate_download, :generate_show]
-  skip_filter :normalize_identifier
+  skip_filter :normalize_identifier, :load_asset, :load_datastream
   prepend_before_filter :normalize_identifier, :except => [:download, :show]
   rescue_from Sufia::SingleUseError, :with => :render_single_use_error
 
@@ -37,7 +37,8 @@ class SingleUseLinkController < DownloadsController
     not_found if link.path != sufia.download_path(id)
 
     # send the data content
-    asset = GenericFile.find(id)
+    @asset = GenericFile.load_instance_from_solr(id)
+    load_datastream
     send_content(asset)
   end