curation_concerns 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a18cbc58262bda78bbccb7fcc5e263e09675b574
-  data.tar.gz: fb6ff7b4b9ad80ff9f2ccb26dbfa2ce93b35b585
+  metadata.gz: 9058b4420919bb0e097ce662820daa18c23f734c
+  data.tar.gz: 50bd609db11df6df2f7e62ff29974e1677760d30
 SHA512:
-  metadata.gz: df0282909989ce292b1dbaa07ae83497e0bb7a8cd253120c5dc3d6d5d9d085a539aefacb701fd13e8fa70bef726b008fd2e5937faad7a6cc96b1808af0bb6695
-  data.tar.gz: 7bc806d8693440c4e17958531be96a56af544878796081521339bfa7ae261672f537900337035a29ae79b1a7385693b0f5403f82ae37a29fd0e8f493d8f94ad5
+  metadata.gz: 0fa3bcd75d29b7778eca8b8afb90fd26f084b207e60c38d1c066fcaac83380b121c556be34cfd98f0c5727218c9ba2a8118d255249d22871e9e623079a2f37f7
+  data.tar.gz: 3a21293ef1519ae15d4fdd87fbf8fc292657c88f23cfa4abe9f842f08d71e8023980bbf408ce58b5292df218d47271151c07a0e2a991d0e1945d0a845ad0fdd1

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

@@ -74,6 +74,7 @@ module CurationConcerns
 
     def edit
       query_collection_members
+      # this is used to populate the "add to a collection" action for the members
       @user_collections = find_collections_for_form
       form
     end
@@ -163,15 +164,10 @@ module CurationConcerns
 
     protected
 
-      # TODO: This method could become a collection service.
-      # TODO: It seems suspicious that this is returning collections with read
-      #       access rather than collections with edit access
-      # run a solr query to get the collections the user has access to read
+      # run a solr query to get the collections the user has access to edit
       # @return [Array] a list of the user's collections
       def find_collections_for_form
-        query = list_search_builder.with(q: '').query
-        response = repository.search(query)
-        response.documents
+        CurationConcerns::CollectionsService.new(self).search_results(:edit)
       end
 
       def remove_select_something_first_flash

data/app/helpers/curation_concerns/collections_helper.rb

@@ -86,17 +86,14 @@ module CurationConcerns::CollectionsHelper
       if current_user.respond_to?(:collections)
         return current_user.collections.map { |c| [c.title.join(', '), c.id] }
       end
-      convert_solr_docs_to_select_options(
-        ::Collection.search_with_conditions({},
-                                            fl: 'title_tesim id',
-                                            rows: 1000)
-      )
+      service = CurationConcerns::CollectionsService.new(controller)
+      convert_solr_docs_to_select_options(service.search_results(:edit))
     end
 
     def convert_solr_docs_to_select_options(results)
       option_values = results.map do |r|
-        title = SolrDocument.new(r).title
-        [title.present? ? title.join(', ') : nil, r['id']]
+        title = r.title
+        [title.present? ? title.join(', ') : nil, r.id]
       end
       option_values.sort do |a, b|
         if a.first && b.first

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

@@ -34,12 +34,4 @@ module CurationConcerns::WorkBehavior
       end
     end
   end
-
-  def to_s
-    if title.present?
-      title.join(' | ')
-    else
-      'No Title'
-    end
-  end
 end

data/app/renderers/curation_concerns/renderers/rights_attribute_renderer.rb

@@ -19,7 +19,7 @@ module CurationConcerns
           if parsed_uri.nil?
             ERB::Util.h(value)
           else
-            %(<a href=#{ERB::Util.h(value)} target="_blank">#{RightsService.label(value)}</a>)
+            %(<a href=#{ERB::Util.h(value)} target="_blank">#{CurationConcerns::LicenseService.new.label(value)}</a>)
           end
         end
     end

data/app/services/curation_concerns/collections_service.rb

@@ -0,0 +1,28 @@
+module CurationConcerns
+  class CollectionsService
+    attr_reader :context
+
+    class_attribute :list_search_builder_class
+    self.list_search_builder_class = CurationConcerns::CollectionSearchBuilder
+
+    # @param [#repository,#blacklight_config,#current_ability] context
+    def initialize(context)
+      @context = context
+    end
+
+    # @param [Symbol] access :read or :edit
+    def search_results(access)
+      builder = list_search_builder(access)
+      response = context.repository.search(builder)
+      response.documents
+    end
+
+    private
+
+      def list_search_builder(access)
+        list_search_builder_class.new(context).tap do |builder|
+          builder.discovery_perms = [access]
+        end
+      end
+  end
+end

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.1'.freeze
 end

data/spec/controllers/curation_concerns/collections_controller_spec.rb

@@ -12,9 +12,9 @@ describe CollectionsController do
                        user: user,
                        depositor: user.user_key) }
   let(:asset3) { build(:generic_work, title: ['Third of the Assets']) }
-  let!(:asset4) { create(:generic_work,
-                         title: ['Fourth of the Assets'],
-                         user: user) }
+  let(:asset4) { create(:generic_work,
+                        title: ['Fourth of the Assets'],
+                        user: user) }
   let(:bogus_depositor_asset) { create(:generic_work,
                                        title: ['Bogus Asset'],
                                        depositor: 'abc') }
@@ -245,11 +245,20 @@ describe CollectionsController do
   end
 
   describe '#edit' do
-    before { sign_in user }
+    let!(:my_collection) { create(:collection, user: user) }
+
+    before do
+      # We expect to not see this collection in the list
+      create(:collection, :public)
+      sign_in user
+    end
 
-    it 'does not show flash' do
+    it 'is successful' do
       get :edit, params: { id: collection }
       expect(flash[:notice]).to be_nil
+      # a list of collections I can add items to:
+      expect(assigns[:user_collections].map(&:id)).to match_array [collection.id,
+                                                                   my_collection.id]
     end
   end
 end

data/spec/helpers/curation_concerns/collections_helper_spec.rb

@@ -34,27 +34,27 @@ describe CurationConcerns::CollectionsHelper do
   describe '#collection_options_for_select' do
     let(:user) { create(:user) }
     let(:collection2) { double(id: '02870w10j') }
-    let(:doc1) { { "id" => "k930bx31t", "title_tesim" => ["One"] } }
-    let(:doc2) { { "id" => "02870w10j", "title_tesim" => ["Two"] } }
-    let(:doc3) { { "id" => "z029p500w", "title_tesim" => ["Three"] } }
+    let(:doc1) { SolrDocument.new("id" => "k930bx31t", "title_tesim" => ["One"]) }
+    let(:doc2) { SolrDocument.new("id" => "02870w10j", "title_tesim" => ["Two"]) }
+    let(:doc3) { SolrDocument.new("id" => "z029p500w", "title_tesim" => ["Three"]) }
+    let(:service) { instance_double(CurationConcerns::CollectionsService) }
 
     before do
       allow(helper).to receive(:current_user).and_return(user)
-      allow(Collection).to receive(:search_with_conditions)
-        .with({}, fl: 'title_tesim id', rows: 1000)
-        .and_return([doc1, doc2, doc3])
+      allow(CurationConcerns::CollectionsService).to receive(:new).with(controller).and_return(service)
+      expect(service).to receive(:search_results).with(:edit).and_return([doc1, doc2, doc3])
     end
 
     subject { helper.collection_options_for_select(collection2) }
 
     it 'excludes the passed in collection' do
-      expect(subject).to eq "<option value=\"#{doc1['id']}\">One</option>\n<option value=\"#{doc3['id']}\">Three</option>"
+      expect(subject).to eq "<option value=\"#{doc1.id}\">One</option>\n<option value=\"#{doc3.id}\">Three</option>"
     end
 
     context "when one of the documents doesn't have title_tesim" do
-      let(:doc1) { { "id" => "k930bx31t" } }
+      let(:doc1) { SolrDocument.new("id" => "k930bx31t") }
       it 'puts the collections without titles last' do
-        expect(subject).to eq "<option value=\"#{doc3['id']}\">Three</option>\n<option value=\"#{doc1['id']}\"></option>"
+        expect(subject).to eq "<option value=\"#{doc3.id}\">Three</option>\n<option value=\"#{doc1.id}\"></option>"
       end
     end
   end

data/spec/services/curation_concerns/collections_service_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+RSpec.describe CurationConcerns::CollectionsService do
+  let(:controller) { ::CatalogController.new }
+
+  let(:context) do
+    double(current_ability: Ability.new(user),
+           repository: controller.repository,
+           blacklight_config: controller.blacklight_config)
+  end
+
+  let(:service) { described_class.new(context) }
+  let(:user) { create(:user) }
+
+  describe "#search_results" do
+    subject { service.search_results(access) }
+    let!(:collection1) { create(:collection, :public, title: ['foo']) }
+    let!(:collection2) { create(:collection, :public, title: ['bar']) }
+    let!(:collection3) { create(:collection, :public, edit_users: [user.user_key], title: ['baz']) }
+    before do
+      create(:admin_set, :public) # this should never be returned.
+    end
+
+    context "with read access" do
+      let(:access) { :read }
+      it "returns three collections" do
+        expect(subject.map(&:id)).to match_array [collection1.id, collection2.id, collection3.id]
+      end
+    end
+
+    context "with edit access" do
+      let(:access) { :edit }
+      it "returns one collections" do
+        expect(subject.map(&:id)).to match_array [collection3.id]
+      end
+    end
+  end
+end

data/spec/views/catalog/index.html.erb_spec.rb

@@ -24,6 +24,7 @@ describe 'catalog/index.html.erb' do
     allow(view).to receive(:document_counter_with_offset).and_return(5)
     allow(view).to receive(:type_tab).and_return("TYPE")
     allow(view).to receive(:search_state).and_return(search_state)
+    allow(view).to receive(:collection_options_for_select)
 
     params[:view] = 'gallery'
 

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

@@ -3,8 +3,10 @@ require 'spec_helper'
 describe 'curation_concerns/base/show_actions' do
   let(:model) { double('model', persisted?: true, to_param: '123', model_name: GenericWork.model_name) }
   let(:presenter) { double("presenter", human_readable_type: 'Image', id: '123', to_model: model, valid_child_concerns: [GenericWork]) }
+
   before do
     assign(:presenter, presenter)
+    allow(view).to receive(:collection_options_for_select)
     render 'curation_concerns/base/show_actions.html.erb', collector: collector, editor: editor
   end
 
@@ -15,6 +17,7 @@ describe 'curation_concerns/base/show_actions' do
       expect(rendered).to have_link 'Add to a Collection'
     end
   end
+
   context "as an editor" do
     let(:editor) { true }
     let(:collector) { true }

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

@@ -26,6 +26,7 @@ describe 'curation_concerns/base/show.html.erb' do
     before do
       allow(view).to receive(:can?).with(:edit, String).and_return(true)
       allow(view).to receive(:can?).with(:collect, String).and_return(true)
+      allow(view).to receive(:collection_options_for_select)
       assign(:presenter, presenter)
       render
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -854,6 +854,7 @@ files:
 - 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/collections_service.rb
 - app/services/curation_concerns/contextual_path.rb
 - app/services/curation_concerns/curation_concern.rb
 - app/services/curation_concerns/derivative_path.rb
@@ -1247,6 +1248,7 @@ files:
 - 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/collections_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
@@ -1469,6 +1471,7 @@ test_files:
 - 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/collections_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