sufia 5.0.0 → 6.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2552f81e36017df0ba6561d10f4f71dd00c4e067
-  data.tar.gz: 045a5eac1f6c483ca8b22698040e2a6d9aab3184
+  metadata.gz: 66f52aa19e4ce45f68360e5c2dbc9bf9fd16a99b
+  data.tar.gz: 0e7ec679161844f502e8fd27db596005b0352d36
 SHA512:
-  metadata.gz: b9e6e0171308860a349af41827ee30b39792bac3765da481e1746771005ca2b5d8a2afb6d526416aadf134a59077f1200066ad0b8747eec31c855731c84e42fd
-  data.tar.gz: 3d557d4ca7e04e1dc5e6fe140428f919d32180d67d9a29edd4e38a2dd63922b3deb98510afd5e788eebebad7fa9639ae2494564ce31368114faf25c9cad218c3
+  metadata.gz: 59957e8d5ebeeec6fc649ad82b802bd03e97e04d7d2a8607ceeff6e2cc46eb6560fa42c437cc55518b8903c9114155839c0589b404018b1a84f1d21baf71fe66
+  data.tar.gz: 5009ca0eb029bd3b2caa86fae5b339e5b6a1b4af4b609d42e532595dd42b223010c2927afb5d08517cc78e1cb693ea9029a1af0f3754710c1b49cf6d5c90ff37

data/.travis.yml

@@ -1,17 +1,10 @@
 language: ruby
-cache: bundler
-sudo: false
 rvm:
   - 2.1
+  - 2.0
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  matrix:
-    - "RAILS_VERSION=4.1.8"
-    - "RAILS_VERSION=4.2.0"
-matrix:
-  allow_failures:
-    - env: "RAILS_VERSION=4.2.0"
 notifications:
   email:
     recipients:

data/Gemfile

@@ -6,24 +6,15 @@ gemspec
 # Required for doing pagination inside an engine. See https://github.com/amatsuda/kaminari/pull/322
 gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'
 gem 'sufia-models', path: './sufia-models'
-gem 'slop', '~> 3.6.0' # This just helps us generate a valid Gemfile.lock when Rails 4.2 is installed (which requires byebug which has a dependency on slop)
+gem 'sass-rails', '~> 4.0.3'
 
 group :development, :test do
   gem "simplecov", require: false
-  gem "byebug", require: false
-end # (leave this comment here to catch a stray line inserted by blacklight!)
+  gem 'byebug' unless ENV['CI']
+end
 
 file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
 if File.exists?(file)
   puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
   instance_eval File.read(file)
-else
-  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
-
-  if ENV['RAILS_VERSION'] and ENV['RAILS_VERSION'] !~ /^4.2/
-    gem 'sass-rails', "< 5.0"
-  else
-    gem 'responders', "~> 2.0"
-    gem 'sass-rails', ">= 5.0"
-  end
 end

data/History.md

@@ -1,40 +1,5 @@
 # History of Sufia releases
 
-## 5.0.0
-
-* Prevent Sufia from picking up Blacklight version 5.10 [Hector Correa]
-* Update README to be more specific about dependency versions [Michael J. Giarlo]
-* Pulled in code from curate to manage add/remove fields on edit forms.  Also story #3978 [Carolyn Cole]
-* Changing the file query to be a solr query for loading the file id, so we do not wait large file content to load.  This speed up the runs significantly on systems with large file. [Carolyn Cole]
-* Users controller should not call an undefined method. Fixes #532. [Michael J. Giarlo]
-* Fix problem where batch edit forms weren't expanding. Fixes #820 [Carolyn Cole]
-* Update and rename LICENSE.md to LICENSE per community convention. [Michael J. Giarlo]
-* Brings some of the fixes in fedora-4/master into master. [Michael J. Giarlo]
-* Adds condition to make the version of sass-rails dependent on the value of RAILS_VERSION [Michael J. Giarlo]
-* Merge travis config change to speed up the build [Michael J. Giarlo]
-* Adding the browse view link into the bread crumbs so it shows on both the edit and the stats page. [Carolyn Cole]
-
-
-## 4.3.1
-
-* Adds an ORCID field to the user model. [Michael J. Giarlo]
-* Styles count for views and downloads, refs #9672 [Michael Tribone]
-* Merge pull request #787 from projecthydra/update_master_to_bl-5.8 [Justin Coyne]
-* More facets modal defaults to numerical sort [Adam Wead]
-* Upgrade to Blacklight 5.8 [Adam Wead]
-* Adding select2 name look up to permissions form for GenericFile and Batch. [Carolyn Cole]
-* Adding blacklight gallery default views to catalog controller to match with the new installer.
-* Display file stats for user.  Feature #9305 [Valerie Maher]
-* Making sure the modal is actually sorted numerically and allow some files to be on the second p
-* Fixing a bug that the home page crashes when a featured work has been destroyed [Carolyn Cole]
-* Fixes button size and alignment issues with metadata and upload forms, refs #9569 [Michael Tribone]
-* Updated dev notes [Valerie Maher]
-* Disable check all instead of making it disappear.  User testing indicated this was confusing [Carolyn Cole]
-* Views should not use the invalid Agent schema.org class [Michael J. Giarlo]
-* README should not implicitly suggest an outdated version of Sufia. (Inspired by #719 -- thx, @mistydemeo!) [Michael J. Giarlo]
-
-## 4.3.0 - YANKED
-
 ## 4.2.0
 
 * Caches google analytics data in the database so we do not have to retrieve them each time the page is loaded [Carolyn Cole]
@@ -207,7 +172,6 @@ This release contains bug fixes and css fixes found after the Sufia 4.0 release.
   * changing to bootstrap 3 danger from important to get the red background for permissions, and fixing collection detail spacing when there is no description [Carolyn Cole]
   * Upgrade to rspec 3. Fixes #493 [Carolyn Cole]
   * Removed extraneous colons preceding key names. Fixes #516 [kerchner]
-
 ## 4.0.0.rc1
 
   * Use the bootstrap_form helpers (bootstrap_forms is no longer available) [Justin Coyne]

data/LICENSE.md

@@ -0,0 +1,14 @@
+Copyright 2012 Penn State University  
+Additional copyright may be held by others, as reflected in the commit history.
+
+   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.

data/README.md

@@ -48,8 +48,7 @@ We'd love to accept your contributions.  Please see our guide to [contributing t
 1. A SQL RDBMS (MySQL, SQLite)
 1. [Redis](http://redis.io/) key-value store
 1. [ImageMagick](http://www.imagemagick.org/)
-1. Ruby (*latest 2.1 recommended*)
-2. Rails (*latest 4.1 recommended*)
+1. Ruby
 
 #### !! Ensure that you have all of the above components installed before you continue. !!
 
@@ -61,15 +60,12 @@ If you have questions or need help, please email [the Hydra community developmen
 
 ### Generate base Rails install
 
-```
-gem install rails -v 4.1.8
-rails new my_app
-```
+```rails new my_app```
 
 ### Add gems to Gemfile
 
 ```
-gem 'sufia', '4.3.1'
+gem 'sufia'
 gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'  # required to handle pagination properly in dashboard. See https://github.com/amatsuda/kaminari/pull/322
 ```
 
@@ -236,7 +232,7 @@ configure_blacklight do |config|
 
   # Specify which field to use in the tag cloud on the homepage.
   # To disable the tag cloud, comment out this line.
-  config.tag_cloud_field_name = Solrizer.solr_name("desc_metadata__tag", :facetable)
+  config.tag_cloud_field_name = Solrizer.solr_name("tag", :facetable)
 end
 ```
 

data/SUFIA_VERSION

@@ -1 +1 @@
-5.0.0
+6.0.0.beta1

data/app/assets/javascripts/sufia.js

@@ -35,7 +35,7 @@
 //= require sufia/trophy
 //= require sufia/featured_works
 //= require sufia/batch_select_all
-//= require sufia/manage_repeating_fields
+//= require sufia/multiForm
 //= require sufia/edit_metadata
 //= require sufia/single_use_link
 //= require sufia/audio
@@ -82,22 +82,6 @@ function notify_update_link() {
 }
 
 Blacklight.onLoad(function() {
-  // Multi-value fields on forms
-  $('body').on('keypress', '.multi-text-field', function(event) {
-    var $activeField = $(event.target).parents('.field-wrapper'),
-        $activeFieldControls = $activeField.children('.field-controls'),
-        $addControl=$activeFieldControls.children('.add'),
-        $removeControl=$activeFieldControls.children('.remove');
-
-    // If user hits the "Enter" key (keyCode 13), it should add another input for the multi-value field.
-    // Unless it's a textarea field (since users might want multi-line input in a textarea).
-    if (event.keyCode == 13 && !($activeField.context.type == "textarea")) {
-      event.preventDefault();
-      $addControl.click()
-      $removeControl.click()
-    }
-  });
-  $('.multi_value.form-group').manage_fields();
 
   // set up global batch edit options to override the ones in the gem
   window.batch_edits_options = { checked_label: "",unchecked_label: "",progress_label: "",status_label: "",css_class: "batch_toggle"};

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

@@ -3,6 +3,17 @@ function batch_edit_init () {
     // initialize popover helpers
     $("a[rel=popover]").popover({ html: true });
 
+    $("tr.expandable").click(function () {
+        $(this).next("ul").slideToggle();
+
+        $(this).find('i.toggle').toggleClass("glyphicon glyphicon-chevron-down");
+    });
+
+    $("tr.expandable_new").click(function () {
+        $(this).find('i').toggleClass("glyphicon glyphicon-chevron-down");
+    });
+
+
     function deserialize(Params) {
         var Data = Params.split("&");
         var i = Data.length;
@@ -105,45 +116,31 @@ function batch_edit_init () {
 
     ajaxManager.run();
 
-    function formButtons(form_id) {
-        return $('#' + form_id + ' .btn')
-    }
-
-    function formFields(form_id) {
-        return $('#' + form_id + ' .form-group > *')
-    }
-
-    function formRightPanel(form_id) {
-        return $('#' + form_id + ' .form-group')
-    }
-
-    function disableForm(form_id) {
-        formButtons(form_id).attr("disabled", "disabled");
-        formRightPanel(form_id).addClass("loading");
-        formFields(form_id).addClass('invisible')
-    }
-
-    function enableForm(form_id) {
-        formButtons(form_id).removeAttr("disabled");
-        formRightPanel(form_id).removeClass("loading");
-        formFields(form_id).removeClass('invisible')
-    }
-
     function after_ajax(form_id) {
         var key = form_id.replace("form_", "");
+        var save_button = "#" + key + "_save";
+        var outer_div = "#detail_" + key;
         $("#status_" + key).html("Changes Saved");
-        enableForm(form_id);
+        $(save_button).removeAttr("disabled");
+        $(outer_div).removeClass("loading");
+        $('#' + form_id).children([".form-group"]).removeClass('hidden')
     }
 
     function before_ajax(form_id) {
-        disableForm(form_id);
+        var key = form_id.replace("form_", "");
+        var save_button = "#" + key + "_save";
+        var outer_div = "#detail_" + key;
+        $(save_button).attr("disabled", "disabled");
+        $(outer_div).addClass("loading");
+        $('#' + form_id).children([".form-group"]).addClass('hidden')
     }
 
+
     function runSave(e) {
         e.preventDefault();
         var button = $(this);
-        var form = button.closest('form');
-        var form_id = form[0].id;
+        var form = $(button.parent().parent()[0]);
+        var form_id = form[0].id
         before_ajax(form_id);
 
         ajaxManager.addReq({
@@ -165,8 +162,26 @@ function batch_edit_init () {
         setTimeout(ajaxManager.runNow(), 100);
     }
 
+    function enable_show_hide_links() {
+        // Show/hide field details when clicking on a link with ID "expand_link_XXX".
+        // We expect to find an element named detail_XXX in addition to the expand_link_XXX.
+        // The "detail_XXX" element has the chevron icon.
+        $('.glyphicon-chevron-right-helper').on('click', function() {
+            var array = this.id.split("expand_link_");
+            if (array.length > 1) {
+                var docId = array[1];
+                $("#detail_" + docId + " .expanded-details").slideToggle();
+                var button = $("#expand_" + docId);
+                button.toggleClass('glyphicon-chevron-right glyphicon-chevron-down');
+            }
+            return false;
+        });
+    }
+
     $("#permissions_save").click(runSave);
     $(".field-save").click(runSave);
+    enable_show_hide_links();
+
 }
 
 

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

@@ -58,8 +58,8 @@ Blacklight.onLoad(function() {
   for (var i=0; i < autocomplete_vocab.url_var.length; i++) {
     autocomplete_vocab.field_name.push('generic_file_' + autocomplete_vocab.url_var[i]);
     autocomplete_vocab.add_btn_id.push('additional_' + autocomplete_vocab.url_var[i] + '_submit');
-    // add autocompletes to all inputs created
-    $(".form-group.multi_value." + autocomplete_vocab.field_name[i]).find('input[type=text]')
+    // autocompletes
+    $("#" + autocomplete_vocab.field_name[i])
         // don't navigate away from the field on tab when selecting an item
         .bind( "keydown", function( event ) {
             if ( event.keyCode === $.ui.keyCode.TAB &&
@@ -72,20 +72,15 @@ Blacklight.onLoad(function() {
   }
 
 
-  function setup_autocomplete(event) {
-    var class_name = $.grep(event.target.className.split(" "),function( c ) {
-          return c.indexOf('generic_file') == 0;
-      })[0];
-    // attach auto complete for location
-    if (class_name == 'generic_file_based_near') {
-      $(event.target).find('input[type=text]').autocomplete(get_autocomplete_opts("location"));
+  function setup_autocomplete(obj, cloneElem) {
+    // should we attach an auto complete based on the input
+    if (obj.id == 'additional_based_near_submit') {
+      cloneElem.find('input[type=text]').autocomplete(cities_autocomplete_opts);
     }
-    // attach other auto completes
-    else if ( (index = $.inArray(class_name, autocomplete_vocab.field_name)) != -1 ) {
-      $(event.target).find('input[type=text]').autocomplete(get_autocomplete_opts(autocomplete_vocab.url_var[index]));
+    else if ( (index = $.inArray(obj.id, autocomplete_vocab.add_btn_id)) != -1 ) {
+      cloneElem.find('input[type=text]').autocomplete(get_autocomplete_opts(autocomplete_vocab.url_var[index]));
     }
   }
 
-  // add setup for autocompletes to multi value forms
-  $('.multi_value.form-group').manage_fields({ add: setup_autocomplete });
+  $('form').multiForm({afterAdd: setup_autocomplete});
 });

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

@@ -0,0 +1,67 @@
+(function( $ ){
+
+  $.fn.multiForm = function( options ) {
+
+    // Create some defaults, extending them with any options that were provided
+    var settings = $.extend( { }, options);
+
+    function addField() {
+      count = $(this).closest('.form-group').find('input').size();
+      var cloneId = this.id.replace("submit", "clone");
+      var newId = this.id.replace("submit", "elements");
+      var cloneElem = $('#'+cloneId).clone();
+      // change the add button to a remove button
+      var plusbttn = cloneElem.find('#'+this.id);
+      var sr_hidden = '<span aria-hidden="true"><i class="glyphicon glyphicon-remove"></i></span>';
+      var sr_only = '<span class="sr-only">remove this ' + this.name.replace("_", " ") + '</span>';
+      var remove_button = sr_hidden + sr_only;
+      plusbttn.html(remove_button);
+      plusbttn.on('click',removeField);
+
+
+      // remove the help tag on subsequent added fields
+      cloneElem.find('.formHelp').remove();
+      cloneElem.find('.modal-div').remove();
+
+      //clear out the value for the element being appended
+      //so the new element has a blank value
+      // Note: there may be more than one input field. Example:
+      //   creator_name
+      //   creator_role
+      textFields = cloneElem.find('input[type=text]')
+      $.each(textFields, function(n, tf) {
+        newName = $(tf).attr('name').replace('[0]', '['+count+']');
+        $(tf).attr('name', newName).val('').attr("required", false)
+      })
+
+      if (settings.afterAdd) {
+        settings.afterAdd(this, cloneElem)
+      }
+
+      $('#'+newId).append(cloneElem);
+      cloneElem.find('input[type=text]').focus();
+      return false;
+    }
+
+    function removeField () {
+      // get parent and remove it
+      $(this).closest('.input-group').remove();
+      return false;
+    }
+
+    return this.each(function() {
+
+      // Tooltip plugin code here
+      /*
+       * adds additional metadata elements
+       */
+      $('.adder', this).click(addField);
+
+      $('.remover', this).click(removeField);
+
+
+    });
+
+  };
+})( jQuery );
+

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

@@ -9,9 +9,33 @@
    */
 
 Blacklight.onLoad(function() {
+  // input for uids -  attach function to verify uid
+  $('#new_user_name_skel').on('blur', function() {
+      // clear out any existing messages
+      $('#directory_user_result').html('');
+      var un = $('#new_user_name_skel').val();
+      var perm = $('#new_user_permission_skel').val();
+      if ( $.trim(un).length == 0 ) {
+        return;
+      }
+      $.ajax( {
+        url: "/directory/user/" + un,
+        success: function( data ) {
+          if (data != null) {
+            if (!data.length) {
+              $('#directory_user_result').html('User id ('+un+ ') does not exist.');
+              $('#new_user_name_skel').select();
+              $('#new_user_permission_skel').val('none');
+              return;
+            }
+            else {
+              $('#new_user_permission_skel').focus();
+            }
+          }
+        }
+      });
 
-  // Attach the user search select2 box to the permission form
-  $("#new_user_name_skel").userSearch();
+  });
 
   // add button for new user
   $('#add_new_user_skel').on('click', function() {
@@ -37,14 +61,14 @@ Blacklight.onLoad(function() {
       $('#permissions_error').html();
       $('#permissions_error').addClass('hidden');
 
-      var un = $('#new_user_name_skel').val();
-      var perm_form = $('#new_user_permission_skel').val();
-      var perm = $('#new_user_permission_skel :selected').text();
+      var user_name = $('#new_user_name_skel').val();
+      var access = $('#new_user_permission_skel').val();
+      var access_label = $('#new_user_permission_skel :selected').text();
       // clear out the elements to add more
       $('#new_user_name_skel').val('');
       $('#new_user_permission_skel').val('none');
 
-      addPerm(un, perm_form, perm, 'new_user_name');
+      addPerm(user_name, access, access_label, 'user');
       return false;
   });
 
@@ -54,9 +78,9 @@ Blacklight.onLoad(function() {
         $('#new_group_name_skel').focus();
         return false;
       }
-      var cn = $('#new_group_name_skel').val();
-      var perm_form = $('#new_group_permission_skel').val();
-      var perm = $('#new_group_permission_skel :selected').text();
+      var group_name = $('#new_group_name_skel').val();
+      var access = $('#new_group_permission_skel').val();
+      var access_label = $('#new_group_permission_skel :selected').text();
 
       if (!is_permission_duplicate($('#new_group_name_skel').val())) {
         $('#permissions_error_text').html("This group already has a permission.");
@@ -70,7 +94,7 @@ Blacklight.onLoad(function() {
       $('#new_group_name_skel').val('');
       $('#new_group_permission_skel').val('none');
 
-      addPerm(cn, perm_form, perm, 'new_group_name');
+      addPerm(group_name, access, access_label, 'group');
       return false;
   });
 
@@ -87,50 +111,84 @@ Blacklight.onLoad(function() {
 
 	});
 
-  function addPerm(un, perm_form, perm, perm_type)
+  function addPerm(agent_name, access, access_label, agent_type)
   {
+      showPermissionNote();
+
+      var tr = createPermissionRow(agent_name, access_label);
+      addHiddenPermField(tr, agent_type, agent_name, access);
+      $('#file_permissions').after(tr);
+      tr.effect("highlight", {}, 3000);
+  }
+
+  function createPermissionRow(agent_name, access_label) {
       var tr = $(document.createElement('tr'));
       var td1 = $(document.createElement('td'));
       var td2 = $(document.createElement('td'));
-      var remove = $('<button class="btn close">X</button>');
-
-      $('#save_perm_note').removeClass('hidden');
+      var remove_button = $('<button class="btn close">X</button>');
 
-      $('#new_perms').append(td1);
-      $('#new_perms').append(td2);
-
-      td1.html('<label class="control-label">'+un+'</label>');
-      td2.html(perm);
-      td2.append(remove);
-      remove.click(function () {
+      td1.html('<label class="control-label">' + agent_name + '</label>');
+      td2.html(access_label);
+      td2.append(remove_button);
+      remove_button.click(function () {
         tr.remove();
       });
 
+      return tr.append(td1).append(td2);
+  }
+
+  function addHiddenPermField(element, type, name, access) {
+      var prefix = 'generic_file[permissions_attributes][' + nextIndex() + ']';
       $('<input>').attr({
           type: 'hidden',
-          name: 'generic_file[permissions]['+perm_type+']['+un+']',
-          value: perm_form
-        }).appendTo(td2);
-      tr.append(td1);
-      tr.append(td2);
-      $('#file_permissions').after(tr);
-      tr.effect("highlight", {}, 3000);
+          name: prefix + '[type]',
+          value: type
+      }).appendTo(element);
+      $('<input>').attr({
+          type: 'hidden',
+          name: prefix + '[name]',
+          value: name
+      }).appendTo(element);
+      $('<input>').attr({
+          type: 'hidden',
+          name: prefix + '[access]',
+          value: access
+      }).appendTo(element);
+  }
+
+  function nextIndex() {
+      return $('#file_permissions').parent().children().size() - 1;
   }
 
   $('.remove_perm').on('click', function() {
      var top = $(this).parent().parent();
      top.addClass('hidden'); // do not show the block
-     top.find('.select_perm')[0].options[0].selected= true; // select the first otion which is none
-     $('#save_perm_note').removeClass('hidden');
+     addDestroyField(top);
+     showPermissionNote();
      return false;
-
   });
 
+  function showPermissionNote() {
+     $('#save_perm_note').removeClass('hidden');
+  }
+
+  function addDestroyField(element) {
+      $('<input>').attr({
+          type: 'hidden',
+          name: 'generic_file[permissions_attributes][' + indexOf(element) + '][_destroy]',
+          value: 'true'
+      }).appendTo(element);
+  }
+
+  function indexOf(element) {
+      return $('#file_permissions').parent().children().index(element) - 1;
+  }
+
 });
 
 // return the files visibility level (institution, open, restricted);
-function get_visibility(){
-  return $("input[name='visibility']:checked").val()
+function get_visibility() {
+  return $("input[name='visibility']:checked").val();
 }
 
 /*
@@ -138,8 +196,7 @@ function get_visibility(){
  * set other users/groups to 'read' (it would be over ruled by the
  * visibility of Open or Institution) so disable the Read option
  */
-function set_access_levels()
-{
+function set_access_levels() {
   var vis = get_visibility();
   var enabled_disabled = false;
   if (vis == "open" || vis == "psu") {