hydra-collections 6.0.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c28f188d368c9473749d96c22309c56e57536633
-  data.tar.gz: b6d1c46f2597ebae64801965633daae8f0cbe5ae
+  metadata.gz: ebe55db03846ed51118593543505434956f99125
+  data.tar.gz: db11d0ff1b2513f376e5e381eba5bf32e1bebdfb
 SHA512:
-  metadata.gz: 6e72303ce4d2b51c69451a3c296692ca3d8db30b06ad6ee2f3754522208aac953c51938ddc7d448f4386e8f97761d0b9ef919fa653a924eb3a0aa01a981dd5f6
-  data.tar.gz: 74652e187ce8fa1c337adfd1617be152fe49a3d9eeec3074e902dd003d38fabeba2559875d14da56f1e863c167c419a6939367ee2d62e61bc378eeb19e4e2d68
+  metadata.gz: 4798abcfddaaabe9bb8f63f3cc82bc214f70ead4a5f80a04a2388dc166ed1f8985e96ecb2b672c5f30d260b636e7aa8a5fdb35874b37cadf77ce4b497cf59b2d
+  data.tar.gz: 730fea9bd4c25e8887373e7c04b67be671c5a0d59f495f39b7a36760995471cebbcb73f4ebbaf30d1caafc294319fb9d6e2f99b155c4b7d2af4ed58bb618cf1a

data/app/controllers/concerns/hydra/collections/selects_collections.rb

@@ -57,16 +57,9 @@ module Hydra::Collections::SelectsCollections
   end
 
   def collections_search_builder(access_level = nil)
-    collections_search_builder_class.new(collection_search_params_logic, self).tap do |builder|
+    collections_search_builder_class.new(self).tap do |builder|
       builder.current_ability = current_ability
       builder.discovery_perms = access_levels[access_level] if access_level
     end
   end
-
-  # Defines which search_params_logic should be used when searching for Collections
-  def collection_search_params_logic
-    [:default_solr_parameters, :add_query_to_solr, :add_access_controls_to_solr_params,
-      :add_collection_filter, :some_rows]
-  end
-
 end

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

@@ -87,7 +87,7 @@ module Hydra
 
     def after_update_error
       respond_to do |format|
-        format.html { render action: collections.edit_collection_path(@collection) }
+        format.html { render action: "edit" }
         format.json { render json: @collection.errors, status: :unprocessable_entity }
       end
     end
@@ -103,14 +103,14 @@ module Hydra
 
     def after_destroy (id)
       respond_to do |format|
-        format.html { redirect_to catalog_index_path, notice: 'Collection was successfully deleted.' }
+        format.html { redirect_to search_catalog_path, notice: 'Collection was successfully deleted.' }
         format.json { render json: {id:id}, status: :destroyed, location: @collection }
       end
     end
 
     def after_destroy_error (id)
       respond_to do |format|
-        format.html { redirect_to catalog_index_path, notice: 'Collection could not be deleted.' }
+        format.html { redirect_to search_catalog_path, notice: 'Collection could not be deleted.' }
         format.json { render json: {id:id}, status: :destroy_error, location: @collection }
       end
     end
@@ -129,11 +129,6 @@ module Hydra
 
     protected
 
-    # Defines which search_params_logic should be used when searching for Collection members
-    def collection_member_search_logic
-      search_params_logic + [:include_collection_ids, :add_access_controls_to_solr_params]
-    end
-
     def collection_params
       params.require(:collection).permit(:part_of, :contributor, :creator, :title,
         :description, :publisher, :date_created, :subject, :language, :rights,
@@ -152,11 +147,11 @@ module Hydra
     end
 
     def collection_member_search_builder_class
-      Hydra::Collections::SearchBuilder
+      Hydra::Collections::MemberSearchBuilder
     end
 
     def collection_member_search_builder
-      @collection_member_search_builder ||= collection_member_search_builder_class.new(collection_member_search_logic, self).tap do |builder|
+      @collection_member_search_builder ||= collection_member_search_builder_class.new(self).tap do |builder|
         builder.current_ability = current_ability
       end
     end

data/app/models/concerns/hydra/collections/metadata.rb

@@ -7,56 +7,71 @@ module Hydra::Collections
       end
 
       property :part_of, predicate: RDF::Vocab::DC.isPartOf
+
       property :contributor, predicate: RDF::Vocab::DC.contributor do |index|
         index.as :stored_searchable, :facetable
       end
+
       property :creator, predicate: RDF::Vocab::DC.creator do |index|
         index.as :stored_searchable, :facetable
       end
+
       property :title, predicate: RDF::Vocab::DC.title, multiple: false do |index|
-        index.as :stored_searchable
+        index.as :stored_searchable, :sortable
       end
+
       property :description, predicate: RDF::Vocab::DC.description, multiple: false do |index|
         index.type :text
         index.as :stored_searchable
       end
+
       property :publisher, predicate: RDF::Vocab::DC.publisher do |index|
         index.as :stored_searchable, :facetable
       end
+
       property :date_created, predicate: RDF::Vocab::DC.created do |index|
         index.as :stored_searchable
       end
+
       property :date_uploaded, predicate: RDF::Vocab::DC.dateSubmitted, multiple: false do |index|
         index.type :date
         index.as :stored_sortable
       end
+
       property :date_modified, predicate: RDF::Vocab::DC.modified, multiple: false do |index|
         index.type :date
         index.as :stored_sortable
       end
+
       property :subject, predicate: RDF::Vocab::DC.subject do |index|
         index.as :stored_searchable, :facetable
       end
+
       property :language, predicate: RDF::Vocab::DC.language do |index|
         index.as :stored_searchable, :facetable
       end
+
       property :rights, predicate: RDF::Vocab::DC.rights do |index|
         index.as :stored_searchable
       end
+
       property :resource_type, predicate: RDF::Vocab::DC.type do |index|
         index.as :stored_searchable, :facetable
       end
+
       property :identifier, predicate: RDF::Vocab::DC.identifier do |index|
         index.as :stored_searchable
       end
+
       property :based_near, predicate: RDF::Vocab::FOAF.based_near do |index|
         index.as :stored_searchable, :facetable
       end
+
       property :tag, predicate: RDF::Vocab::DC.relation do |index|
         index.as :stored_searchable, :facetable
       end
-      property :related_url, predicate: RDF::RDFS.seeAlso
 
+      property :related_url, predicate: RDF::RDFS.seeAlso
     end
   end
 end

data/app/search_builders/hydra/collections/member_search_builder.rb

@@ -0,0 +1,21 @@
+module Hydra::Collections
+  class MemberSearchBuilder < Hydra::SearchBuilder
+
+    class_attribute :from_field
+    self.from_field = 'member_ids_ssim'
+
+    # Defines which search_params_logic should be used when searching for Collection members
+    self.default_processor_chain += [:include_collection_ids]
+
+    def collection
+      scope.collection
+    end
+
+    # include filters into the query to only include the collection memebers
+    def include_collection_ids(solr_parameters)
+      solr_parameters[:fq] ||= []
+      solr_parameters[:fq] << "{!join from=#{from_field} to=id}id:#{collection.id}"
+    end
+
+  end
+end

data/app/search_builders/hydra/collections/search_builder.rb

@@ -1,5 +1,35 @@
 module Hydra::Collections
   class SearchBuilder < Hydra::SearchBuilder
-    include Hydra::Collections::SearchBehaviors
+    # Defines which search_params_logic should be used when searching for Collections
+    self.default_processor_chain = [:default_solr_parameters, :add_query_to_solr,
+      :add_access_controls_to_solr_params, :add_collection_filter, :some_rows, :sort_by_title]
+
+    def some_rows(solr_parameters)
+      solr_parameters[:rows] = '100'
+    end
+
+    def add_collection_filter(solr_parameters)
+      solr_parameters[:fq] ||= []
+      solr_parameters[:fq] << ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::Collection.to_class_uri)
+    end
+
+    # Sort results by title if no query was supplied.
+    # This overrides the default 'relevance' sort.
+    def sort_by_title(solr_parameters)
+      return if solr_parameters[:q]
+      solr_parameters[:sort] ||= "#{sort_field} asc"
+    end
+
+    def discovery_perms= perms
+      @discovery_perms = perms
+    end
+
+    def discovery_permissions
+      @discovery_perms || super
+    end
+
+    def sort_field
+      Solrizer.solr_name('title', :sortable)
+    end
   end
 end

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

@@ -4,7 +4,7 @@
       <label class="accessible-hidden">Search Collection <%=@collection.title %></label>
       <%= text_field_tag :cq, params[:cq], :class => "collection-query", :placeholder => "Search Collection", :size => '30', :type => "search", :id => "collection_search" %>
       <%= hidden_field_tag :sort, params[:sort], :id => 'collection_sort' %>
-      <%= render_hash_as_hidden_fields(params_for_search.except(:cq, :sort, :qt, :page)).html_safe %>
+      <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:cq, :sort, :qt, :page)) %>
       <button type="submit" class="btn btn-primary" id="collection_submit"><i class="icon-search"></i> Go</button>
   <% end %>
 </div>

data/hydra-collections.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'hydra-head', '~> 9.1'
   spec.add_dependency 'deprecation', '~> 0.1'
-  spec.add_dependency 'blacklight', '~> 5.10'
+  spec.add_dependency 'blacklight', '~> 6.0'
   spec.add_dependency 'hydra-works', '~> 0.4'
   spec.add_dependency 'rdf', '~> 1.99'
+  spec.add_dependency 'rdf-vocab', '~> 0'
 
   spec.add_development_dependency 'engine_cart', '~> 0.8'
   spec.add_development_dependency 'rspec-rails', '~> 3.1'

data/lib/hydra-collections.rb

@@ -8,16 +8,9 @@ module Hydra
     autoload :Collectible
     autoload :SearchService
     autoload :AcceptsBatches
-    autoload :SelectsCollections
-    autoload :SolrDocumentBehavior
-    autoload :SearchBehaviors
+
     class Engine < ::Rails::Engine
       engine_name "collections"
-      config.autoload_paths += %W(
-        #{config.root}/app/controllers/concerns
-        #{config.root}/app/models/concerns
-        #{config.root}/app/models/datastreams
-      )
     end
   end
 end

data/lib/hydra/collections/search_service.rb

@@ -10,7 +10,7 @@ module Hydra
         self.class.copy_blacklight_config_from(::CatalogController)
       end
 
-      self.search_params_logic << :apply_gated_search
+      # self.search_params_logic << :apply_gated_search
 
       def last_search_documents
         return [] if @session[:history].blank?

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "6.0.0"
+    VERSION = "7.0.0"
   end
 end

data/spec/controllers/collections_controller_spec.rb

@@ -14,7 +14,7 @@ describe CollectionsController, :type => :controller do
       include Hydra::AccessControls::Permissions
       include Hydra::Works::WorkBehavior
 
-      property :title, predicate: ::RDF::DC.title, multiple: false
+      property :title, predicate: ::RDF::Vocab::DC.title, multiple: false
 
       def to_solr(solr_doc={})
         super.tap do |solr_doc|
@@ -39,15 +39,15 @@ describe CollectionsController, :type => :controller do
   end
 
   describe "#index" do
-    let!(:collection1) { Collection.create { |c| c.apply_depositor_metadata(user.user_key) } }
-    let!(:collection2) { Collection.create { |c| c.apply_depositor_metadata(user.user_key) } }
+    let!(:collection1) { Collection.create(title: 'Beta') { |c| c.apply_depositor_metadata(user.user_key) } }
+    let!(:collection2) { Collection.create(title: 'Alpha') { |c| c.apply_depositor_metadata(user.user_key) } }
     let!(:generic_file) { GenericWork.create }
 
-    it "should show a list of collections" do
+    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 eq [collection1.id, collection2.id]
+      expect(assigns[:document_list].map(&:id)).to eq [collection2.id, collection1.id]
     end
   end
 
@@ -126,6 +126,16 @@ describe CollectionsController, :type => :controller do
        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 "should render 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 "should support adding batches of members" do
         @collection.members << @asset1
@@ -189,7 +199,7 @@ describe CollectionsController, :type => :controller do
 
       it "deletes the collection" do
         delete :destroy, id: @collection
-        expect(response).to redirect_to Rails.application.routes.url_helpers.catalog_index_path
+        expect(response).to redirect_to Rails.application.routes.url_helpers.search_catalog_path
         expect(flash[:notice]).to eq("Collection was successfully deleted.")
       end
 

data/spec/controllers/selects_collections_spec.rb

@@ -5,15 +5,15 @@ class SelectsCollectionsController < ApplicationController
   include Hydra::Controller::ControllerBehavior
   include Hydra::Collections::SelectsCollections
 
-  SelectsCollectionsController.search_params_logic += [:add_access_controls_to_solr_params]
+  #SelectsCollectionsController.search_params_logic += [:add_access_controls_to_solr_params]
 end
 
 describe SelectsCollectionsController, :type => :controller do
 
   describe "#find_collections" do
-    it "should use collection_search_params_logic" do
-      expect(subject.collection_search_params_logic).to eq([:default_solr_parameters, :add_query_to_solr, :add_access_controls_to_solr_params, :add_collection_filter, :some_rows])
-      expect(Hydra::Collections::SearchBuilder).to receive(:new).with(subject.collection_search_params_logic, subject).and_call_original
+    it "uses the search builder" do
+      expect(subject.collections_search_builder_class.default_processor_chain).to eq [:default_solr_parameters, :add_query_to_solr, :add_access_controls_to_solr_params, :add_collection_filter, :some_rows, :sort_by_title]
+      expect(Hydra::Collections::SearchBuilder).to receive(:new).with(subject).and_call_original
       subject.find_collections
     end
   end

data/spec/models/collection_spec.rb

@@ -23,8 +23,9 @@ describe Collection, :type => :model do
 
     subject { collection.to_solr }
 
-    it "should have title and depositor information" do
+    it "has title and depositor information" do
       expect(subject['title_tesim']).to eq ['A good title']
+      expect(subject['title_si']).to eq 'A good title'
       expect(subject['depositor_tesim']).to eq [user.user_key]
       expect(subject['depositor_ssim']).to eq [user.user_key]
     end

data/spec/test_app_templates/Gemfile.extra

@@ -1 +1,2 @@
 gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'
+

data/spec/views/collections/_thumbnail_default.html.erb_spec.rb

@@ -8,14 +8,19 @@ describe 'collections/_thumbnail_default.html.erb' do
     end
   end
 
+  let(:blacklight_configuration_context) do
+    Blacklight::Configuration::Context.new(controller)
+  end
+  let(:search_state) { double('SearchState', url_for_document: '/foo') }
+
   before do
     assign :response, double(start: 0)
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     allow(view).to receive(:render_grouped_response?).and_return(false)
     allow(view).to receive(:current_search_session).and_return nil
     allow(view).to receive(:search_session).and_return({})
-    allow(view).to receive(:url_for_document).and_return('/foo')
-    allow(view).to receive(:session_tracking_params).and_return({})
+    allow(view).to receive(:search_state).and_return(search_state)
+    allow(view).to receive(:blacklight_configuration_context).and_return(blacklight_configuration_context)
     render 'collections/thumbnail_default', document: document, document_counter: 1
   end
 

data/spec/views/collections/show.html.erb_spec.rb

@@ -6,11 +6,15 @@ describe 'collections/show.html.erb' do
 
   let(:blacklight_config) { CatalogController.blacklight_config }
   let(:member_docs) { [ SolrDocument.new(id: '234'), SolrDocument.new(id: '456') ] }
+  let(:search_state) { double('SearchState', params_for_search: {}) }
+  let(:blacklight_configuration_context) do
+    Blacklight::Configuration::Context.new(controller)
+  end
+
   before do
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
-    allow(view).to receive(:search_session).and_return({})
-    allow(view).to receive(:current_search_session).and_return nil
-    allow(view).to receive(:render_index_doc_actions).and_return nil
+    allow(view).to receive(:search_state).and_return(search_state)
+    allow(view).to receive(:blacklight_configuration_context).and_return(blacklight_configuration_context)
     view.lookup_context.prefixes += ['catalog']
     assign(:response, response)
     assign(:collection, collection)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: hydra-works
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.99'
+- !ruby/object:Gem::Dependency
+  name: rdf-vocab
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -138,7 +152,9 @@ files:
 - app/models/concerns/hydra/collection.rb
 - app/models/concerns/hydra/collections/actions.rb
 - app/models/concerns/hydra/collections/metadata.rb
+- app/models/concerns/hydra/collections/solr_document_behavior.rb
 - app/models/solr_document.rb
+- app/search_builders/hydra/collections/member_search_builder.rb
 - app/search_builders/hydra/collections/search_builder.rb
 - app/views/batch_select/_add_button.html.erb
 - app/views/batch_select/_check_all.html.erb
@@ -175,9 +191,7 @@ files:
 - lib/hydra-collections.rb
 - lib/hydra/collections/accepts_batches.rb
 - lib/hydra/collections/collectible.rb
-- lib/hydra/collections/search_behaviors.rb
 - lib/hydra/collections/search_service.rb
-- lib/hydra/collections/solr_document_behavior.rb
 - lib/hydra/collections/version.rb
 - solr_conf/conf/schema.xml
 - solr_conf/conf/solrconfig.xml

data/lib/hydra/collections/search_behaviors.rb

@@ -1,36 +0,0 @@
-module Hydra::Collections::SearchBehaviors
-  extend ActiveSupport::Concern
-
-  included do
-    class_attribute :from_field
-    self.from_field = 'member_ids_ssim'
-  end
-
-  def collection
-    scope.collection
-  end
-
-  # include filters into the query to only include the collection memebers
-  def include_collection_ids(solr_parameters)
-    solr_parameters[:fq] ||= []
-    solr_parameters[:fq] << "{!join from=#{from_field} to=id}id:#{collection.id}"
-  end
-
-  def some_rows(solr_parameters)
-    solr_parameters[:rows] = '100'
-  end
-
-  def add_collection_filter(solr_parameters)
-    solr_parameters[:fq] ||= []
-    solr_parameters[:fq] << ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::Collection.to_class_uri)
-  end
-
-  def discovery_perms= perms
-    @discovery_perms = perms
-  end
-
-  def discovery_permissions
-    @discovery_perms || super
-  end
-
-end