curation_concerns 0.12.0.pre9 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eab5f25a1495de88c62656c40d9261594057c45
-  data.tar.gz: d2cc26ee39bd02be81ade88945c8ef17082f6eb1
+  metadata.gz: 385f4e3748f29f5498d701ecaca78b830e466317
+  data.tar.gz: 9df2179967ddec4f5eac6e8a3e2adec52f50b61a
 SHA512:
-  metadata.gz: cdb783ae9f39849fe73f11ececb03330d491632dc0cec1e9d522070d547ebd06bc28728d7162d61907660361b88e59f25fc1571fbed711945415244f66c9b8e6
-  data.tar.gz: b042084b5e0fe0509620b6b6fe42b82f595b22317df8b1a664591e7f6885e97ca4d9c0b3abd15a7aa1e9380acdaad8f73aa796136453a463b499024cc7fa2f4d
+  metadata.gz: 560677b0f20e0024f49e8a30fbb19114be599f2bbba7a360808c008b0d888593a2051c7bfea46c3a606423299a7e0464f0fa3a7044b398735bb86c106c9aa86c
+  data.tar.gz: 50a8a6920a23729f5a83fa73bb92fc41ec25e27c520cbe6414405f7e14d54c59711c7ac8fab580eb9e3b60712a5aab2523133cdd3a1439e867dbac115832dd08

data/app/controllers/concerns/curation_concerns/collections_controller_behavior.rb

@@ -160,7 +160,7 @@ module CurationConcerns
       end
 
       def collection_search_builder
-        collection_search_builder_class.new(self).with(params.except(:q)).tap do |builder|
+        collection_search_builder_class.new(self).with(params.except(:q, :page)).tap do |builder|
           builder.current_ability = current_ability
         end
       end

data/app/helpers/curation_concerns/collections_helper_behavior.rb

@@ -5,21 +5,6 @@ module CurationConcerns
       !params[:cq].blank?
     end
 
-    # Displays the Collections create collection button.  Put this in your search result page template.  We recommend putting it in catalog/_sort_and_per_page.html.erb
-    def button_for_create_collection(label = 'Create Collection')
-      render '/collections/button_create_collection', label: label
-    end
-
-    # Displays the Collections update collection button.  Put this in your search result page template.  We recommend putting it in catalog/_sort_and_per_page.html.erb
-    def button_for_update_collection(label = 'Update Collection', collection_id = 'collection_replace_id')
-      render '/collections/button_for_update_collection', label: label, collection_id: collection_id
-    end
-
-    # Displays the Collections delete collection button.  Put this in your search result page for each collection found.
-    def button_for_delete_collection(collection, label = 'Delete Collection', confirm = 'Are you sure?')
-      render '/collections/button_for_delete_collection', collection: collection, label: label, confirm: confirm
-    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

data/app/views/collections/_form_for_select_collection.html.erb

@@ -23,10 +23,10 @@
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
           <% if user_collections.blank? %>
-            <%= button_for_create_collection %>
+            <%= render '/collections/button_create_collection', label: 'Create Collection' %>
           <% else %> 
-            <%= button_for_update_collection %>
-            <%= button_for_create_collection "Add to new Collection" %>
+            <%= render '/collections/button_for_update_collection', label: 'Update Collection', collection_id: 'collection_replace_id' %>
+            <%= render '/collections/button_create_collection', label: 'Add to new Collection' %>
           <% end %> 
         </div>
       </div><!-- /.modal-content -->

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "0.12.0.pre9".freeze
+  VERSION = "0.12.0".freeze
 end

data/spec/controllers/curation_concerns/collections_controller_spec.rb

@@ -78,6 +78,20 @@ describe CollectionsController do
     end
   end
 
+  describe '#index' do
+    before { sign_in user }
+    let!(:collection1) { create(:collection, title: ['Beta'], user: user) }
+    let!(:collection2) { create(:collection, title: ['Alpha'], user: user) }
+    let!(:generic_work) { create(:generic_work, user: user) }
+
+    it 'shows a list of collections sorted alphabetically' do
+      get :index
+      expect(response).to be_successful
+      expect(assigns[:document_list].map(&:id)).not_to include generic_work.id
+      expect(assigns[:document_list].map(&:id)).to match_array [collection2.id, collection1.id]
+    end
+  end
+
   describe '#update' do
     before { sign_in user }
 
@@ -137,6 +151,28 @@ describe CollectionsController do
       end
     end
 
+    context 'when moving members between collections' do
+      let(:asset1) { create(:generic_work, user: user) }
+      let(:asset2) { create(:generic_work, user: user) }
+      let(:asset3) { create(:generic_work, user: user) }
+      before do
+        collection.members = [asset1, asset2, asset3]
+        collection.save!
+      end
+      let(:collection2) do
+        Collection.create(title: ['Some Collection']) do |col|
+          col.apply_depositor_metadata(user.user_key)
+        end
+      end
+
+      it 'moves the members' do
+        put :update, id: collection, collection: { members: 'move' },
+                     destination_collection_id: collection2, batch_document_ids: [asset2, asset3]
+        expect(collection.reload.members).to eq [asset1]
+        expect(collection2.reload.members).to match_array [asset2, asset3]
+      end
+    end
+
     context 'updating a collections metadata' do
       it 'saves the metadata' do
         put :update, id: collection, collection: { creator: ['Emily'], visibility: 'open' }
@@ -181,6 +217,14 @@ describe CollectionsController do
           expect(assigns[:presenter].title).to eq 'Collection Title'
         end
       end
+      context 'when the page parameter is passed' do
+        it 'loads the collection (paying no attention to the page param)' do
+          get :show, id: collection, page: '2'
+          expect(response).to be_successful
+          expect(assigns[:presenter]).to be_kind_of CurationConcerns::CollectionPresenter
+          expect(assigns[:presenter].title).to eq 'Collection Title'
+        end
+      end
     end
 
     context 'not signed in' do

data/spec/helpers/collections_helper_spec.rb

@@ -15,47 +15,6 @@ describe CollectionsHelper, type: :helper do
     end
   end
 
-  describe "button_for_create_collection" do
-    it "creates a button to the collections new path" do
-      str = String.new(helper.button_for_create_collection)
-      doc = Nokogiri::HTML(str)
-      form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq(new_collection_path.to_s)
-      i = form.xpath('.//input').first
-      expect(i.attr('type')).to eq('submit')
-    end
-
-    it "creates a button with my text" do
-      str = String.new(helper.button_for_create_collection("Create My Button"))
-      doc = Nokogiri::HTML(str)
-      form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq(new_collection_path.to_s)
-      i = form.xpath('.//input').first
-      expect(i.attr('value')).to eq('Create My Button')
-    end
-  end
-
-  describe "button_for_delete_collection" do
-    let(:collection) { FactoryGirl.create(:collection) }
-
-    it "creates a button to the collections delete path" do
-      str = button_for_delete_collection collection
-      doc = Nokogiri::HTML(str)
-      form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq collection_path(collection)
-      i = form.xpath('.//input')[1]
-      expect(i.attr('type')).to eq('submit')
-    end
-    it "creates a button with my text" do
-      str = button_for_delete_collection collection, "Delete My Button"
-      doc = Nokogiri::HTML(str)
-      form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq collection_path(collection)
-      i = form.xpath('.//input')[1]
-      expect(i.attr('value')).to eq("Delete My Button")
-    end
-  end
-
   describe "button_for_remove_from_collection" do
     let(:item) { double(id: 'changeme:123') }
     let(:collection) { FactoryGirl.create(:collection) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 0.12.0.pre9
+  version: 0.12.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -842,7 +842,6 @@ files:
 - app/views/collections/_form.html.erb
 - app/views/collections/_form_additional_information.html.erb
 - app/views/collections/_form_for_select_collection.html.erb
-- app/views/collections/_form_for_select_destination_collection.html.erb
 - app/views/collections/_form_permission.html.erb
 - app/views/collections/_form_to_add_member.html.erb
 - app/views/collections/_index_default.html.erb
@@ -1046,7 +1045,6 @@ files:
 - spec/actors/curation_concerns/work_actor_spec.rb
 - spec/controllers/accepts_batches_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
-- spec/controllers/collections_controller_spec.rb
 - spec/controllers/curation_concerns/classify_concerns_controller_spec.rb
 - spec/controllers/curation_concerns/collections_controller_spec.rb
 - spec/controllers/curation_concerns/file_sets_controller_json_spec.rb
@@ -1221,9 +1219,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
@@ -1245,7 +1243,6 @@ test_files:
 - spec/actors/curation_concerns/work_actor_spec.rb
 - spec/controllers/accepts_batches_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
-- spec/controllers/collections_controller_spec.rb
 - spec/controllers/curation_concerns/classify_concerns_controller_spec.rb
 - spec/controllers/curation_concerns/collections_controller_spec.rb
 - spec/controllers/curation_concerns/file_sets_controller_json_spec.rb

data/app/views/collections/_form_for_select_destination_collection.html.erb

@@ -1,21 +0,0 @@
-<% if user_collections.nil?%>
-<b>  Make sure you have included CurationConcerns::SelectsCollections in your controller for this page and 
-  added a before filter with one of the find_collections variations depending on your access level: find_collections, find_collections_with_read_access, find_collections_with_edit_access
-</b> 
-<% elsif user_collections.blank? %>
-<b> You do not have access to any existing collections please create a collection. </b>  
-<% else %>
-  Please Select your collection to add you files to:
-  <%= form_tag(collection_path(@collection), :method => "put") do %>
-    <input type="hidden" name="test" value="val" />
-    <%= hash_as_hidden_fields({:collection =>{members:"move"}}) %>
-    <div class="collection-list">
-      <ul>
-      <% user_collections.each do |collection| %>
-        <li> <%= radio_button_tag(:destination_collection_id, collection.id, false, :class => "collection-selector") %><%= label_tag(:collection, collection.title) %> </li>
-      <% end %>
-      </ul>
-    </div>
-    <%= button_to "Move to Selected Collection", collections_path, :method=>:put, :class=>"btn btn-primary collection-update submits-batches", 'data-behavior'=>'hydra-collections', :id=>'hydra-collection-move' %>
-  <% end %>
-<% end %>

data/spec/controllers/collections_controller_spec.rb

@@ -1,272 +0,0 @@
-require 'spec_helper'
-
-describe CollectionsController, type: :controller do
-  let(:user) { FactoryGirl.create(:user) }
-
-  before do
-    allow(controller).to receive(:has_access?).and_return(true)
-
-    sign_in user
-    allow_any_instance_of(User).to receive(:groups).and_return([])
-    allow(controller).to receive(:clear_session_user) ## Don't clear out the authenticated session
-  end
-
-  describe '#index' do
-    let!(:collection1) { FactoryGirl.create(:collection, title: ['Beta'], user: user) }
-    let!(:collection2) { FactoryGirl.create(:collection, title: ['Alpha'], user: user) }
-    let!(:generic_file) { create(:generic_work, user: user) }
-
-    it 'shows a list of collections sorted alphabetically' do
-      get :index
-      expect(response).to be_successful
-      expect(assigns[:document_list].map(&:id)).not_to include generic_file.id
-      expect(assigns[:document_list].map(&:id)).to match_array [collection2.id, collection1.id]
-    end
-  end
-
-  describe '#new' do
-    it 'assigns @collection' do
-      get :new
-      expect(assigns(:collection)).to be_kind_of(Collection)
-    end
-  end
-
-  describe '#create' do
-    it 'creates a Collection' do
-      expect do
-        post :create, collection: { title: ['My First Collection'],
-                                    description: ["The Description\r\n\r\nand more"] }
-      end.to change { Collection.count }.by(1)
-      expect(assigns[:collection].title).to eq ['My First Collection']
-      expect(assigns[:collection].description).to eq ["The Description\r\n\r\nand more"]
-      expect(assigns[:collection].depositor).to eq(user.user_key)
-      expect(response).to redirect_to collection_path(assigns[:collection])
-    end
-
-    it 'adds docs to collection if batch ids provided' do
-      @asset1 = create(:generic_work, user: user)
-      @asset2 = create(:generic_work, user: user)
-      post :create, batch_document_ids: [@asset1, @asset2],
-                    collection: { title: ['My Secong Collection'],
-                                  description: ["The Description\r\n\r\nand more"] }
-      expect(assigns[:collection].members).to eq [@asset1, @asset2]
-    end
-
-    it 'calls after_create' do
-      expect(controller).to receive(:after_create).and_call_original
-      post :create, collection: { title: ['My First Collection'],
-                                  description: ["The Description\r\n\r\nand more"] }
-    end
-
-    it 'adds one doc to collection if batch ids provided and add the collection id to the document in the colledction' do
-      @asset1 = create(:generic_work, user: user)
-      post :create, batch_document_ids: [@asset1],
-                    collection: { title: ['My Second Collection'],
-                                  description: ["The Description\r\n\r\nand more"] }
-      expect(assigns[:collection].members).to eq [@asset1]
-      asset_results = ActiveFedora::SolrService.instance.conn.get 'select', params: { fq: ["id:\"#{@asset1.id}\""], fl: ['id', Solrizer.solr_name(:collection)] }
-      expect(asset_results['response']['numFound']).to eq(1)
-      doc = asset_results['response']['docs'].first
-      expect(doc['id']).to eq @asset1.id
-      afterupdate = GenericWork.find(@asset1.id)
-      expect(doc[Solrizer.solr_name(:collection)]).to eq(afterupdate.to_solr[Solrizer.solr_name(:collection)])
-    end
-
-    it 'adds docs to collection if batch ids provided and add the collection id to the documents int he colledction' do
-      @asset1 = create(:generic_work, user: user)
-      @asset2 = create(:generic_work, user: user)
-      post :create, batch_document_ids: [@asset1, @asset2],
-                    collection: { title: ['My Secong Collection'],
-                                  description: ["The Description\r\n\r\nand more"] }
-      expect(assigns[:collection].members).to eq [@asset1, @asset2]
-      asset_results = ActiveFedora::SolrService.instance.conn.get 'select', params: { fq: ["id:\"#{@asset1.id}\""], fl: ['id', Solrizer.solr_name(:collection)] }
-      expect(asset_results['response']['numFound']).to eq(1)
-      doc = asset_results['response']['docs'].first
-      expect(doc['id']).to eq(@asset1.id)
-      afterupdate = GenericWork.find(@asset1.id)
-      expect(doc[Solrizer.solr_name(:collection)]).to eq(afterupdate.to_solr[Solrizer.solr_name(:collection)])
-    end
-  end
-
-  describe '#update' do
-    let(:collection) { FactoryGirl.create(:collection, user: user) }
-    before do
-      @asset1 = create(:generic_work, user: user)
-      @asset2 = create(:generic_work, user: user)
-      @asset3 = create(:generic_work, user: user)
-    end
-
-    it 'updates collection metadata' do
-      put :update, id: collection.id, collection: { title: ['New Title'], description: ['New Description'] }
-      expect(response).to redirect_to collection_path(collection)
-      expect(assigns[:collection].title).to eq(['New Title'])
-      expect(assigns[:collection].description).to eq(['New Description'])
-    end
-
-    it 'calls after_update' do
-      expect(controller).to receive(:after_update).and_call_original
-      put :update, id: collection.id, collection: { title: ['New Title'], description: ['New Description'] }
-    end
-
-    context 'when updating fails' do
-      before do
-        allow_any_instance_of(Collection).to receive(:save).and_return(false)
-      end
-      it 'renders edit succesfully' do
-        put :update, id: collection.id, collection: { title: ['New Title'] }
-        expect(response).to render_template 'edit'
-      end
-    end
-
-    context 'when there are existing members in the collection' do
-      it 'supports adding batches of members' do
-        collection.members << @asset1
-        collection.save!
-        put :update, id: collection, collection: { members: 'add' }, batch_document_ids: [@asset2, @asset3]
-        expect(response).to redirect_to collection_path(collection)
-        expect(assigns[:collection].members).to match_array [@asset2, @asset3, @asset1]
-      end
-
-      it 'supports removing batches of members' do
-        collection.members = [@asset1, @asset2, @asset3]
-        collection.save!
-        put :update, id: collection, collection: { members: 'remove' }, batch_document_ids: [@asset1, @asset3]
-        expect(response).to redirect_to collection_path(collection)
-        expect(assigns[:collection].members).to eq([@asset2])
-      end
-    end
-
-    it 'supports setting members array' do
-      put :update, id: collection, collection: { members: 'add' }, batch_document_ids: [@asset2, @asset3, @asset1]
-      expect(response).to redirect_to collection_path(collection)
-      expect(assigns[:collection].members).to match_array [@asset2, @asset3, @asset1]
-    end
-
-    it 'set/un-sets collection on members' do
-      # Add to collection (sets collection on members)
-      put :update, id: collection, collection: { members: 'add' }, batch_document_ids: [@asset2, @asset3]
-      expect(assigns[:collection].members).to match_array [@asset2, @asset3]
-
-      # Remove from collection (un-sets collection on members)
-      put :update, id: collection, collection: { members: 'remove' }, batch_document_ids: [@asset2]
-      expect(assigns[:collection].members).not_to include(@asset2)
-    end
-
-    context 'when moving members between collections' do
-      before do
-        collection.members = [@asset1, @asset2, @asset3]
-        collection.save!
-      end
-      let(:collection2) do
-        Collection.create(title: ['Some Collection']) do |col|
-          col.apply_depositor_metadata(user.user_key)
-        end
-      end
-
-      it 'moves the members' do
-        put :update, id: collection, collection: { members: 'move' },
-                     destination_collection_id: collection2, batch_document_ids: [@asset2, @asset3]
-        expect(collection.reload.members).to eq [@asset1]
-        expect(collection2.reload.members).to match_array [@asset2, @asset3]
-      end
-    end
-  end
-
-  describe '#destroy' do
-    describe 'valid collection' do
-      let!(:collection) { FactoryGirl.create(:collection, user: user) }
-      before do
-        expect(controller).to receive(:authorize!).and_return(true)
-      end
-
-      it 'deletes the collection' do
-        delete :destroy, id: collection
-        expect(response).to redirect_to Rails.application.routes.url_helpers.search_catalog_path
-        expect(flash[:notice]).to eq('Collection was successfully deleted.')
-      end
-
-      it 'calls after_destroy' do
-        expect(controller).to receive(:after_destroy).and_call_original
-        delete :destroy, id: collection
-      end
-
-      it 'updates members' do
-        asset1 = create(:generic_work, user: user)
-        collection.members << asset1
-        collection.save!
-        expect(asset1.in_collections).to eq [collection]
-
-        delete :destroy, id: collection
-        expect(asset1.in_collections).to eq []
-      end
-    end
-
-    it 'does not delete an invalid collection' do
-      expect { delete :destroy, id: 'zz:-1' }.to raise_error
-    end
-  end
-
-  describe '#show' do
-    context 'when there are no assets in the collection' do
-      let(:collection) { FactoryGirl.create(:collection, user: user) }
-      it 'shows no assets' do
-        get :show, id: collection
-        expect(response).to be_successful
-        expect(assigns[:presenter].id).to eq collection.id
-        expect(assigns[:member_docs]).to be_empty
-      end
-    end
-
-    context 'with a number of assets' do
-      let(:asset1) { create(:generic_work, title: ['First of the Assets'], read_users: [user.user_key]) }
-      let(:asset2) { create(:generic_work, title: ['Second of the Assets'], read_users: [user.user_key]) }
-      let(:asset3) { create(:generic_work, title: ['Third of the Assets'], read_users: [user.user_key]) }
-      let!(:collection) do
-        FactoryGirl.create(:collection, members: [asset1, asset2, asset3], user: user)
-      end
-
-      it 'queries the collections' do
-        get :show, id: collection, cq: 'First'
-        expect(assigns[:presenter].id).to eq collection.id
-        expect(assigns[:member_docs].map(&:id)).to match_array [asset1.id]
-      end
-
-      it 'returns the specified number of rows' do
-        get :show, id: collection, rows: '2'
-        expect(assigns[:presenter].id).to eq collection.id
-        expect(assigns[:member_docs].size).to eq 2
-      end
-
-      describe 'additional collections' do
-        let(:asset4) { create(:generic_work, user: user, title: [asset1.id.to_s], read_users: [user.user_key]) }
-        let!(:collection2) do
-          FactoryGirl.create(:collection, members: [asset4], user: user)
-        end
-        it 'shows only the collections assets' do
-          get :show, id: collection
-          expect(assigns[:presenter].id).to eq collection.id
-          expect(assigns[:member_docs].map(&:id)).to match_array [asset1.id, asset2.id, asset3.id]
-        end
-
-        it 'shows only the other collections assets' do
-          get :show, id: collection2
-          expect(assigns[:presenter].id).to eq collection2.id
-          expect(assigns[:member_docs].map(&:id)).to match_array [asset4.id]
-        end
-      end
-
-      context 'When there are search matches that are not in the collection' do
-        let!(:bad_asset1) { create(:generic_work, user: user, title: ["#{asset1.id} #{asset1.title.first}"]) }
-        let!(:bad_asset2) { create(:generic_work, user: user, title: ["#{asset1.id} #{asset1.title.first}"]) }
-
-        # NOTE: This test depends on title_tesim being in the qf in solrconfig.xml
-        it 'only shows the collection assets' do
-          get :show, id: collection, cq: "\"#{asset1.title.first}\""
-          expect(assigns[:presenter].id).to eq collection.id
-          expect(assigns[:member_docs].map(&:id)).not_to include bad_asset1.id, bad_asset2.id
-          expect(assigns[:member_docs].map(&:id)).to match_array [asset1.id]
-        end
-      end
-    end
-  end
-end