hydra-collections 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7149da28869268dc7f98e013bc2ff9bfc0f1d4f
-  data.tar.gz: fca470f837199a78ab3f0d7f72035cdd81af2bea
+  metadata.gz: a23c9e212041b2816a048695daa5248aad7430d4
+  data.tar.gz: 1fe561ef9cdf68b337e1940484c9abfabfeab8ed
 SHA512:
-  metadata.gz: 57fd97a1cd596b776e1a3bce56ed6da35123638f2fbdaecb559c81f7dab2e78084e5a17da23e70827976965eb2b4fbb0e603f18d2545176ba2bc19d5baaf2d7d
-  data.tar.gz: f1983ca6f58409e4345a988dcae8149308265f260ad40c29f7754f4fd7105c53cea46486e23059e9963db53a9d36ee3cb5aaaf272b14a1fbe7f4e05197aef709
+  metadata.gz: 0281f3b8a8de3e273d261803addccf4a5755f654e5e4b19236030aab299992b491b19abcb7e4fa7de7451220a664db640e80e37b613505ba62d0a886b264b2c5
+  data.tar.gz: 767db121ed138d32b5c49c5cec0de22f159470ee661f91251cdaf45375f47f446c6851d20bad742d2efad825b6613d0cb09cf916b6e4069dca887fb448eab9f3

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 rvm:
-  - "2.0.0"
+  - 2.0.0
+gemfile:
+  - gemfiles/rails3.gemfile
+  - gemfiles/rails4.gemfile
 notifications:
   email:
     recipients:
@@ -12,5 +15,6 @@ notifications:
   irc:
     channels:
       - "irc.freenode.org#scholarsphere"
+      - "irc.freenode.org#projecthydra"
     template:
       - "%{repository}//%{branch}@%{commit} by %{author}: %{message} - %{build_url}"

data/CONTRIBUTING.md

@@ -0,0 +1,113 @@
+# How to Contribute
+
+We want your help to make Project Hydra great.
+There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
+
+## Hydra Project Intellectual Property Licensing and Ownership
+
+All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group.
+If the contributor works for an institution, the institution must have a Corporate Contributor License Agreement (cCLA) on file.
+
+https://wiki.duraspace.org/display/hydra/Hydra+Project+Intellectual+Property+Licensing+and+Ownership
+
+You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
+
+## Contribution Tasks
+
+* Reporting Issues
+* Making Changes
+* Submitting Changes
+* Merging Changes
+
+### Reporting Issues
+
+* Make sure you have a [GitHub account](https://github.com/signup/free)
+* Submit a [Github issue](./issues) by:
+  * Clearly describing the issue
+    * Provide a descriptive summary
+    * Explain the expected behavior
+    * Explain the actual behavior
+    * Provide steps to reproduce the actual behavior
+
+### Making Changes
+
+* Fork the repository on GitHub
+* Create a topic branch from where you want to base your work.
+  * This is usually the master branch.
+  * To quickly create a topic branch based on master; `git branch fix/master/my_contribution master`
+  * Then checkout the new branch with `git checkout fix/master/my_contribution`.
+  * Please avoid working directly on the `master` branch.
+  * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
+* Make commits of logical units.
+  * Your commit should include a high level description of your work in HISTORY.textile 
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+* If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
+
+```
+    Present tense short summary (50 characters or less)
+
+    More detailed description, if necessary. It should be wrapped to 72
+    characters. Try to be as descriptive as you can, even if you think that
+    the commit content is obvious, it may not be obvious to others. You
+    should add such description also if it's already present in bug tracker,
+    it should not be necessary to visit a webpage to check the history.
+
+    Include Closes #<issue-number> when relavent.
+
+    Description can have multiple paragraphs and you can use code examples
+    inside, just indent it with 4 spaces:
+
+        class PostsController
+          def index
+            respond_with Post.limit(10)
+          end
+        end
+
+    You can also add bullet points:
+
+    - you can use dashes or asterisks
+
+    - also, try to indent next line of a point for readability, if it's too
+      long to fit in 72 characters
+```
+
+* Make sure you have added the necessary tests for your changes.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+* When you are ready to submit a pull request
+
+### Submitting Changes
+
+[Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
+
+* Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
+* Make sure your branch is up to date with its parent branch (i.e. master)
+  * `git checkout master`
+  * `git pull --rebase`
+  * `git checkout <your-branch>`
+  * `git rebase master`
+  * It is likely a good idea to run your tests again.
+* Squash the commits for your branch into one commit
+  * `git rebase --interactive HEAD~<number-of-commits>` ([See Github help](https://help.github.com/articles/interactive-rebase))
+  * To determine the number of commits on your branch: `git log master..<your-branch> --oneline | wc -l`
+  * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
+* Push your changes to a topic branch in your fork of the repository.
+* Submit a pull request from your fork to the project.
+
+### Merging Changes
+
+* It is considered "poor from" to merge your own request.
+* Please take the time to review the changes and get a sense of what is being changed. Things to consider:
+  * Does the commit message explain what is going on?
+  * Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
+  * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
+  * Did the Travis tests complete successfully?
+* If you are uncertain, bring other contributors into the conversation by creating a comment that includes their @username.
+* If you like the pull request, but want others to chime in, create a +1 comment and tag a user.
+
+# Additional Resources
+
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
+* [Pro Git](http://git-scm.com/book) is both a free and excellent book about Git.
+* [A Git Config for Contributing](http://ndlib.github.io/practices/my-typical-per-project-git-config/)

data/Changelog.md

@@ -0,0 +1,105 @@
+# 1.1.0 
+
+* 2013-09-30: Refactor to load modules after engine is initialized (concerns)
+[Justin Coyne]
+
+* 2013-09-23: remove cruft [Justin Coyne]
+
+* 2013-09-19: Updating CONTRIBUTING.md as per Hydra v6.0.0 [Jeremy Friesen]
+
+* 2013-08-23: Fix a rails 4 deprecation [Justin Coyne]
+
+* 2013-08-23: Simplify collections controller [Justin Coyne]
+
+* 2013-08-22: Allow for member query to include sort and per page information
+from the parameters [Carolyn Cole]
+
+* 2013-08-22: change line wrapping of examples [ci skip] [Justin Coyne]
+
+* 2013-08-22: Fix language formatting [ci skip] [Justin Coyne]
+
+* 2013-08-22: Fix code formatting [ci skip] [Justin Coyne]
+
+* 2013-08-22: Link to code examples [ci skip] [Justin Coyne]
+
+* 2013-08-22: What is a hydra-collection. [ci skip] [Justin Coyne]
+
+* 2013-08-22: completing documentation for update-batches [Carolyn Cole]
+
+* 2013-07-30: The filter for include_collection_ids should always work, even if
+there are no members [Justin Coyne]
+
+* 2013-07-30: Adding as collection to remove so the operation will work with any
+class collection [Carolyn Cole]
+
+* 2013-07-29: Allow items to be moved between collections. [Justin Coyne]
+
+* 2013-07-26: tidying up spec example [Matt Zumwalt]
+
+* 2013-07-24: removing call to collection find since load_and_authorize has
+already done the find [Carolyn Cole]
+
+* 2013-07-23: Make sure the @collection instance varriable is set even if the
+collection class name is not Collection [Carolyn Cole]
+
+* 2013-07-19: Test button_for_remove_from_collection with rails3 and 4 [Justin
+Coyne]
+
+* 2013-07-19: Allowing the collection class to be of any name [Carolyn Cole]
+
+* 2013-07-18: Created a hidden field helper [Justin Coyne]
+
+* 2013-07-18: Remove registering LocalAuthority This code was always erroring
+with `uninitialized constant Hydra::CollectionRdfDatastream::LocalAuthority`
+and giving a misleading warning. [Justin Coyne]
+
+* 2013-07-17: Remove the user factory generated by devise [Justin Coyne]
+
+* 2013-07-17: Use the gemfile that rails generates for testing [Justin Coyne]
+
+* 2013-07-17: Relax testing gemspec [Justin Coyne]
+
+* 2013-07-17: Update README.md [Edwin Shin]
+
+* 2013-07-17: Fix gemspec version requirement [Justin Coyne]
+
+* 2013-07-17: Update README.md [Edwin Shin]
+
+* 2013-07-17: Loosen the spec so that we can do development on rails 3.2 or 4.0
+[Justin Coyne]
+
+* 2013-07-17: Check for existence, rather than lack of an error [Justin Coyne]
+
+* 2013-07-17: Stub is deprecated, replace with double() [Justin Coyne]
+
+* 2013-07-17: Fix facet helper so that it shows the collection name [Justin
+Coyne]
+
+* 2013-07-12: Updating to compile with new ruby version and rspec version.
+[Carolyn Cole]
+
+* 2013-07-17: Loosen the spec so that we can do development on rails 3.2 or 4.0
+[Justin Coyne]
+
+* 2013-07-17: Check for existence, rather than lack of an error [Justin Coyne]
+
+* 2013-07-17: Stub is deprecated, replace with double() [Justin Coyne]
+
+* 2013-07-17: Fix facet helper so that it shows the collection name [Justin
+Coyne]
+
+* 2013-07-12: Updating to compile with new ruby version and rspec version.
+[Carolyn Cole]
+
+* 2013-07-09: Add build notifications to #projecthydra IRC channel now that the
+gem is governed by the community, and trigger the first CI build [Michael J.
+Giarlo]
+
+* 2013-07-09: fix relative link to LICENSE file in README [Michael J. Giarlo]
+
+* 2013-07-09: README links to the license, and gemnasium/travis/etc. links now
+point at the new code location [Michael J. Giarlo]
+
+* 2013-07-09: Updates license and README per new community conventions [Michael
+J. Giarlo]
+

data/LICENSE.txt

@@ -1,22 +1,15 @@
-Copyright (c) 2013 Carolyn Cole
+Copyright © 2013 The Pennsylvania State University
+Copyright © 2013 Data Curation Experts
+Additional copyright may be held by others, as reflected in the commit history.
 
-MIT License
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+    http://www.apache.org/licenses/LICENSE-2.0
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.md

@@ -1,6 +1,6 @@
-# Hydra::Collections [![Version](https://badge.fury.io/rb/hydra-collections.png)](http://badge.fury.io/rb/hydra-collections) [![Build Status](https://travis-ci.org/psu-stewardship/hydra-collections.png?branch=master)](https://travis-ci.org/psu-stewardship/hydra-collections) [![Dependency Status](https://gemnasium.com/psu-stewardship/hydra-collections.png)](https://gemnasium.com/psu-stewardship/hydra-collections)
+# Hydra::Collections [![Version](https://badge.fury.io/rb/hydra-collections.png)](http://badge.fury.io/rb/hydra-collections) [![Build Status](https://travis-ci.org/projecthydra/hydra-collections.png?branch=master)](https://travis-ci.org/projecthydra/hydra-collections) [![Dependency Status](https://gemnasium.com/projecthydra/hydra-collections.png)](https://gemnasium.com/projecthydra/hydra-collections)
 
-Add collections to your Hydra application
+Add collections to your Hydra application.  These collections are typically created by depositors (instead of librarians or curators).  Any collectible item can belong to many different collections.  The collection does not confer access rights onto any of the members of the collections.
 
 ## Installation
 
@@ -20,12 +20,15 @@ Or install it yourself as:
 
 ### Mount the engine to get the routes in config/routes.rb
 
-    mount Hydra::Collections::Engine => '/' 
+    mount Hydra::Collections::Engine => '/'
 
 ### Call button_create_collection view helper in your search result page template.
-  We recommend putting it in catalog/_sort_and_per_page.html.erb which you will manually override in you app.
-
-    <%= button_create_collection %>
+  First add `helper :collections` to your `catalog_controller.rb`
+  
+  Next, we recommend putting the view helper in catalog/[_sort_and_per_page.html.erb](https://github.com/projectblacklight/blacklight/blob/master/app/views/catalog/_sort_and_per_page.html.erb) which you will manually override in you app.
+```erb
+<%= button_for_create_collection %>
+```    
 
 ### Any time you want to refer to the routes from hydra-collections use collections.
     collections.new_collections_path
@@ -49,6 +52,19 @@ end
 
 Any items that include the `Hydra::Collections::Collectible` module can look up which collections they belong to via `.collections`.  The `index_collection_pids` puts the pids of all associated collections into the `collection` facet.
 
+### Make the Collection show as a facet in your CatalogController
+
+```ruby
+class CatalogController < ApplicationController
+    include Blacklight::Catalog
+  ...
+    configure_blacklight do |config|
+  ...     
+        config.add_facet_field solr_name("collection", :facetable), label: "Collection", helper_method: :collection_name
+    end
+end
+```
+
 ### Make your Controller Accept a Batch
 
 Add `include Hydra::Collections::AcceptsBatches` to the collections you would like to process batches of models
@@ -60,7 +76,7 @@ Example:
 class BatchEditsController < ApplicationController
     include Hydra::Collections::AcceptsBatches
   ...
-  
+
     def update
       batch.each do |doc_id|
         obj = ActiveFedora::Base.find(doc_id, :cast=>true)
@@ -68,44 +84,64 @@ class BatchEditsController < ApplicationController
         obj.save
       end
       flash[:notice] = "Batch update complete"
-      after_update 
+      after_update
     end
 
 end
 ```
 ### Include the javascript to discover checked batch items
 
-include `//= require hydra/batch_select` in your application.js
+add to your application.js
+```js
+  //= require hydra/batch_select
+  //= require hydra_collections
+```
 
-### Display a selection checkbox in each document partial
+### Display Hydra-collections in you views
+Take a look at the helpers located in:
+* [app/helpers/collections_helper.rb](/app/helpers/collections_helper.rb) 
+* [app/helpers/batch_select_helper.rb](/app/helpers/batch_select_helper.rb) 
+* [app/helpers/collections_search_helper.rb](/app/helpers/collections_search_helper.rb) 
+ 
+#### Examples
 
-include `<%= button_for_add_to_batch document %>'
+##### Display a selection checkbox in each document partial
 
-Example: views/catalog/_document_header.html.erb
-```ruby
+include ```<%= button_for_add_to_batch document %>```
+
+Example:
+```erb
+    <% # views/catalog/_document_header.html.erb -%>
+    
     <% # header bar for doc items in index view -%>
     <div class="documentHeader clearfix">
       <%= button_for_add_to_batch(document) %>
-      
       ...
      </div>
 
 ```
 
 
-### Update your view to submit a Batch
+##### Update your view to submit a Batch
 
-include 
 Add `submits-batches` class to your view input to initialize batch processing
 
-Example: 
-```ruby
-<%= button_to label, edit_batch_edits_path, :method=>:get, :class=>"btn submits-batches", 'data-behavior'=>'batch-edit', :id=>'batch-edit' %>
+Example:
+```erb
+<%= button_to label, edit_batch_edits_path, method: :get, class: "btn submits-batches", 
+      'data-behavior'=>'batch-edit', id: 'batch-edit' %>
 ```
 
-### Update you action view to submit changes to the batch
+##### Update your action view to submit changes to the batch
 
-Add `updates-batches` class to your 
+Add `updates-batches` class to your button for submitting the batch
+
+Example:
+```erb
+<%= button_to label, collections.collection_path(collection_id), method: :put,
+      class: "btn btn-primary updates-collection submits-batches collection-update", 
+      'data-behavior'=>'hydra-collections', id: 'hydra-collection-update' %>
+```
 
 
 ## Contributing
@@ -126,8 +162,17 @@ In order to make modifications to the gem code and run the tests, clone the repo
     $ git submodule update
     $ rake jetty:config
     $ rake jetty:start
-    $ rake clean 
+    $ rake clean
     $ rake spec
 ```
 
+## License
+
+The hydra-collections source code is freely available under the Apache 2.0 license.
+[Read the copyright statement and license](/LICENSE.txt).
+
+## Acknowledgements
+
+This software has been developed by and is brought to you by the Hydra community.  Learn more at the [Project Hydra website](http://projecthydra.org)
 
+![Project Hydra Logo](https://github.com/uvalib/libra-oa/blob/a6564a9e5c13b7873dc883367f5e307bf715d6cf/public/images/powered_by_hydra.png?raw=true)

data/{lib → app/controllers/concerns}/hydra/collections_controller_behavior.rb

@@ -1,19 +1,3 @@
-require 'blacklight'
-
-# -*- coding: utf-8 -*-
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 include Blacklight::SolrHelper
 
 module Hydra
@@ -21,10 +5,9 @@ module Hydra
     extend ActiveSupport::Concern
 
     included do
-      include Hydra::Controller::ControllerBehavior
-      include Blacklight::Configurable # comply with BL 3.7
-      include Blacklight::Controller
+      include Blacklight::Configurable
       include Hydra::Collections::AcceptsBatches
+      include Hydra::Collections::SelectsCollections
 
       # This is needed as of BL 3.7
       self.copy_blacklight_config_from(CatalogController)
@@ -43,21 +26,22 @@ module Hydra
 
       # actions: audit, index, create, new, edit, show, update, destroy, permissions, citation
       before_filter :authenticate_user!, :except => [:show]
-      load_and_authorize_resource :except=>[:index]
-      before_filter :query_collection_members, only:[:show, :edit]
+      load_and_authorize_resource :except=>[:index], instance_name: :collection
 
       #This includes only the collection members in the search
       self.solr_search_params_logic += [:include_collection_ids]
     end
 
     def new
-      #@collection = ::Collection.new
     end
 
     def show
+      query_collection_members
     end
-        
+
     def edit
+      query_collection_members
+      find_collections
     end
 
     def after_create
@@ -88,8 +72,11 @@ module Hydra
     end
     
     def after_update 
+      if flash[:notice].nil?
+        flash[:notice] = 'Collection was successfully updated.'
+      end
       respond_to do |format|
-        format.html { redirect_to collections.collection_path(@collection), notice: 'Collection was successfully updated.' }
+        format.html { redirect_to collections.collection_path(@collection) }
         format.json { render json: @collection, status: :updated, location: @collection }
       end
     end
@@ -102,7 +89,6 @@ module Hydra
     end
     
     def update
-      @collection = ::Collection.find(params[:id])
       process_member_changes
       @collection.update_attributes(params[:collection].except(:members))
       if @collection.save
@@ -128,7 +114,6 @@ module Hydra
     end
     
     def destroy
-      @collection = ::Collection.find(params[:id])     
        if @collection.destroy
           after_destroy(params[:id])
        else
@@ -141,15 +126,13 @@ module Hydra
     # Queries Solr for members of the collection.  
     # Populates @response and @member_docs similar to Blacklight Catalog#index populating @response and @documents
     def query_collection_members
-      if @collection.member_ids.length > 0
-        # run the solr query to find the collections
-        query = params[:cq]
-        (@response, @member_docs) = get_search_results(:q => query, :rows=>100)
-      else
-        #pretend we ran a solr query to get the colelctions since we do not need to really do it since there should be no results
-        @member_docs = []
-        @response =  Blacklight::SolrResponse.new({'responseHeader'=>{'status'=>0,'QTime'=>5,'params'=>{'wt'=>'ruby','q'=>'xxzxas'}},'response'=>{'numFound'=>0,'start'=>0,'maxScore'=>0.0,'docs'=>[]},'facet_counts'=>{'facet_queries'=>{},'facet_fields'=>{'active_fedora_model_ssi'=>[],'object_type_si'=>[]},'facet_dates'=>{},'facet_ranges'=>{}},'spellcheck'=>{'suggestions'=>['correctlySpelled',false]}},"")
-      end
+      query = params[:cq]
+
+      #default the rows to 100 if not specified then merge in the user parameters and the attach the collection query
+      solr_params =  {rows:100}.merge(params.symbolize_keys).merge({:q => query})
+
+      # run the solr query to find the collections
+      (@response, @member_docs) = get_search_results(solr_params)
     end
     
     def process_member_changes
@@ -168,9 +151,15 @@ module Hydra
           when "remove"
             change_members.each do |member|
               @collection.members.delete(member)
-              #puts "removing pid"
-              #@collection.remove_relationship(:has_collection_member, "info:fedora/#{pid}")
             end
+          when "move"
+            @destination_collection = ::Collection.find(params[:destination_collection_id])
+            change_members.each do |member|
+              @collection.members.delete(member)
+              @destination_collection.members << member
+            end
+            @destination_collection.save
+            flash[:notice] = "Successfully moved #{change_members.count} files to #{@destination_collection.title} Collection."
           when Array
             @collection.members.replace(change_members)
           #@collection.clear_relationship(:has_collection_member)
@@ -189,7 +178,9 @@ module Hydra
     # include filters into the query to only include the collection memebers
     def include_collection_ids(solr_parameters, user_parameters)
       solr_parameters[:fq] ||= []
-      if @collection.member_ids.length > 0
+      if @collection.member_ids.empty?
+        solr_parameters[:fq] << '{!lucene}-id:[* TO *]' # Don't match anything
+      else
         query = @collection.member_ids.map{|id| 'id:"'+id+'"'}.join " OR "
         solr_parameters[:fq] << query
       end

data/app/helpers/collections_helper.rb

@@ -40,5 +40,15 @@ module CollectionsHelper
   def single_item_action_form_fields(form, document, action)
     render partial:'/collections/single_item_action_fields', locals:{form:form, document:document, action: action}
   end
+
+  def hidden_collection_members
+    _erbout = ''
+    if params[:batch_document_ids].present?
+      params[:batch_document_ids].each do |batch_item|
+        _erbout.concat hidden_field_tag("batch_document_ids[]", batch_item)
+      end
+    end
+    _erbout.html_safe
+  end
   
 end

data/app/helpers/collections_search_helper.rb

@@ -1,34 +1,10 @@
 # View Helper methods for Hydra Collections in search results
 module CollectionsSearchHelper
-  
+
+  # @param [String] collection_pid the pid of a collection
+  # @return [String] the title of the collection if available, otherwise its pid
   def collection_name(collection_pid)
-    # junk, pid = collection_pid.split('/')
-    escaped_pid = collection_pid.sub(':', '\:')
-    solr_opts = {params: {:q=>"id:#{escaped_pid}"}}
-    result = Blacklight.solr.get("select", solr_opts)
-    docs = result["response"]["docs"]
-    
-    if docs
-      if docs.first[Solrizer.solr_name(:title, :displayable)] 
-        res = docs.first[Solrizer.solr_name(:title, :displayable)] 
-        res.kind_of?(Array) ? res.first : res 
-      else
-        logger.warn "#{docs.first['id']} does not have a #{Solrizer.solr_name(:title, :displayable)} in solr"
-        docs.first['id']
-      end
-    else 
-      'Not Found'
-    end
+    Collection.load_instance_from_solr(collection_pid).title || collection_pid
   end
-  
-  def display_value_for_facet(facet, value)
-      if facet == Solrizer.solr_name(:collection, :facetable)
-        collection_name(value)
-      elsif ['release_date_desc_facet', 'last_update_date_desc_facet'].include? facet
-        Narm::DateFacet.decode(value)
-      else
-        value
-      end
-    end
-  
-end
+
+end

data/{lib → app/models/concerns}/hydra/collection.rb

@@ -5,7 +5,6 @@ module Hydra
   module Collection
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
-    autoload :Permissions
     include Hydra::ModelMethods # for access to apply_depositor_metadata
     include Hydra::ModelMixins::RightsMetadata
     include Hydra::Collections::Collectible
@@ -34,13 +33,6 @@ module Hydra
       before_destroy :remove_all_members
     end
 
-    # TODO: Move this override into ScholarSphere
-    #def to_solr(solr_doc={}, opts={})
-    #  super(solr_doc, opts)
-    #  solr_doc[Solrizer.solr_name("noid", :sortable, :type => :text)] = noid
-    #  return solr_doc
-    #end
-
     def terms_for_editing
       terms_for_display - [:date_modified, :date_uploaded]
     end

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

@@ -1,4 +1,4 @@
 <%# button for deleting a collections %>
 <%# collection -- collection to be deleted %>
-<%= button_to label, collections.collection_path(collection.id), :confirm => confirm, :method=>:delete, :class=>"btn btn-primary collection-delete", 'data-behavior'=>'hydra-collections', :id=>'hydra-collection-add' %>
+<%= button_to label, collections.collection_path(collection.id), data:{confirm: confirm, behavior: 'hydra-collections'}, method: :delete, class: "btn btn-primary collection-delete", id: 'hydra-collection-add' %>