hydra-collections 3.0.0.beta3 → 4.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89c0019427e673f40b0abd3a2293d9bf74bd19cc
-  data.tar.gz: d2f4fb9c57d32e5b3a392afb27174a62666f4021
+  metadata.gz: 1c7e16cee43a7fdaf1ef7f112ae42f8eb1ddb684
+  data.tar.gz: d99f69ce5988cf2023a811344fa461bf3b859e2f
 SHA512:
-  metadata.gz: c09ea609b5bfa9befba296dc44dbb2349d3d52f289f68549feceaefd8afbe07d6d6973e77ed1c9dbd95e5623a779f4c8ce71ff6a2380fda548aa9d04e4cc4124
-  data.tar.gz: eaf736cb88e9690b7b93d09deb2ba3aada36ca27c9d649753592885e88dbfd7d1db0a8e5a8353b4b7e6a8b0c1e6a456494c55e7d3e9436a427d057a5bb0680e4
+  metadata.gz: fe6f6ae745110afbf7fa17e8139a075124421e9f39796b79eb6ede511e80cfdd75238469262be83dd929b941f6d43f66f03e1af5dc23096ce9d53b7e9a2cc533
+  data.tar.gz: b1a372ad7bfa3419d0fddc0350e11b6966b41dac9a30e53e996b05f494164af66e79afc06fc2325181889aa1477ed5945938b8d6976a2ad976e0d6e8c1939af6

data/.rspec

@@ -0,0 +1 @@
+--colour

data/README.md

@@ -35,7 +35,7 @@ Or install it yourself as:
 
 ### Make your Models Collectible
 
-Add `include Hydra::Collections::Collectible` to the models for anything that you want to be able to add to collections (ie. GenericFile, Book, Article, etc.), then add `index_collection_pids` to the solrization logic (ie. put it in to_solr)
+Add `include Hydra::Collections::Collectible` to the models for anything that you want to be able to add to collections (ie. GenericFile, Book, Article, etc.), then add `index_collection_ids` to the solrization logic (ie. put it in to_solr)
 
 Example:
 ```ruby
@@ -44,13 +44,13 @@ class GenericFile < ActiveFedora::Base
   ...
   def to_solr(solr_doc={}, opts={})
     super(solr_doc, opts)
-    index_collection_pids(solr_doc)
+    index_collection_ids(solr_doc)
     return solr_doc
   end
 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.
+Any items that include the `Hydra::Collections::Collectible` module can look up which collections they belong to via `.collections`.  The `index_collection_ids` puts the ids of all associated collections into the `collection` facet.
 
 ### Make the Collection show as a facet in your CatalogController
 

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

@@ -1,12 +1,8 @@
-require 'blacklight/catalog'
-
 module Hydra::Collections::SelectsCollections
-
-  extend ActiveSupport::Autoload
   extend ActiveSupport::Concern
  
   def access_levels
-    {read:[:read,:edit],edit:[:edit]}
+    { 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
@@ -32,11 +28,10 @@ module Hydra::Collections::SelectsCollections
     
     # temporarily set solr_search_params_logic to collection_search_params_logic
     orig_solr_search_params_logic = self.class.solr_search_params_logic
-    # self.class.solr_search_params_logic += [:add_collection_filter]
     self.class.solr_search_params_logic = collection_search_params_logic
     logger.debug "Collection Search logic: "+ self.class.solr_search_params_logic.inspect
     # run the solr query to find the collections
-    (resp, doc_list) = get_search_results({:q => ''}, {:rows=>100})
+    (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?
@@ -48,7 +43,7 @@ module Hydra::Collections::SelectsCollections
       
   def add_collection_filter(solr_parameters, user_parameters)
     solr_parameters[:fq] ||= []
-    solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:\"info:fedora/afmodel:Collection\""
+    solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:Collection"
   end
   
   # Defines which solr_search_params_logic should be used when searching for Collections

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

@@ -14,7 +14,7 @@ module Hydra
 
       # Catch permission errors
       rescue_from Hydra::AccessDenied, CanCan::AccessDenied do |exception|
-        if (exception.action == :edit)
+        if exception.action == :edit
           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
@@ -46,18 +46,19 @@ module Hydra
 
     def after_create
       respond_to do |format|
+        ActiveFedora::SolrService.instance.conn.commit
         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)
       add_members_to_collection unless batch.empty?
@@ -67,8 +68,8 @@ module Hydra
         after_create_error
       end
     end
-    
-    def after_update 
+
+    def after_update
       if flash[:notice].nil?
         flash[:notice] = 'Collection was successfully updated.'
       end
@@ -77,14 +78,14 @@ module Hydra
         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
-    
+
     def update
       process_member_changes
       @collection.update_attributes(params[:collection].except(:members))
@@ -94,21 +95,21 @@ module Hydra
         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
     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
     end
-    
+
     def destroy
       if @collection.destroy
          after_destroy(params[:id])
@@ -116,16 +117,16 @@ module Hydra
         after_destroy_error(params[:id])
       end
     end
-    
+
     protected
 
-    # Queries Solr for members of the collection.  
+    # 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
       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})
+      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)
@@ -142,17 +143,15 @@ module Hydra
 
     def add_members_to_collection collection = nil
       collection ||= @collection
-      collection.members(true)
       collection.member_ids = batch.concat(collection.member_ids)
     end
 
     def remove_members_from_collection
-      @collection.members(true)
-      @collection.member_ids = (@collection.member_ids - batch)
+      @collection.members.delete(batch.map { |pid| ActiveFedora::Base.find(pid) })
     end
 
     def assign_batch_to_collection
-      @collection.members(true)
+      @collection.members(true) #Force the members to get cached before (maybe) removing some of them
       @collection.member_ids = batch
     end
 
@@ -166,11 +165,11 @@ module Hydra
         flash[:error] = "An error occured. Files were not moved to #{destination_collection.title} Collection."
       end
     end
-    
+
     # include filters into the query to only include the collection memebers
     def include_collection_ids(solr_parameters, user_parameters)
       solr_parameters[:fq] ||= []
-      solr_parameters[:fq] << Solrizer.solr_name(:collection)+':"'+@collection.id+'"'
+      solr_parameters[:fq] << Solrizer.solr_name(:collection, :facetable)+':"'+@collection.id+'"'
     end
   end # module CollectionsControllerBehavior
 end # module Hydra

data/app/helpers/collections_search_helper.rb

@@ -4,7 +4,8 @@ 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)
-    Collection.load_instance_from_solr(collection_pid).title || collection_pid
+    #TODO this can be loaded from solr
+    Collection.find(collection_pid).title || collection_pid
   end
 
 end

data/app/models/concerns/hydra/collection.rb

@@ -7,26 +7,87 @@ module Hydra
     include Hydra::Collections::Collectible
 
     included do
-      has_metadata "descMetadata", type: Hydra::CollectionRdfDatastream
-      has_metadata "properties", type: Hydra::Datastream::Properties
-
-      has_and_belongs_to_many :members, property: :has_collection_member, class_name: "ActiveFedora::Base" , after_remove: :update_member
-
-      has_attributes :depositor, datastream: :properties, multiple: false
-
-      has_attributes :title, :date_uploaded, :date_modified, :description,
-                     datastream: :descMetadata, multiple: false
-      has_attributes :creator, :contributor, :based_near, :part_of, :publisher,
-                     :date_created, :subject,:resource_type, :rights,
-                     :identifier, :language, :tag, :related_url,
-                     datastream: :descMetadata, multiple: true
+      has_and_belongs_to_many :members, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasCollectionMember, class_name: "ActiveFedora::Base" , after_remove: :update_member
+
+      property :depositor, predicate: RDF::URI.new("http://id.loc.gov/vocabulary/relators/dpt")
+
+      property :part_of, predicate: RDF::DC.isPartOf
+      property :contributor, predicate: RDF::DC.contributor do |index|
+        index.as :stored_searchable, :facetable
+      end
+      property :creator, predicate: RDF::DC.creator do |index|
+        index.as :stored_searchable, :facetable
+      end
+      property :title, predicate: RDF::DC.title do |index|
+        index.as :stored_searchable
+      end
+      property :description, predicate: RDF::DC.description do |index|
+        index.type :text
+        index.as :stored_searchable
+      end
+      property :publisher, predicate: RDF::DC.publisher do |index|
+        index.as :stored_searchable, :facetable
+      end
+      property :date_created, predicate: RDF::DC.created do |index|
+        index.as :stored_searchable
+      end
+      property :date_uploaded, predicate: RDF::DC.dateSubmitted do |index|
+        index.type :date
+        index.as :stored_sortable
+      end
+      property :date_modified, predicate: RDF::DC.modified do |index|
+        index.type :date
+        index.as :stored_sortable
+      end
+      property :subject, predicate: RDF::DC.subject do |index|
+        index.as :stored_searchable, :facetable
+      end
+      property :language, predicate: RDF::DC.language do |index|
+        index.as :stored_searchable, :facetable
+      end
+      property :rights, predicate: RDF::DC.rights do |index|
+        index.as :stored_searchable
+      end
+      property :resource_type, predicate: RDF::DC.type do |index|
+        index.as :stored_searchable, :facetable
+      end
+      property :identifier, predicate: RDF::DC.identifier do |index|
+        index.as :stored_searchable
+      end
+      property :based_near, predicate: RDF::FOAF.based_near do |index|
+        index.as :stored_searchable, :facetable
+      end
+      property :tag, predicate: RDF::DC.relation do |index|
+        index.as :stored_searchable, :facetable
+      end
+      property :related_url, predicate: RDF::RDFS.seeAlso
+
+      # Single-valued properties
+      def depositor
+        super.first
+      end
+
+      def title
+        super.first
+      end
+
+      def date_uploaded
+        super.first
+      end
+
+      def date_modified
+        super.first
+      end
+
+      def description
+        super.first
+      end
 
       before_create :set_date_uploaded
       before_save :set_date_modified
+      before_destroy :update_all_members
 
       after_save :update_all_members
-
-      before_destroy :update_all_members
     end
 
     def terms_for_editing
@@ -34,7 +95,11 @@ module Hydra
     end
 
     def terms_for_display
-      self.descMetadata.class.properties.keys.map{|v| v.to_sym}
+      [
+        :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
 
     def update_all_members
@@ -58,6 +123,5 @@ module Hydra
       self.date_modified = Date.today
     end
 
-  end
-
+ end
 end

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

@@ -1,19 +1,3 @@
-<%#
-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| %>
 

data/hydra-collections.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["cam156@psu.edu"]
   spec.description   = "A rails engine for managing Hydra Collections"
   spec.summary       = "A rails engine for managing Hydra Collections"
-  spec.homepage      = "https://github.com/psu-stewardship/hydra-collections"
+  spec.homepage      = "https://github.com/projecthydra-labs/hydra-collections"
   spec.license       = "APACHE2"
 
   spec.files         = `git ls-files`.split($/)
@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "blacklight"
-  spec.add_dependency "hydra-head", "~> 8.0.0.beta1"
+  spec.add_dependency "hydra-head", "~> 9.0.0.beta1"
+  spec.add_dependency 'deprecation'
 
   spec.add_development_dependency "engine_cart"
   spec.add_development_dependency "rspec-rails"

data/lib/hydra/collections/accepts_batches.rb

@@ -18,12 +18,12 @@ module Hydra
       protected
       
       def batch_ids_from_params
-        if params["batch_document_ids"].nil? || params["batch_document_ids"].empty?
-          return []
+        if params["batch_document_ids"].blank?
+          []
         elsif params["batch_document_ids"] == "all"
-          return Hydra::Collections::SearchService.new(session, current_user.user_key).last_search_documents.map(&:id)
+          Hydra::Collections::SearchService.new(session, current_user.user_key).last_search_documents.map(&:id)
         else
-          return params["batch_document_ids"]
+          params["batch_document_ids"]
         end
       end
       
@@ -52,4 +52,4 @@ module Hydra
       
     end
   end
-end
+end

data/lib/hydra/collections/collectible.rb

@@ -1,25 +1,32 @@
 # This module adds a `has_many :collections` association to any models that you mix it into, using the :has_collection_member property
 # It also provides methods to help you index the information as a facet
+require 'deprecation'
 module Hydra::Collections::Collectible
-  extend ActiveSupport::Autoload
   extend ActiveSupport::Concern
-  
+  extend Deprecation
+  self.deprecation_horizon = "hydra-collections 4.0"
+
   included do
-    #after_solrize << :index_collection_pids
-    has_many :collections, property: :has_collection_member, :class_name => "ActiveFedora::Base"
+    has_many :collections, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasCollectionMember, class_name: "ActiveFedora::Base"
   end
 
-  # Add this method to your solrization logic (ie. in to_solr) in order to populate the 'collection' facet 
+  # Add this method to your solrization logic (ie. in to_solr) in order to populate the 'collection' facet
   # with the pids of any collections that contain the current object.
   # @example
   #   def to_solr(solr_doc={}, opts={})
   #    super(solr_doc, opts)
-  #    index_collection_pids(solr_doc)
+  #    index_collection_ids(solr_doc)
   #    return solr_doc
   #   end
-  def index_collection_pids(solr_doc={})
+  def index_collection_ids(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
+
+  def index_collection_pids(solr_doc={})
+    index_collection_ids(solr_doc)
+  end
+  deprecation_deprecate :index_collection_pids
+
+end