curation_concerns 2.0.0.rc1 → 2.0.0.rc2

data/spec/presenters/curation_concerns/member_presenter_factory_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+RSpec.describe CurationConcerns::MemberPresenterFactory do
+  describe "#file_set_presenters" do
+    describe "getting presenters from factory" do
+      let(:solr_document) { SolrDocument.new(attributes) }
+      let(:attributes) { {} }
+      let(:ability) { double }
+      let(:request) { double }
+      let(:factory) { described_class.new(solr_document, ability, request) }
+      let(:presenter_class) { double }
+      before do
+        allow(factory).to receive(:composite_presenter_class).and_return(presenter_class)
+        allow(factory).to receive(:ordered_ids).and_return(['12', '33'])
+        allow(factory).to receive(:file_set_ids).and_return(['33', '12'])
+      end
+
+      it "uses the set class" do
+        expect(CurationConcerns::PresenterFactory).to receive(:build_presenters)
+          .with(['12', '33'], presenter_class, ability, request)
+        factory.file_set_presenters
+      end
+    end
+  end
+end

data/spec/presenters/curation_concerns/work_show_presenter_spec.rb

@@ -81,31 +81,25 @@ describe CurationConcerns::WorkShowPresenter do
       expect(presenter.file_set_presenters.map(&:id)).to eq obj.ordered_member_ids
     end
 
-    context "when some of the members are not file sets" do
-      let(:another_work) { create(:work) }
+    context "solr query" do
       before do
-        obj.ordered_members << another_work
-        obj.save!
+        expect(ActiveFedora::SolrService).to receive(:query).twice.with(anything, hash_including(rows: 10_000)).and_return([])
       end
 
-      it "filters out members that are not file sets" do
-        expect(presenter.file_set_presenters.map(&:id)).not_to include another_work.id
+      it "requests >10 rows" do
+        presenter.file_set_presenters
       end
     end
 
-    describe "getting presenters from factory" do
-      let(:attributes) { {} }
-      let(:presenter_class) { double }
+    context "when some of the members are not file sets" do
+      let(:another_work) { create(:work) }
       before do
-        allow(presenter).to receive(:composite_presenter_class).and_return(presenter_class)
-        allow(presenter).to receive(:ordered_ids).and_return(['12', '33'])
-        allow(presenter).to receive(:file_set_ids).and_return(['33', '12'])
+        obj.ordered_members << another_work
+        obj.save!
       end
 
-      it "uses the set class" do
-        expect(CurationConcerns::PresenterFactory).to receive(:build_presenters)
-          .with(['12', '33'], presenter_class, ability, request)
-        presenter.file_set_presenters
+      it "filters out members that are not file sets" do
+        expect(presenter.file_set_presenters.map(&:id)).not_to include another_work.id
       end
     end
   end
@@ -113,13 +107,9 @@ describe CurationConcerns::WorkShowPresenter do
   describe "#representative_presenter" do
     let(:obj) { create(:work_with_representative_file) }
     let(:attributes) { obj.to_solr }
-    let(:presenter_class) { double }
-    before do
-      allow(presenter).to receive(:composite_presenter_class).and_return(presenter_class)
-    end
     it "has a representative" do
       expect(CurationConcerns::PresenterFactory).to receive(:build_presenters)
-        .with([obj.members[0].id], presenter_class, ability, request).and_return ["abc"]
+        .with([obj.members[0].id], CurationConcerns::CompositePresenterFactory, ability, request).and_return ["abc"]
       expect(presenter.representative_presenter).to eq("abc")
     end
   end

data/spec/services/curation_concerns/workflow/grant_edit_to_depositor_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 RSpec.describe CurationConcerns::Workflow::GrantEditToDepositor do
   let(:depositor) { create(:user) }
-  let(:work) { create(:work_without_access, depositor: depositor.user_key) }
   let(:user) { User.new }
 
   describe ".call" do
@@ -12,9 +11,21 @@ RSpec.describe CurationConcerns::Workflow::GrantEditToDepositor do
                            user: user)
     end
 
-    it "adds edit access " do
-      expect { subject }.to change { work.edit_users }.from([]).to([depositor.user_key])
-      expect(work).to be_valid
+    context "with no additional editors" do
+      let(:work) { create(:work_without_access, depositor: depositor.user_key) }
+      it "adds edit access" do
+        expect { subject }.to change { work.edit_users }.from([]).to([depositor.user_key])
+        expect(work).to be_valid
+      end
+    end
+
+    context "with an additional editor" do
+      let(:editor) { create(:user) }
+      let(:work) { create(:work_without_access, depositor: depositor.user_key, edit_users: [editor.user_key]) }
+      it "adds edit access" do
+        expect { subject }.to change { work.edit_users }.from([editor.user_key]).to([editor.user_key, depositor.user_key])
+        expect(work).to be_valid
+      end
     end
   end
 end

data/spec/services/curation_concerns/workflow/permission_query_spec.rb

@@ -165,12 +165,18 @@ module CurationConcerns
           subject { described_class.scope_processing_agents_for(user: nil) }
           it { is_expected.to eq([]) }
         end
+
         context 'when user is persisted' do
           let(:user) { create(:user) }
+          before do
+            allow(user).to receive(:groups).and_return(['librarians'])
+          end
+
           subject { described_class.scope_processing_agents_for(user: user) }
+
           it 'will equal [kind_of(Sipity::Agent)]' do
             is_expected.to contain_exactly(PowerConverter.convert_to_sipity_agent(user),
-                                           PowerConverter.convert_to_sipity_agent(Group.new('registered')))
+                                           PowerConverter.convert_to_sipity_agent(Group.new('librarians')))
           end
         end
       end

data/spec/services/curation_concerns/workflow/workflow_importer_spec.rb

@@ -10,6 +10,7 @@ RSpec.describe CurationConcerns::Workflow::WorkflowImporter do
           "name": "ulra_submission",
           "label": "This is the label",
           "description": "This description could get really long",
+          "allows_access_grant": true,
           "actions": [{
             "name": "approve",
             "transition_to": "reviewed",
@@ -42,8 +43,10 @@ RSpec.describe CurationConcerns::Workflow::WorkflowImporter do
         result = described_class.generate_from_json_file(path: path)
       end.to change { Sipity::Workflow.count }.by(1)
       expect(result).to match_array(kind_of(Sipity::Workflow))
-      expect(result.first.label).to eq "This is the label"
-      expect(result.first.description).to eq "This description could get really long"
+      first_workflow = result.first
+      expect(first_workflow.label).to eq "This is the label"
+      expect(first_workflow.description).to eq "This description could get really long"
+      expect(first_workflow.allows_access_grant?).to be true
     end
   end
 end

data/spec/services/curation_concerns/workflow/workflow_schema_spec.rb

@@ -8,6 +8,7 @@ module CurationConcerns
           workflows: [
             {
               name: "valid",
+              allows_access_grant: true,
               actions: [
                 {
                   name: "finalize_digitization",

data/spec/views/curation_concerns/admin/workflow_roles/index.html.erb_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'curation_concerns/admin/workflow_roles/index.html.erb', type: :view do
+  let!(:user1) { create(:user) }
+  let!(:user2) { create(:user) }
+  let(:presenter) do
+    CurationConcerns::Admin::WorkflowRolePresenter.new
+  end
+
+  before do
+    assign(:presenter, presenter)
+    allow(view).to receive(:admin_workflow_roles_path).and_return('/admin/workflow_roles')
+  end
+
+  context 'with no users having workflow roles' do
+    it 'displays "No Roles" for each user' do
+      render
+      expect(rendered).to have_content('No roles', count: User.count)
+    end
+  end
+
+  context 'with some users having workflow roles' do
+    before do
+      # Force user instances to have corresponding sipity agents
+      user1.to_sipity_agent
+      user2.to_sipity_agent
+    end
+    it 'displays roles for each user' do
+      render
+      expect(rendered.match(/<ul>\s+<\/ul>/m)).to be nil
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe 'curation_concerns/base/_form.html.erb', type: :view do
+  let(:ability) { double }
+  let(:user) { stub_model(User) }
+  let(:form) do
+    CurationConcerns::GenericWorkForm.new(work, ability)
+  end
+
+  before do
+    # view.lookup_context.view_paths.push 'app/views/curation_concerns'
+    # allow(controller).to receive(:current_user).and_return(user)
+    allow(view).to receive(:curation_concern).and_return(work)
+  end
+
+  let(:page) do
+    view.simple_form_for form do |f|
+      render 'curation_concerns/base/form', f: f
+    end
+    Capybara::Node::Simple.new(rendered)
+  end
+
+  context "when the work has been saved before" do
+    before do
+      allow(work).to receive(:new_record?).and_return(false)
+      assign(:form, form)
+    end
+
+    let(:work) { stub_model(GenericWork, id: '456', etag: '123456') }
+
+    it "renders the form with the version" do
+      expect(page).to have_selector("input#generic_work_version[value=\"123456\"]", visible: false)
+    end
+  end
+end

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

@@ -26,19 +26,21 @@ RSpec.describe "curation_concerns/base/file_manager.html.erb" do
   end
   let(:resource) { FactoryGirl.build(:file_set) }
 
-  let(:parent) { FactoryGirl.build(:generic_work) }
-  let(:parent_solr_doc) do
-    SolrDocument.new(parent.to_solr.merge(id: "resource"), nil)
-  end
-  let(:parent_presenter) do
-    CurationConcerns::WorkShowPresenter.new(parent_solr_doc, nil, view)
+  let(:parent) { build(:generic_work) }
+
+  let(:form) do
+    CurationConcerns::Forms::FileManagerForm.new(parent, nil)
   end
 
   let(:blacklight_config) { CatalogController.new.blacklight_config }
 
   before do
-    allow(parent_presenter).to receive(:member_presenters).and_return([file_set, member])
-    assign(:presenter, parent_presenter)
+    allow(parent).to receive(:etag).and_return("123456")
+    allow(parent).to receive(:persisted?).and_return(true)
+    allow(parent).to receive(:id).and_return('resource')
+
+    allow(form).to receive(:member_presenters).and_return([file_set, member])
+    assign(:form, form)
     # Blacklight nonsense
     allow(view).to receive(:dom_class) { '' }
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)

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

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
 describe 'curation_concerns/base/show.json.jbuilder' do
-  let(:curation_concern) { FactoryGirl.create(:generic_work) }
+  let(:curation_concern) { create(:generic_work) }
 
   before do
+    allow(curation_concern).to receive(:etag).and_return('W/"87f79d2244ded4239ad1f0e822c8429b1e72b66c"')
     assign(:curation_concern, curation_concern)
     render
   end
@@ -17,5 +18,6 @@ describe 'curation_concerns/base/show.json.jbuilder' do
     expected_fields.each do |field_symbol|
       expect(json).to have_key(field_symbol.to_s)
     end
+    expect(json['version']).to eq 'W/"87f79d2244ded4239ad1f0e822c8429b1e72b66c"'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -38,14 +38,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.3.0.rc1
+        version: 10.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.3.0.rc1
+        version: 10.3.0
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -785,6 +785,7 @@ 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/optimistic_lock_validator.rb
 - app/assets/images/audio.png
 - app/assets/images/default.png
 - app/assets/images/loading.gif
@@ -877,6 +878,7 @@ files:
 - app/conversions/power_converters/sipity_workflow_state.rb
 - app/forms/curation_concerns/forms.rb
 - app/forms/curation_concerns/forms/collection_edit_form.rb
+- app/forms/curation_concerns/forms/file_manager_form.rb
 - app/forms/curation_concerns/forms/file_set_edit_form.rb
 - app/forms/curation_concerns/forms/work_form.rb
 - app/forms/curation_concerns/forms/workflow_action_form.rb
@@ -972,6 +974,7 @@ files:
 - app/presenters/curation_concerns/file_set_presenter.rb
 - app/presenters/curation_concerns/inspect_work_presenter.rb
 - app/presenters/curation_concerns/lease_presenter.rb
+- app/presenters/curation_concerns/member_presenter_factory.rb
 - app/presenters/curation_concerns/model_proxy.rb
 - app/presenters/curation_concerns/permission_badge.rb
 - app/presenters/curation_concerns/presenter_factory.rb
@@ -1143,8 +1146,10 @@ files:
 - app/views/curation_concerns/base/_form_descriptive_fields.html.erb
 - app/views/curation_concerns/base/_form_files_and_links.html.erb
 - app/views/curation_concerns/base/_form_in_works.html.erb
+- app/views/curation_concerns/base/_form_in_works_error.html.erb
 - app/views/curation_concerns/base/_form_media.html.erb
 - app/views/curation_concerns/base/_form_member_of_collections.html.erb
+- app/views/curation_concerns/base/_form_ordered_members_error.html.erb
 - app/views/curation_concerns/base/_form_permission.html.erb
 - app/views/curation_concerns/base/_form_permission_embargo.html.erb
 - app/views/curation_concerns/base/_form_permission_lease.html.erb
@@ -1243,6 +1248,7 @@ files:
 - db/migrate/20160427155928_create_operations.rb
 - db/migrate/20160919151348_create_sipity.rb
 - db/migrate/20161012182404_create_sipity_workflow_methods.rb
+- db/migrate/20170308175556_add_allows_access_grant_to_workflow.rb
 - lib/curation_concerns.rb
 - lib/curation_concerns/callbacks.rb
 - lib/curation_concerns/callbacks/registry.rb
@@ -1251,6 +1257,7 @@ files:
 - lib/curation_concerns/collections/search_service.rb
 - lib/curation_concerns/configuration.rb
 - lib/curation_concerns/controller_resource.rb
+- lib/curation_concerns/data_migration/collections_migration.rb
 - lib/curation_concerns/engine.rb
 - lib/curation_concerns/name.rb
 - lib/curation_concerns/null_logger.rb
@@ -1324,6 +1331,7 @@ files:
 - spec/abilities/file_set_abilities_spec.rb
 - spec/abilities/generic_work_abilities_spec.rb
 - spec/abilities/operation_ability_spec.rb
+- spec/actors/curation_concerns/add_as_member_of_collections_actor_spec.rb
 - spec/actors/curation_concerns/apply_order_actor_spec.rb
 - spec/actors/curation_concerns/embargo_actor_spec.rb
 - spec/actors/curation_concerns/file_actor_spec.rb
@@ -1331,6 +1339,7 @@ files:
 - spec/actors/curation_concerns/initialize_workflow_actor_spec.rb
 - spec/actors/curation_concerns/interpret_visibility_actor_spec.rb
 - spec/actors/curation_concerns/lease_actor_spec.rb
+- spec/actors/curation_concerns/optimistic_lock_validator_spec.rb
 - spec/actors/curation_concerns/work_actor_spec.rb
 - spec/controllers/accepts_batches_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
@@ -1385,6 +1394,7 @@ files:
 - spec/features/work_generator_spec.rb
 - spec/features/workflow_roles_spec.rb
 - spec/forms/collection_edit_form_spec.rb
+- spec/forms/curation_concerns/forms/file_manager_form_spec.rb
 - spec/forms/curation_concerns/forms/workflow_action_form_spec.rb
 - spec/forms/curation_concerns/forms/workflow_responsibility_form_spec.rb
 - spec/forms/file_set_edit_form_spec.rb
@@ -1430,6 +1440,7 @@ files:
 - spec/lib/curation_concerns/callbacks/registry_spec.rb
 - spec/lib/curation_concerns/callbacks_spec.rb
 - spec/lib/curation_concerns/collections/search_service_spec.rb
+- spec/lib/curation_concerns/data_migration/collections_migration_spec.rb
 - spec/lib/curation_concerns/name_spec.rb
 - spec/lib/curation_concerns/null_logger_spec.rb
 - spec/lib/curation_concerns/readable_permissions_spec.rb
@@ -1470,6 +1481,7 @@ files:
 - spec/presenters/curation_concerns/collection_presenter_spec.rb
 - spec/presenters/curation_concerns/file_set_presenter_spec.rb
 - spec/presenters/curation_concerns/inspect_work_presenter_spec.rb
+- spec/presenters/curation_concerns/member_presenter_factory_spec.rb
 - spec/presenters/curation_concerns/permission_badge_spec.rb
 - spec/presenters/curation_concerns/presenter_factory_spec.rb
 - spec/presenters/curation_concerns/single_use_link_presenter_spec.rb
@@ -1556,7 +1568,9 @@ files:
 - spec/views/curation_concerns/admin/_total_objects_charts.html.erb_spec.rb
 - spec/views/curation_concerns/admin/index.html.erb_spec.rb
 - spec/views/curation_concerns/admin/widgets/_pie.html.erb_spec.rb
+- spec/views/curation_concerns/admin/workflow_roles/index.html.erb_spec.rb
 - spec/views/curation_concerns/base/_attributes.html.erb_spec.rb
+- spec/views/curation_concerns/base/_form.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
@@ -1604,7 +1618,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A Rails Engine that allows an application to CRUD CurationConcern objects
@@ -1617,6 +1631,7 @@ test_files:
 - spec/abilities/file_set_abilities_spec.rb
 - spec/abilities/generic_work_abilities_spec.rb
 - spec/abilities/operation_ability_spec.rb
+- spec/actors/curation_concerns/add_as_member_of_collections_actor_spec.rb
 - spec/actors/curation_concerns/apply_order_actor_spec.rb
 - spec/actors/curation_concerns/embargo_actor_spec.rb
 - spec/actors/curation_concerns/file_actor_spec.rb
@@ -1624,6 +1639,7 @@ test_files:
 - spec/actors/curation_concerns/initialize_workflow_actor_spec.rb
 - spec/actors/curation_concerns/interpret_visibility_actor_spec.rb
 - spec/actors/curation_concerns/lease_actor_spec.rb
+- spec/actors/curation_concerns/optimistic_lock_validator_spec.rb
 - spec/actors/curation_concerns/work_actor_spec.rb
 - spec/controllers/accepts_batches_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
@@ -1678,6 +1694,7 @@ test_files:
 - spec/features/work_generator_spec.rb
 - spec/features/workflow_roles_spec.rb
 - spec/forms/collection_edit_form_spec.rb
+- spec/forms/curation_concerns/forms/file_manager_form_spec.rb
 - spec/forms/curation_concerns/forms/workflow_action_form_spec.rb
 - spec/forms/curation_concerns/forms/workflow_responsibility_form_spec.rb
 - spec/forms/file_set_edit_form_spec.rb
@@ -1723,6 +1740,7 @@ test_files:
 - spec/lib/curation_concerns/callbacks/registry_spec.rb
 - spec/lib/curation_concerns/callbacks_spec.rb
 - spec/lib/curation_concerns/collections/search_service_spec.rb
+- spec/lib/curation_concerns/data_migration/collections_migration_spec.rb
 - spec/lib/curation_concerns/name_spec.rb
 - spec/lib/curation_concerns/null_logger_spec.rb
 - spec/lib/curation_concerns/readable_permissions_spec.rb
@@ -1763,6 +1781,7 @@ test_files:
 - spec/presenters/curation_concerns/collection_presenter_spec.rb
 - spec/presenters/curation_concerns/file_set_presenter_spec.rb
 - spec/presenters/curation_concerns/inspect_work_presenter_spec.rb
+- spec/presenters/curation_concerns/member_presenter_factory_spec.rb
 - spec/presenters/curation_concerns/permission_badge_spec.rb
 - spec/presenters/curation_concerns/presenter_factory_spec.rb
 - spec/presenters/curation_concerns/single_use_link_presenter_spec.rb
@@ -1849,7 +1868,9 @@ test_files:
 - spec/views/curation_concerns/admin/_total_objects_charts.html.erb_spec.rb
 - spec/views/curation_concerns/admin/index.html.erb_spec.rb
 - spec/views/curation_concerns/admin/widgets/_pie.html.erb_spec.rb
+- spec/views/curation_concerns/admin/workflow_roles/index.html.erb_spec.rb
 - spec/views/curation_concerns/base/_attributes.html.erb_spec.rb
+- spec/views/curation_concerns/base/_form.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