sufia 6.0.0.rc2 → 6.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66e90cd7b7ad05dfa098aeaa54478231dadb82e7
-  data.tar.gz: ad0c57d24b26850de77ee710268983018abe0bca
+  metadata.gz: a67f16943a8f2a6992d93cd1b9a2f55a983864f9
+  data.tar.gz: a1ded0b6d953e9821b63b8662e4ade6d28444e93
 SHA512:
-  metadata.gz: e579cba46ffd2ed1e926e4b0948b7871cd768e22670338f9ffd5cb707e801df5e48be5b8859963675f55511630daac955e6a1e3e682b5ea542932d51fed059a1
-  data.tar.gz: 098a5f9024a5948189286035b180e8778de2bb2fc051929931f0fceb400633b94f11e9a6fa365691fd18c809a75db21e98ba86249bab6ad28e6c7406c6a026e7
+  metadata.gz: dbc993658fa74c21bf7413c5339aed88aa1235f7b3d964005182a1395d3c767dfa06679225f7ae964c75086b076837e064d0b0288c8d5dbd84768d8700c4a0de
+  data.tar.gz: 182feec8e0a68c2a11eecfbcd3f896d43018e891151be4b491e23b127c49511e7efe6bbdd39a095f18aeaef2391a68a5924f34b936f16f0222dcd916c3986320

data/.travis.yml

@@ -2,7 +2,11 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.1
+  - 2.2
+matrix:
+  include:
+    - rvm: 2.1
+      env: "RAILS_VERSION=4.1.8"
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
@@ -11,10 +15,6 @@ env:
     - "RAILS_VERSION=4.1.8"
     - "RAILS_VERSION=4.2.0"
 
-matrix:
-  allow_failures:
-    - env: "RAILS_VERSION=4.2.0"
-
 notifications:
   email:
     recipients:

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/SUFIA_VERSION

@@ -1 +1 @@
-6.0.0.rc2
+6.0.0.rc3

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

@@ -69,7 +69,7 @@ function batch_edit_init () {
                     if (typeof req.form === 'object') {
                         for (f in req.form) {
                             form_id = form[f];
-                            after_ajax(form_id);
+                            after_ajax(new BatchEditField($("#"+form_id)));
                         }
                     }
                     this.tid = setTimeout(function () {

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

@@ -136,30 +136,26 @@ Blacklight.onLoad(function() {
       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
-     addDestroyField(top);
-     showPermissionNote();
-     return false;
+  $('.remove_perm').on('click', function(evt) {
+       evt.preventDefault();
+       var top = $(this).parent().parent();
+       top.addClass('hidden'); // do not show the block
+       addDestroyField(top, $(this).attr('data-index'));
+       showPermissionNote();
   });
 
   function showPermissionNote() {
      $('#save_perm_note').removeClass('hidden');
   }
 
-  function addDestroyField(element) {
+  function addDestroyField(element, index) {
       $('<input>').attr({
           type: 'hidden',
-          name: 'generic_file[permissions_attributes][' + indexOf(element) + '][_destroy]',
+          name: 'generic_file[permissions_attributes][' + index + '][_destroy]',
           value: 'true'
       }).appendTo(element);
   }
 
-  function indexOf(element) {
-      return $('#file_permissions').parent().children().index(element) - 1;
-  }
-
 });
 
 // return the files visibility level (institution, open, restricted);

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

@@ -18,7 +18,7 @@
 @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/tinymce', 'sufia/proxy-rights';
 @import 'hydra-editor/multi_value_fields';
 
 #browse-everything {

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;
+  }
+}

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

@@ -14,6 +14,7 @@ $brown-light: #D2B48C;
 $classic-white: #FFF;
 $cream-light: #FCFBF7;
 $gray-dark: #333;
+$gray-med-dark: #888;
 $gray-medium: #CECDCD;
 $gray-light: #DDD;
 $gray-lighter: #E1E1E1;

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

@@ -82,6 +82,10 @@ label.required, span.required {
   }
 }
 
+label.disabled {
+  color: $gray-med-dark;
+}
+
 @media only screen and (min-width: 768px) {
   #masthead {
     min-height: 8em;

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

@@ -0,0 +1,14 @@
+
+.content_block_preview button {
+  margin-right: 1em;
+}
+
+.tinymce-form {
+  label {
+    margin: 1em 1em 1em 0;
+  }
+}
+
+.home_marketing_text #content_block_external_key {
+  color: black;
+}

data/app/controllers/batch_controller.rb

@@ -3,7 +3,6 @@ class BatchController < ApplicationController
   layout "sufia-one-column"
 
   before_filter :has_access?
-  prepend_before_filter :normalize_identifier, only: [:edit, :show, :update, :destroy]
 
   def edit
     @batch = Batch.find_or_create(params[:id])
@@ -18,7 +17,11 @@ class BatchController < ApplicationController
     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
+    if uploading_on_behalf_of? @batch
+      redirect_to sufia.dashboard_shares_path
+    else
+      redirect_to sufia.dashboard_files_path
+    end
   end
 
   protected
@@ -33,5 +36,11 @@ class BatchController < ApplicationController
     file.initialize_fields
   end
 
+  def uploading_on_behalf_of? batch
+    file = batch.generic_files.first
+    return false if file.nil? || file.on_behalf_of.blank?
+    current_user.user_key != file.on_behalf_of
+  end  
+
   ActiveSupport::Deprecation.deprecate_methods(BatchController, :initialize_fields)
 end

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

@@ -3,7 +3,7 @@
     extend ActiveSupport::Concern
 
     def build_breadcrumbs
-      if request.referer 
+      if request.referer
         trail_from_referer
       else
         default_trail
@@ -38,9 +38,8 @@
 
     def add_breadcrumb_for_action
       if /edit|stats/ =~ action_name && controller_name == "generic_files"
-        add_breadcrumb I18n.t("sufia.generic_file.browse_view"), sufia.generic_file_path(Sufia::Noid.noidify params["id"])
+        add_breadcrumb I18n.t("sufia.generic_file.browse_view"), sufia.generic_file_path(params["id"])
       end
     end
-
   end
 end

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

@@ -9,7 +9,6 @@ module Sufia
       include BlacklightAdvancedSearch::Controller
       include Sufia::Breadcrumbs
 
-      prepend_before_filter :normalize_identifier, except: [:index, :create, :new]
       before_filter :filter_docs_with_read_access!, except: :show
       before_filter :has_access?, except: :show
       before_filter :build_breadcrumbs, only: [:edit, :show]

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

@@ -8,8 +8,7 @@ module Sufia
       @contact_form = ContactForm.new(params[:contact_form])
       @contact_form.request = request
       # not spam and a valid form
-      logger.warn "*** MARK ***"
-      if @contact_form.deliver
+      if @contact_form.respond_to?(:deliver_now) ? @contact_form.deliver_now : @contact_form.deliver
         flash.now[:notice] = 'Thank you for your message!'
         after_deliver
         render :new

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

@@ -12,12 +12,6 @@ module Sufia::Controller
     user_signed_in? ? current_user.ability : super
   end
 
-  def normalize_identifier
-    # nop
-    # If you want to override you can do something like this:
-    # params[:id] = Sufia::Noid.namespaceize(params[:id])
-  end
-
   def render_404(exception)
     logger.error("Rendering 404 page due to exception: #{exception.inspect} - #{exception.backtrace if exception.respond_to? :backtrace}")
     render template: '/error/404', layout: "error", formats: [:html], status: 404
@@ -39,7 +33,7 @@ module Sufia::Controller
     return if action_name == "index" && controller_name == "mailbox"
     if user_signed_in?
       @notify_number = current_user.mailbox.inbox(unread: true).count
-      @batches = current_user.mailbox.inbox.map { |msg| msg.last_message.body[/<span id="(.*)"><a (href=|data-content=)(.*)/,1] }.select{ |val| !val.blank? }
+      @batches = current_user.mailbox.inbox.map { |msg| msg.last_message.body[/<span id="(.*)"><a (href=|data-content=|rel=)(.*)/,1] }.select{ |val| !val.blank? }
     end
   end
 

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

@@ -3,16 +3,11 @@ module Sufia
     extend ActiveSupport::Concern
     include Hydra::Controller::DownloadBehavior
 
-    included do
-      # moved check into the routine so we can handle the user with no access
-      prepend_before_filter :normalize_identifier
-    end
-
-    def datastream_name
-      if !params[:datastream_id] || params[:datastream_id] == self.class.default_content_dsid
+    def file_name
+      if !params[:file] || params[:file] == self.class.default_file_path
         params[:filename] || asset.label
       else
-        params[:datastream_id]
+        params[:file]
       end
     end
   end

data/app/controllers/concerns/sufia/files_controller/local_ingest_behavior.rb

@@ -10,9 +10,9 @@ module Sufia
       end
     end
 
-  
+
     private
-    
+
     def perform_local_ingest
       if Sufia.config.enable_local_ingest && current_user.respond_to?(:directory)
         if ingest_local_file
@@ -61,6 +61,5 @@ module Sufia
         Sufia.queue.push(IngestLocalFileJob.new(gf.id, current_user.directory, filename, current_user.user_key))
       end
     end
-    
   end # /FilesController::LocalIngestBehavior
 end # /Sufia

data/app/controllers/concerns/sufia/files_controller/upload_complete_behavior.rb

@@ -7,6 +7,5 @@ module Sufia
     def destroy_complete_path(params)
       Sufia::Engine.routes.url_helpers.dashboard_files_path
     end
-
   end # /FilesController::UploadCompleteBehavior
-end # /Sufia
+end # /Sufia

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

@@ -38,21 +38,18 @@ module Sufia
       before_filter :authenticate_user!, except: [:show, :citation, :stats]
       before_filter :has_access?, except: [:show]
       before_filter :build_breadcrumbs, only: [:show, :edit, :stats]
-      prepend_before_filter :normalize_identifier, except: [:index, :create, :new]
       load_resource only: [:audit]
       load_and_authorize_resource except: [:index, :audit]
     end
 
     # routed to /files/new
     def new
-      @batch_noid = Batch.create.noid
+      @batch_id = Batch.create.id
     end
 
     # routed to /files/:id/edit
     def edit
-      @form = edit_form
-      @groups = current_user.groups
-      @version_list = version_list
+      set_variables_for_edit_form
     end
 
     # routed to /files/:id/stats
@@ -119,7 +116,7 @@ module Sufia
     def update
       success = if wants_to_revert?
         update_version
-      elsif params.has_key? :filedata
+      elsif wants_to_upload_new_version?
         update_file
       elsif params.has_key? :generic_file
         update_metadata
@@ -131,16 +128,20 @@ module Sufia
         redirect_to sufia.edit_generic_file_path(tab: params[:redirect_tab]), notice:
           render_to_string(partial: 'generic_files/asset_updated_flash', locals: { generic_file: @generic_file })
       else
+        flash[:error] ||= 'Update was unsuccessful.'
+        set_variables_for_edit_form
         render action: 'edit'
       end
-    rescue => error
-      flash[:error] = error.message
-      logger.error "GenericFilesController::update rescued #{error.class}\n\t#{error.message}\n #{error.backtrace.join("\n")}\n\n"
-      render action: 'edit'
     end
 
     protected
 
+    def set_variables_for_edit_form
+      @form = edit_form
+      @groups = current_user.groups
+      @version_list = version_list
+    end
+
     def presenter
       Sufia::GenericFilePresenter.new(@generic_file)
     end
@@ -161,6 +162,13 @@ module Sufia
       params.has_key?(:revision) && params[:revision] != @generic_file.content.latest_version.label
     end
 
+    def wants_to_upload_new_version?
+      has_file_data = params.has_key?(:filedata)
+      on_version_tab = params[:redirect_tab] == 'versions'
+
+      has_file_data || (on_version_tab && !wants_to_revert?)
+    end
+
     def actor
       @actor ||= Sufia::GenericFile::Actor.new(@generic_file, current_user)
     end
@@ -170,7 +178,12 @@ module Sufia
     end
 
     def update_file
-      actor.update_content(params[:filedata], datastream_id)
+      if params[:filedata]
+        actor.update_content(params[:filedata], file_path)
+      else
+        flash[:error] = 'Please select a file.'
+        false
+      end
     end
 
     # this is provided so that implementing application can override this behavior and map params to different attributes
@@ -196,7 +209,7 @@ module Sufia
     def process_file(file)
       update_metadata_from_upload_screen
       actor.create_metadata(params[:batch_id])
-      if actor.create_content(file, file.original_filename, datastream_id)
+      if actor.create_content(file, file.original_filename, file_path, file.content_type)
         respond_to do |format|
           format.html {
             render 'jq_upload', formats: 'json', content_type: 'text/html'
@@ -225,8 +238,8 @@ module Sufia
 
     ActiveSupport::Deprecation.deprecate_methods(FilesControllerBehavior, :initialize_fields)
 
-    # The name of the datastream where we store the file data
-    def datastream_id
+    # The path of the fedora node where we store the file data
+    def file_path
       'content'
     end