sufia 4.3.1 → 5.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 202087176245b06ed3908752e6474c316fe2d669
-  data.tar.gz: 46a3bf0c6206c0d76738b2e1092b310f793f02d6
+  metadata.gz: 0fd461554f395403414904f00dd90a78fb0537f2
+  data.tar.gz: 1d5831ea8387a489951180194b7180bd4d62a76d
 SHA512:
-  metadata.gz: e9d2a4b2abc2ccbd14ecee1047f87c9f5ffc3cc93b9361fe7a5a3c651d601c014534230a8098e83aadb8ec078a071678257333816eb65a7874f767fab3398ae8
-  data.tar.gz: f1e9781b0f053375be769c16c963b1702de618b471f9af9c2177ceba5262b091da4e24bb5b143c7476614aced26800ed559aa5e7e189ed4ecfa7ba8d35e33798
+  metadata.gz: 442d9714f6a6791d4d8d0f1bb04b2343c205dc763833431887d6021b6d5fa21ea2098e534ea7ed783e8ed9009858f5302a44c459bb834e084aa466609340679b
+  data.tar.gz: 79104ad39beb8ceeecf6e509dd38cffa5b1cf0b59b2420028fed6539bd00747ac872facce84c6987fad8681f01e378b7143933a6b3f2004ceb3f06e1c42ecaf1

data/.travis.yml

@@ -1,10 +1,17 @@
 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,7 +6,7 @@ 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 'sass-rails', '~> 4.0.3'
+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)
 
 group :development, :test do
   gem "simplecov", require: false
@@ -17,4 +17,13 @@ file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_
 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,5 +1,19 @@
 # History of Sufia releases
 
+## 5.0.0
+
+* 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]

data/LICENSE

@@ -0,0 +1,15 @@
+##########################################################################
+# Copyright 2012 Penn State University
+# Additional copyright may be held by others, as reflected in the commit log
+#
+# 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,7 +48,8 @@ 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
+1. Ruby (*latest 2.1 recommended*)
+2. Rails (*latest 4.1 recommended*)
 
 #### !! Ensure that you have all of the above components installed before you continue. !!
 
@@ -60,12 +61,15 @@ If you have questions or need help, please email [the Hydra community developmen
 
 ### Generate base Rails install
 
-```rails new my_app```
+```
+gem install rails -v 4.1.8
+rails new my_app
+```
 
 ### Add gems to Gemfile
 
 ```
-gem 'sufia'
+gem 'sufia', '4.3.1'
 gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'  # required to handle pagination properly in dashboard. See https://github.com/amatsuda/kaminari/pull/322
 ```
 

data/SUFIA_VERSION

@@ -1 +1 @@
-4.3.1
+5.0.0.rc1

data/app/assets/javascripts/sufia.js

@@ -35,7 +35,7 @@
 //= require sufia/trophy
 //= require sufia/featured_works
 //= require sufia/batch_select_all
-//= require sufia/multiForm
+//= require sufia/manage_repeating_fields
 //= require sufia/edit_metadata
 //= require sufia/single_use_link
 //= require sufia/audio
@@ -82,6 +82,22 @@ 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,17 +3,6 @@ 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;
@@ -116,31 +105,45 @@ 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");
-        $(save_button).removeAttr("disabled");
-        $(outer_div).removeClass("loading");
-        $('#' + form_id).children([".form-group"]).removeClass('hidden')
+        enableForm(form_id);
     }
 
     function before_ajax(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')
+        disableForm(form_id);
     }
 
-
     function runSave(e) {
         e.preventDefault();
         var button = $(this);
-        var form = $(button.parent().parent()[0]);
-        var form_id = form[0].id
+        var form = button.closest('form');
+        var form_id = form[0].id;
         before_ajax(form_id);
 
         ajaxManager.addReq({
@@ -162,26 +165,8 @@ 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');
-    // autocompletes
-    $("#" + autocomplete_vocab.field_name[i])
+    // add autocompletes to all inputs created
+    $(".form-group.multi_value." + autocomplete_vocab.field_name[i]).find('input[type=text]')
         // don't navigate away from the field on tab when selecting an item
         .bind( "keydown", function( event ) {
             if ( event.keyCode === $.ui.keyCode.TAB &&
@@ -72,15 +72,20 @@ Blacklight.onLoad(function() {
   }
 
 
-  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);
+  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"));
     }
-    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]));
+    // 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]));
     }
   }
 
-  $('form').multiForm({afterAdd: setup_autocomplete});
+  // add setup for autocompletes to multi value forms
+  $('.multi_value.form-group').manage_fields({ add: setup_autocomplete });
 });

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

@@ -0,0 +1,74 @@
+// This widget manages the adding and removing of repeating fields.
+// There are a lot of assumptions about the structure of the classes and elements.
+// These assumptions are reflected in the MultiValueInput class.
+
+(function($){
+  $.widget( "curate.manage_fields", {
+    options: {
+      change: null,
+      add: null,
+      remove: null
+    },
+
+    _create: function() {
+      this.element.addClass("managed");
+      $('.field-wrapper', this.element).addClass("input-group input-append");
+
+      this.controls = $("<span class=\"input-group-btn field-controls\">");
+      this.remover  = $("<button class=\"btn btn-danger remove\"><i class=\"icon-white glyphicon-minus\"></i><span>Remove</span></button>");
+      this.adder    = $("<button class=\"btn btn-success add\"><i class=\"icon-white glyphicon-plus\"></i><span>Add</span></button>");
+
+      $('.field-wrapper', this.element).append(this.controls);
+      $('.field-wrapper:not(:last-child) .field-controls', this.element).append(this.remover);
+      $('.field-controls:last', this.element).append(this.adder);
+
+      this._on( this.element, {
+        "click .remove": "remove_from_list",
+        "click .add": "add_to_list"
+      });
+    },
+
+    add_to_list: function( event ) {
+      event.preventDefault();
+
+      var $activeField = $(event.target).parents('.field-wrapper'),
+          $activeFieldControls = $activeField.children('.field-controls'),
+          $removeControl = this.remover.clone(),
+          $newField = $activeField.clone(),
+          $listing = $('.listing', this.element),
+          $warningMessage  = $("<div class=\'message has-warning\'>cannot add new empty field</div>");
+      if ($activeField.children('input').val() === '') {
+          $listing.children('.has-warning').remove();
+          $listing.append($warningMessage);
+      }
+      else{
+        $listing.children('.has-warning').remove();
+        $('.add', $activeFieldControls).remove();
+        $activeFieldControls.prepend($removeControl);
+        $newChildren = $newField.find('input');
+        $newChildren.
+          val('').
+          removeProp('required');
+        $listing.append($newField);
+        $newChildren.first().focus();
+        this._trigger("add",$newChildren);
+      }
+    },
+
+    remove_from_list: function( event ) {
+      event.preventDefault();
+
+      $(event.target)
+        .parents('.field-wrapper')
+        .remove();
+
+      this._trigger("remove");
+    },
+
+    _destroy: function() {
+      this.actions.remove();
+      $('.field-wrapper', this.element).removeClass("input-append");
+      this.element.removeClass( "managed" );
+    }
+  });
+})(jQuery);

data/app/assets/stylesheets/sufia.css.scss

@@ -16,7 +16,7 @@
 // Use import here instead of require so we can use the Sass variables defined in Bootstrap and Blacklight
 // TODO: Probably should use import throughout and move all of Sufia's stylesheets into a single named directory.
 @import 'sufia/settings','sufia/header','sufia/styles','sufia/file-listing','sufia/collections','sufia/batch-edit',
-'sufia/dashboard','sufia/home-page','sufia/featured','sufia/tagcloud','sufia/usage-stats','sufia/catalog','sufia/buttons','sufia/proxy-rights';
+'sufia/dashboard','sufia/home-page','sufia/featured','sufia/tagcloud','sufia/usage-stats','sufia/catalog','sufia/buttons','sufia/proxy-rights', 'sufia/multi_value_fields';
 
 #browse-everything {
   top:10%;

data/app/assets/stylesheets/sufia/_batch-edit.scss

@@ -19,3 +19,11 @@
   padding-top: 5px;
 }
 
+.glyphicon-chevron-right-helper.collapsed .chevron {
+  @extend .glyphicon-chevron-right;
+}
+.glyphicon-chevron-right-helper .chevron {
+  @extend .glyphicon;
+  @extend .glyphicon-chevron-down;
+}
+

data/app/assets/stylesheets/sufia/_file-listing.scss

@@ -41,7 +41,7 @@ h4 .small {
 }
 
 .file_listing_thumbnail {
-  @extend .media-object;
+  @extend .media-object !optional;
   width: 64px;
 }
 

data/app/assets/stylesheets/sufia/_multi_value_fields.css.scss

@@ -0,0 +1,67 @@
+.multi_value, .single_value {
+  .field-wrapper {
+    list-style-type:none;
+  }
+
+  .listing {
+    margin-left: 0;
+    max-width: 40em;
+    padding-left: 0px;
+    .input-group {
+      margin-bottom: 1px;
+    }
+  }
+
+  .field-controls span {
+    margin-left:.2em;
+  }
+
+  .field-controls {
+    margin-left: 2em;
+  }
+
+  .message{
+    background-size: 40px 40px;
+    background-image: linear-gradient(135deg, rgba(255, 255, 255, .05) 25%, transparent 25%,
+    transparent 50%, rgba(255, 255, 255, .05) 50%, rgba(255, 255, 255, .05) 75%,
+    transparent 75%, transparent);
+    box-shadow: inset 0 -1px 0 rgba(255,255,255,.4);
+    width: 100%;
+    border: 1px solid;
+    color: #fff;
+    padding: 10px;
+    text-shadow: 0 1px 0 rgba(0,0,0,.5);
+    animation: animate-bg 5s linear infinite;
+    border-radius: $border-radius-base;
+  }
+
+  .has-error{
+    background-color: #de4343;
+    border-color: #c43d3d;
+  }
+
+  .has-warning{
+    background-color: #eaaf51;
+    border-color: #d99a36;
+  }
+}
+
+// The contributor listing needs some normalization
+#contributors .listing {
+  max-width:20em;
+}
+
+#collection_title.listing {
+  max-width:37em;
+}
+
+.collection_description .listing {
+  max-width:35.5em;
+}
+
+#descriptions_display {
+  .form-group, .batch-group {
+    margin-left: 0;
+    margin-bottom: 0.5em;
+  }
+}