curation_concerns 1.0.0.beta4 → 1.0.0.beta5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta4
+  version: 1.0.0.beta5
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -178,14 +178,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: active_fedora-noid
   requirement: !ruby/object:Gem::Requirement
@@ -613,13 +613,11 @@ files:
 - README.md
 - RELEASING.md
 - Rakefile
-- app/actors/concerns/curation_concerns/manages_embargoes_actor.rb
 - app/actors/curation_concerns/actors.rb
 - app/actors/curation_concerns/actors/abstract_actor.rb
 - app/actors/curation_concerns/actors/actor_stack.rb
 - app/actors/curation_concerns/actors/add_to_collection_actor.rb
 - app/actors/curation_concerns/actors/apply_order_actor.rb
-- app/actors/curation_concerns/actors/assign_identifier_actor.rb
 - app/actors/curation_concerns/actors/assign_representative_actor.rb
 - app/actors/curation_concerns/actors/attach_files_actor.rb
 - app/actors/curation_concerns/actors/base_actor.rb
@@ -629,7 +627,6 @@ files:
 - app/actors/curation_concerns/actors/interpret_visibility_actor.rb
 - app/actors/curation_concerns/actors/lease_actor.rb
 - app/actors/curation_concerns/actors/root_actor.rb
-- app/actors/curation_concerns/actors/work_actor_behavior.rb
 - app/assets/images/audio.png
 - app/assets/images/default.png
 - app/assets/images/loading.gif
@@ -714,17 +711,15 @@ files:
 - app/helpers/curation_concerns/main_app_helpers.rb
 - app/helpers/curation_concerns/permissions_helper.rb
 - app/helpers/curation_concerns/render_constraints_helper.rb
+- app/helpers/curation_concerns/rights_helper.rb
 - app/helpers/curation_concerns/search_paths_helper.rb
 - app/helpers/curation_concerns/title_helper.rb
 - app/helpers/curation_concerns/url_helper.rb
 - app/indexers/curation_concerns/collection_indexer.rb
 - app/indexers/curation_concerns/file_set_indexer.rb
 - app/indexers/curation_concerns/work_indexer.rb
-- app/inputs/multi_value_with_help_input.rb
+- app/inputs/multi_value_select_input.rb
 - app/inputs/multifile_input.rb
-- app/inputs/select_with_help_input.rb
-- app/inputs/select_with_modal_help_input.rb
-- app/inputs/with_help_icon.rb
 - app/jobs/audit_job.rb
 - app/jobs/characterize_job.rb
 - app/jobs/create_derivatives_job.rb
@@ -776,6 +771,9 @@ files:
 - app/presenters/curation_concerns/work_show_presenter.rb
 - app/renderers/curation_concerns/renderers/attribute_renderer.rb
 - app/renderers/curation_concerns/renderers/configured_microdata.rb
+- app/renderers/curation_concerns/renderers/faceted_attribute_renderer.rb
+- app/renderers/curation_concerns/renderers/linked_attribute_renderer.rb
+- app/renderers/curation_concerns/renderers/rights_attribute_renderer.rb
 - app/renderers/renderers.rb
 - app/search_builders/curation_concerns/collection_member_search_builder.rb
 - app/search_builders/curation_concerns/collection_search_builder.rb
@@ -788,7 +786,6 @@ files:
 - app/search_builders/curation_concerns/filter_by_type.rb
 - app/search_builders/curation_concerns/lease_search_builder.rb
 - app/search_builders/curation_concerns/member_search_builder.rb
-- app/search_builders/curation_concerns/search_builder.rb
 - app/search_builders/curation_concerns/search_filters.rb
 - app/search_builders/curation_concerns/single_result.rb
 - app/search_builders/curation_concerns/single_use_link_search_builder.rb
@@ -997,6 +994,8 @@ files:
 - lib/generators/curation_concerns/templates/config/authorities/rights.yml
 - lib/generators/curation_concerns/templates/config/clamav.rb
 - lib/generators/curation_concerns/templates/config/curation_concerns.rb
+- lib/generators/curation_concerns/templates/config/initializers/simple_form.rb
+- lib/generators/curation_concerns/templates/config/initializers/simple_form_bootstrap.rb
 - lib/generators/curation_concerns/templates/config/mime_types.rb
 - lib/generators/curation_concerns/templates/config/redis.yml
 - lib/generators/curation_concerns/templates/config/redis_config.rb
@@ -1089,7 +1088,6 @@ files:
 - spec/helpers/curation_concerns/ability_helper_spec.rb
 - spec/helpers/curation_concerns/collections_helper_spec.rb
 - spec/helpers/curation_concerns/file_set_helper_spec.rb
-- spec/helpers/curation_concerns/permissions_helper_spec.rb
 - spec/helpers/render_constraints_helper_spec.rb
 - spec/helpers/url_helper_spec.rb
 - spec/indexers/collection_indexer_spec.rb
@@ -1097,8 +1095,6 @@ files:
 - spec/indexers/work_indexer_spec.rb
 - spec/inputs/multi_value_with_help_input_spec.rb
 - spec/inputs/multifile_input_spec.rb
-- spec/inputs/select_with_help_input_spec.rb
-- spec/inputs/select_with_modal_help_input_spec.rb
 - spec/javascripts/file_manager_member_spec.coffee
 - spec/javascripts/fixtures/.gitkeep
 - spec/javascripts/fixtures/file_manager_member.html
@@ -1150,12 +1146,14 @@ files:
 - spec/presenters/embargo_presenter_spec.rb
 - spec/presenters/lease_presenter_spec.rb
 - spec/renderers/curation_concerns/renderers/attribute_renderer_spec.rb
+- spec/renderers/curation_concerns/renderers/faceted_attribute_renderer_spec.rb
+- spec/renderers/curation_concerns/renderers/linked_attribute_renderer_spec.rb
+- spec/renderers/curation_concerns/renderers/rights_attribute_renderer_spec.rb
 - spec/routing/curation_concerns/routes_spec.rb
 - spec/routing/route_spec.rb
 - spec/search_builders/curation_concerns/embargo_search_builder_spec.rb
 - spec/search_builders/curation_concerns/file_set_search_builder_spec.rb
 - spec/search_builders/curation_concerns/lease_search_builder_spec.rb
-- spec/search_builders/curation_concerns/search_builder_spec.rb
 - spec/search_builders/resource_types_service_spec.rb
 - spec/services/curation_concern_spec.rb
 - spec/services/derivative_path_spec.rb
@@ -1189,6 +1187,7 @@ files:
 - spec/views/collections/_sort_and_per_page.html.erb_spec.rb
 - spec/views/curation_concerns/base/_attributes.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb
+- spec/views/curation_concerns/base/_form_rights_spec.rb
 - spec/views/curation_concerns/base/_member.html.erb_spec.rb
 - spec/views/curation_concerns/base/_show_actions.html.erb_spec.rb
 - spec/views/curation_concerns/base/file_manager.html.erb_spec.rb
@@ -1291,7 +1290,6 @@ test_files:
 - spec/helpers/curation_concerns/ability_helper_spec.rb
 - spec/helpers/curation_concerns/collections_helper_spec.rb
 - spec/helpers/curation_concerns/file_set_helper_spec.rb
-- spec/helpers/curation_concerns/permissions_helper_spec.rb
 - spec/helpers/render_constraints_helper_spec.rb
 - spec/helpers/url_helper_spec.rb
 - spec/indexers/collection_indexer_spec.rb
@@ -1299,8 +1297,6 @@ test_files:
 - spec/indexers/work_indexer_spec.rb
 - spec/inputs/multi_value_with_help_input_spec.rb
 - spec/inputs/multifile_input_spec.rb
-- spec/inputs/select_with_help_input_spec.rb
-- spec/inputs/select_with_modal_help_input_spec.rb
 - spec/javascripts/file_manager_member_spec.coffee
 - spec/javascripts/fixtures/.gitkeep
 - spec/javascripts/fixtures/file_manager_member.html
@@ -1352,12 +1348,14 @@ test_files:
 - spec/presenters/embargo_presenter_spec.rb
 - spec/presenters/lease_presenter_spec.rb
 - spec/renderers/curation_concerns/renderers/attribute_renderer_spec.rb
+- spec/renderers/curation_concerns/renderers/faceted_attribute_renderer_spec.rb
+- spec/renderers/curation_concerns/renderers/linked_attribute_renderer_spec.rb
+- spec/renderers/curation_concerns/renderers/rights_attribute_renderer_spec.rb
 - spec/routing/curation_concerns/routes_spec.rb
 - spec/routing/route_spec.rb
 - spec/search_builders/curation_concerns/embargo_search_builder_spec.rb
 - spec/search_builders/curation_concerns/file_set_search_builder_spec.rb
 - spec/search_builders/curation_concerns/lease_search_builder_spec.rb
-- spec/search_builders/curation_concerns/search_builder_spec.rb
 - spec/search_builders/resource_types_service_spec.rb
 - spec/services/curation_concern_spec.rb
 - spec/services/derivative_path_spec.rb
@@ -1391,6 +1389,7 @@ test_files:
 - spec/views/collections/_sort_and_per_page.html.erb_spec.rb
 - spec/views/curation_concerns/base/_attributes.html.erb_spec.rb
 - spec/views/curation_concerns/base/_form_permission.html.erb_spec.rb
+- spec/views/curation_concerns/base/_form_rights_spec.rb
 - spec/views/curation_concerns/base/_member.html.erb_spec.rb
 - spec/views/curation_concerns/base/_show_actions.html.erb_spec.rb
 - spec/views/curation_concerns/base/file_manager.html.erb_spec.rb

data/app/actors/concerns/curation_concerns/manages_embargoes_actor.rb

@@ -1,28 +0,0 @@
-module CurationConcerns
-  #  To use this module, include it in your Actor class
-  #  and then add its interpreters wherever you want them to run.
-  #  They should be called _before_ apply_attributes is called because
-  #  they intercept values in the attributes Hash.
-  #
-  #  @example
-  #  class MyActorClass < BaseActor
-  #     include Worthwile::ManagesEmbargoesActor
-  #
-  #     def create
-  #       interpret_visibility && super
-  #     end
-  #
-  #     def update
-  #       interpret_visibility && super
-  #     end
-  #  end
-  #
-  module ManagesEmbargoesActor
-    extend ActiveSupport::Concern
-    extend Deprecation
-
-    included do
-      Deprecation.warn(ManagesEmbargoesActor, "ManagesEmbargoesActor is deprecated and will be removed in CurationConcerns 1.0")
-    end
-  end
-end

data/app/actors/curation_concerns/actors/assign_identifier_actor.rb

@@ -1,9 +0,0 @@
-module CurationConcerns
-  module Actors
-    class AssignIdentifierActor < AbstractActor
-      def create(attributes)
-        curation_concern.assign_id && next_actor.create(attributes)
-      end
-    end
-  end
-end

data/app/actors/curation_concerns/actors/work_actor_behavior.rb

@@ -1,12 +0,0 @@
-module CurationConcerns
-  module Actors
-    module WorkActorBehavior
-      extend ActiveSupport::Concern
-      extend Deprecation
-
-      included do
-        Deprecation.warn(CurationConcerns::WorkActorBehavior, "CurationConcerns::WorkActorBehavior is deprecated and will be removed in CurationConcerns 1.0")
-      end
-    end
-  end
-end

data/app/inputs/multi_value_with_help_input.rb

@@ -1,8 +0,0 @@
-class MultiValueWithHelpInput < MultiValueInput
-  include WithHelpIcon
-
-  # Overriding this so that the class is correct and the javascript for multivalue will work on this.
-  def input_type
-    'multi_value'.freeze
-  end
-end

data/app/inputs/select_with_help_input.rb

@@ -1,3 +0,0 @@
-class SelectWithHelpInput < SimpleForm::Inputs::CollectionSelectInput
-  include WithHelpIcon
-end

data/app/inputs/select_with_modal_help_input.rb

@@ -1,36 +0,0 @@
-class SelectWithModalHelpInput < MultiValueWithHelpInput
-  def link_to_help
-    template.link_to "##{attribute_name}Modal", id: "#{input_class}_help_modal", rel: 'button',
-                                                data: { toggle: 'modal' }, 'aria-label' => aria_label do
-      help_icon
-    end
-  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(value, _index)
-      html_options = input_html_options.dup
-
-      if @rendered_first_element
-        html_options[:id] = nil
-        html_options[:required] = nil
-      else
-        html_options[:id] ||= input_dom_id
-      end
-      html_options[:class] ||= []
-      html_options[:class] += ["#{input_dom_id} form-control multi-text-field"]
-      html_options[:'aria-labelledby'] = label_id
-      html_options.delete(:multiple)
-      @rendered_first_element = true
-
-      html_options.merge!(options.slice(:include_blank))
-      template.select_tag(attribute_name, template.options_for_select(select_options, value), html_options)
-    end
-end

data/app/inputs/with_help_icon.rb

@@ -1,34 +0,0 @@
-module WithHelpIcon
-  def label(wrapper_options = nil)
-    "#{super} #{link_to_help}"
-  end
-
-  protected
-
-    def link_to_help
-      template.link_to '#', id: "#{input_class}_help",
-                            data: { toggle: 'popover'.freeze,
-                                    content: metadata_help,
-                                    'original-title' => raw_label_text },
-                            'aria-label' => aria_label do
-        help_icon
-      end
-    end
-
-    def help_icon
-      template.content_tag 'i', nil, 'aria-hidden' => true, class: "help-icon"
-    end
-
-    def metadata_help
-      translate_from_namespace(:metadata_help) || attribute_name.to_s.humanize
-    end
-
-    def aria_label
-      translate_from_namespace(:aria_label) || default_aria_label
-    end
-
-    def default_aria_label
-      I18n.t("#{i18n_scope}.aria_label.#{lookup_model_names.join('.')}.default",
-             title: attribute_name.to_s.humanize)
-    end
-end

data/app/search_builders/curation_concerns/search_builder.rb

@@ -1,10 +0,0 @@
-class CurationConcerns::SearchBuilder < Blacklight::SearchBuilder
-  include Blacklight::Solr::SearchBuilderBehavior
-  include Hydra::AccessControlsEnforcement
-  include CurationConcerns::SearchFilters
-  extend Deprecation
-  def initialize(*)
-    Deprecation.warn CurationConcerns::SearchBuilder, "CurationConcerns::SearchBuilder is deprecated and will be removed in CurationConcerns 1.0. Add CurationConcerns::SearchFilters to your own SearchBuilder instead"
-    super
-  end
-end

data/spec/helpers/curation_concerns/permissions_helper_spec.rb

@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe CurationConcerns::PermissionsHelper do
-  describe "#help_link" do
-    subject { helper.help_link 'curation_concerns/base/visibility', 'Visibility', 'Usage information for visibility' }
-
-    it "draws help_icon" do
-      expect(subject).to match(/data-content="<p>This setting will determine who can view your file/)
-      expect(subject).to have_selector 'a i.help-icon'
-    end
-  end
-end

data/spec/inputs/select_with_help_input_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe 'SelectWithHelpInput', type: :input do
-  subject { input_for form, :resource_type, options }
-  let(:file) { FileSet.new }
-  let(:form_class) do
-    Class.new do
-      include HydraEditor::Form
-      self.model_class = FileSet
-      self.terms = [:resource_type]
-    end
-  end
-  let(:form) { form_class.new(FileSet.new) }
-  let(:collection) { ResourceTypesService.select_options }
-  let(:base_options) do
-    { as: :select_with_help, collection: collection,
-      input_html: { class: 'form-control', multiple: true } }
-  end
-  let(:options) { base_options }
-
-  it "does not be required by default" do
-    expect(subject).to have_selector 'select'
-    expect(subject).not_to match(/required/)
-  end
-
-  context 'with File Edit' do
-    let(:user) { create(:user) }
-    let(:file) { FileSet.create(label: 'f1') { |f| f.apply_depositor_metadata(user) } }
-    let(:form) { CurationConcerns::Forms::FileSetEditForm.new(file) }
-    let(:base_options) do
-      { as: :select_with_help, collection: collection,
-        input_html: { class: 'form-control', multiple: true } }
-    end
-    let(:options) { base_options }
-
-    subject { input_for form, :resource_type, options }
-
-    it "is not required by default" do
-      expect(subject).to have_selector 'select'
-      expect(subject).not_to match(/required/)
-    end
-  end
-end

data/spec/inputs/select_with_modal_help_input_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe 'SelectWithModalHelpInput', type: :input do
-  subject { input_for file, :rights, options }
-  let(:file) { FileSet.new }
-  let(:base_options) { { as: :select_with_modal_help, required: true, collection: RightsService.select_options } }
-  let(:options) { base_options }
-
-  context "when a blank is requested" do
-    let(:options) { base_options.merge(include_blank: true) }
-    it 'renders a blank option' do
-      expect(subject).to have_selector 'select option[value=""]'
-    end
-  end
-
-  context "when a blank is not requested" do
-    it 'has no blanks' do
-      expect(subject).to have_selector 'select option:first-child', text: 'Attribution 3.0 United States'
-    end
-  end
-end

data/spec/search_builders/curation_concerns/search_builder_spec.rb

@@ -1,53 +0,0 @@
-require 'spec_helper'
-
-describe CurationConcerns::SearchBuilder do
-  let(:processor_chain) { [:filter_models] }
-  let(:ability) { double('ability') }
-  let(:context) { double('context') }
-  let(:user) { double('user') }
-  let(:solr_params) { { fq: [] } }
-
-  subject { described_class.new(processor_chain, context) }
-
-  describe '#gated_discovery_filters' do
-    before do
-      allow(subject).to receive(:current_ability).and_return(ability)
-      allow(ability).to receive(:admin?).and_return(true)
-    end
-
-    it 'does not filter results for admin users' do
-      expect(subject.gated_discovery_filters).to eq([])
-    end
-  end
-
-  describe '#discovery_permissions' do
-    context 'when showing my works' do
-      before { allow(subject).to receive(:blacklight_params).and_return(works: 'mine') }
-
-      it 'limits query to edit permissions' do
-        expect(subject.discovery_permissions).to eq(['edit'])
-      end
-    end
-  end
-
-  describe '#filter_models' do
-    context "with default work types" do
-      before { subject.filter_models(solr_params) }
-
-      it 'limits query to collection and generic work' do
-        expect(solr_params[:fq].first).to match(/{!field f=has_model_ssim}GenericWork.*OR.*{!field f=has_model_ssim}Collection/)
-      end
-    end
-
-    context 'when work_types is overridden' do
-      before do
-        allow(subject).to receive(:work_types).and_return([FileSet])
-        subject.filter_models(solr_params)
-      end
-
-      it "doesn't have GenericWork" do
-        expect(solr_params[:fq].first).not_to match(/{!field f=has_model_ssim}GenericWork/)
-      end
-    end
-  end
-end