curation_concerns 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41288e2f6cac8f0a3b90f302c1a6cd838397c8ee
-  data.tar.gz: a599175e07b064de3cf19e081792343b08a21705
+  metadata.gz: f7cfdad9a9be43d5356653c2f33b2366241c07b8
+  data.tar.gz: fc51ce634c3532c0956d2822f8dcb36f381ab577
 SHA512:
-  metadata.gz: 4200cadf0561abed624775a1526e235a093ac006b2dbcc883fb5e80a1d3ed6eb2f33a7c363378529d348525d377d7d462581a15b8c415692f3305fd718f027e3
-  data.tar.gz: e5567ddae6fb5b4f9bb5949ea45ba8ab7f8e62fdfcd7c17c41275f2080425eb0614449c84ce2b45439d89ffac88095ddb2f5c9e2f6b51ba076ed6dc70eb47980
+  metadata.gz: 29f30a7c5a4d29c69b1feb098b918b1a5319025a8f38f811a3699745ace59c3fae94f2341e2950b3b4f134c7552e50ff1a85c02bc28e43b213c6cf5d16e80f93
+  data.tar.gz: df6588bfae1ec8231c6d39853f6bf22e9dfff09705e56d7390049631d5fcd969d2787414257ec35f2ef6c18aed154718408403420ae72a637bc79b03eafaad7d

data/.travis.yml

@@ -6,7 +6,9 @@ rvm:
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  - RAILS_VERSION=4.2.7
+  matrix:
+    - RAILS_VERSION=4.2.7
+    - RAILS_VERSION=5.0.0
 notifications:
   irc:
     channels:

data/Gemfile

@@ -46,3 +46,8 @@ else
 end
 # END ENGINE_CART BLOCK
 
+gem 'rails-controller-testing' if !ENV['RAILS_VERSION'] || ENV['RAILS_VERSION'] =~ /^5\./
+
+unless File.exist?(file)
+  eval_gemfile File.expand_path('spec/test_app_templates/Gemfile.extra', File.dirname(__FILE__))
+end

data/app/actors/curation_concerns/actors/actor_stack.rb

@@ -17,12 +17,14 @@ module CurationConcerns
         first_actor_class.new(curation_concern, user, inner_stack)
       end
 
-      def create(attributes)
-        actor.create(attributes.with_indifferent_access)
+      # @param [ActionController::Parameters,Hash,NilClass] new_attributes
+      def create(new_attributes)
+        actor.create(cast_to_indifferent_hash(new_attributes))
       end
 
-      def update(attributes)
-        actor.update(attributes.with_indifferent_access)
+      # @param [ActionController::Parameters,Hash,NilClass] new_attributes
+      def update(new_attributes)
+        actor.update(cast_to_indifferent_hash(new_attributes))
       end
 
       def destroy
@@ -33,6 +35,20 @@ module CurationConcerns
         end
         curation_concern.destroy
       end
+
+      private
+
+        # @param [ActionController::Parameters,Hash,NilClass] new_attributes
+        def cast_to_indifferent_hash(new_attributes)
+          new_attributes ||= {}
+          if new_attributes.respond_to?(:to_unsafe_h)
+            # This is the typical (not-ActionView::TestCase) code path.
+            new_attributes = new_attributes.to_unsafe_h
+          end
+          # In Rails 5 to_unsafe_h returns a HashWithIndifferentAccess, in Rails 4 it returns Hash
+          new_attributes = new_attributes.with_indifferent_access if new_attributes.instance_of? Hash
+          new_attributes
+        end
     end
   end
 end

data/app/actors/curation_concerns/actors/base_actor.rb

@@ -53,7 +53,7 @@ module CurationConcerns
         def apply_save_data_to_curation_concern(attributes)
           attributes[:rights] = Array(attributes[:rights]) if attributes.key? :rights
           remove_blank_attributes!(attributes)
-          curation_concern.attributes = attributes.symbolize_keys
+          curation_concern.attributes = attributes
           curation_concern.date_modified = CurationConcerns::TimeService.time_in_utc
         end
 

data/app/assets/javascripts/curation_concerns/boot.es6

@@ -0,0 +1,6 @@
+import FileManager from 'curation_concerns/file_manager'
+export class Initializer {
+  constructor() {
+    this.file_manager = new FileManager
+  }
+}

data/app/assets/javascripts/curation_concerns/curation_concerns.js

@@ -1,23 +1,23 @@
-//= require hydra-editor/hydra-editor
 //= require curation_concerns/facet_mine
 //= require curation_concerns/embargoes
 //= require curation_concerns/fileupload
-//= require curation_concerns/file_manager/affix
+//= require hydra-editor/hydra-editor
 //= require curation_concerns/file_manager/sorting
 //= require curation_concerns/file_manager/save_manager
 //= require curation_concerns/file_manager/member
 //= require curation_concerns/single_use_links_manager
 //= require curation_concerns/batch_select
 //= require curation_concerns/collections
-
+//= require curation_concerns/file_manager
+//= require curation_concerns/boot
 
 // Initialize plugins and Bootstrap dropdowns on jQuery's ready event as well as
 // Turbolinks's page change event.
 Blacklight.onLoad(function() {
+  cc = require('curation_concerns/boot')
   $('abbr').tooltip();
 
   $("[data-toggle='dropdown']").dropdown();
   $('a[data-toggle="popover"]').popover({ html: true })
-                                 .click(function() { return false });
-
+  window.curation_concerns = new cc.Initializer()
 });

data/app/assets/javascripts/curation_concerns/file_manager.es6

@@ -0,0 +1,41 @@
+import SaveManager from 'curation_concerns/file_manager/save_manager'
+import SortManager from 'curation_concerns/file_manager/sorting'
+import {FileManagerMember} from 'curation_concerns/file_manager/member'
+export default class FileManager {
+  constructor() {
+    this.save_manager = this.initialize_save_manager()
+    this.sorting()
+    this.save_affix()
+    this.member_tracking()
+  }
+
+  initialize_save_manager() {
+    return(new SaveManager)
+  }
+
+  sorting() {
+    window.new_sort_manager = new SortManager(this.save_manager)
+  }
+
+  save_affix() {
+    let tools = $("#file-manager-tools")
+    if(tools.length > 0) {
+      tools.affix({
+        offset: {
+          top: $("#file-manager-tools .actions").offset().top,
+          bottom: function() {
+            return $("#file-manager-extra-tools").outerHeight(true) + $("footer").outerHeight(true)
+          }
+        }
+      })
+    }
+  }
+
+  member_tracking() {
+    let sm = this.save_manager
+    $("li[data-reorder-id]").each(function(index, element) {
+      var manager_member = new FileManagerMember($(element), sm)
+      $(element).data("file_manager_member", manager_member)
+    })
+  }
+}

data/app/assets/javascripts/curation_concerns/file_manager/member.es6

@@ -1,10 +1,4 @@
-Blacklight.onLoad(function() {
-  $("li[data-reorder-id]").each(function(index, element) {
-    let manager_member = new FileManagerMember($(element), window.save_manager)
-    $(element).data("file_manager_member", manager_member)
-  })
-})
-class InputTracker {
+export class InputTracker {
   constructor(element, notifier) {
     this.element = element
     this.notifier = notifier
@@ -28,7 +22,7 @@ class InputTracker {
     }
   }
 }
-class FileManagerMember {
+export class FileManagerMember {
   constructor(element, save_manager) {
     this.element = element
     this.save_manager = save_manager

data/app/assets/javascripts/curation_concerns/file_manager/save_manager.es6

@@ -1,4 +1,4 @@
-class SaveManager {
+export default class SaveManager {
   constructor() {
     this.override_save_button()
     this.elements = []
@@ -66,5 +66,3 @@ class SaveManager {
     }
   }
 }
-
-window.save_manager = new SaveManager

data/app/assets/javascripts/curation_concerns/file_manager/sorting.es6

@@ -1,91 +1,85 @@
-{
-  Blacklight.onLoad(function() {
-    window.new_sort_manager = new SortManager
-  })
+export default class SortManager {
+  constructor(save_manager) {
+    this.element = $("#sortable")
+    this.sorting_info = {}
+    this.initialize_sort()
+    this.element.data("current-order", this.order)
+    this.save_manager = save_manager
+  }
 
-  class SortManager {
-    constructor() {
-      this.element = $("#sortable")
-      this.sorting_info = {}
-      this.initialize_sort()
-      this.element.data("current-order", this.order)
-      this.save_manager = window.save_manager
-    }
+  initialize_sort() {
+    this.element.sortable({handle: ".panel-heading"})
+    this.element.on("sortstop", this.stopped_sorting)
+    this.element.on("sortstart", this.started_sorting)
+  }
 
-    initialize_sort() {
-      this.element.sortable({handle: ".panel-heading"})
-      this.element.on("sortstop", this.stopped_sorting)
-      this.element.on("sortstart", this.started_sorting)
+  persist() {
+    let params = {}
+    params[this.singular_class_name] = {
+      "ordered_member_ids": this.order
     }
-
-    persist() {
-      let params = {}
-      params[this.singular_class_name] = {
-        "ordered_member_ids": this.order
-      }
-      params["_method"] = "PATCH"
-      this.element.addClass("pending")
-      this.element.removeClass("success")
+    params["_method"] = "PATCH"
+    this.element.addClass("pending")
+    this.element.removeClass("success")
+    this.element.removeClass("failure")
+    let persisting = $.post(
+      `/concern/${this.class_name}/${this.id}.json`,
+      params
+    ).done(() => {
+      this.element.data("current-order", this.order)
+      this.element.addClass("success")
       this.element.removeClass("failure")
-      let persisting = $.post(
-        `/concern/${this.class_name}/${this.id}`,
-        params
-      ).done(() => {
-        this.element.data("current-order", this.order)
-        this.element.addClass("success")
-        this.element.removeClass("failure")
-      }).fail(() => {
-        this.element.addClass("failure")
-        this.element.removeClass("success")
-      }).always(() => {
-        this.element.removeClass("pending")
-      })
-      return persisting
-    }
+    }).fail(() => {
+      this.element.addClass("failure")
+      this.element.removeClass("success")
+    }).always(() => {
+      this.element.removeClass("pending")
+    })
+    return persisting
+  }
 
-    get_sort_position(item) {
-      return this.element.children().index(item)
-    }
+  get_sort_position(item) {
+    return this.element.children().index(item)
+  }
 
-    get stopped_sorting() {
-      return (event, ui) => {
-        this.sorting_info.end = this.get_sort_position($(ui.item))
-        if(this.sorting_info.end == this.sorting_info.start) {
-          return
-        }
-        if(this.order.toString() != this.element.data("current-order").toString()) {
-          this.save_manager.push_changed(this)
-        } else {
-          this.save_manager.mark_unchanged(this)
-        }
+  get stopped_sorting() {
+    return (event, ui) => {
+      this.sorting_info.end = this.get_sort_position($(ui.item))
+      if(this.sorting_info.end == this.sorting_info.start) {
+        return
       }
-    }
-
-    get started_sorting() {
-      return (event, ui) => {
-        this.sorting_element = $(ui.item)
-        this.sorting_info.start = this.get_sort_position(ui.item)
+      if(this.order.toString() != this.element.data("current-order").toString()) {
+        this.save_manager.push_changed(this)
+      } else {
+        this.save_manager.mark_unchanged(this)
       }
     }
+  }
 
-    get id() {
-      return this.element.data("id")
+  get started_sorting() {
+    return (event, ui) => {
+      this.sorting_element = $(ui.item)
+      this.sorting_info.start = this.get_sort_position(ui.item)
     }
+  }
 
-    get class_name() {
-      return this.element.data("class-name")
-    }
+  get id() {
+    return this.element.data("id")
+  }
 
-    get singular_class_name() {
-      return this.element.data("singular-class-name")
-    }
+  get class_name() {
+    return this.element.data("class-name")
+  }
 
-    get order() {
-      return $("*[data-reorder-id]").map(
-        function() {
-          return $(this).data("reorder-id")
-        }
-      ).toArray()
-    }
+  get singular_class_name() {
+    return this.element.data("singular-class-name")
+  }
+
+  get order() {
+    return $("*[data-reorder-id]").map(
+      function() {
+        return $(this).data("reorder-id")
+      }
+    ).toArray()
   }
 }

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

@@ -197,7 +197,7 @@ module CurationConcerns
       #   search_field: 'all_fields'
       # @return <Hash> the inputs required for the collection member search builder
       def params_for_members_query
-        params.symbolize_keys.merge(q: params[:cq])
+        params.merge(q: params[:cq])
       end
 
       def collection_member_search_builder

data/app/controllers/concerns/curation_concerns/curation_concern_controller.rb

@@ -56,8 +56,6 @@ module CurationConcerns::CurationConcernController
       wants.html { presenter && parent_presenter }
       wants.json do
         # load and authorize @curation_concern manually because it's skipped for html
-        # This has to use #find instead of #load_instance_from_solr because
-        # we want to return values like file_set_ids in the json
         @curation_concern = _curation_concern_type.find(params[:id]) unless curation_concern
         authorize! :show, @curation_concern
         render :show, status: :ok
@@ -168,7 +166,9 @@ module CurationConcerns::CurationConcernController
     end
 
     def attributes_for_actor
-      form_class.model_attributes(params[hash_key_for_curation_concern])
+      raw_params = params[hash_key_for_curation_concern]
+      return unless raw_params
+      form_class.model_attributes(raw_params)
     end
 
     def hash_key_for_curation_concern

data/app/controllers/concerns/curation_concerns/file_sets_controller_behavior.rb

@@ -65,12 +65,7 @@ module CurationConcerns
     def show
       respond_to do |wants|
         wants.html { presenter }
-        wants.json do
-          # load and authorize @curation_concern manually because it's skipped for html
-          self.curation_concern ||= curation_concern_type.load_instance_from_solr(params[:id])
-          authorize! :show, curation_concern
-          render :show, status: :ok
-        end
+        wants.json { presenter }
         additional_response_formats(wants)
       end
     end
@@ -115,7 +110,10 @@ module CurationConcerns
         wants.html do
           redirect_to [main_app, curation_concern], notice: "The file #{view_context.link_to(curation_concern, [main_app, curation_concern])} has been updated."
         end
-        wants.json { render :show, status: :ok, location: polymorphic_path([main_app, curation_concern]) }
+        wants.json do
+          @presenter = show_presenter.new(curation_concern, current_ability)
+          render :show, status: :ok, location: polymorphic_path([main_app, curation_concern])
+        end
       end
     end
 

data/app/controllers/concerns/curation_concerns/single_use_links_controller_behavior.rb

@@ -1,6 +1,7 @@
 module CurationConcerns
   module SingleUseLinksControllerBehavior
     extend ActiveSupport::Concern
+    include Blacklight::SearchHelper
     included do
       class_attribute :show_presenter
       self.show_presenter = CurationConcerns::SingleUseLinkPresenter
@@ -18,12 +19,12 @@ module CurationConcerns
     end
 
     def create_download
-      @su = SingleUseLink.create itemId: params[:id], path: main_app.download_path(id: asset)
+      @su = SingleUseLink.create itemId: params[:id], path: main_app.download_path(id: params[:id])
       render text: curation_concerns.download_single_use_link_url(@su.downloadKey)
     end
 
     def create_show
-      @su = SingleUseLink.create itemId: params[:id], path: polymorphic_path([main_app, asset])
+      @su = SingleUseLink.create(itemId: params[:id], path: asset_show_path)
       render text: curation_concerns.show_single_use_link_url(@su.downloadKey)
     end
 
@@ -40,11 +41,11 @@ module CurationConcerns
     protected
 
       def authorize_user!
-        authorize! :edit, asset
+        authorize! :edit, params[:id]
       end
 
-      def asset
-        @asset ||= ActiveFedora::Base.load_instance_from_solr(params[:id])
+      def asset_show_path
+        polymorphic_path([main_app, fetch(params[:id]).last])
       end
   end
 end