hyrax 3.0.0.pre.beta1 → 3.0.0.pre.beta2

data/app/models/concerns/hyrax/solr_document/characterization.rb

@@ -3,27 +3,27 @@ module Hyrax
     # TODO: aside from height and width, I don't think any of these other terms are indexed by default. - Justin 3/2016
     module Characterization
       def byte_order
-        self[Solrizer.solr_name("byte_order")]
+        self[ActiveFedora.index_field_mapper.solr_name("byte_order")]
       end
 
       def capture_device
-        self[Solrizer.solr_name("capture_device")]
+        self[ActiveFedora.index_field_mapper.solr_name("capture_device")]
       end
 
       def color_map
-        self[Solrizer.solr_name("color_map")]
+        self[ActiveFedora.index_field_mapper.solr_name("color_map")]
       end
 
       def color_space
-        self[Solrizer.solr_name("color_space")]
+        self[ActiveFedora.index_field_mapper.solr_name("color_space")]
       end
 
       def compression
-        self[Solrizer.solr_name("compression")]
+        self[ActiveFedora.index_field_mapper.solr_name("compression")]
       end
 
       def gps_timestamp
-        self[Solrizer.solr_name("gps_timestamp")]
+        self[ActiveFedora.index_field_mapper.solr_name("gps_timestamp")]
       end
 
       def height
@@ -31,31 +31,31 @@ module Hyrax
       end
 
       def image_producer
-        self[Solrizer.solr_name("image_producer")]
+        self[ActiveFedora.index_field_mapper.solr_name("image_producer")]
       end
 
       def latitude
-        self[Solrizer.solr_name("latitude")]
+        self[ActiveFedora.index_field_mapper.solr_name("latitude")]
       end
 
       def longitude
-        self[Solrizer.solr_name("longitude")]
+        self[ActiveFedora.index_field_mapper.solr_name("longitude")]
       end
 
       def orientation
-        self[Solrizer.solr_name("orientation")]
+        self[ActiveFedora.index_field_mapper.solr_name("orientation")]
       end
 
       def profile_name
-        self[Solrizer.solr_name("profile_name")]
+        self[ActiveFedora.index_field_mapper.solr_name("profile_name")]
       end
 
       def profile_version
-        self[Solrizer.solr_name("profile_version")]
+        self[ActiveFedora.index_field_mapper.solr_name("profile_version")]
       end
 
       def scanning_software
-        self[Solrizer.solr_name("scanning_software")]
+        self[ActiveFedora.index_field_mapper.solr_name("scanning_software")]
       end
 
       def width
@@ -63,43 +63,43 @@ module Hyrax
       end
 
       def format_label
-        self[Solrizer.solr_name("format_label")]
+        self[ActiveFedora.index_field_mapper.solr_name("format_label")]
       end
 
       def file_size
-        self[Solrizer.solr_name("file_size")]
+        self[ActiveFedora.index_field_mapper.solr_name("file_size")]
       end
 
       def filename
-        self[Solrizer.solr_name("filename")]
+        self[ActiveFedora.index_field_mapper.solr_name("filename")]
       end
 
       def well_formed
-        self[Solrizer.solr_name("well_formed")]
+        self[ActiveFedora.index_field_mapper.solr_name("well_formed")]
       end
 
       def page_count
-        self[Solrizer.solr_name("page_count")]
+        self[ActiveFedora.index_field_mapper.solr_name("page_count")]
       end
 
       def file_title
-        self[Solrizer.solr_name("file_title")]
+        self[ActiveFedora.index_field_mapper.solr_name("file_title")]
       end
 
       def duration
-        self[Solrizer.solr_name("duration")]
+        self[ActiveFedora.index_field_mapper.solr_name("duration")]
       end
 
       def sample_rate
-        self[Solrizer.solr_name("sample_rate")]
+        self[ActiveFedora.index_field_mapper.solr_name("sample_rate")]
       end
 
       def last_modified
-        self[Solrizer.solr_name("last_modified")]
+        self[ActiveFedora.index_field_mapper.solr_name("last_modified")]
       end
 
       def original_checksum
-        self[Solrizer.solr_name("original_checksum")]
+        self[ActiveFedora.index_field_mapper.solr_name("original_checksum")]
       end
     end
   end

data/app/models/concerns/hyrax/solr_document/metadata.rb

@@ -10,7 +10,7 @@ module Hyrax
         end
 
         def solr_name(*args)
-          Solrizer.solr_name(*args)
+          ActiveFedora.index_field_mapper.solr_name(*args)
         end
       end
 
@@ -66,6 +66,7 @@ module Hyrax
         attribute :source, Solr::Array, solr_name('source')
         attribute :date_created, Solr::Array, solr_name('date_created')
         attribute :rights_statement, Solr::Array, solr_name('rights_statement')
+        attribute :rights_notes, Solr::Array, solr_name('rights_notes')
 
         attribute :mime_type, Solr::String, solr_name('mime_type', :stored_sortable)
         attribute :workflow_state, Solr::String, solr_name('workflow_state_name', :symbol)
@@ -77,7 +78,7 @@ module Hyrax
         attribute :thumbnail_path, Solr::String, CatalogController.blacklight_config.index.thumbnail_field
         attribute :label, Solr::String, solr_name('label')
         attribute :file_format, Solr::String, solr_name('file_format')
-        attribute :suppressed?, Solr::String, solr_name('suppressed', Solrizer::Descriptor.new(:boolean, :stored, :indexed))
+        attribute :suppressed?, Solr::String, solr_name('suppressed', ActiveFedora::Indexing::Descriptor.new(:boolean, :stored, :indexed))
 
         attribute :date_modified, Solr::Date, solr_name('date_modified', :stored_sortable, type: :date)
         attribute :date_uploaded, Solr::Date, solr_name('date_uploaded', :stored_sortable, type: :date)

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

@@ -71,11 +71,11 @@ module Hyrax
 
     # Method to return the ActiveFedora model
     def hydra_model
-      first(Solrizer.solr_name('has_model', :symbol)).constantize
+      first(ActiveFedora.index_field_mapper.solr_name('has_model', :symbol)).constantize
     end
 
     def depositor(default = '')
-      val = first(Solrizer.solr_name('depositor'))
+      val = first(ActiveFedora.index_field_mapper.solr_name('depositor'))
       val.present? ? val : default
     end
 
@@ -85,7 +85,7 @@ module Hyrax
                    else
                      :stored_searchable
                    end
-      fetch(Solrizer.solr_name('creator', descriptor), [])
+      fetch(ActiveFedora.index_field_mapper.solr_name('creator', descriptor), [])
     end
 
     def visibility

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

@@ -30,7 +30,7 @@ module Hyrax::User
 
     scope :guests, ->() { where(guest: true) }
     scope :registered, ->() { where(guest: false) }
-    scope :without_system_accounts, -> { where("#{Hydra.config.user_key_field} not in (?)", [::User.batch_user_key, ::User.audit_user_key]) }
+    scope :without_system_accounts, -> { where("#{::User.user_key_field} not in (?)", [::User.batch_user_key, ::User.audit_user_key]) }
 
     # Validate and normalize ORCIDs
     validates_with OrcidValidator
@@ -48,6 +48,10 @@ module Hyrax::User
     has_one :sipity_agent, as: :proxy_for, dependent: :destroy, class_name: 'Sipity::Agent'
   end
 
+  def user_key
+    public_send(self.class.user_key_field)
+  end
+
   # Look for, in order:
   #   A cached version of the agent
   #   A non-cached version (direct read of the database)
@@ -149,6 +153,10 @@ module Hyrax::User
       Hyrax.config.audit_user_key
     end
 
+    def user_key_field
+      Hydra.config.user_key_field
+    end
+
     # Override this method if you aren't using email/password
     def batch_user
       find_or_create_system_user(batch_user_key)
@@ -159,7 +167,7 @@ module Hyrax::User
     end
 
     def find_or_create_system_user(user_key)
-      User.find_by_user_key(user_key) || User.create!(Hydra.config.user_key_field => user_key, password: Devise.friendly_token[0, 20])
+      User.find_by_user_key(user_key) || User.create!(user_key_field => user_key, password: Devise.friendly_token[0, 20])
     end
 
     def from_url_component(component)

data/app/presenters/hyrax/work_show_presenter.rb

@@ -15,7 +15,7 @@ module Hyrax
 
     # delegate fields from Hyrax::Works::Metadata to solr_document
     delegate :based_near_label, :related_url, :depositor, :identifier, :resource_type,
-             :keyword, :itemtype, :admin_set, to: :solr_document
+             :keyword, :itemtype, :admin_set, :rights_notes, to: :solr_document
 
     # @param [SolrDocument] solr_document
     # @param [Ability] current_ability
@@ -218,7 +218,7 @@ module Hyrax
       Hyrax.config.iiif_metadata_fields.each do |field|
         metadata << {
           'label' => I18n.t("simple_form.labels.defaults.#{field}"),
-          'value' => Array.wrap(send(field))
+          'value' => Array.wrap(send(field).map { |f| Loofah.fragment(f.to_s).scrub!(:whitewash).to_s })
         }
       end
       metadata

data/app/renderers/hyrax/renderers/faceted_attribute_renderer.rb

@@ -12,7 +12,7 @@ module Hyrax
         end
 
         def search_field
-          ERB::Util.h(Solrizer.solr_name(options.fetch(:search_field, field), :facetable, type: :string))
+          ERB::Util.h(ActiveFedora.index_field_mapper.solr_name(options.fetch(:search_field, field), :facetable, type: :string))
         end
     end
   end

data/app/search_builders/hyrax/collection_search_builder.rb

@@ -19,7 +19,7 @@ module Hyrax
 
     # @return [String] Solr field name indicating default sort order
     def sort_field
-      Solrizer.solr_name('title', :sortable)
+      ActiveFedora.index_field_mapper.solr_name('title', :sortable)
     end
 
     # This overrides the models in FilterByType

data/app/search_builders/hyrax/deposit_search_builder.rb

@@ -17,7 +17,7 @@ module Hyrax
     end
 
     def self.depositor_field
-      @depositor_field ||= Solrizer.solr_name('depositor', :symbol).freeze
+      @depositor_field ||= ActiveFedora.index_field_mapper.solr_name('depositor', :symbol).freeze
     end
 
     private

data/app/search_builders/hyrax/embargo_search_builder.rb

@@ -14,7 +14,7 @@ module Hyrax
 
     def only_active_embargoes(solr_params)
       solr_params[:fq] ||= []
-      solr_params[:fq] = 'embargo_release_date_dtsi:*'
+      solr_params[:fq] = 'embargo_release_date_dtsi:[* TO *]'
     end
   end
 end

data/app/search_builders/hyrax/lease_search_builder.rb

@@ -14,7 +14,7 @@ module Hyrax
 
     def only_active_leases(solr_params)
       solr_params[:fq] ||= []
-      solr_params[:fq] = 'lease_expiration_date_dtsi:*'
+      solr_params[:fq] = 'lease_expiration_date_dtsi:[* TO *]'
     end
   end
 end

data/app/services/hyrax/default_middleware_stack.rb

@@ -3,10 +3,6 @@ module Hyrax
     # rubocop:disable Metrics/MethodLength
     def self.build_stack
       ActionDispatch::MiddlewareStack.new.tap do |middleware|
-        # Wrap everything in a database transaction, if the save of the resource
-        # fails then roll back any database AdminSetChangeSet
-        middleware.use Hyrax::Actors::TransactionalRequest
-
         # Ensure you are mutating the most recent version
         middleware.use Hyrax::Actors::OptimisticLockValidator
 

data/app/services/hyrax/statistics/file_sets/by_format.rb

@@ -6,7 +6,7 @@ module Hyrax
 
           # Returns 'file_format_sim'
           def index_key
-            Solrizer.solr_name('file_format', :facetable)
+            ActiveFedora.index_field_mapper.solr_name('file_format', :facetable)
           end
       end
     end

data/app/services/hyrax/statistics/works/by_resource_type.rb

@@ -5,7 +5,7 @@ module Hyrax
         private
 
           def index_key
-            Solrizer.solr_name("resource_type", :facetable)
+            ActiveFedora.index_field_mapper.solr_name("resource_type", :facetable)
           end
       end
     end

data/app/services/hyrax/visibility_intention.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+module Hyrax
+  ##
+  # Provides tools for interpreting form input as a visibility.
+  #
+  # @since 3.0.0
+  class VisibilityIntention
+    PUBLIC          = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+    PRIVATE         = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+    LEASE_REQUEST   = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE
+    EMBARGO_REQUEST = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO
+
+    ##
+    # @!attribute [rw] after
+    #   @return [String] the visibility requested after the embargo/lease release
+    # @!attribute [rw] during
+    #   @return [String] the visibility requested while the embargo/lease is in effect
+    # @!attribute [rw] release_date
+    #   @return [String]
+    # @!attribute [rw] visibility
+    #   @return [String]
+    attr_accessor :after, :during, :release_date, :visibility
+
+    ##
+    # @param [String] after
+    # @param [String] during
+    # @param [String] release_date
+    # @param [String] visibility
+    def initialize(visibility: PRIVATE, release_date: nil, during: nil, after: nil)
+      self.after        = after
+      self.during       = during
+      self.release_date = release_date
+      self.visibility   = visibility
+    end
+
+    ##
+    # @return [Array] the parameters for the requested embargo
+    def embargo_params
+      return []           unless wants_embargo?
+      raise ArgumentError unless valid_embargo?
+
+      [release_date, (during || PRIVATE), (after || PUBLIC)]
+    end
+
+    ##
+    # @return [Array] the parameters for the requested embargo
+    def lease_params
+      return []           unless wants_lease?
+      raise ArgumentError unless valid_lease?
+
+      [release_date, (during || PUBLIC), (after || PRIVATE)]
+    end
+
+    ##
+    # @return [Boolean]
+    def valid_embargo?
+      wants_embargo? && release_date.present?
+    end
+
+    ##
+    # @return [Boolean]
+    def wants_embargo?
+      visibility == EMBARGO_REQUEST
+    end
+
+    ##
+    # @return [Boolean]
+    def valid_lease?
+      wants_lease? && release_date.present?
+    end
+
+    ##
+    # @return [Boolean]
+    def wants_lease?
+      visibility == LEASE_REQUEST
+    end
+  end
+end

data/app/views/catalog/_index_list_default.html.erb

@@ -5,14 +5,14 @@
     <% index_fields(document).each do |field_name, field| -%>
       <% if should_render_index_field? document, field %>
           <dt><%= render_index_field_label document, field: field_name %></dt>
-          <dd><%= doc_presenter.field_value field_name %></dd>
+          <dd><%= doc_presenter.field_value field %></dd>
       <% end %>
     <% end %>
     </dl>
   </div>
 </div>
-<% if(doc_presenter.field_value('has_model_ssim') == 'Collection') %>
-    <% collection_presenter = Hyrax::CollectionPresenter.new(document, current_ability) %>
+<% if document.collection? %>
+<% collection_presenter = Hyrax::CollectionPresenter.new(document, current_ability) %>
 <div class="col-md-4">
   <div class="collection-counts-wrapper">
     <div class="collection-counts-item">

data/app/views/catalog/_thumbnail_list_collection.html.erb

@@ -1,3 +1,4 @@
 <div class="col-md-2">
-  <span class="<%= Hyrax::ModelIcon.css_class_for(Collection) %> collection-icon-search" aria-hidden="true"></span>
-</div>
+  <%= render_thumbnail_tag document, {}, suppress_link: true %>
+</div> 
+

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

@@ -12,4 +12,5 @@
 <%= presenter.attribute_to_html(:resource_type, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:source, html_dl: true) %>
 <%= presenter.attribute_to_html(:rights_statement, render_as: :rights_statement, html_dl: true) %>
+<%= presenter.attribute_to_html(:rights_notes, html_dl: true) %>
 <%= presenter.attribute_to_html(:license, render_as: :license, html_dl: true) %>

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

@@ -15,13 +15,13 @@
                 <!-- The fileinput-button span is used to style the file input field as button -->
                 <span id="addfiles" class="btn btn-success fileinput-button">
                     <span class="glyphicon glyphicon-plus"></span>
-                    <span>Add files...</span>
+                    <span><%=  t(".add_files") %></span>
                     <input type="file" name="files[]" multiple />
                 </span>
                 <!-- The fileinput-button span is used to style the file input field as button -->
                 <span id="addfolder" class="btn btn-success fileinput-button">
                     <span class="glyphicon glyphicon-plus"></span>
-                    <span>Add folder...</span>
+                    <span><%=  t(".add_folder") %></span>
                     <input type="file" name="files[]" multiple directory webkitdirectory />
                 </span>
                 <% if Hyrax.config.browse_everything? %>

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

@@ -4,7 +4,7 @@
   <%= render 'form_permission_under_lease', f: f %>
 <% else %>
     <fieldset>
-      <legend class="legend-save-work">Visibility</legend>
+      <legend class="legend-save-work"><%= t('.visibility') %></legend>
       <ul class="visibility">
         <li class="radio">
           <label>