curation_concerns 1.4.0 → 1.5.0

data/spec/services/curation_concerns/rights_statements_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe CurationConcerns::RightsStatements do
+  let(:service) { described_class.new }
+
+  describe "#select_active_options" do
+    it "returns active terms" do
+      expect(service.select_active_options).to include(["In Copyright", "http://rightsstatements.org/vocab/InC/1.0/"], ["No Known Copyright", "http://rightsstatements.org/vocab/NKC/1.0/"])
+    end
+  end
+end

data/spec/services/rights_service_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+Deprecation.default_deprecation_behavior = :silence
 describe RightsService do
   before do
     # Configure QA to use fixtures
@@ -33,3 +34,4 @@ describe RightsService do
     end
   end
 end
+Deprecation.default_deprecation_behavior = :stderr

data/spec/spec_helper.rb

@@ -93,6 +93,7 @@ RSpec.configure do |config|
   config.include(ControllerLevelHelpers, type: :view)
   config.before(:each, type: :view) { initialize_controller_helpers(view) }
 
+  config.include BackportTest, type: :controller unless Rails.version > '5'
   config.include Controllers::EngineHelpers, type: :controller
   config.include Controllers::EngineHelpers, type: :helper
   config.include ::Rails.application.routes.url_helpers
@@ -103,6 +104,49 @@ RSpec.configure do |config|
   config.include Capybara::RSpecMatchers, type: :input
   config.infer_spec_type_from_file_location!
   config.deprecation_stream
+
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.default_formatter = 'doc' if config.files_to_run.one?
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  config.example_status_persistence_file_path = 'spec/examples.txt'
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 end
 
 if defined?(ClamAV)

data/spec/support/backport_test.rb

@@ -0,0 +1,14 @@
+# Backport the Rails 5 controller test methods to Rails 4
+module BackportTest
+  [:delete, :get, :post, :put, :patch].each do |http_action|
+    define_method(http_action) do |*args|
+      (action, rest) = *args
+      rest ||= {}
+      if rest[:xhr]
+        @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
+        @request.env['HTTP_ACCEPT'] ||= [Mime::JS, Mime::HTML, Mime::XML, 'text/xml', Mime::ALL].join(', ')
+      end
+      super(action, rest[:params])
+    end
+  end
+end

data/spec/support/curation_concerns/factory_helpers.rb

@@ -26,7 +26,9 @@ module CurationConcerns
                  file_title:        opts.fetch(:file_title, []),
                  last_modified:     opts.fetch(:last_modified, []),
                  original_checksum: opts.fetch(:original_checksum, []),
-                 digest:            opts.fetch(:digest, [])
+                 digest:            opts.fetch(:digest, []),
+                 duration:          opts.fetch(:duration, []),
+                 sample_rate:       opts.fetch(:sample_rate, [])
                 )
     end
   end

data/spec/test_app_templates/Gemfile.extra

@@ -1,7 +1,5 @@
 # placeholder to use for pinning against specific gem commit references
 
-gem 'breadcrumbs_on_rails', git: 'https://github.com/weppos/breadcrumbs_on_rails.git'
-
 group :development do
   gem 'better_errors'
   gem 'binding_of_caller'

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

@@ -77,10 +77,22 @@ RSpec.describe "curation_concerns/base/file_manager.html.erb" do
   end
 
   it "renders a form for each member" do
-    expect(rendered).to have_selector("form", count: members.length)
+    expect(rendered).to have_selector("#sortable form", count: members.length)
   end
 
   it "renders an input for titles" do
     expect(rendered).to have_selector("input[name='file_set[title][]']")
   end
+
+  it "renders a resource form for the entire resource" do
+    expect(rendered).to have_selector("form#resource-form")
+  end
+
+  it "renders a hidden field for the resource form thumbnail id" do
+    expect(rendered).to have_selector("#resource-form input[type=hidden][name='generic_work[thumbnail_id]']", visible: false)
+  end
+
+  it "renders a thumbnail field for each member" do
+    expect(rendered).to have_selector("input[name='thumbnail_id']", count: members.length)
+  end
 end

data/spec/views/curation_concerns/file_sets/show.html.erb_spec.rb

@@ -72,28 +72,28 @@ describe 'curation_concerns/file_sets/show.html.erb', type: :view do
         context 'with an image' do
           let(:mime_type) { 'image/tiff' }
           it 'renders the download link' do
-            expect(rendered).to have_link('Download the full-sized image')
+            expect(rendered).to have_link('Download image')
           end
         end
 
         context 'with a PDF' do
           let(:mime_type) { 'application/pdf' }
           it 'renders the download link' do
-            expect(rendered).to have_link('Download the full-sized PDF')
+            expect(rendered).to have_link('Download PDF')
           end
         end
 
         context 'with a word document' do
           let(:mime_type) { 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' }
           it 'renders the download link' do
-            expect(rendered).to have_link('Download the document')
+            expect(rendered).to have_link('Download file')
           end
         end
 
         context 'with anything else' do
           let(:mime_type) { 'application/binary' }
           it 'renders the download link' do
-            expect(rendered).to have_link('Download the document')
+            expect(rendered).to have_link('Download file')
           end
         end
       end
@@ -107,28 +107,28 @@ describe 'curation_concerns/file_sets/show.html.erb', type: :view do
         context 'with an image' do
           let(:mime_type) { 'image/tiff' }
           it 'does not render the download link' do
-            expect(rendered).not_to have_link('Download the full-sized image')
+            expect(rendered).not_to have_link('Download image')
           end
         end
 
         context 'with a PDF' do
           let(:mime_type) { 'application/pdf' }
           it 'does not render the download link' do
-            expect(rendered).not_to have_link('Download the full-sized PDF')
+            expect(rendered).not_to have_link('Download PDF')
           end
         end
 
         context 'with a word document' do
           let(:mime_type) { 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' }
           it 'does not render the download link' do
-            expect(rendered).not_to have_link('Download the document')
+            expect(rendered).not_to have_link('Download file')
           end
         end
 
         context 'with anything else' do
           let(:mime_type) { 'application/binary' }
           it 'does not render the download link' do
-            expect(rendered).not_to have_link('Download the document')
+            expect(rendered).not_to have_link('Download file')
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -38,14 +38,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.0.0.rc6
+        version: 10.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 11.0.0.rc6
+        version: 10.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 3.0.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -76,7 +76,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 3.0.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -772,6 +772,7 @@ files:
 - 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/admin_set_indexer.rb
 - app/indexers/curation_concerns/collection_indexer.rb
 - app/indexers/curation_concerns/file_set_indexer.rb
 - app/indexers/curation_concerns/work_indexer.rb
@@ -785,9 +786,11 @@ files:
 - app/jobs/ingest_local_file_job.rb
 - app/jobs/resolrize_job.rb
 - 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
 - app/models/concerns/curation_concerns/collection.rb
 - app/models/concerns/curation_concerns/collection_behavior.rb
@@ -799,13 +802,16 @@ files:
 - app/models/concerns/curation_concerns/file_set_behavior.rb
 - app/models/concerns/curation_concerns/has_representative.rb
 - app/models/concerns/curation_concerns/human_readable_type.rb
+- app/models/concerns/curation_concerns/in_admin_set.rb
 - app/models/concerns/curation_concerns/naming.rb
 - app/models/concerns/curation_concerns/nested_works.rb
 - app/models/concerns/curation_concerns/permissions.rb
 - app/models/concerns/curation_concerns/permissions/readable.rb
 - app/models/concerns/curation_concerns/permissions/writable.rb
+- app/models/concerns/curation_concerns/publishable.rb
 - app/models/concerns/curation_concerns/required_metadata.rb
 - app/models/concerns/curation_concerns/serializers.rb
+- app/models/concerns/curation_concerns/solr_behavior/characterization.rb
 - app/models/concerns/curation_concerns/solr_document_behavior.rb
 - app/models/concerns/curation_concerns/user.rb
 - app/models/concerns/curation_concerns/with_file_sets.rb
@@ -813,8 +819,11 @@ files:
 - app/models/curation_concerns/classify_concern.rb
 - app/models/curation_concerns/operation.rb
 - app/models/curation_concerns/quick_classification_query.rb
+- app/models/curation_concerns/state_workflow.rb
 - app/models/single_use_link.rb
 - app/models/version_committer.rb
+- app/models/vocab/fedora_resource_status.rb
+- app/presenters/curation_concerns/characterization_behavior.rb
 - app/presenters/curation_concerns/collection_presenter.rb
 - app/presenters/curation_concerns/composite_presenter_factory.rb
 - app/presenters/curation_concerns/embargo_presenter.rb
@@ -835,6 +844,7 @@ files:
 - 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
 - app/search_builders/curation_concerns/deactivated_embargo_search_builder.rb
@@ -852,6 +862,7 @@ files:
 - app/search_builders/curation_concerns/work_relation.rb
 - app/search_builders/curation_concerns/work_search_builder.rb
 - app/services/curation_concerns/actors/actor_factory.rb
+- app/services/curation_concerns/admin_set_service.rb
 - app/services/curation_concerns/contextual_path.rb
 - app/services/curation_concerns/curation_concern.rb
 - app/services/curation_concerns/derivative_path.rb
@@ -860,6 +871,7 @@ files:
 - app/services/curation_concerns/graph_exporter.rb
 - app/services/curation_concerns/indexes_thumbnails.rb
 - app/services/curation_concerns/lease_service.rb
+- app/services/curation_concerns/license_service.rb
 - app/services/curation_concerns/list_source_exporter.rb
 - app/services/curation_concerns/local_file_service.rb
 - app/services/curation_concerns/lock_manager.rb
@@ -868,8 +880,10 @@ files:
 - app/services/curation_concerns/parent_service.rb
 - app/services/curation_concerns/persist_derivatives.rb
 - app/services/curation_concerns/persist_directly_contained_output_file_service.rb
+- app/services/curation_concerns/qa_select_service.rb
 - app/services/curation_concerns/repository_audit_service.rb
 - app/services/curation_concerns/restriction_service.rb
+- app/services/curation_concerns/rights_statements.rb
 - app/services/curation_concerns/thumbnail_path_service.rb
 - app/services/curation_concerns/time_service.rb
 - app/services/curation_concerns/versioning_service.rb
@@ -938,7 +952,9 @@ files:
 - app/views/curation_concerns/base/_file_manager_attributes.html.erb
 - app/views/curation_concerns/base/_file_manager_extra_tools.html.erb
 - app/views/curation_concerns/base/_file_manager_member.html.erb
+- app/views/curation_concerns/base/_file_manager_member_resource_options.html.erb
 - app/views/curation_concerns/base/_file_manager_members.html.erb
+- app/views/curation_concerns/base/_file_manager_resource_form.html.erb
 - app/views/curation_concerns/base/_file_manager_thumbnail.html.erb
 - app/views/curation_concerns/base/_form.html.erb
 - app/views/curation_concerns/base/_form_additional_information.html.erb
@@ -1060,8 +1076,9 @@ files:
 - lib/generators/curation_concerns/templates/app/models/collection.rb
 - lib/generators/curation_concerns/templates/app/models/file_set.rb
 - lib/generators/curation_concerns/templates/catalog_controller.rb
+- lib/generators/curation_concerns/templates/config/authorities/licenses.yml
 - lib/generators/curation_concerns/templates/config/authorities/resource_types.yml
-- lib/generators/curation_concerns/templates/config/authorities/rights.yml
+- lib/generators/curation_concerns/templates/config/authorities/rights_statements.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
@@ -1102,6 +1119,7 @@ files:
 - solr/config/xslt/example_atom.xsl
 - solr/config/xslt/example_rss.xsl
 - solr/config/xslt/luke.xsl
+- spec/abilities/admin_set_abilities_spec.rb
 - spec/abilities/collection_abilities_spec.rb
 - spec/abilities/embargo_and_lease_ability_spec.rb
 - spec/abilities/file_set_abilities_spec.rb
@@ -1132,6 +1150,7 @@ files:
 - spec/controllers/leases_controller_spec.rb
 - spec/controllers/selects_collections_controller_spec.rb
 - spec/controllers/welcome_controller_spec.rb
+- spec/factories/admin_sets.rb
 - spec/factories/collections.rb
 - spec/factories/create_curation_concern.rb
 - spec/factories/file_sets.rb
@@ -1194,6 +1213,7 @@ files:
 - spec/matchers.rb
 - spec/matchers/metadata_field_matchers.rb
 - spec/matchers/response_matchers.rb
+- spec/models/admin_set_spec.rb
 - spec/models/checksum_audit_log_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/curation_concerns/collection_behavior_spec.rb
@@ -1224,12 +1244,16 @@ files:
 - 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/admin_set_search_builder_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/work_relation_spec.rb
 - spec/search_builders/resource_types_service_spec.rb
 - spec/services/curation_concern_spec.rb
+- spec/services/curation_concerns/admin_set_service_spec.rb
+- spec/services/curation_concerns/license_service_spec.rb
+- spec/services/curation_concerns/rights_statements_spec.rb
 - spec/services/derivative_path_spec.rb
 - spec/services/embargo_service_spec.rb
 - spec/services/file_set_audit_service_spec.rb
@@ -1244,6 +1268,7 @@ files:
 - spec/services/thumbnail_path_service_spec.rb
 - spec/services/versioning_service_spec.rb
 - spec/spec_helper.rb
+- spec/support/backport_test.rb
 - spec/support/controllers/engine_helpers.rb
 - spec/support/curation_concerns/factory_helpers.rb
 - spec/support/features.rb
@@ -1314,6 +1339,7 @@ specification_version: 4
 summary: A Rails Engine that allows an application to CRUD CurationConcern objects
   (a.k.a. "Works")
 test_files:
+- spec/abilities/admin_set_abilities_spec.rb
 - spec/abilities/collection_abilities_spec.rb
 - spec/abilities/embargo_and_lease_ability_spec.rb
 - spec/abilities/file_set_abilities_spec.rb
@@ -1344,6 +1370,7 @@ test_files:
 - spec/controllers/leases_controller_spec.rb
 - spec/controllers/selects_collections_controller_spec.rb
 - spec/controllers/welcome_controller_spec.rb
+- spec/factories/admin_sets.rb
 - spec/factories/collections.rb
 - spec/factories/create_curation_concern.rb
 - spec/factories/file_sets.rb
@@ -1406,6 +1433,7 @@ test_files:
 - spec/matchers.rb
 - spec/matchers/metadata_field_matchers.rb
 - spec/matchers/response_matchers.rb
+- spec/models/admin_set_spec.rb
 - spec/models/checksum_audit_log_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/curation_concerns/collection_behavior_spec.rb
@@ -1436,12 +1464,16 @@ test_files:
 - 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/admin_set_search_builder_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/work_relation_spec.rb
 - spec/search_builders/resource_types_service_spec.rb
 - spec/services/curation_concern_spec.rb
+- spec/services/curation_concerns/admin_set_service_spec.rb
+- spec/services/curation_concerns/license_service_spec.rb
+- spec/services/curation_concerns/rights_statements_spec.rb
 - spec/services/derivative_path_spec.rb
 - spec/services/embargo_service_spec.rb
 - spec/services/file_set_audit_service_spec.rb
@@ -1456,6 +1488,7 @@ test_files:
 - spec/services/thumbnail_path_service_spec.rb
 - spec/services/versioning_service_spec.rb
 - spec/spec_helper.rb
+- spec/support/backport_test.rb
 - spec/support/controllers/engine_helpers.rb
 - spec/support/curation_concerns/factory_helpers.rb
 - spec/support/features.rb