hydra-collections 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c5a786d66ac76371de611ba60c82a417cb7bf2e
-  data.tar.gz: d2aa7e948ff445d78cf8850a42cf3f1eb6c4f0bf
+  metadata.gz: d9f1837b7839dd05eb2e4491c0880601f1e9085d
+  data.tar.gz: 0ae0566206139f10230859c5eac19a9056ee8f70
 SHA512:
-  metadata.gz: df8819b16d5c05fb2bba1c0d8ea75b7cdab1f4222a468c91c0ae72eafbe66ecd5ae06439d85b65241e5a5595d27bc3fb5ba11fe3966108b074724476ede2cf58
-  data.tar.gz: 0501175dc1e84dd91992945b8ae666355d2577e83bedcc692ba61211c5c738eefa6685ea3bdc87a6d27dff82785537c002247d7e98a6df77c70697608534edce
+  metadata.gz: 1798220406600445cf05d2e8fcaf94a3fa68fcc6eea05afebc31f79caddd1c85be19b2c1b81e0a3c1a72b997a98d242199d9ae548b4881900522210b22f1a06e
+  data.tar.gz: 3a5c84107f842c2dea9b4ca6cfbd1efee7f7704d35854c6d3bf0b47653e28df81c3402b9f93ac8de82e6fd5026ebf7cdc331d98c070910fa8dff9681ed381660

data/Gemfile

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in hydra-collections.gemspec
 gemspec
 
+gem 'blacklight', github:'projectblacklight/blacklight' ,ref:'2eb87e73ee81ee701982ca32e5eca37429e3c199'
+
 group :development, :test do
   gem 'sqlite3'
   gem "factory_girl_rails", "~> 4.1.0"

data/app/assets/javascripts/hydra/batch_select.js

@@ -32,7 +32,8 @@ $(function () {
       var form = $(this).closest("form"); 
       $.map( $(".batch_document_selector:checked"), function(document, i) {
          var id = document.id.substring("batch_document_".length);
-        form.append('<input type="hidden" multiple="multiple" name="batch_document_ids[]" value="'+id+'" />');
+         if (form.children("input[value='"+id+"']").length == 0)
+           form.append('<input type="hidden" multiple="multiple" name="batch_document_ids[]" value="'+id+'" />');
       });
   
       

data/app/assets/javascripts/hydra_collections.js

@@ -6,6 +6,7 @@ $(function () {
       var form = $(this).closest("form"); 
       var collection_id = $(".collection-selector:checked")[0].value;      
       form[0].action = form[0].action.replace("collection_replace_id",collection_id);
+      form.append('<input type="hidden" value="add" name="collection[members]"></input>');
       
   });
 

data/app/assets/stylesheets/hydra_collections.css.scss

@@ -0,0 +1,4 @@
+.collection-list {
+  max-height: 200px;
+  overflow-y: scroll;
+}

data/app/helpers/collections_helper.rb

@@ -4,11 +4,36 @@ module CollectionsHelper
  
   # 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 :partial=>'/collections/button_create_collection', :locals=>{:label=>label}
+    render partial:'/collections/button_create_collection', locals:{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 partial:'/collections/button_for_update_collection', locals:{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 partial:'/collections/button_for_delete_collection', locals:{collection:collection,label:label, confirm:confirm}
+  end
+
+  def button_for_remove_from_collection(document, label = 'Remove From Collection')
+    render partial:'/collections/button_remove_from_collection', locals:{label:label, document:document}
+  end
+
+  # add hidden fields to a form for removing a single document from a collection
+  def single_item_action_remove_form_fields(form, document)
+    single_item_action_form_fields(form, document, "remove")
   end
   
-  def button_for_add_batch_to_collection(label = 'Add Selected to a Collection')
-    render :partial=>'/collections/button_add_batch_to_collection', :locals=>{:label=>label}
+  # add hidden fields to a form for adding a single document to a collection
+  def single_item_action_add_form_fields(form, document)
+    single_item_action_form_fields(form, document, "add")
+  end
+
+  # add hidden fields to a form for performing an action on a single document on a collection      
+  def single_item_action_form_fields(form, document, action)
+    render partial:'/collections/single_item_action_fields', locals:{form:form, document:document, action: action}
   end
   
 end

data/app/models/solr_document.rb

@@ -0,0 +1,13 @@
+# -*- encoding : utf-8 -*-
+class SolrDocument
+  # Add Blacklight behaviors to the SolrDocument
+  include Blacklight::Solr::Document
+  # Adds Collection behaviors to the SolrDocument.
+  include Hydra::Collections::SolrDocumentBehavior
+
+  # Method to return the ActiveFedora model
+  def hydra_model
+    Array(self[Solrizer.solr_name('active_fedora_model', Solrizer::Descriptor.new(:string, :stored, :indexed))]).first
+  end
+   
+end

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

@@ -1,2 +1,2 @@
-<%= button_to label, collections.new_collection_path, :method=>:get, :class=>"btn btn-primary collection-add", 'data-behavior'=>'hydra-collections', :id=>'hydra-collection-add' %>
+<%= button_to label, collections.new_collection_path, :method=>:get, :class=>"btn btn-primary collection-add submits-batches", 'data-behavior'=>'hydra-collections', :id=>'hydra-collection-add' %>
 

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

@@ -0,0 +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' %>
+

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

@@ -0,0 +1,4 @@
+<%# button for updating a collections %>
+<%# collection_id -- collection to be updated (use 'collection_replace_id' if you wish the form to be updated by a form value) %>
+<%# label -- button label %>
+<%= 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' %>

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

@@ -0,0 +1,6 @@
+<%#= button_to label, ,  :class=>"btn btn-primary collection-remove", 'data-behavior'=>'hydra-collections-remove', members:"delete", batch_document_ids:[document.id] %>
+
+<%= form_for @collection, url:collections.collection_path(@collection.id), :method=>:put do |f| %>
+  <%= single_item_action_remove_form_fields(f,document) %>
+  <%= f.submit label, :class => "btn btn-primary collection-remove" %>
+<% end %>

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

@@ -0,0 +1,12 @@
+     
+      <% # header bar for doc items in index view -%>
+      <div class="documentHeader clearfix">
+        
+        <% # main title container for doc partial view -%>
+          <h5 class="index_title"><%= t('blacklight.search.documents.counter', :counter => (document_counter + 1 + @response.params[:start].to_i)) %><%= link_to_document document, :label=>document_show_link_field(document), :counter => (document_counter + 1 + @response.params[:start].to_i) %></h5>
+
+        <div class="documentFunctions span2">
+          <%= button_for_remove_from_collection(document) %>
+        </div>
+      </div>
+      

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

@@ -0,0 +1 @@
+<%= render partial:'catalog/document_list', locals:{documents: documents} %>

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

@@ -1,13 +1,23 @@
-Please Select your colection to add you files to:
 <% thing = Collection.new %>
-<%= form_tag(collections.collection_path('collection_replace_id'), :method => "put") do %>
-<%#= form_for thing, :url => , :html => {:multipart => true, :class => 'form-horizontal'}, :method => :put do |f| %>
-  <input type="hidden" name="test" value="val" />
-  <%= hash_as_hidden_fields({:collection =>{members:"add"}}) %>
-  <ul>
-  <% user_collections.each do |collection| %>
-    <li> <%= radio_button_tag(:id, collection.id, false, :class => "collection-selector") %><%= label_tag(:collection, collection.title) %> </li>
+<% if user_collections.nil?%>
+<b>  Make sure you have included Hydra::Collections::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(collections.collection_path('collection_replace_id'), :method => "put") do %>
+  <%#= form_for thing, :url => , :html => {:multipart => true, :class => 'form-horizontal'}, :method => :put do |f| %>
+    <input type="hidden" name="test" value="val" />
+    <%= hash_as_hidden_fields({:collection =>{members:"add"}}) %>
+    <div class="collection-list">
+      <ul>
+      <% user_collections.each do |collection| %>
+        <li> <%= radio_button_tag(:id, collection.id, false, :class => "collection-selector") %><%= label_tag(:collection, collection.title) %> </li>
+      <% end %>
+      </ul>
+    </div>
+    <%= button_to "Update Collection", collections.collections_path, :method=>:put, :class=>"btn btn-primary collection-update submits-batches", 'data-behavior'=>'hydra-collections', :id=>'hydra-collection-add' %>
   <% end %>
-  </ul>
-  <%= button_to "Update Collection", collections.collections_path, :method=>:put, :class=>"btn btn-primary collection-update submits-batches", 'data-behavior'=>'hydra-collections', :id=>'hydra-collection-add' %>
 <% end %>

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

@@ -0,0 +1,6 @@
+  <%# this includes the fields in a form necissary for manipulating a single item in a collection %>
+  <%# form - form these fields will reside in %>
+  <%# action - collection action: add or remove %>
+  <%# document - current document %>
+  <%= form.hidden_field :members, :value => action %>
+  <%= hidden_field :batch_document_ids, '',{value:document.id, multiple:true} %>

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

@@ -1,9 +1,4 @@
 <h1><%=@collection.title%><h1>
 <h3><%=@collection.description%> </h3>
 <h3> <u>Contained Files </u></h3>
-<table>
-  <tr> <th> File id </th> </tr>
-  <% @collection.members.each_with_index do |document,counter| %>
-     <tr><td><%=document.pid%></tr>
-  <% end %>
-</table>
+<%= render partial:'document_list', locals:{documents: @member_docs} %>

data/lib/hydra-collections.rb

@@ -5,3 +5,4 @@ require "bundler/setup"
 require "blacklight"
 require "hydra/head"
 require "active_fedora"
+require "hydra/collections/selects_collections"

data/lib/hydra/collection.rb

@@ -6,9 +6,10 @@ module Hydra
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
     autoload :Permissions
-    include Hydra::ModelMethods # for access to apply_depositor_metadata
-
-    included do
+   include Hydra::ModelMethods # for access to apply_depositor_metadata
+   include Hydra::ModelMixins::RightsMetadata
+    
+   included do
       has_metadata :name => "descMetadata", :type => CollectionRdfDatastream
       has_metadata :name => "properties", :type => Hydra::Datastream::Properties
       has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata
@@ -16,7 +17,7 @@ module Hydra
       has_and_belongs_to_many :members, :property => :has_collection_member, :class_name => "ActiveFedora::Base"
 
       delegate_to :properties, [:depositor], :unique => true
-      delegate_to :descMetadata, [:date_uploaded, :date_modified, :related_url,
+      delegate_to :descMetadata, [:date_uploaded, :date_modified,
                                   :title, :description], :unique => true
 
       before_create :set_date_uploaded

data/lib/hydra/collections.rb

@@ -5,6 +5,8 @@ module Hydra
     autoload :Collectible
     autoload :SearchService
     autoload :AcceptsBatches
+    autoload :SelectsCollections
+    autoload :SolrDocumentBehavior
     class Engine < ::Rails::Engine
       engine_name "collections"
     end

data/lib/hydra/collections/selects_collections.rb

@@ -0,0 +1,49 @@
+require 'blacklight/catalog'
+
+module Hydra::Collections::SelectsCollections
+
+  extend ActiveSupport::Autoload
+  extend ActiveSupport::Concern
+ 
+  def access_levels
+    {read:[:read,:edit],edit:[:edit]}
+  end 
+
+  # add one of the following methods as a before filter on any page that shows the form_for_select_collection
+  def find_collections_with_read_access
+    find_collections(:read)
+  end
+
+  def find_collections_with_edit_access
+    find_collections(:edit)
+  end
+    
+  def find_collections (access_level='')
+    # need to know the user if there is an access level applied otherwise we are just doing public collections
+    authenticate_user! unless access_level.blank?
+    
+    # update the permission filters for the query of need be
+    original_permissions = discovery_permissions 
+    self.class.send(:define_method, "discovery_permissions")  { access_levels[access_level] } unless access_level.blank?
+ 
+    # add the collection filter to the solr logic for this query
+    orig_solr_search_params_logic = self.class.solr_search_params_logic
+    self.class.solr_search_params_logic += [:add_collection_filter]
+    
+    # run the solr query to find the collections
+    (resp, doc_list) = get_search_results(:q => '', :rows=>100)
+
+    #reset to original solr logic
+    self.class.send(:define_method, "discovery_permissions")  { original_permissions } unless access_level.blank?
+    self.class.solr_search_params_logic = orig_solr_search_params_logic
+
+    # return the user's collections (or public collections if no access_level is applied)
+    @user_collections = doc_list
+  end
+      
+  def add_collection_filter(solr_parameters, user_parameters)
+    solr_parameters[:fq] ||= []
+    solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:\"info:fedora/afmodel:Collection\""
+  end
+  
+end

data/lib/hydra/collections/solr_document_behavior.rb

@@ -0,0 +1,33 @@
+# 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.
+
+# -*- encoding : utf-8 -*-
+module Hydra
+  module Collections
+    module SolrDocumentBehavior
+      def title_or_label
+        title || label
+      end
+    
+      def title
+        Array(self[Solrizer.solr_name('desc_metadata__title')]).first
+      end
+  
+      def description
+        Array(self[Solrizer.solr_name('desc_metadata__description')]).first
+      end
+      
+    end
+  end
+end

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/hydra/collections_controller_behavior.rb

@@ -1,3 +1,5 @@
+require 'blacklight'
+
 # -*- coding: utf-8 -*-
 # Copyright © 2012 The Pennsylvania State University
 #
@@ -12,6 +14,7 @@
 # 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
   module CollectionsControllerBehavior
@@ -20,6 +23,7 @@ module Hydra
     included do
       include Hydra::Controller::ControllerBehavior
       include Blacklight::Configurable # comply with BL 3.7
+      include Blacklight::Controller
       include Hydra::Collections::AcceptsBatches
 
       # This is needed as of BL 3.7
@@ -28,7 +32,7 @@ module Hydra
       # Catch permission errors
       rescue_from Hydra::AccessDenied, CanCan::AccessDenied do |exception|
         if (exception.action == :edit)
-          redirect_to(sufia.url_for({:action=>'show'}), :alert => "You do not have sufficient privileges to edit this document")
+          redirect_to(collections.url_for({:action=>'show'}), :alert => "You do not have sufficient privileges to edit this document")
         elsif current_user and current_user.persisted?
           redirect_to root_url, :alert => exception.message
         else
@@ -45,24 +49,64 @@ module Hydra
     def new
       #@collection = ::Collection.new
     end
-    
+
+    def show
+      logger.warn "Got to show"
+
+      if @collection.member_ids.length > 0
+        query = @collection.member_ids.join " OR "
+        
+        # run the solr query to find the collections
+        (@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
+
+    end
+        
     def edit
     end
+
+    def after_create
+      respond_to do |format|
+        format.html { redirect_to collections.collection_path(@collection), notice: 'Collection was successfully created.' }
+        format.json { render json: @collection, status: :created, location: @collection }
+      end
+    end
     
+    def after_create_error
+      respond_to do |format|
+        format.html { render action: "new" }
+        format.json { render json: @collection.errors, status: :unprocessable_entity }
+      end
+    end
+        
     def create
       @collection.apply_depositor_metadata(current_user.user_key)
       unless batch.empty?
         params[:collection][:members]="add"
         process_member_changes
       end
+      if @collection.save
+        after_create
+      else
+        after_create_error
+      end
+    end
+    
+    def after_update 
       respond_to do |format|
-        if @collection.save
-          format.html { redirect_to collections.collection_path(@collection), notice: 'Collection was successfully created.' }
-          format.json { render json: @collection, status: :created, location: @collection }
-        else
-          format.html { render action: "new" }
-          format.json { render json: @collection.errors, status: :unprocessable_entity }
-        end
+        format.html { redirect_to collections.collection_path(@collection), notice: 'Collection was successfully updated.' }
+        format.json { render json: @collection, status: :updated, location: @collection }
+      end
+    end
+    
+    def after_update_error
+      respond_to do |format|
+        format.html { render action: collections.edit_collection_path(@collection) }
+        format.json { render json: @collection.errors, status: :unprocessable_entity }
       end
     end
     
@@ -70,17 +114,37 @@ module Hydra
       @collection = ::Collection.find(params[:id])
       process_member_changes
       @collection.update_attributes(params[:collection].except(:members))
-      respond_to do |format|
-        if @collection.save
-          format.html { redirect_to collections.collection_path(@collection), notice: 'Collection was successfully created.' }
-          format.json { render json: @collection, status: :updated, location: @collection }
-        else
-          format.html { render action: collections.edit_collection_path(@collection) }
-          format.json { render json: @collection.errors, status: :unprocessable_entity }
-        end
+      if @collection.save
+        after_update
+      else
+        after_update_error
       end
     end
     
+    
+    def after_destroy (id)
+      respond_to do |format|
+        format.html { redirect_to catalog_index_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.json { render json: {id:id}, status: :destroy_error, location: @collection }
+      end      
+    end
+    
+    def destroy
+      @collection = ::Collection.find(params[:id])     
+       if @collection.destroy
+          after_destroy(params[:id])
+       else
+         after_destroy_error(params[:id])
+       end
+     end
+    
     protected
     
     def process_member_changes
@@ -103,6 +167,10 @@ module Hydra
       end
     end  
     
-      
+    # this is only needed until the version of balcklight that we are using this include it in it's solr helper  
+    def blacklight_solr
+        Blacklight.solr
+    end
+    
   end # module CollectionsControllerBehavior
 end # module Hydra

data/spec/controllers/catalog_controller_spec.rb

@@ -0,0 +1,44 @@
+# 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.
+
+require 'spec_helper'
+
+include Rails.application.routes.url_helpers
+
+describe CatalogController do
+  before do
+    controller.stub(:has_access?).and_return(true)
+    @user = FactoryGirl.find_or_create(:user)
+    @collection = Collection.new title:"Test"
+    @collection.apply_depositor_metadata(@user.user_key)
+    @collection.read_groups = ["public"]
+    @collection.save
+  end
+
+  after do
+    @user.delete
+    @collection.delete
+  end
+  
+  
+  describe '#index' do
+    it 'should assign @user_collections' do
+      @routes = Rails.application.routes
+      get :index
+      expect(assigns(:user_collections)).to be_kind_of(Array)
+      assigns(:user_collections).index{|d| d.id == @collection.id}.should_not be_nil
+    end
+  end
+  
+end

data/spec/controllers/collections_controller_spec.rb

@@ -52,6 +52,10 @@ describe CollectionsController do
       post :create, batch_document_ids: [@asset1, @asset2], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
       assigns[:collection].members.should == [@asset1, @asset2]
     end
+    it "should call after_create" do
+       controller.should_receive(:after_create).and_call_original
+       post :create, collection: {title: "My First Collection ", description: "The Description\r\n\r\nand more"}
+    end
   end
   
   describe "#update" do
@@ -70,12 +74,17 @@ describe CollectionsController do
       assigns[:collection].title.should == "New Title"
       assigns[:collection].description.should == "New Description"
     end
+
+    it "should call after_update" do
+       controller.should_receive(:after_update).and_call_original
+       put :update, id: @collection.id, collection: {title: "New Title", description: "New Description"}
+    end
     it "should support adding batches of members" do
       @collection.members << @asset1
       @collection.save
       put :update, id: @collection.id, collection: {members:"add"}, batch_document_ids:[@asset2, @asset3]
       response.should redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(@collection.id)
-      assigns[:collection].members.should == [@asset2, @asset3, @asset1]
+      assigns[:collection].members.sort! { |a,b| a.pid <=> b.pid }.should == [@asset2, @asset3, @asset1].sort! { |a,b| a.pid <=> b.pid }
     end
     it "should support removing batches of members" do
       @collection.members = [@asset1, @asset2, @asset3]
@@ -90,4 +99,28 @@ describe CollectionsController do
       assigns[:collection].members.should == [@asset1,@asset2, @asset3]
     end
   end
+
+  describe "#destroy" do
+    describe "valid collection" do
+      before do
+        @collection = Collection.new
+        @collection.apply_depositor_metadata(@user.user_key)
+        @collection.save
+        controller.should_receive(:authorize!).and_return(true)
+      end
+      it "should delete collection" do
+        delete :destroy, id: @collection.id
+        response.should redirect_to Rails.application.routes.url_helpers.catalog_index_path
+        flash[:notice].should == "Collection was successfully deleted."
+      end
+      it "should call after_destroy" do
+         controller.should_receive(:after_destroy).and_call_original
+        delete :destroy, id: @collection.id
+      end
+    end
+    it "should not delete an invalid collection" do
+       expect {delete :destroy, id: 'zz:-1'}.to raise_error
+    end
+  end
+
 end

data/spec/controllers/selects_collections_spec.rb

@@ -0,0 +1,102 @@
+require "spec_helper"
+
+class SelectsCollectionsController < ApplicationController
+  include Blacklight::Catalog
+  include Hydra::Controller::ControllerBehavior
+  include Hydra::Collections::SelectsCollections
+
+  SelectsCollectionsController.solr_search_params_logic += [:add_access_controls_to_solr_params]
+  # This filters out objects that you want to exclude from search results, like FileAssets
+  SelectsCollectionsController.solr_search_params_logic += [:exclude_unwanted_models]
+
+end
+
+
+describe SelectsCollectionsController do
+
+  describe "Select Collections" do
+    before (:all) do
+      @user = FactoryGirl.find_or_create(:user)
+      @collection = Collection.new title:"Test Public"
+      @collection.apply_depositor_metadata(@user.user_key)
+      @collection.read_groups = ["public"]
+      @collection.save
+      @collection2 = Collection.new title:"Test Read"
+      @collection2.apply_depositor_metadata('abc123@test.com')
+      @collection2.read_users = [@user.user_key]
+      @collection2.save
+      @collection3 = Collection.new title:"Test Edit"
+      @collection3.apply_depositor_metadata('abc123@test.com')
+      @collection3.edit_users = [@user.user_key]
+      @collection3.save 
+      @collection4 = Collection.new title:"Test No Access"
+      @collection4.apply_depositor_metadata('abc123@test.com')
+      @collection4.save 
+    end
+    after (:all) do
+      Collection.find(:all).map(&:delete)
+    end
+    describe "Public Access" do
+      before (:each) do
+        subject.find_collections
+        @user_collections =  subject.instance_variable_get (:@user_collections)
+        expect(@user_collections).to be_kind_of(Array)
+      end
+      it "should return public collections" do
+        @user_collections.index{|d| d.id == @collection.id}.should_not be_nil
+      end 
+      it "should not return non public collections" do
+        @user_collections.index{|d| d.id == @collection2.id}.should be_nil
+        @user_collections.index{|d| d.id == @collection3.id}.should be_nil
+        @user_collections.index{|d| d.id == @collection4.id}.should be_nil
+       end
+    end
+    describe "Read Access" do
+      describe "not signed in" do
+        it "should error if the user is not signed in" do
+          expect { subject.find_collections_with_read_access }.to raise_error
+        end
+      end
+      describe "signed in" do
+        before (:each) do
+          sign_in @user
+          subject.find_collections_with_read_access
+          @user_collections =  subject.instance_variable_get (:@user_collections)
+          expect(@user_collections).to be_kind_of(Array)
+        end
+        it "should return public and read access (edit access implies read) collections" do
+          @user_collections.index{|d| d.id == @collection.id}.should_not be_nil
+          @user_collections.index{|d| d.id == @collection2.id}.should_not be_nil
+          @user_collections.index{|d| d.id == @collection3.id}.should_not be_nil
+        end 
+        it "should not return non public collections" do
+          @user_collections.index{|d| d.id == @collection4.id}.should be_nil
+        end
+      end
+    end
+    describe "Edit Access" do
+      describe "not signed in" do
+        it "should error if the user is not signed in" do
+          expect { subject.find_collections_with_edit_access }.to raise_error
+        end
+      end
+      describe "signed in" do
+        before (:each) do
+          sign_in @user
+          subject.find_collections_with_edit_access
+           @user_collections =  subject.instance_variable_get (:@user_collections)
+           expect(@user_collections).to be_kind_of(Array)
+         end
+        it "should return public or editable collections" do
+          @user_collections.index{|d| d.id == @collection.id}.should_not be_nil
+          @user_collections.index{|d| d.id == @collection3.id}.should_not be_nil
+        end 
+        it "should not return non public or editable collections" do
+          @user_collections.index{|d| d.id == @collection2.id}.should be_nil
+          @user_collections.index{|d| d.id == @collection4.id}.should be_nil
+        end
+      end
+    end
+  end
+  
+end

data/spec/helpers/collections_helper_spec.rb

@@ -17,13 +17,32 @@ require 'spec_helper'
 include Hydra::Collections::Engine.routes.url_helpers
 
 describe CollectionsHelper do
-  it "button_for_create_collection should create a button to the collections new path" do
-    html = button_for_create_collection 
-    html.should have_selector("form[action='#{collections.new_collection_path}']")
+  describe "button_for_create_collection" do
+    it " should create a button to the collections new path" do
+      html = button_for_create_collection 
+      html.should have_selector("form[action='#{collections.new_collection_path}']")
+      html.should have_selector("input[type='submit']")
+    end
+    it "should create a button with my text" do
+      html = button_for_create_collection "Create My Button"
+      html.should have_selector("input[value='Create My Button']")
+    end
+  end
+describe "button_for_delete_collection" do
+  before (:all) do
+    @collection = Collection.create title:"Test Public"
+  end
+  after (:all) do
+    @collection.delete
+  end
+  it " should create a button to the collections delete path" do
+    html = button_for_delete_collection @collection
+    html.should have_selector("form[action='#{collections.collection_path(@collection.pid)}']")
     html.should have_selector("input[type='submit']")
   end
-  it "button_for_create_collection should create a button with my text" do
-    html = button_for_create_collection "Create My Button"
-    html.should have_selector("input[value='Create My Button']")
+  it "should create a button with my text" do
+    html = button_for_delete_collection @collection,  "Delete My Button"
+    html.should have_selector("input[value='Delete My Button']")
   end
 end
+end

data/spec/support/app/views/catalog/_index_collection.html.erb

@@ -0,0 +1 @@
+<%= button_for_delete_collection(document, "Delete") %>

data/spec/support/app/views/catalog/_sort_and_per_page.html.erb

@@ -8,13 +8,6 @@
 
     <%= button_for_create_collection %>
 
-
-    <% c1 = Collection.new(title:"title1") %>
-    <% c1.apply_depositor_metadata("cam156@psu.edu") %>
-    <% c1.save %>
-    <% c2  = Collection.new(title:"title2") %>
-    <% c2.apply_depositor_metadata("cam156@psu.edu") %>
-    <% c2.save %>
-    <%= render partial: 'collections/form_for_select_collection', locals: {user_collections: [c1,c2]}  %>
+    <%= render partial: 'collections/form_for_select_collection', locals: {user_collections: @user_collections}  %>
 
 </div>

data/spec/support/lib/generators/test_app_generator.rb

@@ -44,10 +44,31 @@ class TestAppGenerator < Rails::Generators::Base
     directory("app/views/catalog")
   end
   
-  # Inject call to Hydra::Collections.add_routes in config/routes.rb
+  # Inject javascript into application.js
   def inject_javascript
-    insert_into_file "app/assets/javascripts/application.js", :after => '/= require_tree .' do
-      "\n  #include javascript for batches and collections\n//= require hydra/batch_select\n//=  require hydra_collections"
+    insert_into_file "app/assets/javascripts/application.js", :after => '//= require_tree .' do
+      "\n   //include javascript for batches and collections\n//= require hydra/batch_select\n//=  require hydra_collections"
+    end
+  end
+
+  # Inject javascript into application.js
+  def inject_css
+    insert_into_file "app/assets/stylesheets/application.css", :after => '*= require_tree .' do
+      "\n  *= require hydra_collections"
+    end
+  end
+  
+  # Inject collections call into balacklight catalog
+  def inject_collections
+    insert_into_file "app/controllers/catalog_controller.rb", :after => 'Hydra::Controller::ControllerBehavior' do
+      "\n  include Hydra::Collections::SelectsCollections\n  before_filter :find_collections, :only=>:index"
+    end
+  end
+
+  # Inject collections SolrDocumentBehavior into balacklight SolrDocument
+  def inject_solr_doc
+    insert_into_file "app/models/solr_document.rb", :after => 'include Blacklight::Solr::Document' do
+      "\n      # Adds Collection behaviors to the SolrDocument.\n      include Hydra::Collections::SolrDocumentBehavior"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -98,16 +98,24 @@ files:
 - Rakefile
 - app/assets/javascripts/hydra/batch_select.js
 - app/assets/javascripts/hydra_collections.js
+- app/assets/stylesheets/hydra_collections.css.scss
 - app/controllers/collections_controller.rb
 - app/helpers/batch_select_helper.rb
 - app/helpers/collections_helper.rb
 - app/models/collection.rb
+- app/models/solr_document.rb
 - app/views/batch_select/_add_button.html.erb
 - app/views/batch_select/_check_all.html.erb
 - app/views/batch_select/_tools.html.erb
 - app/views/collections/_button_create_collection.html.erb
+- app/views/collections/_button_for_delete_collection.html.erb
+- app/views/collections/_button_for_update_collection.html.erb
+- app/views/collections/_button_remove_from_collection.html.erb
+- app/views/collections/_document_header.html.erb
+- app/views/collections/_document_list.html.erb
 - app/views/collections/_form.html.erb
 - app/views/collections/_form_for_select_collection.html.erb
+- app/views/collections/_single_item_action_fields.html.erb
 - app/views/collections/new.html.erb
 - app/views/collections/show.html.erb
 - config/jetty.yml
@@ -121,6 +129,8 @@ files:
 - lib/hydra/collections/accepts_batches.rb
 - lib/hydra/collections/collectible.rb
 - lib/hydra/collections/search_service.rb
+- lib/hydra/collections/selects_collections.rb
+- lib/hydra/collections/solr_document_behavior.rb
 - lib/hydra/collections/version.rb
 - lib/hydra/collections_controller_behavior.rb
 - lib/hydra/datastreams/collection_rdf_datastream.rb
@@ -128,7 +138,9 @@ files:
 - solr_conf/conf/solrconfig.xml
 - solr_conf/solr.xml
 - spec/controllers/accepts_batches_spec.rb
+- spec/controllers/catalog_controller_spec.rb
 - spec/controllers/collections_controller_spec.rb
+- spec/controllers/selects_collections_spec.rb
 - spec/factories.rb
 - spec/factories/.gitkeep
 - spec/factories/users.rb
@@ -141,6 +153,7 @@ files:
 - spec/support/app/models/sample.rb
 - spec/support/app/models/solr_document.rb
 - spec/support/app/views/catalog/_document_header.html.erb
+- spec/support/app/views/catalog/_index_collection.html.erb
 - spec/support/app/views/catalog/_sort_and_per_page.html.erb
 - spec/support/config/initializers/hydra_config.rb
 - spec/support/db/migrate/20111101221803_create_searches.rb
@@ -174,7 +187,9 @@ specification_version: 4
 summary: A rails engine for managing Hydra Collections
 test_files:
 - spec/controllers/accepts_batches_spec.rb
+- spec/controllers/catalog_controller_spec.rb
 - spec/controllers/collections_controller_spec.rb
+- spec/controllers/selects_collections_spec.rb
 - spec/factories.rb
 - spec/factories/.gitkeep
 - spec/factories/users.rb
@@ -187,6 +202,7 @@ test_files:
 - spec/support/app/models/sample.rb
 - spec/support/app/models/solr_document.rb
 - spec/support/app/views/catalog/_document_header.html.erb
+- spec/support/app/views/catalog/_index_collection.html.erb
 - spec/support/app/views/catalog/_sort_and_per_page.html.erb
 - spec/support/config/initializers/hydra_config.rb
 - spec/support/db/migrate/20111101221803_create_searches.rb