hydra-collections 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9f1837b7839dd05eb2e4491c0880601f1e9085d
-  data.tar.gz: 0ae0566206139f10230859c5eac19a9056ee8f70
+  metadata.gz: a7149da28869268dc7f98e013bc2ff9bfc0f1d4f
+  data.tar.gz: fca470f837199a78ab3f0d7f72035cdd81af2bea
 SHA512:
-  metadata.gz: 1798220406600445cf05d2e8fcaf94a3fa68fcc6eea05afebc31f79caddd1c85be19b2c1b81e0a3c1a72b997a98d242199d9ae548b4881900522210b22f1a06e
-  data.tar.gz: 3a5c84107f842c2dea9b4ca6cfbd1efee7f7704d35854c6d3bf0b47653e28df81c3402b9f93ac8de82e6fd5026ebf7cdc331d98c070910fa8dff9681ed381660
+  metadata.gz: 57fd97a1cd596b776e1a3bce56ed6da35123638f2fbdaecb559c81f7dab2e78084e5a17da23e70827976965eb2b4fbb0e603f18d2545176ba2bc19d5baaf2d7d
+  data.tar.gz: f1983ca6f58409e4345a988dcae8149308265f260ad40c29f7754f4fd7105c53cea46486e23059e9963db53a9d36ee3cb5aaaf272b14a1fbe7f4e05197aef709

data/app/assets/javascripts/hydra_collections.js

@@ -1,7 +1,7 @@
 $(function () {
 
   // change the action based which collection is selected
-  $('input.submits-batches').on('click', function() {  
+  $('input.updates-collection').on('click', function() {
  
       var form = $(this).closest("form"); 
       var collection_id = $(".collection-selector:checked")[0].value;      

data/app/helpers/collections_helper.rb

@@ -1,4 +1,4 @@
-# View Helpers for Hydra Batch Edit functionality
+# View Helpers for Hydra Collections functionality
 module CollectionsHelper 
   
  
@@ -21,6 +21,11 @@ module CollectionsHelper
     render partial:'/collections/button_remove_from_collection', locals:{label:label, document:document}
   end
 
+  def button_for_remove_selected_from_collection(collection, label = 'Remove From Collection')
+    render partial:'/collections/button_for_remove_selected_from_collection', locals:{collection:collection, label:label}
+  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")

data/app/helpers/collections_search_helper.rb

@@ -0,0 +1,34 @@
+# View Helper methods for Hydra Collections in search results
+module CollectionsSearchHelper
+  
+  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
+  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

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

@@ -0,0 +1,8 @@
+<%# button for removing a batch from a collection %>
+<%# collection -- collection to be updated  %>
+<%# label -- button label %>
+<%= form_for collection, url:collections.collection_path(collection.id), :method=>:put do |f| %>
+    <%= f.hidden_field :members, :value => "remove" %>
+    <%= f.submit label, :class => "btn btn-primary collection-remove-selected updates-collection submits-batches" %>
+<% end %>
+

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

@@ -0,0 +1,26 @@
+<%#
+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.
+%>
+
+<div style="float: right;" >
+  <%= form_for([collections, @collection] , :method => :get, :class => "well form-search") do |f| %>
+
+      <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' %>
+      <%= search_as_hidden_fields(:omit_keys => [:cq, :sort, :qt, :page]).html_safe %>
+      <button type="submit" class="btn btn-primary" id="collection_submit"><i class="icon-search"></i> Go</button>
+  <% end %>
+</div>

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

@@ -0,0 +1,3 @@
+<h1>Edit Collection</h1>
+
+<%= render 'form' %>

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

@@ -1,4 +1,5 @@
 <h1><%=@collection.title%><h1>
 <h3><%=@collection.description%> </h3>
 <h3> <u>Contained Files </u></h3>
+<%= render partial: 'search_form'%>
 <%= render partial:'document_list', locals:{documents: @member_docs} %>

data/lib/hydra/collection.rb

@@ -6,22 +6,32 @@ module Hydra
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
     autoload :Permissions
-   include Hydra::ModelMethods # for access to apply_depositor_metadata
-   include Hydra::ModelMixins::RightsMetadata
-    
-   included do
+    include Hydra::ModelMethods # for access to apply_depositor_metadata
+    include Hydra::ModelMixins::RightsMetadata
+    include Hydra::Collections::Collectible
+
+    included do
       has_metadata :name => "descMetadata", :type => CollectionRdfDatastream
       has_metadata :name => "properties", :type => Hydra::Datastream::Properties
       has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata
 
-      has_and_belongs_to_many :members, :property => :has_collection_member, :class_name => "ActiveFedora::Base"
+      has_and_belongs_to_many :members, :property => :has_collection_member, :class_name => "ActiveFedora::Base" , :after_remove => :remove_member
 
       delegate_to :properties, [:depositor], :unique => true
-      delegate_to :descMetadata, [:date_uploaded, :date_modified,
-                                  :title, :description], :unique => true
+      
+      delegate_to :descMetadata, [:title, :date_uploaded, :date_modified,
+                                  :description], :unique => true         
+      delegate_to :descMetadata, [:creator, :contributor, :based_near, :part_of, 
+                                :publisher, :date_created, :subject,:resource_type, :rights, :identifier,
+                                :language, :tag, :related_url]                            
 
       before_create :set_date_uploaded
       before_save :set_date_modified
+
+      after_save :local_update_members
+      after_create :create_member_index
+
+      before_destroy :remove_all_members
     end
 
     # TODO: Move this override into ScholarSphere
@@ -36,7 +46,12 @@ module Hydra
     end
 
     def terms_for_display
-      self.descMetadata.class.config.keys
+      self.descMetadata.class.config.keys.map{|v| v.to_sym}
+    end
+
+    def remove_member(member)
+      #member.collections.delete self if member.respond_to?(:collections)
+      member.reload.update_index
     end
 
     private
@@ -49,5 +64,34 @@ module Hydra
       self.date_modified = Date.today
     end
 
-  end
+    # cause the members to index the relationship
+    def local_update_members
+      if self.respond_to?(:members)
+        self.members.each do |member|
+          member.reload.update_index
+        end
+      end
+    end
+
+    def create_member_index
+      self.members.each do |member|
+        member.to_solr  # not sure why this to_solr is needed but it caused the removal and update to work
+        if member.respond_to?(:collections)
+          member.collections << self
+          member.update_index
+          member.collections << self if self.members.size == 1  #again who konw why but this allows on asset to be added
+        end
+      end
+    end
+
+    def remove_all_members
+      self.members.each do |member|
+        member.to_solr  # not sure why this to_solr is needed but it caused the removal and update to work
+        member.collections.delete(self) if member.respond_to?(:collections)
+        member.update_index
+      end
+    end
+
+ end
+
 end

data/lib/hydra/collections/collectible.rb

@@ -19,6 +19,7 @@ module Hydra::Collections::Collectible
   #   end
   def index_collection_pids(solr_doc={})
     solr_doc[Solrizer.solr_name(:collection, :facetable)] = self.collection_ids
+    solr_doc[Solrizer.solr_name(:collection)] = self.collection_ids
     solr_doc
   end
 end

data/lib/hydra/collections/version.rb

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

data/lib/hydra/collections_controller_behavior.rb

@@ -44,6 +44,10 @@ 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]
+
+      #This includes only the collection members in the search
+      self.solr_search_params_logic += [:include_collection_ids]
     end
 
     def new
@@ -51,19 +55,6 @@ module Hydra
     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
@@ -147,30 +138,61 @@ module Hydra
     
     protected
     
+    # 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
+    end
+    
     def process_member_changes
       unless params[:collection].nil?
+        change_members = []
+        batch.each do |pid|
+          change_members << ActiveFedora::Base.find(pid, :cast=>true)
+        end
+
         case params[:collection][:members]
-        when "add"
-          batch.each do |pid|
-            @collection.add_relationship(:has_collection_member, "info:fedora/#{pid}")
-          end
-        when "remove"
-          batch.each do |pid|
-            @collection.remove_relationship(:has_collection_member, "info:fedora/#{pid}")
-          end
-        when Array
-          @collection.clear_relationship(:has_collection_member)
-          params[:collection][:members].each do |pid|
-            @collection.add_relationship(:has_collection_member, "info:fedora/#{pid}")
-          end
+          when "add"
+            change_members.each do |member|
+              @collection.members << member
+              #@collection.add_relationship(:has_collection_member, "info:fedora/#{pid}")
+            end
+          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 Array
+            @collection.members.replace(change_members)
+          #@collection.clear_relationship(:has_collection_member)
+          #params[:collection][:members].each do |pid|
+          #  @collection.add_relationship(:has_collection_member, "info:fedora/#{pid}")
+          #end
         end
       end
-    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
-    
+
+    # 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
+        query = @collection.member_ids.map{|id| 'id:"'+id+'"'}.join " OR "
+        solr_parameters[:fq] << query
+      end
+    end
   end # module CollectionsControllerBehavior
 end # module Hydra

data/lib/hydra/datastreams/collection_rdf_datastream.rb

@@ -16,6 +16,13 @@ require 'active_fedora'
 module Hydra
   class CollectionRdfDatastream < ActiveFedora::NtriplesRDFDatastream
     map_predicates do |map|
+      map.part_of(:to => "isPartOf", :in => RDF::DC)
+      map.contributor(:in => RDF::DC) do |index|
+        index.as :stored_searchable, :facetable
+      end
+      map.creator(:in => RDF::DC) do |index|
+        index.as :stored_searchable, :facetable
+      end
       map.title(:in => RDF::DC) do |index|
         index.as :stored_searchable
       end
@@ -23,6 +30,12 @@ module Hydra
         index.type :text
         index.as :stored_searchable
       end
+      map.publisher(:in => RDF::DC) do |index|
+        index.as :stored_searchable, :facetable
+      end
+      map.date_created(:to => "created", :in => RDF::DC) do |index|
+        index.as :stored_searchable
+      end
       map.date_uploaded(:to => "dateSubmitted", :in => RDF::DC) do |index|
         index.type :date
         index.as :stored_sortable
@@ -31,6 +44,35 @@ module Hydra
         index.type :date
         index.as :stored_sortable
       end
+      map.subject(:in => RDF::DC) do |index|
+        index.as :stored_searchable, :facetable
+      end
+      map.language(:in => RDF::DC) do |index|
+        index.as :stored_searchable, :facetable
+      end
+      map.rights(:in => RDF::DC) do |index|
+        index.as :stored_searchable
+      end
+      map.resource_type(:to => "type", :in => RDF::DC) do |index|
+        index.as :stored_searchable, :facetable
+      end
+      map.identifier(:in => RDF::DC) do |index|
+        index.as :stored_searchable
+      end
+      map.based_near(:in => RDF::FOAF) do |index|
+        index.as :stored_searchable, :facetable
+      end
+      map.tag(:to => "relation", :in => RDF::DC) do |index|
+        index.as :stored_searchable, :facetable
+      end
+      map.related_url(:to => "seeAlso", :in => RDF::RDFS)
+    end
+    begin
+      LocalAuthority.register_vocabulary(self, "subject", "lc_subjects")
+      LocalAuthority.register_vocabulary(self, "language", "lexvo_languages")
+      LocalAuthority.register_vocabulary(self, "tag", "lc_genres")
+    rescue
+      puts "tables for vocabularies missing"
     end
   end
 end

data/solr_conf/conf/solrconfig.xml

@@ -40,6 +40,7 @@
           all_text_timv
           active_fedora_model_ssi
           object_type_si
+          label_tesim
         </str>
         <str name="pf">
           all_text_timv^10

data/spec/controllers/collections_controller_spec.rb

@@ -15,6 +15,28 @@
 require 'spec_helper'
 
 describe CollectionsController do
+  before(:all) do
+    @user = FactoryGirl.find_or_create(:user)
+    class GenericFile < ActiveFedora::Base
+      include Hydra::Collections::Collectible
+
+
+      attr_accessor :title
+      def to_solr(solr_doc={})
+        super
+        solr_doc = index_collection_pids(solr_doc)
+        solr_doc["label_tesim"] = self.title
+        solr_doc
+      end
+    end
+  end
+  after(:all) do
+    @user.destroy
+    GenericFile.destroy_all
+    Collection.destroy_all
+    Object.send(:remove_const, :GenericFile)
+  end
+  
   before do
     controller.stub(:has_access?).and_return(true)
 
@@ -56,17 +78,44 @@ describe CollectionsController 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
+
+    it "should add one doc to collection if batch ids provided and add the collection id to the document in the colledction" do
+      @asset1 = GenericFile.create!
+      post :create, batch_document_ids: [@asset1], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
+      assigns[:collection].members.should == [@asset1]
+      asset_results = Blacklight.solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results["response"]["numFound"].should == 1
+      doc = asset_results["response"]["docs"].first
+      doc["id"].should == @asset1.pid
+      afterupdate = GenericFile.find(@asset1.pid)
+      puts doc
+      doc[Solrizer.solr_name(:collection)].should == afterupdate.to_solr[Solrizer.solr_name(:collection)]
+    end
+    it "should add docs to collection if batch ids provided and add the collection id to the documents int he colledction" do
+      @asset1 = GenericFile.create!
+      @asset2 = GenericFile.create!
+      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]
+      asset_results = Blacklight.solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results["response"]["numFound"].should == 1
+      doc = asset_results["response"]["docs"].first
+      doc["id"].should == @asset1.pid
+      afterupdate = GenericFile.find(@asset1.pid)
+      puts doc
+      doc[Solrizer.solr_name(:collection)].should == afterupdate.to_solr[Solrizer.solr_name(:collection)]
+    end
   end
-  
+
   describe "#update" do
     before do
       @collection = Collection.new
       @collection.apply_depositor_metadata(@user.user_key)
       @collection.save
-      @asset1 = ActiveFedora::Base.create!
-      @asset2 = ActiveFedora::Base.create!
-      @asset3 = ActiveFedora::Base.create!
-      controller.should_receive(:authorize!).and_return(true)
+      @asset1 = GenericFile.create!
+      @asset2 = GenericFile.create!
+      @asset3 = GenericFile.create!
+      controller.stub(:authorize!).and_return(true)
+      controller.should_receive(:authorize!).at_least(:once)
     end
     it "should update collection metadata" do
       put :update, id: @collection.id, collection: {title: "New Title", description: "New Description"}
@@ -96,8 +145,34 @@ describe CollectionsController do
     it "should support setting members array" do
       put :update, id: @collection.id, collection: {members:"add"}, batch_document_ids:[@asset2, @asset3, @asset1]
       response.should redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(@collection.id)
-      assigns[:collection].members.should == [@asset1,@asset2, @asset3]
+      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 setting members array" do
+      put :update, id: @collection.id, collection: {members:"add"}, batch_document_ids:[@asset2, @asset3, @asset1]
+      response.should redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(@collection.id)
+      assigns[:collection].members.sort! { |a,b| a.pid <=> b.pid }.should == [@asset2, @asset3, @asset1].sort! { |a,b| a.pid <=> b.pid }
+    end
+    it "should set collection on 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.sort! { |a,b| a.pid <=> b.pid }.should == [@asset2, @asset3, @asset1].sort! { |a,b| a.pid <=> b.pid }
+      asset_results = Blacklight.solr.get "select", params:{fq:["id:\"#{@asset2.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results["response"]["numFound"].should == 1
+      doc = asset_results["response"]["docs"].first
+      doc["id"].should == @asset2.pid
+      afterupdate = GenericFile.find(@asset2.pid)
+      doc[Solrizer.solr_name(:collection)].should == afterupdate.to_solr[Solrizer.solr_name(:collection)]
+      put :update, id: @collection.id, collection: {members:"remove"}, batch_document_ids:[@asset2]
+      asset_results = Blacklight.solr.get "select", params:{fq:["id:\"#{@asset2.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results["response"]["numFound"].should == 1
+      doc = asset_results["response"]["docs"].first
+      doc["id"].should == @asset2.pid
+      afterupdate = GenericFile.find(@asset2.pid)
+      doc[Solrizer.solr_name(:collection)].should be_nil
+    end
+
   end
 
   describe "#destroy" do
@@ -113,14 +188,87 @@ describe CollectionsController do
         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
+      it "should after_destroy" do
+        controller.should_receive(:after_destroy).and_call_original
         delete :destroy, id: @collection.id
       end
+      it "should call update members" do
+        @asset1 = GenericFile.create!
+        @collection.members << @asset1
+        @collection.save
+        @asset1 = @asset1.reload
+        @asset1.update_index
+        @asset1.collections.should == [@collection]
+        asset_results = Blacklight.solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
+        asset_results["response"]["numFound"].should == 1
+        doc = asset_results["response"]["docs"].first
+        doc[Solrizer.solr_name(:collection)].should == [@collection.pid]
+
+        delete :destroy, id: @collection.id
+        @asset1.reload.collections.should == []
+        asset_results = Blacklight.solr.get "select", params:{fq:["id:\"#{@asset1.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
+        asset_results["response"]["numFound"].should == 1
+        doc = asset_results["response"]["docs"].first
+        doc[Solrizer.solr_name(:collection)].should be_nil
+        @asset1.destroy
+      end
     end
     it "should not delete an invalid collection" do
        expect {delete :destroy, id: 'zz:-1'}.to raise_error
     end
   end
 
+  describe "#show" do
+    before do
+      @asset1 = GenericFile.create!(title: "First of the Assets")
+      @asset2 = GenericFile.create!(title: "Second of the Assets")
+      @asset3 = GenericFile.create!(title: "Third of the Assets")
+      @collection = Collection.new
+      @collection.title = "My collection"
+      @collection.apply_depositor_metadata(@user.user_key)
+      @collection.members = [@asset1,@asset2,@asset3]
+      @collection.save
+      controller.should_receive(:authorize!).and_return(true)
+      controller.stub(:apply_gated_search)
+    end
+    it "should show the collections" do
+      get :show, id: @collection.id
+      assigns[:collection].title.should == @collection.title
+      ids = assigns[:member_docs].map {|d| d.id}
+      ids.should include @asset1.pid
+      ids.should include @asset2.pid
+      ids.should include @asset3.pid
+    end
+    it "should show only the collections assets" do
+      @asset4 = GenericFile.create!(title: "#{@asset1.id}")
+      get :show, id: @collection.id
+      assigns[:collection].title.should == @collection.title
+      ids = assigns[:member_docs].map {|d| d.id}
+      ids.should include @asset1.pid
+      ids.should include @asset2.pid
+      ids.should include @asset3.pid
+      ids.should_not include @asset4.pid
+    end
+    it "should query the collections" do
+      get :show, id: @collection.id, cq:"\"#{@asset1.title}\""
+      assigns[:collection].title.should == @collection.title
+      ids = assigns[:member_docs].map {|d| d.id}
+      ids.should include @asset1.pid
+      ids.should_not include @asset2.pid
+      ids.should_not include @asset3.pid
+    end
+    it "should query the collections and show only the collection assets" do
+      @asset4 = GenericFile.create!(title: "#{@asset1.id} #{@asset1.title}")
+      @asset5 = GenericFile.create!(title: "#{@asset1.title}")
+      get :show, id: @collection.id, cq:"\"#{@asset1.title}\""
+      assigns[:collection].title.should == @collection.title
+      ids = assigns[:member_docs].map {|d| d.id}
+      ids.should include @asset1.pid
+      ids.should_not include @asset2.pid
+      ids.should_not include @asset3.pid
+      ids.should_not include @asset4.pid
+      ids.should_not include @asset5.pid
+    end
+  end
+
 end

data/spec/helpers/collections_helper_spec.rb

@@ -45,4 +45,22 @@ describe "button_for_delete_collection" do
     html.should have_selector("input[value='Delete My Button']")
   end
 end
+  describe "button_for_remove_selected_from_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_remove_selected_from_collection @collection
+      html.should have_selector("form[action='#{collections.collection_path(@collection.pid)}']")
+      html.should have_selector("input[type='submit']")
+    end
+    it "should create a button with my text" do
+      html = button_for_remove_selected_from_collection @collection, "Remove My Button"
+      html.should have_selector("input[value='Remove My Button']")
+    end
+  end
+
 end

data/spec/helpers/collections_search_helper_spec.rb

@@ -0,0 +1,43 @@
+# Copyright © 2013 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'
+
+describe CollectionsSearchHelper do
+  before do
+    @collection = Collection.create(title: "Title of Collection 1")
+    class CollectionWithMetadata < ActiveFedora::Base
+      include Hydra::Collection
+      def to_solr(solr_doc={})
+        super
+        solr_doc[Solrizer.solr_name(:title, :displayable)] = self.descMetadata.title
+        solr_doc
+      end
+    end
+    @collection_with_metadata = CollectionWithMetadata.create(title: "Title of Collection 2")
+  end
+  describe "collection_name" do
+    it "should return the pid if no title available" do
+      collection_name(@collection.pid).should == @collection.pid
+    end
+    it "should return the title value associated with the given pid" do
+      collection_name(@collection_with_metadata.pid).should == "Title of Collection 2"
+    end
+  end
+  describe "display_value_for_facet" do
+    it "should look up collection_name when displaying collection facet" do
+      display_value_for_facet(Solrizer.solr_name(:collection, :facetable), @collection_with_metadata.pid).should == "Title of Collection 2"
+    end
+  end
+end

data/spec/lib/collectible_spec.rb

@@ -16,7 +16,7 @@ describe Hydra::Collections::Collectible do
       @collection1.save
       @collectible.collections << @collection2
       reloaded = CollectibleThing.find(@collectible.pid)
-      @collection2.members.should == [@collectible]
+      @collection2.reload.members.should == [@collectible]
       reloaded.collections.should == [@collection1, @collection2]
     end
   end

data/spec/models/collection_spec.rb

@@ -85,10 +85,10 @@ describe Collection do
     Collection.find(@collection.pid).description.should == @collection.description
   end
   it "should have the expected display terms" do
-    @collection.terms_for_display.should == [:title, :description, :date_uploaded, :date_modified]
+    @collection.terms_for_display.should == [:part_of, :contributor, :creator, :title, :description, :publisher, :date_created, :date_uploaded, :date_modified, :subject, :language, :rights, :resource_type, :identifier, :based_near, :tag, :related_url]
   end
   it "should have the expected edit terms" do
-    @collection.terms_for_editing.should == [:title,:description]
+    @collection.terms_for_editing.should == [:part_of, :contributor, :creator, :title, :description, :publisher, :date_created, :subject, :language, :rights, :resource_type, :identifier, :based_near, :tag, :related_url]
   end
   it "should not delete member files when deleted" do
     @collection.members = [@gf1, @gf2]

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

@@ -31,10 +31,6 @@ class TestAppGenerator < Rails::Generators::Base
     copy_file "lib/tasks/rspec.rake"
   end
 
-  def copy_hydra_config
-    copy_file "config/initializers/hydra_config.rb"
-  end
-  
   def delete_generated_noise
     remove_file("public/index.html")
     remove_file("spec/models/user_spec.rb")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-23 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -102,6 +102,7 @@ files:
 - app/controllers/collections_controller.rb
 - app/helpers/batch_select_helper.rb
 - app/helpers/collections_helper.rb
+- app/helpers/collections_search_helper.rb
 - app/models/collection.rb
 - app/models/solr_document.rb
 - app/views/batch_select/_add_button.html.erb
@@ -109,13 +110,16 @@ files:
 - 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_remove_selected_from_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/_search_form.html.erb
 - app/views/collections/_single_item_action_fields.html.erb
+- app/views/collections/edit.html.erb
 - app/views/collections/new.html.erb
 - app/views/collections/show.html.erb
 - config/jetty.yml
@@ -145,6 +149,7 @@ files:
 - spec/factories/.gitkeep
 - spec/factories/users.rb
 - spec/helpers/collections_helper_spec.rb
+- spec/helpers/collections_search_helper_spec.rb
 - spec/lib/collectible_spec.rb
 - spec/lib/search_service_spec.rb
 - spec/models/collection_spec.rb
@@ -155,7 +160,6 @@ files:
 - 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
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/lib/tasks/rspec.rake
@@ -194,6 +198,7 @@ test_files:
 - spec/factories/.gitkeep
 - spec/factories/users.rb
 - spec/helpers/collections_helper_spec.rb
+- spec/helpers/collections_search_helper_spec.rb
 - spec/lib/collectible_spec.rb
 - spec/lib/search_service_spec.rb
 - spec/models/collection_spec.rb
@@ -204,7 +209,6 @@ test_files:
 - 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
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/lib/tasks/rspec.rake

data/spec/support/config/initializers/hydra_config.rb

@@ -1,28 +0,0 @@
-# The following lines determine which user attributes your hydrangea app will use
-# This configuration allows you to use the out of the box ActiveRecord associations between users and user_attributes
-# It also allows you to specify your own user attributes
-# The easiest way to override these methods would be to create your own module to include in User
-# For example you could create a module for your local LDAP instance called MyLocalLDAPUserAttributes:
-#   User.send(:include, MyLocalLDAPAttributes)
-# As long as your module includes methods for full_name, affiliation, and photo the personalization_helper should function correctly
-#
-
-# windows doesn't properly require hydra-head (from the gemfile), so we need to require it explicitly here:
-require 'hydra/head' unless defined? Hydra
-
-if Hydra.respond_to?(:configure)
-  Hydra.configure(:shared) do |config|
-    # This specifies the solr field names of permissions-related fields.
-    # You only need to change these values if you've indexed permissions by some means other than the Hydra's built-in tooling.
-    # If you change these, you must also update the permissions request handler in your solrconfig.xml to return those values
-    indexer = Solrizer::Descriptor.new(:string, :stored, :indexed, :multivalued)
-    config[:permissions] = {
-      :discover => {:group =>ActiveFedora::SolrService.solr_name("discover_access_group", indexer), :individual=>ActiveFedora::SolrService.solr_name("discover_access_person", indexer)},
-      :read => {:group =>ActiveFedora::SolrService.solr_name("read_access_group", indexer), :individual=>ActiveFedora::SolrService.solr_name("read_access_person", indexer)},
-      :edit => {:group =>ActiveFedora::SolrService.solr_name("edit_access_group", indexer), :individual=>ActiveFedora::SolrService.solr_name("edit_access_person", indexer)},
-      :owner => ActiveFedora::SolrService.solr_name("depositor", indexer),
-      :embargo_release_date => ActiveFedora::SolrService.solr_name("embargo_release_date", Solrizer::Descriptor.new(:date, :stored, :indexed))
-    }
-    
-  end
-end