sufia 6.0.0.beta1 → 6.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66f52aa19e4ce45f68360e5c2dbc9bf9fd16a99b
-  data.tar.gz: 0e7ec679161844f502e8fd27db596005b0352d36
+  metadata.gz: 23a8aa646f0192a0e3637c499d513f8ee363f128
+  data.tar.gz: 7d98159bb2f6b95131dc290c271a53e62e18a043
 SHA512:
-  metadata.gz: 59957e8d5ebeeec6fc649ad82b802bd03e97e04d7d2a8607ceeff6e2cc46eb6560fa42c437cc55518b8903c9114155839c0589b404018b1a84f1d21baf71fe66
-  data.tar.gz: 5009ca0eb029bd3b2caa86fae5b339e5b6a1b4af4b609d42e532595dd42b223010c2927afb5d08517cc78e1cb693ea9029a1af0f3754710c1b49cf6d5c90ff37
+  metadata.gz: 329dd1e4e2580887878b25c14f8dc7553de38dd570da8ff66e37739e853a8d074524e4de8c31afda32e0140591633a256ecd3f173e1da4ff6c8c91dc0252bdd0
+  data.tar.gz: eea2cc4345bbd3c245d6c638cf8442151cc89e68d88de0957cadabf4444248dbcdcac17c7caab02fafa3b583cb8bab1c11c0b676a37efaa2c61edfe52bba876a

data/.travis.yml

@@ -1,10 +1,20 @@
 language: ruby
+cache: bundler
+sudo: false
 rvm:
   - 2.1
-  - 2.0
 env:
   global:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+    - 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 'responders', "~> 2.0"
+    gem 'sass-rails', ">= 5.0"
+  else
+    gem 'sass-rails', "< 5.0"
+  end
 end

data/History.md

@@ -1,5 +1,25 @@
 # History of Sufia releases
 
+## 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]
@@ -172,6 +192,7 @@ 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/SUFIA_VERSION

@@ -1 +1 @@
-6.0.0.beta1
+6.0.0.rc1

data/app/assets/javascripts/sufia.js

@@ -35,7 +35,6 @@
 //= require sufia/trophy
 //= require sufia/featured_works
 //= require sufia/batch_select_all
-//= require sufia/multiForm
 //= require sufia/edit_metadata
 //= require sufia/single_use_link
 //= require sufia/audio
@@ -51,6 +50,7 @@
 //= require sufia/batch
 
 //= require hydra_collections
+//= require hydra-editor/hydra-editor
 
 //
 // For Browse-everything until https://github.com/projecthydra-labs/browse-everything/issues/85 is resolved:

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,32 +105,45 @@ function batch_edit_init () {
 
     ajaxManager.run();
 
-    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')
+
+    function after_ajax(form) {
+        form.enableForm();
     }
 
-    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')
+    function before_ajax(form) {
+        form.disableForm();
     }
 
+    var BatchEditField = function (form) {
+        this.form = form;
+        this.formButtons = form.find('.btn');
+        this.formFields = form.find('.form-group > *');
+        this.formRightPanel = form.find('.form-group');
+        this.statusField = form.find('.status');
+    }
+
+    BatchEditField.prototype = {
+        disableForm: function () {
+            this.formButtons.attr("disabled", "disabled");
+            this.formRightPanel.addClass("loading");
+            this.formFields.addClass('invisible')
+        },
+
+        enableForm: function () {
+            this.statusField.html("Changes Saved");
+            this.formButtons.removeAttr("disabled");
+            this.formRightPanel.removeClass("loading");
+            this.formFields.removeClass('invisible')
+        }
+    }
 
     function runSave(e) {
         e.preventDefault();
         var button = $(this);
-        var form = $(button.parent().parent()[0]);
-        var form_id = form[0].id
-        before_ajax(form_id);
+        var form = button.closest('form');
+        var f = new BatchEditField(form);
+        var form_id = form[0].id;
+        before_ajax(f);
 
         ajaxManager.addReq({
             form: form_id,
@@ -150,38 +152,18 @@ function batch_edit_init () {
             dataType: "json",
             type: form.attr("method").toUpperCase(),
             data: form.serialize(),
-            complete: function (e) {
-                after_ajax(form_id);
-                if (e.status == 200) {
-                    eval(e.responseText);
-                } else {
-                    alert("Error!  Status: " + e.status);
-                }
+            success: function (e) {
+                after_ajax(f);
+            },
+            fail: function (e) {
+                alert("Error!  Status: " + e.status);
             }
         });
         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

@@ -51,13 +51,11 @@ Blacklight.onLoad(function() {
 
   autocomplete_vocab.url_var = ['subject', 'language'];   // the url variable to pass to determine the vocab to attach to
   autocomplete_vocab.field_name = new Array(); // the form name to attach the event for autocomplete
-  autocomplete_vocab.add_btn_id = new Array(); // the id of the button pressed when adding an additional form element
 
   // loop over the autocomplete fields and attach the
   // events for autocomplete and create other array values for autocomplete
   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])
         // don't navigate away from the field on tab when selecting an item
@@ -68,19 +66,20 @@ Blacklight.onLoad(function() {
             }
         })
         .autocomplete( get_autocomplete_opts(autocomplete_vocab.url_var[i]) );
-
   }
 
 
-  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);
-    }
-    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 an auto complete based on the field
+  function setup_autocomplete(e, cloneElem) {
+    var $cloneElem = $(cloneElem);
+    // FIXME this code (comparing the id) depends on a bug. Each input has an id and the id is
+    // duplicated when you press the plus button. This is not valid html.
+    if ($cloneElem.attr("id") == 'generic_file_based_near') {
+      $cloneElem.autocomplete(cities_autocomplete_opts);
+    } else if ( (index = $.inArray($cloneElem.attr("id"), autocomplete_vocab.field_name)) != -1 ) {
+      $cloneElem.autocomplete(get_autocomplete_opts(autocomplete_vocab.url_var[index]));
     }
   }
 
-  $('form').multiForm({afterAdd: setup_autocomplete});
+  $('.multi_value.form-group').manage_fields({add: setup_autocomplete});
 });

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

@@ -9,33 +9,9 @@
    */
 
 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() {

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

@@ -15,8 +15,11 @@
 
 // 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';
+@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';
+@import 'hydra-editor/multi_value_fields';
 
 #browse-everything {
   top:10%;
@@ -35,6 +38,11 @@
   padding-top: 10px;
 }
 
+.profile img.orcid {
+  float: left;
+  margin-right: 2px;
+}
+
 /* This class is to workaround an issue in which Bootstrap requires a div to display a tooltip
  * on a disabled button. Using a span instead of a div would be ideal but unfortunately it does
  * not render the tooltip correctly in all browsers (e.g. in Chrome the tooltip is detected in

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

@@ -5,12 +5,6 @@
   top: 5px;
 }
 
-.form-horizontal .batch-group {
-  @extend .form-group;
-  margin-left: 0px;
-  margin-right: 0px;
-}
-
 #hide_addl_descriptions {
   margin-bottom: 10px;
 }
@@ -19,3 +13,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/_dashboard.scss

@@ -18,6 +18,16 @@
     background-color: $badge-background-color;
     color: $badge-font-color;
   }
+  .badge-optional {
+    background-color: $badge-optional-background-color;
+    border-radius: 2px;
+    color: $badge-font-color;
+    padding: 0 .25em;
+  }
+  .views-downloads-dashboard {
+    list-style-type: none;
+    padding-left: 0;
+  }
   .panel-default > .panel-heading {
     background-color: $panel-background-color;
   }

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

@@ -23,6 +23,7 @@ $teal: #2CAEB7;
 $vermilion: #F30;
 
 $badge-background-color: $highlight-yellow;
+$badge-optional-background-color: $gray-medium;
 $badge-font-color: $classic-white;
 $content-wrapper-background-color: $cream-light;
 $dashboard-background-color: $classic-white;

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

@@ -75,9 +75,11 @@ button {
   min-height: 4em;
 }
 
-.required-field {
-  color: red;
-  font-size: small;
+label.required, span.required {
+  abbr{
+    color: red;
+    font-size: small;
+  }
 }
 
 @media only screen and (min-width: 768px) {

data/app/controllers/batch_controller.rb

@@ -6,11 +6,8 @@ class BatchController < ApplicationController
   prepend_before_filter :normalize_identifier, only: [:edit, :show, :update, :destroy]
 
   def edit
-    @batch =  Batch.find_or_create(params[:id])
-    @generic_file = GenericFile.new
-    @generic_file.creator = [current_user.name]
-    @generic_file.title = @batch.generic_files.map(&:label)
-    @generic_file.initialize_fields
+    @batch = Batch.find_or_create(params[:id])
+    @form = edit_form
   end
 
   def update
@@ -18,13 +15,19 @@ class BatchController < ApplicationController
     @batch = Batch.find_or_create(params[:id])
     @batch.status = ["processing"]
     @batch.save
-    Sufia.queue.push(BatchUpdateJob.new(current_user.user_key, params))
+    file_attributes = Sufia::Forms::BatchEditForm.model_attributes(params[:generic_file])
+    Sufia.queue.push(BatchUpdateJob.new(current_user.user_key, params[:id], params[:title], file_attributes, params[:visibility]))
     flash[:notice] = 'Your files are being processed by ' + t('sufia.product_name') + ' in the background. The metadata and access controls you specified are being applied. Files will be marked <span class="label label-danger" title="Private">Private</span> until this process is complete (shouldn\'t take too long, hang in there!). You may need to refresh your dashboard to see these updates.'
     redirect_to sufia.dashboard_files_path
   end
 
   protected
 
+  def edit_form
+    generic_file = GenericFile.new(creator: [current_user.name], title: @batch.generic_files.map(&:label))
+    Sufia::Forms::BatchEditForm.new(generic_file)
+  end
+
   # override this method if you need to initialize more complex RDF assertions (b-nodes)
   def initialize_fields(file)
     file.initialize_fields