hyrax 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ba1e774b9fb00e5c4384e30c0001161c3dac629
-  data.tar.gz: b3c1f51c995c1a56bbbeeb447dbd9d0c2f41161a
+  metadata.gz: 53d0448b486959ee94b0d0162e0c63ce940ba4e7
+  data.tar.gz: 24c811f8e483eb5de9a5cbb05b763cb45748e0ba
 SHA512:
-  metadata.gz: a7fede837b32421d36837ebea2aaec223fc81c89005009336cedf60fbf6e9605b726a30c8cbcbb17b3e30ebf23cdb80d7fe32aaf0ad3142882b45b50c6a88a24
-  data.tar.gz: d05a6e8047084d8de30add25123d815c634f6880ea37d6a0b681667ddb46bd7be8594f5b6722af92b25fd1b7678b86801fe6a2d9cc2c3c52d0de545b1566d121
+  metadata.gz: 8e52f858b31059312c2905af9000b0035424ac47589ff0d5c40a87d6e3b92fd94c35ee9b6456bbebee70fae3804841fcc66b6a913b64e2fb8f47dfad66e1449c
+  data.tar.gz: 16c3b93cdbebcd3c2cbdee9527db865e88d9ad635e46d32979bb337862023a2ecf1992babe2a7ac196510e01f539c5a663706725220b6699a281c94e306e2f95

data/.rubocop_todo.yml

@@ -153,7 +153,6 @@ RSpec/AnyInstance:
     - 'spec/controllers/hyrax/mailbox_controller_spec.rb'
     - 'spec/controllers/hyrax/stats_controller_spec.rb'
     - 'spec/controllers/hyrax/users_controller_spec.rb'
-    - 'spec/controllers/hyrax/transfers_controller_spec.rb'
     - 'spec/jobs/file_set_attached_event_job_spec.rb'
     - 'spec/jobs/content_update_event_job_spec.rb'
     - 'spec/jobs/content_restored_version_event_job_spec.rb'

data/README.md

@@ -59,7 +59,7 @@ If you have questions or need help, please email [the Hydra community tech list]
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v1.0.2__. If you are looking for instructions on installing a different
+v1.0.3__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -133,7 +133,7 @@ Rails requires that you have a JavaScript runtime -- for example, nodejs -- inst
 Generate a new Rails application using the template.
 
 ```
-rails new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v1.0.2/template.rb
+rails new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v1.0.3/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/app/assets/javascripts/hyrax/autocomplete.es6

@@ -12,7 +12,7 @@ export default class Autocomplete {
           element,
           data.autocompleteUrl,
           data.user,
-          data.id
+          element.data('exclude-work')
         )
         break
       default:

data/app/assets/javascripts/hyrax/batch_select.js

@@ -1,6 +1,6 @@
 Blacklight.onLoad(function () {
   $('input.submits-batches').on('click', function() {  
-      var form = $(this).closest("form"); 
+      var form = $(this).closest("form");
       $.map( $(".batch_document_selector:checked"), function(document, i) {
          var id = document.id.substring("batch_document_".length);
          if (form.children("input[value='"+id+"']").length == 0)

data/app/assets/javascripts/hyrax/collections.js

@@ -1,13 +1,12 @@
 Blacklight.onLoad(function () {
 
   // change the action based which collection is selected
-  $('input.updates-collection').on('click', function() {
- 
-      var form = $(this).closest("form"); 
-      var collection_id = $(".collection-selector:checked")[0].value;      
-      form[0].action = form[0].action.replace("collection_replace_id",collection_id);
+  // This expects the form to have a path that includes the string 'collection_replace_id'
+  $('[data-behavior="updates-collection"]').on('click', function() {
+      var string_to_replace = "collection_replace_id"
+      var form = $(this).closest("form");
+      var collection_id = $(".collection-selector:checked")[0].value;
+      form[0].action = form[0].action.replace(string_to_replace, collection_id);
       form.append('<input type="hidden" value="add" name="collection[members]"></input>');
-      
   });
-
 });

data/app/authorities/qa/authorities/find_works.rb

@@ -1,6 +1,8 @@
 module Qa::Authorities
   class FindWorks < Qa::Authorities::Base
     def search(_q, controller)
+      # The FindWorksSearchBuilder expects a current_user
+      return [] unless controller.current_user
       repo = CatalogController.new.repository
       builder = Hyrax::FindWorksSearchBuilder.new(controller)
       response = repo.search(builder)

data/app/controllers/concerns/hyrax/download_behavior.rb

@@ -39,7 +39,7 @@ module Hyrax
       # Hydra::Ability#download_permissions can't be used in this case because it assumes
       # that files are in a LDP basic container, and thus, included in the asset's uri.
       def authorize_download!
-        authorize! :read, params[asset_param_key]
+        authorize! :download, params[asset_param_key]
       rescue CanCan::AccessDenied
         redirect_to default_image
       end

data/app/controllers/concerns/hyrax/transfers_controller_behavior.rb

@@ -28,7 +28,8 @@ module Hyrax
       if @proxy_deposit_request.save
         redirect_to hyrax.transfers_path, notice: "Transfer request created"
       else
-        redirect_to root_url, alert: @proxy_deposit_request.errors.full_messages.to_sentence
+        @work = Hyrax::WorkRelation.new.find(params[:id])
+        render :new
       end
     end
 

data/app/forms/hyrax/forms/batch_edit_form.rb

@@ -41,7 +41,7 @@ module Hyrax
           permissions = []
           # For each of the files in the batch, set the attributes to be the concatenation of all the attributes
           batch_document_ids.each do |doc_id|
-            work = model_class.find(doc_id)
+            work = ActiveFedora::Base.find(doc_id)
             terms.each do |key|
               combined_attributes[key] ||= []
               combined_attributes[key] = (combined_attributes[key] + work[key].to_a).uniq

data/app/helpers/hyrax/hyrax_helper_behavior.rb

@@ -46,18 +46,6 @@ module Hyrax
       user_agent.include? 'Chrome'
     end
 
-    def error_messages_for(object)
-      return '' unless object.try(:errors) && object.errors.full_messages.any?
-      content_tag(:div, class: 'alert alert-block alert-error validation-errors') do
-        content_tag(:h4, I18n.t('hyrax.errors.header', model: object.class.model_name.human.downcase), class: 'alert-heading') +
-          content_tag(:ul) do
-            object.errors.full_messages.map do |message|
-              content_tag(:li, message)
-            end.join('').html_safe
-          end
-      end
-    end
-
     # @param [ProxyDepositRequest] req
     def show_transfer_request_title(req)
       if req.deleted_work? || req.canceled?

data/app/models/concerns/hyrax/ability.rb

@@ -19,6 +19,25 @@ module Hyrax
                              :trophy_abilities]
     end
 
+    # Samvera doesn't use download user/groups, so make it an alias to read
+    # Grant all groups with read or edit access permission to download
+    def download_groups(id)
+      doc = permissions_doc(id)
+      return [] if doc.nil?
+      groups = Array(doc[self.class.read_group_field]) + Array(doc[self.class.edit_group_field])
+      Rails.logger.debug("[CANCAN] download_groups: #{groups.inspect}")
+      groups
+    end
+
+    # Grant all users with read or edit access permission to download
+    def download_users(id)
+      doc = permissions_doc(id)
+      return [] if doc.nil?
+      users = Array(doc[self.class.read_user_field]) + Array(doc[self.class.edit_user_field])
+      Rails.logger.debug("[CANCAN] download_users: #{users.inspect}")
+      users
+    end
+
     # Returns true if can create at least one type of work
     def can_create_any_work?
       Hyrax.config.curation_concerns.any? do |curation_concern_type|
@@ -34,6 +53,18 @@ module Hyrax
 
     private
 
+      # This overrides hydra-head, (and restores the method from blacklight-access-controls)
+      def download_permissions
+        can :download, String do |id|
+          test_download(id)
+        end
+
+        can :download, SolrDocument do |obj|
+          cache.put(obj.id, obj)
+          test_download(obj.id)
+        end
+      end
+
       # Add this to your ability_logic if you want all logged in users to be able
       # to submit content
       def everyone_can_create_curation_concerns
@@ -142,7 +173,7 @@ module Hyrax
         alias_action :edit, to: :update
         alias_action :show, to: :read
         alias_action :discover, to: :read
-
+        can :download, String # The identifier of a work or FileSet
         can :manage, curation_concerns_models
         can :manage, Sipity::WorkflowResponsibility
       end

data/app/models/concerns/hyrax/collection_behavior.rb

@@ -56,30 +56,40 @@ module Hyrax
     # @return [Fixnum] size of collection in bytes
     # @raise [RuntimeError] unsaved record does not exist in solr
     def bytes
-      return 0 if member_ids.empty?
+      return 0 if member_object_ids.empty?
 
       raise "Collection must be saved to query for bytes" if new_record?
 
       # One query per member_id because Solr is not a relational database
-      sizes = member_ids.collect do |work_id|
+      member_object_ids.collect { |work_id| size_for_work(work_id) }.sum
+    end
+
+    private
+
+      # Use this query to get the ids of the member objects (since the containment
+      # association has been flipped)
+      def member_object_ids
+        return [] unless id
+        ActiveFedora::Base.search_with_conditions("member_of_collection_ids_ssim:#{id}").map(&:id)
+      end
+
+      # Calculate the size of all the files in the work
+      # @param work_id [String] identifer for a work
+      # @return [Integer] the size in bytes
+      def size_for_work(work_id)
         argz = { fl: "id, #{file_size_field}",
                  fq: "{!join from=#{member_ids_field} to=id}id:#{work_id}" }
         files = ::FileSet.search_with_conditions({}, argz)
         files.reduce(0) { |sum, f| sum + f[file_size_field].to_i }
       end
 
-      sizes.reduce(0, :+)
-    end
-
-    private
-
       # Field name to look up when locating the size of each file in Solr.
       # Override for your own installation if using something different
       def file_size_field
         Solrizer.solr_name(:file_size, Hyrax::FileSetIndexer::STORED_LONG)
       end
 
-      # Solr field name collections and works use to index member ids
+      # Solr field name works use to index member ids
       def member_ids_field
         Solrizer.solr_name('member_ids', :symbol)
       end

data/app/models/proxy_deposit_request.rb

@@ -64,7 +64,7 @@ class ProxyDepositRequest < ActiveRecord::Base
   end
 
   def sending_user_should_not_be_receiving_user
-    errors.add(:sending_user, 'must specify another user to receive the work') if receiving_user && receiving_user.user_key == sending_user.user_key
+    errors.add(:transfer_to, 'specify a different user to receive the work') if receiving_user && receiving_user.user_key == sending_user.user_key
   end
 
   def should_not_be_already_part_of_a_transfer

data/app/models/sipity/entity.rb

@@ -5,6 +5,13 @@ module Sipity
   #
   # The goal is to keep this behavior separate, so that we can possibly
   # extract the information.
+  # @example To get the Sipity::Entity for a work
+  #   work = GenericWork.first
+  #   work_global_id = work.to_global_id.to_s
+  #   => "gid://whatever/GenericWork/3x816m604"
+  #   Sipity::Entity.where(proxy_for_global_id: work_global_id).first
+  #   => #<Sipity::Entity id: 1, proxy_for_global_id: "gid://whatever/GenericWork/3x816m604",
+  # workflow_id: 8, workflow_state_id: 20, created_at: "2017-07-07 13:39:42", updated_at: "2017-07-07 13:39:42">
   class Entity < ActiveRecord::Base
     self.table_name = 'sipity_entities'
 

data/app/presenters/hyrax/collection_presenter.rb

@@ -51,7 +51,7 @@ module Hyrax
     end
 
     def total_items
-      @solr_document.fetch('member_ids_ssim', []).length
+      ActiveFedora::Base.where("member_of_collection_ids_ssim:#{id}").count
     end
   end
 end

data/app/search_builders/hyrax/find_works_search_builder.rb

@@ -8,7 +8,8 @@ class Hyrax::FindWorksSearchBuilder < Hyrax::SearchBuilder
   # Excludes the id that is part of the params
   def initialize(context)
     super(context)
-    @id = context.params[:id]
+    # Without an id this class will produce an invalid query.
+    @id = context.params[:id] || raise("missing required parameter: id")
     @q = context.params[:q]
   end
 

data/app/services/hyrax/microdata.rb

@@ -1,7 +1,7 @@
 module Hyrax
   class Microdata
     include Singleton
-    FILENAME = 'config/schema_org.yml'.freeze
+    FILENAME = Hyrax::Engine.root + 'config/schema_org.yml'
     TOP_KEY = 'schema_org'.freeze
 
     def self.fetch(key, options = {})

data/app/services/hyrax/persist_directly_contained_output_file_service.rb

@@ -5,22 +5,37 @@ module Hyrax
     # This method conforms to the signature of the .call method on Hydra::Derivatives::PersistOutputFileService
     # * Persists the file within the DirectContainer specified by :container
     #
-    # @param [String] the data to be persisted
-    # @param [Hash] directives directions which can be used to determine where to persist to.
+    # @param content [String] the data to be persisted
+    # @param directives [Hash] directions which can be used to determine where to persist to.
     # @option directives [String] url URI for the parent object.
     # @option directives [String] container Name of the container association.
-    def self.call(string, directives)
-      file = Hydra::Derivatives::IoDecorator.new(string, new_mime_type(directives.fetch(:format)))
-      o_name = determine_original_name(file)
-      m_type = determine_mime_type(file)
-      uri = URI(directives.fetch(:url))
-      raise ArgumentError, "#{uri} is not an http(s) uri" unless uri.is_a?(URI::HTTP)
-      file_set = ActiveFedora::Base.find(ActiveFedora::Base.uri_to_id(uri.to_s))
-      remote_file = file_set.send("build_#{directives.fetch(:container)}".to_sym)
+    def self.call(content, directives)
+      file = io(content, directives)
+      file_set = retrieve_file_set(directives)
+      remote_file = retrieve_remote_file(file_set, directives)
       remote_file.content = file
-      remote_file.mime_type = m_type
-      remote_file.original_name = o_name
+      remote_file.mime_type = determine_mime_type(file)
+      remote_file.original_name = determine_original_name(file)
       file_set.save
     end
+
+    # @param directives [Hash] directions which can be used to determine where to persist to.
+    # @option directives [String] url URI for the parent object.
+    def self.retrieve_file_set(directives)
+      uri = URI(directives.fetch(:url))
+      raise ArgumentError, "#{uri} is not an http(s) uri" unless uri.is_a?(URI::HTTP)
+      ActiveFedora::Base.find(ActiveFedora::Base.uri_to_id(uri.to_s))
+    end
+    private_class_method :retrieve_file_set
+
+    # Override this implementation if you need a remote file from a different location
+    # @param file_set [FileSet] the container of the remote file
+    # @param directives [Hash] directions which can be used to determine where to persist to
+    # @option directives [String] container Name of the container association.
+    # @return [ActiveFedora::File]
+    def self.retrieve_remote_file(file_set, directives)
+      file_set.send("build_#{directives.fetch(:container)}".to_sym)
+    end
+    private_class_method :retrieve_remote_file
   end
 end

data/app/services/hyrax/workflow/abstract_notification.rb

@@ -1,5 +1,27 @@
 module Hyrax
   module Workflow
+    # @abstract A notification that happens when a state transition occurs. Subclass AbstractNotification to create a notification.
+    # @example
+    #   module Hyrax
+    #     module Workflow
+    #       class LocalApprovedNotification < AbstractNotification
+    #         private
+    #
+    #           def subject
+    #             "Deposit #{title} has been approved"
+    #           end
+    #
+    #           def message
+    #             "#{title} (#{link_to work_id, document_path}) has been approved by #{user.display_name}  #{comment}"
+    #           end
+    #
+    #           # Add the user who initiated this action to the list of users being notified
+    #           def users_to_notify
+    #             super << user
+    #           end
+    #       end
+    #     end
+    #   end
     class AbstractNotification
       include ActionView::Helpers::UrlHelper
 
@@ -9,6 +31,12 @@ module Hyrax
 
       attr_reader :work_id, :title, :comment, :user, :recipients
 
+      # @param [Sipity::Entity] entity - the Sipity::Entity that is a proxy for the relevant Hyrax work
+      # @param [#comment] comment - the comment associated with the action being taken, could be a Sipity::Comment, or anything that responds to a #comment method
+      # @param [Hyrax::User] user - the user who has performed the relevant action
+      # @param [Hash] recipients - a hash with keys "to" and (optionally) "cc"
+      # @option recipients [Array<Hyrax::User>] :to a list of users to which to send the notification
+      # @option recipients [Array<Hyrax::User>] :cc a list of users to which to copy on the notification
       def initialize(entity, comment, user, recipients)
         @work_id = entity.proxy_for_global_id.sub(/.*\//, '')
         @title = entity.proxy_for.title.first

data/app/services/hyrax/workflow/permission_query.rb

@@ -257,8 +257,11 @@ module Hyrax
             .and(entity_responsibilities[:entity_id].eq(entity.id))
         )
 
-        # PostgreSQL requires an explicit cast from string to integer
-        cast = Arel::Nodes::NamedFunction.new "CAST", [agent_table[:proxy_for_id].as("integer")]
+        # Default to "integer" for adapters like Postgres and Sqlite, but cast
+        # to "signed" for Mysql. The type CAST causes a SQL syntax error for an
+        # unsupported type depending on which adapter is being used.
+        type = ActiveRecord::Base.connection.adapter_name.casecmp("mysql2").zero? ? "signed" : "integer"
+        cast = Arel::Nodes::NamedFunction.new "CAST", [agent_table[:proxy_for_id].as(type)]
 
         sub_query_for_user = agent_table.project(cast).where(
           agent_table[:id].in(workflow_agent_id_subquery)

data/app/views/hyrax/base/_browse_everything.html.erb

@@ -3,4 +3,4 @@
 </div>
 <%= button_tag(t('hyrax.upload.browse_everything.browse_files_button'), type: 'button', class: 'btn btn-lg btn-success', id: "browse-btn",
   'data-toggle' => 'browse-everything', 'data-route' => browse_everything_engine.root_path,
-  'data-target' => "##{f.object.persisted? ? 'edit' : 'new'}_#{f.object.model.model_name.param_key}" ) %>
+  'data-target' => "#{f.object.persisted? ? "#edit_#{f.object.model.model_name.param_key}_#{f.object.model.id}" : "#new_#{f.object.model.model_name.param_key}"}" ) %>

data/app/views/hyrax/batch_uploads/_form.html.erb

@@ -1,4 +1,9 @@
-<%= simple_form_for [hyrax, @form], html: { multipart: true } do |f| %>
+<%= simple_form_for [hyrax, @form],
+                    html: {
+                      data: { behavior: 'work-form',
+                              'param-key' => @form.model_name.param_key },
+                      multipart: true
+                    } do |f| %>
   <% content_for :files_tab do %>
     <p class="instructions"><%= t("hyrax.batch_uploads.files.instructions") %></p>
     <p class="switch-upload-type"><%= t("hyrax.batch_uploads.files.upload_type_instructions") %>

data/app/views/hyrax/collections/_button_for_update_collection.html.erb

@@ -1,4 +1,7 @@
 <%# button for updating a collections %>
 <%# collection_id -- collection to be updated (use 'collection_replace_id' if you wish the form to be updated by a form value) %>
 <%# label -- button label %>
-<%= button_to label, collection_path(collection_id), method: :put, class: "btn btn-primary updates-collection submits-batches collection-update", 'data-behavior'=>'hydra-collections', id: 'hydra-collection-update' %>
+<%= button_to label, collection_path(collection_id),
+              method: :put,
+              class: "btn btn-primary submits-batches",
+              data: { behavior: 'updates-collection' } %>

data/app/views/hyrax/transfers/new.html.erb

@@ -1,23 +1,11 @@
 <h1>Transfer ownership of "<%= @proxy_deposit_request.to_s %>"</h1>
 <span class="sr-only">Select a user to transfer <%= @proxy_deposit_request.to_s %> to, add optional comments and then press transfer.</span>
-<%= form_for @proxy_deposit_request,
-             url: hyrax.work_transfers_path(@work),
-             html: { class: 'form-horizontal', id: 'new_transfer' } do |f| %>
-  <%= error_messages_for(f.object) %>
-  <div class="control-group">
-    <%= f.label :transfer_to, "User", class: 'control-label' %>
-    <div class="controls">
-      <%= f.text_field :transfer_to, "aria-hidden" => true %>
-    </div>
-  </div>
-  <div class="control-group">
-    <%= f.label :sender_comment, "Comments", class: 'control-label' %>
-    <div class="controls">
-    <%= f.text_area :sender_comment %>
-    </div>
-  </div>
+<%= simple_form_for @proxy_deposit_request,
+             url: hyrax.work_transfers_path(@work) do |f| %>
+  <%= f.input :transfer_to %>
+  <%= f.input :sender_comment %>
 
   <div class="form-actions">
-    <%= f.submit "Transfer", class: 'btn btn-primary', data: {confirm: "Are you sure you want to transfer ownership of this work to another user? Click Ok to transfer or Cancel to return to the transfer screen"} %>
+    <%= f.submit class: 'btn btn-primary', data: { confirm: t('.confirm') } %>
   </div>
 <% end %>

data/config/locales/hyrax.en.yml

@@ -42,6 +42,8 @@ en:
         update: 'Save'
       hyrax_permission_template_access:
         create: 'Add'
+      proxy_deposit_request:
+        create: 'Transfer'
       update: 'Save'
   hyrax:
     account_label:      "User"
@@ -568,6 +570,9 @@ en:
         menu: "Works"
         my: "My Works"
         new: "New Work"
+    transfers:
+      new:
+        confirm: "Are you sure you want to transfer ownership of this work to another user? Click Ok to transfer or Cancel to return to the transfer screen"
     upload:
       alert:
         contact_href_text: "contact form"
@@ -728,5 +733,8 @@ en:
         visibility_after_lease:    'then restrict it to'
         visibility_during_embargo: 'Restricted to'
         visibility_during_lease:   'Is available for'
+      proxy_deposit_request:
+        transfer_to:              "User"
+        sender_comment:           "Comments"
     required:
       html: '<span class="label label-info required-tag">required</span>'

data/config/locales/hyrax.es.yml

@@ -42,6 +42,8 @@ es:
         update: 'Guardar'
       hyrax_permission_template_access:
         create: 'Agregar'
+      proxy_deposit_request:
+        create: 'Transferir'
       update: 'Guardar'
   hyrax:
     account_label:      "Usuario"
@@ -567,6 +569,9 @@ es:
         menu: "Trabajos"
         my: "Mis Trabajos"
         new: "Nuevo"
+    transfers:
+      new:
+        confirm: "¿Está seguro de que desea transferir la propiedad de este trabajo a otro usuario? Haga clic en Aceptar para transferir o Cancelar para volver a la pantalla de transferencia"
     upload:
       alert:
         contact_href_text: "formulario de contacto"
@@ -727,5 +732,8 @@ es:
         visibility_after_lease:    'luego restringirlo a'
         visibility_during_embargo: 'Restringido a'
         visibility_during_lease:   'Está disponible para'
+      proxy_deposit_request:
+        transfer_to:               "Usuario"
+        sender_comment:            "Comentarios"
     required:
       html: '<span class="label label-info required-tag">obligatorio</span>'

data/config/locales/hyrax.zh.yml

@@ -53,6 +53,8 @@ zh:
         update: '保存'
       hyrax_permission_template_access:
         create: '添加'
+      proxy_deposit_request:
+        create: '转让'
       update: '保存'
   hyrax:
     account_label:  "用户"
@@ -578,6 +580,9 @@ zh:
         logout: "退出登录"
         sr_action: "阅览"
         sr_target: "个人资料"
+    transfers:
+      new:
+        confirm: "您确定要将此作品的所有权转让给其他使用者吗？ 单击确定转移或取消返回到传输屏幕"
     upload:
       alert:
         contact_href_text: "联系表格"
@@ -726,5 +731,8 @@ zh:
         visibility_after_lease:    '仅限'
         visibility_during_embargo: '仅限'
         visibility_during_lease:   '可使用'
+      proxy_deposit_request:
+        transfer_to:               "用户"
+        sender_comment:            "注释"
     required:
       html: '<span class="label label-info required-tag">需要的</span>'

data/hyrax.gemspec

@@ -6,9 +6,16 @@ require 'hyrax/version'
 Gem::Specification.new do |spec|
   spec.authors       = ["Justin Coyne", 'Michael J. Giarlo', "Carolyn Cole", "Matt Zumwalt", 'Jeremy Friesen', 'Trey Pendragon', 'Esmé Cowles']
   spec.email         = ["jcoyne85@stanford.edu", 'mjgiarlo@stanford.edu', 'cam156@psu.edu', 'matt@databindery.com', "jeremy.n.friesen@gmail.com", 'tpendragon@princeton.edu', 'escowles@ticklefish.org']
-  spec.description   = 'Hyrax is a featureful Hydra front-end based on the latest and greatest Hydra software components.'
-  spec.summary       = "Hyrax is a front-end based on the robust Hydra framework, providing a user interface for common repository features. Hyrax offers the ability to create repository object types on demand, to deposit content via multiple workflows, and to describe content with flexible metadata. Numerous optional features may be turned on in the administrative dashboard or added through plugins."
-  spec.homepage      = "http://github.com/projecthydra-labs/hyrax"
+  spec.description   = 'Hyrax is a featureful Samvera front-end based on the latest and greatest Samvera software components.'
+  spec.summary       = <<-EOF
+  Hyrax is a front-end based on the robust Samvera framework, providing a user
+  interface for common repository features. Hyrax offers the ability to create
+  repository object types on demand, to deposit content via multiple workflows,
+  and to describe content with flexible metadata. Numerous optional features may
+  be turned on in the administrative dashboard or added through plugins.
+EOF
+
+  spec.homepage      = "http://github.com/samvera/hyrax"
 
   spec.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}).map { |f| File.basename(f) }
@@ -16,11 +23,12 @@ Gem::Specification.new do |spec|
   spec.name          = "hyrax"
   spec.require_paths = ["lib"]
   spec.version       = Hyrax::VERSION
-  spec.license       = 'Apache2'
+  spec.license       = 'Apache-2.0'
 
   spec.add_dependency 'hydra-head', '>= 10.4.0'
   spec.add_dependency 'hydra-editor', '~> 3.2'
   spec.add_dependency 'hydra-works', '~> 0.16'
+  spec.add_dependency 'hydra-derivatives', '~> 3.3'
   spec.add_dependency 'browse-everything', '>= 0.10.5'
   spec.add_dependency 'blacklight', '~> 6.9'
   spec.add_dependency 'blacklight-gallery', '~> 0.7'
@@ -59,7 +67,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'active_attr', '~> 0.9'
   spec.add_dependency 'redlock', '~> 0.1.2'
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'
-  spec.add_dependency 'active-fedora', '>= 11.1.3'
+  spec.add_dependency 'active-fedora', '>= 11.3.1'
+  spec.add_dependency 'linkeddata' # Required for getting values from geonames
 
   spec.add_development_dependency 'engine_cart', '~> 1.0'
   spec.add_development_dependency 'mida', '~> 0.3'

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

data/spec/abilities/ability_spec.rb

@@ -43,6 +43,7 @@ describe 'Hyrax::Ability', type: :model do
     it { is_expected.to be_able_to(:update, ContentBlock) }
     it { is_expected.to be_able_to(:read, ContentBlock) }
     it { is_expected.to be_able_to(:read, Hyrax::Statistics) }
+    it { is_expected.to be_able_to(:download, 'abcd123') } # an id for a work/FileSet
     it { is_expected.to be_able_to(:read, :admin_dashboard) }
     it { is_expected.to be_able_to(:manage, AdminSet) }
     it { is_expected.to be_able_to(:create, AdminSet) }

data/spec/controllers/hyrax/downloads_controller_spec.rb

@@ -31,7 +31,7 @@ describe Hyrax::DownloadsController do
       end
 
       it 'authorizes the resource using only the id' do
-        expect(controller).to receive(:authorize!).with(:read, file_set.id)
+        expect(controller).to receive(:authorize!).with(:download, file_set.id)
         get :show, params: { id: file_set.to_param }
       end
     end
@@ -55,6 +55,7 @@ describe Hyrax::DownloadsController do
 
           it 'sends requested file content' do
             get :show, params: { id: file_set, file: 'thumbnail' }
+            expect(response).to be_success
             expect(response.body).to eq content
             expect(response.headers['Content-Length']).to eq "4218"
             expect(response.headers['Accept-Ranges']).to eq "bytes"

data/spec/controllers/hyrax/transfers_controller_spec.rb

@@ -71,7 +71,6 @@ describe Hyrax::TransfersController, type: :controller do
     describe "#create" do
       let(:work) { create(:work, user: user) }
       it "is successful" do
-        allow_any_instance_of(User).to receive(:display_name).and_return("Jill Z. User")
         expect do
           post :create, params: {
             id: work.id,
@@ -99,7 +98,8 @@ describe Hyrax::TransfersController, type: :controller do
           post :create, params: { id: work.id, proxy_deposit_request: { transfer_to: 'foo' } }
         end.not_to change(ProxyDepositRequest, :count)
         expect(assigns[:proxy_deposit_request].errors[:transfer_to]).to eq(['must be an existing user'])
-        expect(response).to redirect_to(root_path)
+        expect(assigns[:work]).to be_instance_of GenericWork
+        expect(response).to be_success
       end
     end
 

data/spec/features/ownership_transfer_spec.rb

@@ -20,8 +20,8 @@ RSpec.describe 'Transferring work ownership:', type: :feature do
 
     context 'To myself' do
       before { transfer_ownership_of_work work, original_owner }
-      it 'Displays an appropriate error message' do
-        expect(page).to have_content 'Sending user must specify another user to receive the work'
+      it 'displays an appropriate error message' do
+        expect(page).to have_content 'specify a different user to receive the work'
       end
     end
 
@@ -94,6 +94,6 @@ RSpec.describe 'Transferring work ownership:', type: :feature do
     new_owner_search_field.set new_owner.user_key
     new_owner_search_result.click
     fill_in 'proxy_deposit_request[sender_comment]', with: 'Work transfer comments'
-    submit_button.click
+    click_button "Transfer"
   end
 end

data/spec/features/work_show_spec.rb

@@ -5,7 +5,14 @@ describe "display a work as its owner" do
   end
 
   context "as the work owner" do
-    let(:work) { create(:work_with_one_file, title: ["Magnificent splendor"], source: ["The Internet"], based_near: ["USA"], user: user) }
+    let(:work) do
+      create(:work_with_one_file,
+             with_admin_set: true,
+             title: ["Magnificent splendor"],
+             source: ["The Internet"],
+             based_near: ["USA"],
+             user: user)
+    end
     let(:user) { create(:user) }
     before do
       sign_in user

data/spec/forms/hyrax/forms/batch_edit_form_spec.rb

@@ -15,22 +15,26 @@ RSpec.describe Hyrax::Forms::BatchEditForm do
            related_url: ['related_url1']
   end
 
+  # Using a different work type in order to show that the form supports
+  # batches containing multiple types of works
   let(:work2) do
-    create :generic_work,
-           title: ["title 2"],
-           keyword: ["123"],
-           creator: ["Fred"],
-           publisher: ['Rand McNally'],
-           language: ['en'],
-           resource_type: ['bar'],
-           contributor: ['contributor2'],
-           description: ['description2'],
-           rights: ['rights2'],
-           subject: ['subject2'],
-           identifier: ['id2'],
-           based_near: ['based_near2'],
-           related_url: ['related_url2']
+    RareBooks::Atlas.create!(
+      title: ["title 2"],
+      keyword: ["123"],
+      creator: ["Fred"],
+      publisher: ['Rand McNally'],
+      language: ['en'],
+      resource_type: ['bar'],
+      contributor: ['contributor2'],
+      description: ['description2'],
+      rights: ['rights2'],
+      subject: ['subject2'],
+      identifier: ['id2'],
+      based_near: ['based_near2'],
+      related_url: ['related_url2']
+    )
   end
+
   let(:batch) { [work1.id, work2.id] }
   let(:form) { described_class.new(model, ability, batch) }
   let(:ability) { Ability.new(user) }

data/spec/models/proxy_deposit_request_spec.rb

@@ -124,7 +124,7 @@ describe ProxyDepositRequest, type: :model do
       it 'raises an error' do
         subject.transfer_to = sender.user_key
         expect(subject).not_to be_valid
-        expect(subject.errors[:sending_user]).to eq(['must specify another user to receive the work'])
+        expect(subject.errors[:transfer_to]).to eq(['specify a different user to receive the work'])
       end
     end
 

data/spec/presenters/hyrax/collection_presenter_spec.rb

@@ -75,12 +75,12 @@ describe Hyrax::CollectionPresenter do
     it { is_expected.to eq ['adc12v'] }
   end
 
-  describe "#size" do
+  describe "#size", :clean_repo do
     subject { presenter.size }
     it { is_expected.to eq '0 Bytes' }
   end
 
-  describe "#total_items" do
+  describe "#total_items", :clean_repo do
     subject { presenter.total_items }
 
     context "empty collection" do
@@ -88,13 +88,19 @@ describe Hyrax::CollectionPresenter do
     end
 
     context "collection with work" do
-      let(:work) { build(:work, title: ['unimaginitive title']) }
-      before { collection.members << work }
+      let(:work) { create(:work, title: ['unimaginitive title']) }
+
+      before do
+        work.member_of_collections << collection
+        work.save!
+      end
+
       it { is_expected.to eq 1 }
     end
 
     context "null members" do
-      let(:presenter) { described_class.new({}, nil) }
+      let(:presenter) { described_class.new(SolrDocument.new(id: '123'), nil) }
+
       it { is_expected.to eq 0 }
     end
   end

data/spec/services/hyrax/persist_directly_contained_output_file_service_spec.rb

@@ -2,17 +2,19 @@ require 'spec_helper'
 
 RSpec.describe Hyrax::PersistDirectlyContainedOutputFileService do
   # PersistDirectlyContainedOutputFileService is used by FullTextExtract.output_file_service
-  let(:object) { FileSet.create! { |fs| fs.apply_depositor_metadata('justin') } }
-  let(:stream) { "fake file content" }
+  let(:file_set) { FileSet.create! { |fs| fs.apply_depositor_metadata('justin') } }
+  let(:content) { "fake file content" }
   subject(:call) do
-    described_class.call(stream,
+    described_class.call(content,
                          format: 'txt',
-                         url: object.uri,
+                         url: file_set.uri,
                          container: 'extracted_text')
   end
+  let(:resource) { file_set.reload.extracted_text }
 
   it "persists the file to the specified destination on the given object" do
     expect(call).to be true
-    expect(object.reload.extracted_text.content).to eq("fake file content")
+    expect(resource.content).to eq("fake file content")
+    expect(resource.content.encoding).to eq(Encoding::UTF_8)
   end
 end

data/spec/support/selectors.rb

@@ -23,12 +23,6 @@ module Selectors
         find '.select2-result-selectable'
       end
     end
-
-    def submit_button
-      within '#new_transfer' do
-        find 'input[type=submit]'
-      end
-    end
   end
 
   module Transfers

data/spec/views/hyrax/base/_browse_everything.html.erb_spec.rb

@@ -9,5 +9,6 @@ describe 'hyrax/base/_browse_everything.html.erb', type: :view do
     render 'hyrax/base/browse_everything', f: f
     page = Capybara::Node::Simple.new(rendered)
     expect(page).to have_selector('div.alert-success', text: /Please note that if you upload a large number of files/i, count: 1)
+    expect(page).to have_selector("button[id='browse-btn'][data-target='#edit_generic_work_#{form.model.id}']")
   end
 end

data/spec/views/hyrax/batch_edits/edit.html.erb_spec.rb

@@ -4,7 +4,7 @@ describe 'hyrax/batch_edits/edit.html.erb', type: :view do
   let(:form) { Hyrax::Forms::BatchEditForm.new(generic_work, nil, batch) }
 
   before do
-    allow(GenericWork).to receive(:find).and_return(generic_work)
+    allow(ActiveFedora::Base).to receive(:find).and_return(generic_work)
 
     # this prevents AF from hitting Fedora (permissions is a related object)
     allow(generic_work).to receive(:permissions_attributes=)

data/spec/views/hyrax/batch_uploads/_form.html.erb_spec.rb

@@ -18,6 +18,8 @@ describe 'hyrax/batch_uploads/_form.html.erb', type: :view do
 
   it "draws the page" do
     expect(page).to have_selector("form[action='/batch_uploads']")
+    expect(page).to have_selector("form[action='/batch_uploads'][data-behavior='work-form']")
+    expect(page).to have_selector("form[action='/batch_uploads'][data-param-key='batch_upload_item']")
     # No title, because it's captured per file (e.g. Display label)
     expect(page).not_to have_selector("input#generic_work_title")
     expect(view.content_for(:files_tab)).to have_link("New Work", href: "/concern/generic_works/new")

data/template.rb

@@ -1,4 +1,4 @@
-gem 'hyrax', '1.0.0.rc2'
+gem 'hyrax', '1.0.3'
 
 run 'bundle install'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.16'
+- !ruby/object:Gem::Dependency
+  name: hydra-derivatives
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: browse-everything
   requirement: !ruby/object:Gem::Requirement
@@ -614,14 +628,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.1.3
+        version: 11.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 11.3.1
+- !ruby/object:Gem::Dependency
+  name: linkeddata
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.1.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -908,8 +936,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Hyrax is a featureful Hydra front-end based on the latest and greatest
-  Hydra software components.
+description: Hyrax is a featureful Samvera front-end based on the latest and greatest
+  Samvera software components.
 email:
 - jcoyne85@stanford.edu
 - mjgiarlo@stanford.edu
@@ -2543,9 +2571,9 @@ files:
 - vendor/assets/javascripts/webcomponentsjs/0.5.4/CustomElements.min.js
 - vendor/assets/stylesheets/morris.js/0.5.1/morris.css
 - vendor/assets/stylesheets/sharing_buttons.css
-homepage: http://github.com/projecthydra-labs/hyrax
+homepage: http://github.com/samvera/hyrax
 licenses:
-- Apache2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -2563,10 +2591,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
-summary: Hyrax is a front-end based on the robust Hydra framework, providing a user
+summary: Hyrax is a front-end based on the robust Samvera framework, providing a user
   interface for common repository features. Hyrax offers the ability to create repository
   object types on demand, to deposit content via multiple workflows, and to describe
   content with flexible metadata. Numerous optional features may be turned on in the