curation_concerns 1.7.8 → 2.0.0.rc1

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

@@ -10,7 +10,6 @@ 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",
@@ -43,10 +42,8 @@ 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))
-      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
+      expect(result.first.label).to eq "This is the label"
+      expect(result.first.description).to eq "This description could get really long"
     end
   end
 end

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

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

data/spec/services/graph_exporter_spec.rb

@@ -8,10 +8,10 @@ RSpec.describe CurationConcerns::GraphExporter do
 
   describe "fetch" do
     subject { service.fetch }
-    let(:ttl) { subject.dump(:ttl) }
+    let(:ttl) { subject.dump(:ntriples) }
     it "transforms suburis to hashcodes" do
-      expect(ttl).to match %r{<http://localhost/concern/generic_works/#{work.id}> a ([^;]*)<http://projecthydra\.org/works/models#Work>}
-      expect(ttl).to match %r{<http://purl\.org/dc/terms/title> "Test title";}
+      expect(ttl).to match %r{<http://localhost/concern/generic_works/#{work.id}> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://projecthydra.org/works/models#Work>}
+      expect(ttl).to match %r{<http://purl\.org/dc/terms/title> "Test title"}
       expect(ttl).to match %r{<http://www\.w3\.org/ns/auth/acl#accessControl> <http://localhost/catalog/}
 
       query = subject.query([RDF::URI("http://localhost/concern/generic_works/#{work.id}"),

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

@@ -14,7 +14,7 @@ describe 'curation_concerns/base/show_actions' do
     let(:editor) { true }
     let(:collector) { true }
     it "shows the add to collection link" do
-      expect(rendered).to have_link 'Add to a Collection'
+      expect(rendered).not_to have_link 'Add to a Collection'
     end
   end
 

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

@@ -26,21 +26,19 @@ RSpec.describe "curation_concerns/base/file_manager.html.erb" do
   end
   let(:resource) { FactoryGirl.build(:file_set) }
 
-  let(:parent) { build(:generic_work) }
-
-  let(:form) do
-    CurationConcerns::Forms::FileManagerForm.new(parent, nil)
+  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)
   end
 
   let(:blacklight_config) { CatalogController.new.blacklight_config }
 
   before do
-    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)
+    allow(parent_presenter).to receive(:member_presenters).and_return([file_set, member])
+    assign(:presenter, parent_presenter)
     # 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,10 +1,9 @@
 require 'spec_helper'
 
 describe 'curation_concerns/base/show.json.jbuilder' do
-  let(:curation_concern) { create(:generic_work) }
+  let(:curation_concern) { FactoryGirl.create(:generic_work) }
 
   before do
-    allow(curation_concern).to receive(:etag).and_return('W/"87f79d2244ded4239ad1f0e822c8429b1e72b66c"')
     assign(:curation_concern, curation_concern)
     render
   end
@@ -18,6 +17,5 @@ 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: 1.7.8
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -160,16 +160,16 @@ dependencies:
   name: kaminari_route_prefix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
@@ -190,14 +190,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: active_fedora-noid
   requirement: !ruby/object:Gem::Requirement
@@ -420,6 +420,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hydra-pcdm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -758,7 +772,7 @@ files:
 - 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/add_as_member_of_collections_actor.rb
 - app/actors/curation_concerns/actors/add_to_work_actor.rb
 - app/actors/curation_concerns/actors/apply_order_actor.rb
 - app/actors/curation_concerns/actors/assign_representative_actor.rb
@@ -771,7 +785,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/optimistic_lock_validator.rb
 - app/assets/images/audio.png
 - app/assets/images/default.png
 - app/assets/images/loading.gif
@@ -864,7 +877,6 @@ 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
@@ -960,7 +972,6 @@ 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
@@ -992,7 +1003,6 @@ files:
 - app/search_builders/curation_concerns/filter_suppressed.rb
 - app/search_builders/curation_concerns/filter_suppressed_with_roles.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_filters.rb
 - app/search_builders/curation_concerns/single_collection_search_builder.rb
 - app/search_builders/curation_concerns/single_result.rb
@@ -1057,7 +1067,6 @@ files:
 - app/views/batch_select/_add_button.html.erb
 - app/views/batch_select/_check_all.html.erb
 - app/views/batch_select/_tools.html.erb
-- app/views/catalog/_action_menu_partials/_collection.html.erb
 - app/views/catalog/_action_menu_partials/_default.html.erb
 - app/views/catalog/_document.html.erb
 - app/views/catalog/_document_list.html.erb
@@ -1134,9 +1143,8 @@ 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_ordered_members_error.html.erb
+- app/views/curation_concerns/base/_form_member_of_collections.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
@@ -1149,6 +1157,7 @@ files:
 - app/views/curation_concerns/base/_form_thumbnail.html.erb
 - app/views/curation_concerns/base/_legally_binding_text.html.erb
 - app/views/curation_concerns/base/_member.html.erb
+- app/views/curation_concerns/base/_member_of_collections.html.erb
 - app/views/curation_concerns/base/_multiple_upload.html.erb
 - app/views/curation_concerns/base/_related_files.html.erb
 - app/views/curation_concerns/base/_representative_media.html.erb
@@ -1234,7 +1243,6 @@ 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
@@ -1316,7 +1324,6 @@ 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_to_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
@@ -1324,7 +1331,6 @@ 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
@@ -1379,7 +1385,6 @@ 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
@@ -1465,7 +1470,6 @@ 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
@@ -1552,9 +1556,7 @@ 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
@@ -1597,12 +1599,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Rails Engine that allows an application to CRUD CurationConcern objects
@@ -1615,7 +1617,6 @@ 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_to_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
@@ -1623,7 +1624,6 @@ 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,7 +1678,6 @@ 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
@@ -1764,7 +1763,6 @@ 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
@@ -1851,9 +1849,7 @@ 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

data/app/actors/curation_concerns/actors/add_to_collection_actor.rb

@@ -1,42 +0,0 @@
-module CurationConcerns
-  module Actors
-    class AddToCollectionActor < AbstractActor
-      def create(attributes)
-        collection_ids = attributes.delete(:collection_ids)
-        next_actor.create(attributes) && add_to_collections(collection_ids)
-      end
-
-      def update(attributes)
-        collection_ids = attributes.delete(:collection_ids)
-        add_to_collections(collection_ids) && next_actor.update(attributes)
-      end
-
-      private
-
-        # The default behavior of active_fedora's aggregates association,
-        # when assigning the id accessor (e.g. collection_ids = ['foo:1']) is to add
-        # to new collections, but not remove from old collections.
-        # This method ensures it's removed from the old collections.
-        def add_to_collections(new_collection_ids)
-          return true unless new_collection_ids
-          # remove from old collections
-          (curation_concern.in_collection_ids - new_collection_ids).each do |old_id|
-            collection = ::Collection.find(old_id)
-            # don't remove from collections current user doesn't have edit permissions for
-            if collection.edit_users.include? user.email
-              collection.members.delete(curation_concern)
-              collection.save
-            end
-          end
-
-          # add to new
-          new_collection_ids.each do |coll_id|
-            collection = ::Collection.find(coll_id)
-            collection.members << curation_concern
-            collection.save
-          end
-          true
-        end
-    end
-  end
-end

data/app/actors/curation_concerns/optimistic_lock_validator.rb

@@ -1,28 +0,0 @@
-module CurationConcerns
-  # Validates that the submitted version is the most recent version in the datastore.
-  # Caveat: we are not detecting if the version is changed by a different process between
-  # the time this validator is run and when the object is saved
-  class OptimisticLockValidator < Actors::AbstractActor
-    class_attribute :version_field
-    self.version_field = 'version'
-
-    def update(attributes)
-      validate_lock(version_attribute(attributes)) && next_actor.update(attributes)
-    end
-
-    private
-
-      # @return [Boolean] returns true if the lock is missing or
-      #                   if it matches the current object version.
-      def validate_lock(version)
-        return true if version.blank? || version == curation_concern.etag
-        curation_concern.errors.add(:base, :conflict)
-        false
-      end
-
-      # Removes the version attribute
-      def version_attribute(attributes)
-        attributes.delete(version_field)
-      end
-  end
-end

data/app/forms/curation_concerns/forms/file_manager_form.rb

@@ -1,27 +0,0 @@
-module CurationConcerns
-  module Forms
-    class FileManagerForm
-      include HydraEditor::Form
-      self.terms = []
-      delegate :id, :thumbnail_id, :representative_id, :to_s, to: :model
-      attr_reader :current_ability, :request
-      def initialize(work, ability)
-        super(work)
-        @current_ability = ability
-        @request = nil
-      end
-
-      def version
-        model.etag
-      end
-
-      delegate :member_presenters, to: :member_presenter_factory
-
-      private
-
-        def member_presenter_factory
-          MemberPresenterFactory.new(model, current_ability)
-        end
-    end
-  end
-end