curation_concerns 1.0.0.beta4 → 1.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4308100446011564275bcdedd4c7481463a38e5c
-  data.tar.gz: 7b81af4f3ea2ed2c2d576532ad300325447ea269
+  metadata.gz: 3516c66d4ff6b39953a066d649baa15417442b33
+  data.tar.gz: 540d110fcf876cdaf08346246317fc7d4ae109ee
 SHA512:
-  metadata.gz: 80590935c92b01803e6112748622e8932907900449355710af1bdb7162e9b8ff2b5e2d2a7f4fa02279e607aac1fe614b2eca92eb5e9fe77011b5f64bedeb1173
-  data.tar.gz: 2beb2613b9ec9627081d40d0177e678f31a9a10802528ae1d75be089b4d1bca4d1c570445ecf86efca6225d84069f46adb4a254093c02d3a3bf9d14696b6ffb3
+  metadata.gz: ec704704bbb9085b8e42d3d8b53d6e87a68fd6f51d24ab80639dc59edc6b2fce718b188194eb8c4c2fe1dbbd3a3a66f9b97226fa609b40f38e20a2a4d3e3ca81
+  data.tar.gz: 6c545fae4b20c118a42ba34cb4e9cd1e73401c3d3936e1adc7028c41af7aaf7db604e8554307b0d0898ec7db95f3f6e27a6c28b1a835344b67160e0291381091

data/README.md

@@ -2,12 +2,11 @@
 
 [![Version](https://badge.fury.io/rb/curation_concerns.png)](http://badge.fury.io/rb/curation_concerns)
 [![Build Status](https://travis-ci.org/projecthydra/curation_concerns.svg?branch=master)](https://travis-ci.org/projecthydra/curation_concerns)
-[![Coverage Status](https://coveralls.io/repos/projecthydra-labs/curation_concerns/badge.svg?branch=master)](https://coveralls.io/r/projecthydra-labs/curation_concerns?branch=master)
-[![Code Climate](https://codeclimate.com/github/projecthydra-labs/curation_concerns/badges/gpa.svg)](https://codeclimate.com/github/projecthydra-labs/curation_concerns)
+[![Coverage Status](https://coveralls.io/repos/projecthydra/curation_concerns/badge.svg?branch=master)](https://coveralls.io/r/projecthydra/curation_concerns?branch=master)
+[![Code Climate](https://codeclimate.com/github/projecthydra/curation_concerns/badges/gpa.svg)](https://codeclimate.com/github/projecthydra/curation_concerns)
 [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE.txt)
 [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
 [![API Docs](http://img.shields.io/badge/API-docs-blue.svg)](http://rubydoc.info/gems/curation_concerns)
-[![Stories in Ready](https://badge.waffle.io/projecthydra-labs/sufia-core.png?source=projecthydra-labs%2Fcuration_concerns&label=ready&title=Ready)](https://waffle.io/projecthydra-labs/sufia-core?source=projecthydra-labs%2Fcuration_concerns)
 
 A Hydra-based Rails Engine that extends an application, adding the ability to Create, Read, Update and Destroy (CRUD) objects (based on [Hydra::Works](http://github.com/projecthydra/hydra-works)) and providing a generator for defining object types with custom workflows, views, access controls, etc.
 

data/app/assets/stylesheets/curation_concerns/modules/forms.scss

@@ -25,6 +25,8 @@ legend small {
   padding-left:1.2em;
 }
 
+.form-group { margin-bottom: 2em; }
+
 .form-group.has-error input,
 .form-group.has-error option,
 .form-group.has-error textarea {
@@ -35,8 +37,16 @@ legend small {
   margin-top: 1em;
 }
 
-form label.optional { font-weight: normal; }
-form label.required { font-weight: bold; }
+form {
+  label { font-weight: bold; }
+
+  label { margin-bottom: 7px; }
+
+  .help-block {
+    margin-top: 0;
+    margin-bottom: 10px;
+  }
+}
 
 .set-access-controls {
   label { font-weight: normal; }
@@ -68,3 +78,7 @@ form label.required { font-weight: bold; }
 form.button-to {
   margin:0 .3em;
 }
+
+.required-tag {
+  vertical-align: super;
+}

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

@@ -22,10 +22,5 @@ module CurationConcerns::CatalogController
     def modified_field
       solr_name('date_modified', :stored_sortable, type: :date)
     end
-
-    def search_config
-      ActiveSupport::Deprecation.warn("#{self.class}.search_config is deprecated and will be removed in CurationConcerns 1.0")
-      { 'qf' => %w(title_tesim name_tesim), 'qt' => 'search', 'rows' => 10 }
-    end
   end
 end

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

@@ -16,11 +16,6 @@ module CurationConcerns::CurationConcernController
   end
 
   module ClassMethods
-    def set_curation_concern_type(curation_concern_type)
-      Deprecation.warn self, "set_curation_concern_type is deprecated and will be removed in curation_concerns 1.0. Use self.curation_concern_type = #{curation_concern_type} instead."
-      self.curation_concern_type = curation_concern_type
-    end
-
     def curation_concern_type=(curation_concern_type)
       load_and_authorize_resource class: curation_concern_type, instance_name: :curation_concern, except: [:show, :file_manager]
       self._curation_concern_type = curation_concern_type

data/app/helpers/curation_concerns/main_app_helpers.rb

@@ -9,4 +9,5 @@ module CurationConcerns::MainAppHelpers
   include CurationConcerns::LeaseHelper
   include CurationConcerns::CollectionsHelper
   include CurationConcerns::PermissionsHelper
+  include CurationConcerns::RightsHelper
 end

data/app/helpers/curation_concerns/permissions_helper.rb

@@ -1,9 +1,7 @@
 module CurationConcerns
   module PermissionsHelper
-    def help_link(file, title, aria_label)
-      link_to help_icon, '#',
-              data: { toggle: 'popover', content: capture_content(file), 'original-title' => title },
-              'aria-label' => aria_label
+    def help_text(file)
+      capture_content(file)
     end
 
     private

data/app/helpers/curation_concerns/rights_helper.rb

@@ -0,0 +1,9 @@
+module CurationConcerns::RightsHelper
+  def include_current_value(value, _index, render_options, html_options)
+    unless value.blank? || RightsService.active?(value)
+      html_options[:class] << ' force-select'
+      render_options += [[RightsService.label(value), value]]
+    end
+    [render_options, html_options]
+  end
+end

data/app/inputs/multi_value_select_input.rb

@@ -0,0 +1,45 @@
+class MultiValueSelectInput < MultiValueInput
+  def input_type
+    'multi_value'.freeze
+  end
+
+  private
+
+    def select_options
+      @select_options ||= begin
+        collection = options.delete(:collection) || self.class.boolean_collection
+        collection.respond_to?(:call) ? collection.call : collection.to_a
+      end
+    end
+
+    def build_field_options(value)
+      field_options = input_html_options.dup
+
+      field_options[:value] = value
+      if @rendered_first_element
+        field_options[:id] = nil
+        field_options[:required] = nil
+      else
+        field_options[:id] ||= input_dom_id
+      end
+      field_options[:class] ||= []
+      field_options[:class] += ["#{input_dom_id} form-control multi-text-field"]
+      field_options[:'aria-labelledby'] = label_id
+      field_options.delete(:multiple)
+      field_options.delete(:item_helper)
+      field_options.merge!(options.slice(:include_blank))
+
+      @rendered_first_element = true
+
+      field_options
+    end
+
+    def build_field(value, index)
+      render_options = select_options
+      html_options = build_field_options(value)
+      if options[:item_helper]
+        (render_options, html_options) = options[:item_helper].call(value, index, render_options, html_options)
+      end
+      template.select_tag(attribute_name, template.options_for_select(render_options, value), html_options)
+    end
+end

data/app/models/concerns/curation_concerns/collection.rb

@@ -1,7 +1,6 @@
 module CurationConcerns
   module Collection
     extend ActiveSupport::Concern
-    extend Deprecation
     include Hydra::WithDepositor # for access to apply_depositor_metadata
     include Hydra::AccessControls::Permissions
     include CurationConcerns::RequiredMetadata

data/app/presenters/curation_concerns/file_set_presenter.rb

@@ -21,17 +21,17 @@ module CurationConcerns
     delegate :has?, :first, :fetch, to: :solr_document
 
     # Metadata Methods
-    delegate :title, :description, :creator, :contributor, :subject, :publisher,
-             :language, :date_uploaded, :rights,
+    delegate :title, :label, :description, :creator, :contributor, :subject,
+             :publisher, :language, :date_uploaded, :rights,
              :embargo_release_date, :lease_expiration_date,
              :depositor, :keyword, :title_or_label, to: :solr_document
 
     def page_title
-      Array.wrap(solr_document['label_tesim']).first
+      label
     end
 
     def link_name
-      current_ability.can?(:read, id) ? Array.wrap(solr_document['label_tesim']).first : 'File'
+      current_ability.can?(:read, id) ? label : 'File'
     end
   end
 end

data/app/presenters/curation_concerns/presents_attributes.rb

@@ -4,17 +4,20 @@ module CurationConcerns
     # Present the attribute as an HTML table row.
     #
     # @param [Hash] options
-    # @option options [true, false] :catalog_search_link return a link to a catalog search for that text if true
+    # @option options [Symbol] :render_as use an alternate renderer
+    #   (e.g., :linked or :linked_attribute to use LinkedAttributeRenderer)
     # @option options [String] :search_field If the method_name of the attribute is different than
     #   how the attribute name should appear on the search URL,
     #   you can explicitly set the URL's search field name
     # @option options [String] :label The default label for the field if no translation is found
+    # @option options [TrueClass, FalseClass] :include_empty should we display a row if there are no values?
     def attribute_to_html(field, options = {})
       unless respond_to?(field)
         Rails.logger.warn("#{self.class} attempted to render #{field}, but no method exists with that name.")
         return
       end
-      CurationConcerns::Renderers::AttributeRenderer.new(field, send(field), options).render
+
+      renderer_for(field, options).new(field, send(field), options).render
     end
 
     def permission_badge
@@ -37,6 +40,29 @@ module CurationConcerns
 
     private
 
+      def find_renderer_class(name)
+        renderer = nil
+        ['Renderer', 'AttributeRenderer'].each do |suffix|
+          const_name = "#{name.to_s.camelize}#{suffix}".to_sym
+          renderer = begin
+            Renderers.const_get(const_name)
+          rescue NameError
+            nil
+          end
+          break unless renderer.nil?
+        end
+        raise NameError, "unknown renderer type `#{name}`" if renderer.nil?
+        renderer
+      end
+
+      def renderer_for(_field, options)
+        if options[:render_as]
+          find_renderer_class(options[:render_as])
+        else
+          Renderers::AttributeRenderer
+        end
+      end
+
       def microdata_type_key
         "curation_concerns.schema_org.resource_type.#{human_readable_type}"
       end

data/app/presenters/curation_concerns/work_show_presenter.rb

@@ -25,7 +25,7 @@ module CurationConcerns
     end
 
     def page_title
-      solr_document.title.first
+      title.first
     end
 
     # CurationConcern methods
@@ -53,13 +53,6 @@ module CurationConcerns
       @work_presenters ||= member_presenters(ordered_ids - file_set_ids, work_presenter_class)
     end
 
-    # @deprecated
-    # @return [Array<FileSetPresenter>] presenters for the orderd_members that are FileSets
-    def file_presenters
-      Deprecation.warn WorkShowPresenter, "file_presenters is deprecated and will be removed in CurationConcerns 1.0. Use file_set_presenters or member_presenters instead."
-      member_presenters
-    end
-
     # @param [Array<String>] ids a list of ids to build presenters for
     # @param [Class] presenter_class the type of presenter to build
     # @return [Array<presenter_class>] presenters for the ordered_members (not filtered by class)

data/app/renderers/curation_concerns/renderers/attribute_renderer.rb

@@ -45,9 +45,7 @@ module CurationConcerns
       private
 
         def attribute_value_to_html(value)
-          if field == :rights
-            rights_attribute_to_html(value)
-          elsif microdata_value_attributes(field).present?
+          if microdata_value_attributes(field).present?
             "<span#{html_attributes(microdata_value_attributes(field))}>#{li_value(value)}</span>"
           else
             li_value(value)
@@ -63,37 +61,8 @@ module CurationConcerns
           buffer
         end
 
-        def search_field
-          options.fetch(:search_field, field)
-        end
-
         def li_value(value)
-          if options[:catalog_search_link]
-            link_to(ERB::Util.h(value), search_path(value))
-          else
-            auto_link(ERB::Util.h(value))
-          end
-        end
-
-        def search_path(value)
-          Rails.application.routes.url_helpers.search_catalog_path(
-            search_field: search_field, q: ERB::Util.h(value))
-        end
-
-        ##
-        # Special treatment for license/rights.  A URL from the Sufia gem's config/sufia.rb is stored in the descMetadata of the
-        # curation_concern.  If that URL is valid in form, then it is used as a link.  If it is not valid, it is used as plain text.
-        def rights_attribute_to_html(value)
-          begin
-            parsed_uri = URI.parse(value)
-          rescue
-            nil
-          end
-          if parsed_uri.nil?
-            ERB::Util.h(value)
-          else
-            %(<a href=#{ERB::Util.h(value)} target="_blank">#{RightsService.label(value)}</a>)
-          end
+          auto_link(ERB::Util.h(value))
         end
     end
   end

data/app/renderers/curation_concerns/renderers/faceted_attribute_renderer.rb

@@ -0,0 +1,19 @@
+module CurationConcerns
+  module Renderers
+    class FacetedAttributeRenderer < AttributeRenderer
+      private
+
+        def li_value(value)
+          link_to(ERB::Util.h(value), search_path(value))
+        end
+
+        def search_path(value)
+          Rails.application.routes.url_helpers.search_catalog_path(:"f[#{search_field}][]" => ERB::Util.h(value))
+        end
+
+        def search_field
+          ERB::Util.h(Solrizer.solr_name(options.fetch(:search_field, field), :facetable, type: :string))
+        end
+    end
+  end
+end

data/app/renderers/curation_concerns/renderers/linked_attribute_renderer.rb

@@ -0,0 +1,20 @@
+module CurationConcerns
+  module Renderers
+    class LinkedAttributeRenderer < AttributeRenderer
+      private
+
+        def li_value(value)
+          link_to(ERB::Util.h(value), search_path(value))
+        end
+
+        def search_path(value)
+          Rails.application.routes.url_helpers.search_catalog_path(
+            search_field: search_field, q: ERB::Util.h(value))
+        end
+
+        def search_field
+          options.fetch(:search_field, field)
+        end
+    end
+  end
+end

data/app/renderers/curation_concerns/renderers/rights_attribute_renderer.rb

@@ -0,0 +1,27 @@
+module CurationConcerns
+  module Renderers
+    class RightsAttributeRenderer < AttributeRenderer
+      private
+
+        def attribute_value_to_html(value)
+          rights_attribute_to_html(value)
+        end
+
+        ##
+        # Special treatment for license/rights.  A URL from the Sufia gem's config/sufia.rb is stored in the descMetadata of the
+        # curation_concern.  If that URL is valid in form, then it is used as a link.  If it is not valid, it is used as plain text.
+        def rights_attribute_to_html(value)
+          begin
+            parsed_uri = URI.parse(value)
+          rescue
+            nil
+          end
+          if parsed_uri.nil?
+            ERB::Util.h(value)
+          else
+            %(<a href=#{ERB::Util.h(value)} target="_blank">#{RightsService.label(value)}</a>)
+          end
+        end
+    end
+  end
+end

data/app/services/curation_concerns/actors/actor_factory.rb

@@ -13,8 +13,7 @@ module CurationConcerns
          AttachFilesActor,
          ApplyOrderActor,
          InterpretVisibilityActor,
-         model_actor(curation_concern),
-         AssignIdentifierActor]
+         model_actor(curation_concern)]
       end
 
       def self.model_actor(curation_concern)

data/app/services/rights_service.rb

@@ -2,10 +2,20 @@ module RightsService
   mattr_accessor :authority
   self.authority = Qa::Authorities::Local.subauthority_for('rights')
 
-  def self.select_options
+  def self.select_all_options
+    authority.all.map do |element|
+      [element[:label], element[:id]]
+    end
+  end
+
+  def self.select_active_options
     active_elements.map { |e| [e[:label], e[:id]] }
   end
 
+  def self.active?(id)
+    authority.find(id).fetch('active')
+  end
+
   def self.label(id)
     authority.find(id).fetch('term')
   end

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

@@ -1,7 +1,7 @@
   <%= presenter.attribute_to_html(:description) %>
-  <%= presenter.attribute_to_html(:creator, catalog_search_link: true ) %>
-  <%= presenter.attribute_to_html(:contributor, label: 'Contributors', catalog_search_link: true) %>
-  <%= presenter.attribute_to_html(:subject, catalog_search_link: true) %>
+  <%= presenter.attribute_to_html(:creator, render_as: :linked) %>
+  <%= presenter.attribute_to_html(:contributor, label: 'Contributors', render_as: :linked) %>
+  <%= presenter.attribute_to_html(:subject, render_as: :linked) %>
   <%= presenter.attribute_to_html(:publisher) %>
   <%= presenter.attribute_to_html(:language) %>
 

data/app/views/curation_concerns/base/_attributes.html.erb

@@ -8,6 +8,6 @@
     <%= presenter.attribute_to_html(:permission_badge, label: 'Visibility') %>
     <%= presenter.attribute_to_html(:embargo_release_date) %>
     <%= presenter.attribute_to_html(:lease_expiration_date) %>
-    <%= presenter.attribute_to_html(:rights) %>
+    <%= presenter.attribute_to_html(:rights, render_as: :rights) %>
   </tbody>
 </table>

data/app/views/curation_concerns/base/_form_permission.html.erb

@@ -9,7 +9,7 @@
       Visibility
       <small>Who should be able to view or download this content?</small>
       <span id="visibility_tooltip" class="h5">
-        <%= help_link 'visibility', 'Visibility', 'Usage information for visibility' %>
+        <%= help_text 'visibility' %>
       </span>
     </legend>
 

data/app/views/curation_concerns/base/_form_rights.html.erb

@@ -9,8 +9,10 @@
         <a href="http://creativecommons.org/licenses/" target="_blank">Here's some help</a> if you don't know which license to choose.
       </p>
 
-      <%= f.input :rights, as: :select,
-        collection: RightsService.select_options,
+      <%= f.input :rights, as: :multi_value_select,
+        collection: RightsService.select_active_options,
+        include_blank: true,
+        item_helper: method(:include_current_value),
         input_html: { class: 'form-control' } %>
     </fieldset>
   </div>

data/app/views/records/edit_fields/_default.html.erb

@@ -1,5 +1,5 @@
 <% if f.object.class.multiple? key %>
-  <%= f.input key, as: :multi_value_with_help, input_html: { class: 'form-control' }, required: f.object.required?(key) %>
+  <%= f.input key, as: :multi_value, input_html: { class: 'form-control' }, required: f.object.required?(key) %>
 <% else %>
   <%= f.input key, required: f.object.required?(key) %>
 <% end %>

data/config/locales/curation_concerns.en.yml

@@ -159,6 +159,8 @@ en:
   file_manager:
     link_text: 'File Manager'
   simple_form:
+    required:
+      html: '<span class="label label-info required-tag">required</span>'
     hints:
       defaults:
         description: 'Please keep your description to 300 words or fewer.'

data/curation_concerns.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sprockets-es6'
   spec.add_dependency 'kaminari_route_prefix', '~> 0.0.1'
   spec.add_dependency 'active_attr'
-  spec.add_dependency 'hydra-works', '>= 0.11.0'
+  spec.add_dependency 'hydra-works', '>= 0.12.0'
   spec.add_dependency 'active_fedora-noid', '~> 1.0'
   spec.add_dependency 'qa', '~> 0.5'
   spec.add_dependency 'redlock', '~> 0.1.2'

data/lib/curation_concerns/configuration.rb

@@ -1,7 +1,6 @@
 require 'curation_concerns/callbacks'
 
 module CurationConcerns
-  extend Deprecation
   class << self
     attr_accessor :config
   end

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "1.0.0.beta4".freeze
+  VERSION = "1.0.0.beta5".freeze
 end

data/lib/generators/curation_concerns/install_generator.rb

@@ -17,7 +17,7 @@ module CurationConcerns
    7. Adds CurationConcerns::SolrDocumentBehavior to app/models/solr_document.rb
    8. Adds config/authorities/rights.yml to the application
    9. Adds config/authorities/resource_types.yml to the application
-   10. Runs simple_form:install --bootstrap
+   10. Copies modified simple_form initializers
          '
 
     def run_required_generators
@@ -101,8 +101,11 @@ module CurationConcerns
       copy_file "config/authorities/resource_types.yml", "config/authorities/resource_types.yml"
     end
 
-    def simple_form_bootstrap
-      generate 'simple_form:install --bootstrap'
+    def simple_form_initializers
+      copy_file 'config/initializers/simple_form.rb',
+                'config/initializers/simple_form.rb'
+      copy_file 'config/initializers/simple_form_bootstrap.rb',
+                'config/initializers/simple_form_bootstrap.rb'
     end
   end
 end