curation_concerns 1.5.0 → 1.6.0

data/spec/views/curation_concerns/base/file_manager.html.erb_spec.rb

@@ -95,4 +95,12 @@ RSpec.describe "curation_concerns/base/file_manager.html.erb" do
   it "renders a thumbnail field for each member" do
     expect(rendered).to have_selector("input[name='thumbnail_id']", count: members.length)
   end
+
+  it "renders a hidden field for the resource form representative id" do
+    expect(rendered).to have_selector("#resource-form input[type=hidden][name='generic_work[representative_id]']", visible: false)
+  end
+
+  it "renders a representative field for each member" do
+    expect(rendered).to have_selector("input[name='representative_id']", count: members.length)
+  end
 end

data/spec/views/curation_concerns/base/show.json.jbuilder_spec.rb

@@ -11,7 +11,7 @@ describe 'curation_concerns/base/show.json.jbuilder' do
   it "renders json of the curation_concern" do
     json = JSON.parse(rendered)
     expect(json['id']).to eq curation_concern.id
-    expect(json['title']).to eq curation_concern.title
+    expect(json['title']).to match_array curation_concern.title
     expected_fields = curation_concern.class.fields.select { |f| ![:has_model, :create_date].include? f }
     expected_fields << :date_created
     expected_fields.each do |field_symbol|

data/spec/views/curation_concerns/file_sets/show.json.jbuilder_spec.rb

@@ -13,7 +13,7 @@ describe 'curation_concerns/file_sets/show.json.jbuilder' do
   it "renders json of the curation_concern" do
     json = JSON.parse(rendered)
     expect(json['id']).to eq file_set.id
-    expect(json['title']).to eq file_set.title
+    expect(json['title']).to match_array file_set.title
     expect(json).to have_key('label')
     expect(json).to have_key('description')
     expect(json).to have_key('creator')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -204,14 +204,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: active_fedora-noid
   requirement: !ruby/object:Gem::Requirement
@@ -344,20 +344,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: fcrepo_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -426,14 +420,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -736,6 +730,7 @@ files:
 - app/controllers/concerns/curation_concerns/leases_controller_behavior.rb
 - app/controllers/concerns/curation_concerns/manages_embargoes.rb
 - app/controllers/concerns/curation_concerns/parent_container.rb
+- app/controllers/concerns/curation_concerns/permissions_controller_behavior.rb
 - app/controllers/concerns/curation_concerns/selects_collections.rb
 - app/controllers/concerns/curation_concerns/single_use_links_controller_behavior.rb
 - app/controllers/concerns/curation_concerns/single_use_links_viewer_controller_behavior.rb
@@ -757,18 +752,14 @@ files:
 - app/forms/curation_concerns/forms/file_set_edit_form.rb
 - app/forms/curation_concerns/forms/work_form.rb
 - app/helpers/batch_select_helper.rb
-- app/helpers/collections_helper.rb
 - app/helpers/curation_concerns/ability_helper.rb
 - app/helpers/curation_concerns/catalog_helper.rb
 - app/helpers/curation_concerns/collections_helper.rb
-- app/helpers/curation_concerns/collections_helper_behavior.rb
 - app/helpers/curation_concerns/embargo_helper.rb
 - app/helpers/curation_concerns/file_set_helper.rb
 - app/helpers/curation_concerns/lease_helper.rb
 - 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
@@ -788,7 +779,6 @@ files:
 - app/jobs/visibility_copy_job.rb
 - app/models/admin_set.rb
 - app/models/checksum_audit_log.rb
-- app/models/collection.rb
 - app/models/concerns/curation_concerns/ability.rb
 - app/models/concerns/curation_concerns/admin_set_behavior.rb
 - app/models/concerns/curation_concerns/basic_metadata.rb
@@ -837,13 +827,14 @@ files:
 - app/presenters/curation_concerns/version_list_presenter.rb
 - app/presenters/curation_concerns/version_presenter.rb
 - app/presenters/curation_concerns/work_show_presenter.rb
+- app/renderers/curation_concerns/renderers.rb
 - app/renderers/curation_concerns/renderers/attribute_renderer.rb
 - app/renderers/curation_concerns/renderers/configured_microdata.rb
 - app/renderers/curation_concerns/renderers/date_attribute_renderer.rb
+- app/renderers/curation_concerns/renderers/external_link_attribute_renderer.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/admin_set_search_builder.rb
 - app/search_builders/curation_concerns/collection_member_search_builder.rb
 - app/search_builders/curation_concerns/collection_search_builder.rb
@@ -1089,6 +1080,8 @@ files:
 - lib/generators/curation_concerns/templates/curation_concerns.js
 - lib/generators/curation_concerns/templates/curation_concerns.scss
 - lib/generators/curation_concerns/templates/curation_concerns_helper.rb
+- lib/generators/curation_concerns/templates/spec/models/collection_spec.rb
+- lib/generators/curation_concerns/templates/spec/models/file_set_spec.rb
 - lib/generators/curation_concerns/work/USAGE
 - lib/generators/curation_concerns/work/templates/README
 - lib/generators/curation_concerns/work/templates/actor.rb.erb
@@ -1171,7 +1164,6 @@ files:
 - spec/forms/file_set_edit_form_spec.rb
 - spec/forms/work_form_spec.rb
 - spec/helpers/catalog_helper_spec.rb
-- spec/helpers/collections_helper_spec.rb
 - spec/helpers/configuration_helper_spec.rb
 - spec/helpers/curation_concerns/ability_helper_spec.rb
 - spec/helpers/curation_concerns/collections_helper_spec.rb
@@ -1184,9 +1176,11 @@ files:
 - spec/inputs/multi_value_with_help_input_spec.rb
 - spec/inputs/multifile_input_spec.rb
 - spec/javascripts/file_manager_member_spec.coffee
+- spec/javascripts/file_manager_sorting_spec.coffee
 - spec/javascripts/fixtures/.gitkeep
 - spec/javascripts/fixtures/file_manager_member.html
 - spec/javascripts/fixtures/save_button.html
+- spec/javascripts/fixtures/sortable.html
 - spec/javascripts/fixtures/sul_table.html
 - spec/javascripts/helpers/jasmine-jquery.js
 - spec/javascripts/helpers/mock-ajax.js
@@ -1239,6 +1233,7 @@ files:
 - spec/presenters/lease_presenter_spec.rb
 - spec/renderers/curation_concerns/renderers/attribute_renderer_spec.rb
 - spec/renderers/curation_concerns/renderers/date_attribute_renderer_spec.rb
+- spec/renderers/curation_concerns/renderers/external_link_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
@@ -1391,7 +1386,6 @@ test_files:
 - spec/forms/file_set_edit_form_spec.rb
 - spec/forms/work_form_spec.rb
 - spec/helpers/catalog_helper_spec.rb
-- spec/helpers/collections_helper_spec.rb
 - spec/helpers/configuration_helper_spec.rb
 - spec/helpers/curation_concerns/ability_helper_spec.rb
 - spec/helpers/curation_concerns/collections_helper_spec.rb
@@ -1404,9 +1398,11 @@ test_files:
 - spec/inputs/multi_value_with_help_input_spec.rb
 - spec/inputs/multifile_input_spec.rb
 - spec/javascripts/file_manager_member_spec.coffee
+- spec/javascripts/file_manager_sorting_spec.coffee
 - spec/javascripts/fixtures/.gitkeep
 - spec/javascripts/fixtures/file_manager_member.html
 - spec/javascripts/fixtures/save_button.html
+- spec/javascripts/fixtures/sortable.html
 - spec/javascripts/fixtures/sul_table.html
 - spec/javascripts/helpers/jasmine-jquery.js
 - spec/javascripts/helpers/mock-ajax.js
@@ -1459,6 +1455,7 @@ test_files:
 - spec/presenters/lease_presenter_spec.rb
 - spec/renderers/curation_concerns/renderers/attribute_renderer_spec.rb
 - spec/renderers/curation_concerns/renderers/date_attribute_renderer_spec.rb
+- spec/renderers/curation_concerns/renderers/external_link_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

data/app/helpers/collections_helper.rb

@@ -1,4 +0,0 @@
-# View Helpers for Hydra Collections functionality
-module CollectionsHelper
-  include CurationConcerns::CollectionsHelperBehavior
-end

data/app/helpers/curation_concerns/collections_helper_behavior.rb

@@ -1,41 +0,0 @@
-# View Helpers for Hydra Collections functionality
-module CurationConcerns
-  module CollectionsHelperBehavior
-    def has_collection_search_parameters?
-      !params[:cq].blank?
-    end
-
-    def button_for_remove_from_collection(collection, document, label = 'Remove From Collection')
-      render '/collections/button_remove_from_collection', collection: collection, label: label, document: document
-    end
-
-    def button_for_remove_selected_from_collection(collection, label = 'Remove From Collection')
-      render '/collections/button_for_remove_selected_from_collection', collection: collection, label: label
-    end
-
-    # add hidden fields to a form for removing a single document from a collection
-    def single_item_action_remove_form_fields(form, document)
-      single_item_action_form_fields(form, document, 'remove')
-    end
-
-    # add hidden fields to a form for adding a single document to a collection
-    def single_item_action_add_form_fields(form, document)
-      single_item_action_form_fields(form, document, 'add')
-    end
-
-    # add hidden fields to a form for performing an action on a single document on a collection
-    def single_item_action_form_fields(form, document, action)
-      render '/collections/single_item_action_fields', form: form, document: document, action: action
-    end
-
-    def hidden_collection_members
-      erbout = ''
-      if params[:batch_document_ids].present?
-        params[:batch_document_ids].each do |batch_item|
-          erbout.concat hidden_field_tag('batch_document_ids[]', batch_item)
-        end
-      end
-      erbout.html_safe
-    end
-  end
-end

data/app/helpers/curation_concerns/permissions_helper.rb

@@ -1,19 +0,0 @@
-module CurationConcerns
-  module PermissionsHelper
-    def help_text(file)
-      capture_content(file)
-    end
-
-    private
-
-      def capture_content(file)
-        capture do
-          render file
-        end
-      end
-
-      def help_icon
-        content_tag 'i', '', 'aria-hidden' => true, class: 'help-icon'
-      end
-  end
-end

data/app/helpers/curation_concerns/rights_helper.rb

@@ -1,9 +0,0 @@
-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/models/collection.rb

@@ -1,6 +0,0 @@
-# Generated by curation_concerns:models:install
-class Collection < ActiveFedora::Base
-  include ::CurationConcerns::CollectionBehavior
-  # You can replace these metadata if they're not suitable
-  include CurationConcerns::BasicMetadata
-end

data/spec/helpers/collections_helper_spec.rb

@@ -1,88 +0,0 @@
-require 'spec_helper'
-
-describe CollectionsHelper, type: :helper do
-  describe "has_collection_search_parameters?" do
-    subject { helper }
-
-    context "when cq is set" do
-      before { allow(helper).to receive(:params).and_return(cq: 'foo') }
-      it { is_expected.to have_collection_search_parameters }
-    end
-
-    context "when cq is not set" do
-      before { allow(helper).to receive(:params).and_return(cq: '') }
-      it { is_expected.not_to have_collection_search_parameters }
-    end
-  end
-
-  describe "button_for_remove_from_collection" do
-    let(:item) { double(id: 'changeme:123') }
-    let(:collection) { FactoryGirl.create(:collection) }
-
-    it "generates a form that can remove the item" do
-      str = button_for_remove_from_collection collection, item
-      doc = Nokogiri::HTML(str)
-      form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq collection_path(collection)
-      expect(form.css('input#collection_members[type="hidden"][value="remove"]')).not_to be_empty
-      expect(form.css('input[type="hidden"][name="batch_document_ids[]"][value="changeme:123"]')).not_to be_empty
-    end
-
-    describe "for a collection of another name" do
-      before(:all) do
-        class OtherCollection < ActiveFedora::Base
-          include CurationConcerns::Collection
-          include Hydra::Works::WorkBehavior
-        end
-      end
-
-      let!(:collection) { OtherCollection.create! }
-
-      after(:all) do
-        Object.send(:remove_const, :OtherCollection)
-      end
-
-      it "generates a form that can remove the item" do
-        str = button_for_remove_from_collection collection, item
-        doc = Nokogiri::HTML(str)
-        form = doc.xpath('//form').first
-        expect(form.attr('action')).to eq collection_path(collection)
-        expect(form.css('input#collection_members[type="hidden"][value="remove"]')).not_to be_empty
-        expect(form.css('input[type="hidden"][name="batch_document_ids[]"][value="changeme:123"]')).not_to be_empty
-      end
-    end
-  end
-
-  describe "button_for_remove_selected_from_collection" do
-    let(:collection) { FactoryGirl.create(:collection) }
-
-    it "creates a button to the collections delete path" do
-      str = button_for_remove_selected_from_collection collection
-      doc = Nokogiri::HTML(str)
-      form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq collection_path(collection)
-      i = form.xpath('.//input')[2]
-      expect(i.attr('value')).to eq("remove")
-      expect(i.attr('name')).to eq("collection[members]")
-    end
-
-    it "creates a button with my text" do
-      str = button_for_remove_selected_from_collection collection, "Remove My Button"
-      doc = Nokogiri::HTML(str)
-      form = doc.css('form').first
-      expect(form.attr('action')).to eq collection_path(collection)
-      expect(form.css('input[type="submit"]').attr('value').value).to eq "Remove My Button"
-    end
-  end
-
-  describe "hidden_collection_members" do
-    before { helper.params[:batch_document_ids] = ['foo:12', 'foo:23'] }
-    it "makes hidden fields" do
-      doc = Nokogiri::HTML(hidden_collection_members)
-      inputs = doc.xpath('//input[@type="hidden"][@name="batch_document_ids[]"]')
-      expect(inputs.length).to eq(2)
-      expect(inputs[0].attr('value')).to eq('foo:12')
-      expect(inputs[1].attr('value')).to eq('foo:23')
-    end
-  end
-end