curation_concerns 1.3.3 → 1.4.0

data/app/models/concerns/curation_concerns/solr_document_behavior.rb

@@ -16,16 +16,35 @@ module CurationConcerns
       title_or_label
     end
 
+    class ModelWrapper
+      def initialize(model, id)
+        @model = model
+        @id = id
+      end
+
+      def persisted?
+        true
+      end
+
+      def to_param
+        @id
+      end
+
+      def model_name
+        @model.model_name
+      end
+
+      def to_partial_path
+        @model._to_partial_path
+      end
+    end
     ##
     # Offer the source (ActiveFedora-based) model to Rails for some of the
     # Rails methods (e.g. link_to).
     # @example
     #   link_to '...', SolrDocument(:id => 'bXXXXXX5').new => <a href="/dams_object/bXXXXXX5">...</a>
     def to_model
-      @model ||= begin
-        m = ActiveFedora::Base.load_instance_from_solr(id, self)
-        m.class == ActiveFedora::Base ? self : m
-      end
+      @model ||= ModelWrapper.new(hydra_model, id)
     end
 
     def collection?

data/app/services/curation_concerns/time_service.rb

@@ -1,7 +1,8 @@
 module CurationConcerns
   class TimeService
+    # @return [DateTime] the current time in UTC
     def self.time_in_utc
-      DateTime.now.utc
+      DateTime.now.new_offset(0)
     end
   end
 end

data/app/views/curation_concerns/file_sets/show.json.jbuilder

@@ -1 +1 @@
-json.extract! @file_set, *[:id] + @file_set.class.fields.select {|f| ![:has_model].include? f}
+json.extract! @presenter, :id, :title, :label, :description, :creator

data/curation_concerns.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'hydra-head', '>= 10.0.0', '< 11'
-  spec.add_dependency 'active-fedora', '>= 10.0.0', '< 11.a'
+  spec.add_dependency 'active-fedora', '>= 11.0.0.rc6'
   spec.add_dependency 'blacklight', '~> 6.3'
   spec.add_dependency 'breadcrumbs_on_rails', '>= 2.3', '< 4'
   spec.add_dependency 'jquery-ui-rails'
@@ -51,6 +51,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency 'rspec-html-matchers'
+  spec.add_development_dependency 'equivalent-xml'
   spec.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0'
   spec.add_development_dependency "capybara", '~> 2.5'
   spec.add_development_dependency "poltergeist", ">= 1.5.0"

data/lib/curation_concerns/engine.rb

@@ -15,6 +15,7 @@ module CurationConcerns
     isolate_namespace CurationConcerns
     require 'awesome_nested_set'
     require 'breadcrumbs_on_rails'
+    require 'rdf/vocab'
 
     config.autoload_paths += %W(
       #{config.root}/app/actors/concerns

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = '1.3.3'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/solr/config/solrconfig.xml

@@ -57,6 +57,21 @@
     <defaultQuery>*:*</defaultQuery>
   </admin>
 
+  <updateHandler class="solr.DirectUpdateHandler2">
+    <updateLog>
+      <str name="dir">${solr.ulog.dir:}</str>
+    </updateLog>
+
+    <autoCommit>
+      <maxTime>${solr.autoCommit.maxTime:15000}</maxTime>
+      <openSearcher>false</openSearcher>
+    </autoCommit>
+
+    <autoSoftCommit>
+      <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
+    </autoSoftCommit>
+  </updateHandler>
+
   <!-- SearchHandler
 
        http://wiki.apache.org/solr/SearchHandler
@@ -87,7 +102,6 @@
        -->
         <str name="qf">
           id
-          active_fedora_model_ssi
           title_tesim
           author_tesim
           subject_tesim
@@ -119,9 +133,6 @@
 
        <str name="facet">true</str>
        <str name="facet.mincount">1</str>
-       <str name="facet.limit">10</str>
-       <str name="facet.field">active_fedora_model_ssi</str>
-       <str name="facet.field">subject_sim</str>
 
        <str name="spellcheck">true</str>
        <str name="spellcheck.dictionary">default</str>
@@ -176,6 +187,17 @@
     </lst>
   </requestHandler>
 
+  <searchComponent name="termsComponent" class="solr.TermsComponent" />
+
+  <requestHandler name="/terms" class="solr.SearchHandler">
+    <lst name="defaults">
+      <bool name="terms">true</bool>
+    </lst>
+    <arr name="components">
+      <str>termsComponent</str>
+    </arr>
+  </requestHandler>
+
 <!-- Spell Check
 
         The spell check component can return a list of alternative spelling

data/spec/actors/curation_concerns/apply_order_actor_spec.rb

@@ -14,7 +14,7 @@ describe CurationConcerns::Actors::ApplyOrderActor do
     end
 
     context 'with ordered_member_ids that are already associated with the parent' do
-      let(:attributes) { { ordered_member_ids: ["Blah"] } }
+      let(:attributes) { { ordered_member_ids: ["BlahBlah1"] } }
       let(:root_actor) { double }
       before do
         allow(CurationConcerns::Actors::RootActor).to receive(:new).and_return(root_actor)
@@ -31,7 +31,7 @@ describe CurationConcerns::Actors::ApplyOrderActor do
   describe '#update' do
     let(:user) { create(:admin) }
     let(:curation_concern) { create(:work_with_one_child, user: user) }
-    let(:child) { GenericWork.new("Blah3") }
+    let(:child) { GenericWork.new(id: "blahblah3") }
 
     subject do
       CurationConcerns::Actors::ActorStack.new(curation_concern,
@@ -41,17 +41,19 @@ describe CurationConcerns::Actors::ApplyOrderActor do
     end
 
     context 'with ordered_members_ids that arent associated with the curation concern yet.' do
-      let(:attributes) { { ordered_member_ids: ["Blah3"] } }
+      let(:attributes) { { ordered_member_ids: [child.id] } }
       let(:root_actor) { double }
       before do
         allow(CurationConcerns::Actors::RootActor).to receive(:new).and_return(root_actor)
         allow(root_actor).to receive(:update).with({}).and_return(true)
+        # TODO: This can be moved into the Factory
         child.title = ["Generic Title"]
         child.apply_depositor_metadata(user.user_key)
         child.save!
         curation_concern.apply_depositor_metadata(user.user_key)
         curation_concern.save!
       end
+
       it "attaches the parent" do
         expect(subject.update(attributes)).to be true
       end
@@ -59,7 +61,7 @@ describe CurationConcerns::Actors::ApplyOrderActor do
 
     context 'without an ordered_member_id that was associated with the curation concern' do
       let(:curation_concern) { create(:work_with_two_children, user: user) }
-      let(:attributes) { { ordered_member_ids: ["Blah2"] } }
+      let(:attributes) { { ordered_member_ids: ["BlahBlah2"] } }
       let(:root_actor) { double }
       before do
         allow(CurationConcerns::Actors::RootActor).to receive(:new).and_return(root_actor)

data/spec/actors/curation_concerns/file_set_actor_spec.rb

@@ -108,7 +108,7 @@ describe CurationConcerns::Actors::FileSetActor do
 
       subject { file_set.title }
 
-      it { is_expected.to eql [short_name] }
+      it { is_expected.to match_array [short_name] }
     end
 
     context 'when a label is already specified' do
@@ -159,11 +159,11 @@ describe CurationConcerns::Actors::FileSetActor do
       end
 
       it "removes representative, thumbnail, and the proxy association" do
-        gw = GenericWork.load_instance_from_solr(work.id)
+        gw = GenericWork.find(work.id)
         expect(gw.representative_id).to eq(file_set.id)
         expect(gw.thumbnail_id).to eq(file_set.id)
         expect { actor.destroy }.to change { ActiveFedora::Aggregation::Proxy.count }.by(-1)
-        gw = GenericWork.load_instance_from_solr(work.id)
+        gw = GenericWork.find(work.id)
         expect(gw.representative_id).to be_nil
         expect(gw.thumbnail_id).to be_nil
       end

data/spec/actors/curation_concerns/work_actor_spec.rb

@@ -94,13 +94,15 @@ describe CurationConcerns::Actors::GenericWorkActor do
         end
 
         context 'authenticated visibility' do
+          let(:file_actor) { double }
           before do
             allow(CurationConcerns::TimeService).to receive(:time_in_utc) { xmas }
             redlock_client_stub
+            allow(CurationConcerns::Actors::FileActor).to receive(:new).and_return(file_actor)
           end
 
           it 'stamps each file with the access rights' do
-            expect(CharacterizeJob).to receive(:perform_later)
+            expect(file_actor).to receive(:ingest_file).and_return(true)
             expect(subject.create(attributes)).to be true
             expect(curation_concern).to be_persisted
             expect(curation_concern.date_uploaded).to eq xmas
@@ -108,18 +110,16 @@ describe CurationConcerns::Actors::GenericWorkActor do
             expect(curation_concern.depositor).to eq user.user_key
             expect(curation_concern.representative).to_not be_nil
             expect(curation_concern.file_sets.size).to eq 1
-            # Sanity test to make sure the file we uploaded is stored and has same permission as parent.
-            file_set = curation_concern.file_sets.first
-            file.rewind
-            expect(file_set.reload.original_file.content).to eq file.read
-
             expect(curation_concern).to be_authenticated_only_access
+            # Sanity test to make sure the file_set has same permission as parent.
+            file_set = curation_concern.file_sets.first
             expect(file_set).to be_authenticated_only_access
           end
         end
       end
 
       context 'with multiple files file' do
+        let(:file_actor) { double }
         let(:attributes) do
           FactoryGirl.attributes_for(:generic_work, visibility: visibility).tap do |a|
             a[:files] = [file, file]
@@ -130,10 +130,11 @@ describe CurationConcerns::Actors::GenericWorkActor do
           before do
             allow(CurationConcerns::TimeService).to receive(:time_in_utc) { xmas }
             redlock_client_stub
+            allow(CurationConcerns::Actors::FileActor).to receive(:new).and_return(file_actor)
           end
 
           it 'stamps each file with the access rights' do
-            expect(CharacterizeJob).to receive(:perform_later).twice
+            expect(file_actor).to receive(:ingest_file).and_return(true).twice
 
             expect(subject.create(attributes)).to be true
             expect(curation_concern).to be_persisted

data/spec/controllers/catalog_controller_spec.rb

@@ -72,7 +72,7 @@ describe CatalogController do
       let!(:work) { FactoryGirl.create(:generic_work, user: user, title: ["All my #{srand}"]) }
       render_views
       it 'returns json' do
-        xhr :get, :index, format: :json, q: work.title
+        xhr :get, :index, format: :json, q: work.title.first
         json = JSON.parse(response.body)
         # Grab the doc corresponding to work and inspect the json
         work_json = json['docs'].first

data/spec/controllers/curation_concerns/collections_controller_spec.rb

@@ -127,7 +127,7 @@ describe CollectionsController do
                        batch_document_ids: [asset4.id]
         }.to change { collection.reload.members.size }.by(1)
         expect(response).to redirect_to routes.url_helpers.collection_path(collection)
-        expect(assigns[:collection].members).to eq [asset1, asset2, asset4]
+        expect(assigns[:collection].members).to match_array [asset1, asset2, asset4]
 
         asset_results = ActiveFedora::SolrService.instance.conn.get 'select', params: { fq: ["id:\"#{asset2.id}\""], fl: ['id'] }
         expect(asset_results['response']['numFound']).to eq 1

data/spec/controllers/curation_concerns/file_sets_controller_json_spec.rb

@@ -16,6 +16,7 @@ describe CurationConcerns::FileSetsController do
   context "JSON" do
     let(:resource) { file_set }
     let(:resource_request) { get :show, id: resource, format: :json }
+    let(:actor) { controller.send(:actor) }
     subject { response }
     describe "unauthorized" do
       before do
@@ -35,13 +36,22 @@ describe CurationConcerns::FileSetsController do
 
     describe 'not found' do
       before { get :show, id: "non-existent-pid", format: :json }
-      it { is_expected.to respond_not_found(description: 'Could not find a resource that matches your request.') }
+      # Respond with forbidden to protect against object enumeration attack
+      it { is_expected.to respond_forbidden }
     end
 
     describe 'created' do
       it "returns 201, renders jq_upload json template and sets location header" do
-        expect(controller.send(:actor)).to receive(:create_metadata).with(parent, hash_including(:files, title: ['a title']))
-        expect(controller.send(:actor)).to receive(:create_content).with(file).and_return(true)
+        if Rails.version < '5.0.0'
+          expect(actor).to receive(:create_metadata).with(parent, hash_including(:files, title: ['a title']))
+          expect(actor).to receive(:create_content).with(file).and_return(true)
+        else
+          expect(actor).to receive(:create_metadata).with(parent, ActionController::Parameters) do |_work, ac_params|
+            expect(ac_params['files'].map(&:class)).to eq [ActionDispatch::Http::UploadedFile]
+            expect(ac_params['title']).to eq ['a title']
+          end
+          expect(actor).to receive(:create_content).with(ActionDispatch::Http::UploadedFile).and_return(true)
+        end
 
         allow_any_instance_of(FileSet).to receive(:persisted?).and_return(true)
         allow_any_instance_of(FileSet).to receive(:to_param).and_return('999')
@@ -83,7 +93,8 @@ describe CurationConcerns::FileSetsController do
     describe 'found' do
       before { resource_request }
       it "returns json of the work" do
-        expect(assigns[:file_set]).to be_instance_of ::FileSet # this object is used by the jbuilder template
+        # this object is used by the jbuilder template
+        expect(assigns[:presenter]).to be_instance_of CurationConcerns::FileSetPresenter
         expect(controller).to render_template('curation_concerns/file_sets/show')
         expect(response.code).to eq "200"
       end
@@ -95,7 +106,12 @@ describe CurationConcerns::FileSetsController do
         allow(controller).to receive(:actor).and_return(actor)
       end
       it "returns json of updated work and sets location header" do
-        expect(actor).to receive(:update_metadata).with(title: ['updated title']).and_return(true)
+        expected_params = { title: ['updated title'] }
+        if Rails.version < '5.0.0'
+          expect(actor).to receive(:update_metadata).with(expected_params).and_return(true)
+        else
+          expect(actor).to receive(:update_metadata).with(ActionController::Parameters.new(expected_params).permit!).and_return(true)
+        end
         put :update, id: resource, file_set: { title: ['updated title'] }, format: :json
         expect(assigns[:file_set]).to be_instance_of ::FileSet # this object is used by the jbuilder template
         expect(response.status).to eq 200
@@ -105,6 +121,14 @@ describe CurationConcerns::FileSetsController do
       end
     end
 
+    describe "integration update" do
+      render_views
+      it "works" do
+        put :update, id: resource.id, file_set: { title: ['test'] }, format: :json
+        expect(response.status).to eq 200
+      end
+    end
+
     describe 'failed update' do
       before {
         expect(controller).to receive(:update_metadata) do

data/spec/controllers/curation_concerns/file_sets_controller_spec.rb

@@ -15,14 +15,30 @@ describe CurationConcerns::FileSetsController do
 
       context 'on the happy path' do
         let(:date_today) { DateTime.now }
+        let(:expected_params) do
+          { files: [file],
+            title: ['test title'],
+            visibility: 'restricted' }
+        end
+        let(:actor) { controller.send(:actor) }
 
         before do
           allow(DateTime).to receive(:now).and_return(date_today)
         end
 
         it 'calls the actor to create metadata and content' do
-          expect(controller.send(:actor)).to receive(:create_metadata).with(parent, files: [file], title: ['test title'], visibility: 'restricted')
-          expect(controller.send(:actor)).to receive(:create_content).with(file).and_return(true)
+          if Rails.version < '5.0.0'
+            expect(actor).to receive(:create_metadata).with(parent, expected_params)
+            expect(actor).to receive(:create_content).with(file).and_return(true)
+          else
+            expect(actor).to receive(:create_metadata).with(parent, ActionController::Parameters) do |_work, ac_params|
+              expect(ac_params['files'].map(&:class)).to eq [ActionDispatch::Http::UploadedFile]
+              expect(ac_params['title']).to eq expected_params[:title]
+              expect(ac_params['visibility']).to eq expected_params[:visibility]
+            end
+            expect(actor).to receive(:create_content).with(ActionDispatch::Http::UploadedFile).and_return(true)
+          end
+
           xhr :post, :create, parent_id: parent,
                               file_set: { files: [file],
                                           title: ['test title'],
@@ -62,7 +78,7 @@ describe CurationConcerns::FileSetsController do
       context 'when solr is down' do
         before do
           allow(controller.send(:actor)).to receive(:create_metadata)
-          allow(controller.send(:actor)).to receive(:create_content).with(file).and_raise(RSolr::Error::Http.new({}, {}))
+          allow(controller.send(:actor)).to receive(:create_content).and_raise(RSolr::Error::Http.new({}, {}))
         end
 
         it 'errors out of create after on continuous rsolr error' do
@@ -75,7 +91,7 @@ describe CurationConcerns::FileSetsController do
       context 'when the file is not created' do
         before do
           allow(controller.send(:actor)).to receive(:create_metadata)
-          allow(controller.send(:actor)).to receive(:create_content).with(file).and_return(false)
+          allow(controller.send(:actor)).to receive(:create_content).and_return(false)
         end
 
         it 'errors out of create after on continuous rsolr error' do

data/spec/controllers/curation_concerns/generic_works_controller_json_spec.rb

@@ -75,8 +75,9 @@ describe CurationConcerns::GenericWorksController do
     end
 
     describe 'failed update' do
-      before { post :update, id: resource, generic_work: { title: [] }, format: :json }
-
+      before do
+        post :update, id: resource, generic_work: { title: [''] }, format: :json
+      end
       it "returns 422 and the errors" do
         expect(response).to respond_unprocessable_entity(errors: { title: ["Your work must have a title."] })
       end

data/spec/controllers/curation_concerns/generic_works_controller_spec.rb

@@ -180,7 +180,12 @@ describe CurationConcerns::GenericWorksController do
 
     it "can update file membership" do
       patch :update, id: work, generic_work: { ordered_member_ids: ['foo_123'] }
-      expect(actor).to have_received(:update).with(ordered_member_ids: ['foo_123'])
+      expected_params = { ordered_member_ids: ['foo_123'] }
+      if Rails.version < '5.0.0'
+        expect(actor).to have_received(:update).with(expected_params)
+      else
+        expect(actor).to have_received(:update).with(ActionController::Parameters.new(expected_params).permit!)
+      end
     end
 
     describe 'changing rights' do

data/spec/factories/generic_works.rb

@@ -31,8 +31,8 @@ FactoryGirl.define do
 
     factory :work_with_two_children do
       before(:create) do |work, evaluator|
-        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user, title: ['A Contained Work'], id: "Blah")
-        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user, title: ['Another Contained Work'], id: "Blah2")
+        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user, title: ['A Contained Work'], id: "BlahBlah1")
+        work.ordered_members << FactoryGirl.create(:generic_work, user: evaluator.user, title: ['Another Contained Work'], id: "BlahBlah2")
       end
     end
 

data/spec/features/create_work_spec.rb

@@ -15,7 +15,7 @@ feature 'Creating a new Work' do
     sign_in user
 
     # stub out characterization. Travis doesn't have fits installed, and it's not relevant to the test.
-    expect(CharacterizeJob).to receive(:perform_later)
+    allow(CharacterizeJob).to receive(:perform_later)
     redlock_client_stub
   end