hydra-collections 5.0.4 → 6.0.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36ddec8b1586e43c728658973979db06786efb05
-  data.tar.gz: 07d3a47de4e1fac51cb63cbce5dcab0e7f1078e0
+  metadata.gz: a55e2a03471e0659271fbbbc73f0dd6233119390
+  data.tar.gz: 872f3f1d0fc426e335b870b1384ebd71d0c8ba78
 SHA512:
-  metadata.gz: 008fb15b304508524d24bbf9c25246e6e32db12b744d974fe762659544acde8f2b266f8a641a6ba39491a9d6400096e382a3ff0e48930cdb587170fe500ae261
-  data.tar.gz: 995ff18102b0a35df5e089ea1c45818323a7d16460f2c386993f4b64fe06b5d5321d73d393b34d513a5d9f4678d4c3e7ddf9b297bfbfaa4ccef54bd54db23c65
+  metadata.gz: 4a029879709867b6df79503628696e37bcdb5e68ef69abbae331266ffdc2b604a66c6632c9f53dae9f0b7441b6441228866b868c6551d60c606e3abef51929bc
+  data.tar.gz: de9b2cbbe3e68940bf208d8ff90db132ddfecd6adc1a8f3f785514b614d63078041125d2b959baa7d1a6dfde7d1b82d1057a4f7e9b0970398aba52248085b383

data/.gitignore

@@ -18,5 +18,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-.internal_test_app
+spec/internal
 jetty

data/.travis.yml

@@ -2,12 +2,13 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.2
+  - 2.1
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
-  - "RAILS_VERSION=4.2.5"
+  - "RAILS_VERSION=4.1.10"
+  - "RAILS_VERSION=4.2.1"
 notifications:
   email:
     recipients:

data/Gemfile

@@ -3,8 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in hydra-collections.gemspec
 gemspec
 
-gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia'
-
 group :development, :test do
   gem 'sqlite3'
   gem "factory_girl_rails"
@@ -16,28 +14,22 @@ group :development, :test do
   gem 'rspec-activemodel-mocks'
 end
 
-# BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.8.0
-# engine_cart stanza: 0.8.0
-# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
-file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
-if File.exist?(file)
-  begin
-    eval_gemfile file
-  rescue Bundler::GemfileError => e
-    Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
-    Bundler.ui.warn e.message
-  end
+gem 'slop', '~> 3.6' # because rails installs byebug in the Gemfile
+
+file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
+if File.exists?(file)
+  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(file)
 else
-  Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
+  extra_file = File.expand_path("../spec/test_app_templates/Gemfile.extra", __FILE__)
+  instance_eval File.read(extra_file)
 
   gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
 
-  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
+  if ENV['RAILS_VERSION'] and ENV['RAILS_VERSION'] !~ /^4.2/
+    gem 'sass-rails', "< 5.0"
+  else
     gem 'responders', "~> 2.0"
     gem 'sass-rails', ">= 5.0"
-  else
-    gem 'sass-rails', "< 5.0"
   end
 end
-# END ENGINE_CART BLOCK

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

@@ -11,35 +11,16 @@ module Hydra::Collections::SelectsCollections
     { read: [:read, :edit], edit: [:edit] }
   end
 
-  ##
-  # Return list of collections for which the current user has read access.
-  # Add this or find_collections_with_edit_access as a before filter on any page that shows the form_for_select_collection
-  #
-  # @return [Array<SolrDocument>] Solr documents for each collection the user has read access
+  # 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
 
-  ##
-  # Return list of collections for which the current user has edit access.  Optionally prepend with default
-  # that can be used in a select menu to instruct user to select a collection.
-  # Add this or find_collections_with_read_access as a before filter on any page that shows the form_for_select_collection
-  #
-  # @param [TrueClass|FalseClass] :include_default if true, prepends the default_option; otherwise, if false, returns only collections
-  # @param [Fixnum] :default_id for select menus, this is the id of the first selection representing the instructions
-  # @param [String] :default_title for select menus, this is the text displayed as the first item serving as instructions
-  #
-  # @return [Array<SolrDocument>] Solr documents for each collection the user has edit access, plus optional instructions
-  def find_collections_with_edit_access(include_default=false, default_id=-1, default_title="Select collection...")
+  def find_collections_with_edit_access
     find_collections(:edit)
-    default_option = SolrDocument.new(id: default_id, title_tesim: default_title)
-    @user_collections.unshift(default_option) if include_default
   end
 
-  ##
-  # Return list of collections matching the passed in access_level for the current user.
-  # @param [Symbol] :access_level one of :read or :edit
-  # @return [Array<SolrDocument>] Solr documents for each collection the user has the appropriate access level
+  #
   def find_collections (access_level = nil)
     # 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?
@@ -66,7 +47,7 @@ module Hydra::Collections::SelectsCollections
   # Defines which search_params_logic should be used when searching for Collections
   def collection_search_params_logic
     [:default_solr_parameters, :add_query_to_solr, :add_access_controls_to_solr_params,
-      :add_collection_filter, :some_rows, :sort_by_title]
+      :add_collection_filter, :some_rows]
   end
 
 end

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

@@ -172,7 +172,10 @@ module Hydra
 
     def add_members_to_collection collection = nil
       collection ||= @collection
-      collection.add_members batch
+      batch.each do |id|
+        collection.child_generic_works << ActiveFedora::Base.find(id)
+      end
+      #TODO this old way was more efficient #collection.member_ids = batch.concat(collection.member_ids)
     end
 
     def remove_members_from_collection

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

@@ -2,28 +2,10 @@ module Hydra
   module Collection
     extend ActiveSupport::Concern
     extend Deprecation
+    include Hydra::Works::CollectionBehavior
     include Hydra::WithDepositor # for access to apply_depositor_metadata
     include Hydra::AccessControls::Permissions
-    include Hydra::Collections::Collectible
     include Hydra::Collections::Metadata
-    include Hydra::Collections::Relations
-
-    def update_all_members
-      Deprecation.warn(Collection, 'update_all_members is deprecated and will be removed in version 5.0')
-      self.members.collect { |m| update_member(m) }
-    end
-
-    # TODO: Use solr atomic updates to accelerate this process
-    def update_member member
-      Deprecation.warn(Collection, 'update_member is deprecated and will be removed in version 5.0')
-      # because the member may have its collections cached, reload that cache so that it indexes the correct fields.
-      member.collections(true) if member.respond_to? :collections
-      member.update_index
-    end
-
-    def add_members new_member_ids
-      return if new_member_ids.nil? || new_member_ids.size < 1
-      self.members << ActiveFedora::Base.find(new_member_ids)
-    end
- end
+    include Hydra::Works::CollectionBehavior
+  end
 end

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

@@ -2,76 +2,61 @@ module Hydra::Collections
   module Metadata
     extend ActiveSupport::Concern
     included do
-      property :depositor, predicate: RDF::Vocab::MARCRelators.dpt, multiple: false do |index|
+      property :depositor, predicate: ::RDF::URI.new("http://id.loc.gov/vocabulary/relators/dpt"), multiple: false do |index|
         index.as :symbol, :stored_searchable
       end
 
-      property :part_of, predicate: RDF::Vocab::DC.isPartOf
-
-      property :contributor, predicate: RDF::Vocab::DC.contributor do |index|
+      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::Vocab::DC.creator do |index|
+      property :creator, predicate: RDF::DC.creator do |index|
         index.as :stored_searchable, :facetable
       end
-
-      property :title, predicate: RDF::Vocab::DC.title, multiple: false do |index|
-        index.as :stored_searchable, :sortable
+      property :title, predicate: RDF::DC.title, multiple: false do |index|
+        index.as :stored_searchable
       end
-
-      property :description, predicate: RDF::Vocab::DC.description, multiple: false do |index|
+      property :description, predicate: RDF::DC.description, multiple: false do |index|
         index.type :text
         index.as :stored_searchable
       end
-
-      property :publisher, predicate: RDF::Vocab::DC.publisher do |index|
+      property :publisher, predicate: RDF::DC.publisher do |index|
         index.as :stored_searchable, :facetable
       end
-
-      property :date_created, predicate: RDF::Vocab::DC.created do |index|
+      property :date_created, predicate: RDF::DC.created do |index|
         index.as :stored_searchable
       end
-
-      property :date_uploaded, predicate: RDF::Vocab::DC.dateSubmitted, multiple: false do |index|
+      property :date_uploaded, predicate: RDF::DC.dateSubmitted, multiple: false do |index|
         index.type :date
         index.as :stored_sortable
       end
-
-      property :date_modified, predicate: RDF::Vocab::DC.modified, multiple: false do |index|
+      property :date_modified, predicate: RDF::DC.modified, multiple: false do |index|
         index.type :date
         index.as :stored_sortable
       end
-
-      property :subject, predicate: RDF::Vocab::DC.subject do |index|
+      property :subject, predicate: RDF::DC.subject do |index|
         index.as :stored_searchable, :facetable
       end
-
-      property :language, predicate: RDF::Vocab::DC.language do |index|
+      property :language, predicate: RDF::DC.language do |index|
         index.as :stored_searchable, :facetable
       end
-
-      property :rights, predicate: RDF::Vocab::DC.rights do |index|
+      property :rights, predicate: RDF::DC.rights do |index|
         index.as :stored_searchable
       end
-
-      property :resource_type, predicate: RDF::Vocab::DC.type do |index|
+      property :resource_type, predicate: RDF::DC.type do |index|
         index.as :stored_searchable, :facetable
       end
-
-      property :identifier, predicate: RDF::Vocab::DC.identifier do |index|
+      property :identifier, predicate: RDF::DC.identifier do |index|
         index.as :stored_searchable
       end
-
-      property :based_near, predicate: RDF::Vocab::FOAF.based_near do |index|
+      property :based_near, predicate: RDF::FOAF.based_near do |index|
         index.as :stored_searchable, :facetable
       end
-
-      property :tag, predicate: RDF::Vocab::DC.relation do |index|
+      property :tag, predicate: RDF::DC.relation do |index|
         index.as :stored_searchable, :facetable
       end
-
       property :related_url, predicate: RDF::RDFS.seeAlso
+
     end
   end
 end

data/hydra-collections.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hydra-head', '~> 9.1'
   spec.add_dependency 'deprecation', '~> 0.1'
   spec.add_dependency 'blacklight', '~> 5.10'
-  spec.add_dependency 'rdf-vocab', '~> 0'
+  spec.add_dependency 'hydra-works', '~> 0.1'
 
-  spec.add_development_dependency 'engine_cart', '~> 0.8'
+  spec.add_development_dependency 'engine_cart', '~> 0.5'
   spec.add_development_dependency 'rspec-rails', '~> 3.1'
 end

data/lib/hydra-collections.rb

@@ -1,4 +1,5 @@
 require "hydra/head"
+require 'hydra/works'
 
 module Hydra
   module Collections
@@ -19,4 +20,4 @@ module Hydra
       )
     end
   end
-end
+end

data/lib/hydra/collections/collectible.rb

@@ -1,36 +1,25 @@
 # 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::Concern
-  extend Deprecation
-  self.deprecation_horizon = "hydra-collections 4.0"
+module Hydra::Collections
+  module Collectible
+    extend ActiveSupport::Concern
+    extend Deprecation
 
-  included do
-    has_many :collections, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasCollectionMember, class_name: "ActiveFedora::Base"
-  end
+    included do
+      include Hydra::Works::GenericWorkBehavior
+      Deprecation.warn(Collectible, "Hydra::Collections::Collectible is deprecated. include Hydra::Works::GenericWorkBehavior instead. Hydra::Collections::Collectible will be removed in Hydra::Collections 7.0")
+    end
 
-  # 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_ids(solr_doc)
-  #    return solr_doc
-  #   end
-  def index_collection_ids(solr_doc={})
-    Deprecation.warn(Hydra::Collections::Collectible, 'index_collection_ids is deprecated and will be removed in version 5.0')
-    # CollectionAssociation#ids_reader loads from solr on each call, so only call it once
-    # see https://github.com/projecthydra/active_fedora/issues/644
-    ids = collection_ids
-    solr_doc[Solrizer.solr_name(:collection, :facetable)] = ids
-    solr_doc[Solrizer.solr_name(:collection)] = ids
-    solr_doc
-  end
+    def collection_ids
+      Deprecation.warn(Collectible, "collection_ids is deprecated and will be removed in Hydra::Collections 7.0. Use parent_collections.map(&:id) instead.")
+      parent_collections.map(&:id)
+    end
 
-  def index_collection_pids(solr_doc={})
-    index_collection_ids(solr_doc)
-  end
-  deprecation_deprecate :index_collection_pids
+    def collections
+      Deprecation.warn(Collectible, "collections is deprecated and will be removed in Hydra::Collections 7.0. Use parent_collections instead.")
+      parent_collections
+    end
 
+  end
 end

data/lib/hydra/collections/search_behaviors.rb

@@ -1,4 +1,10 @@
 module Hydra::Collections::SearchBehaviors
+  extend ActiveSupport::Concern
+
+  included do
+    class_attribute :from_field
+    self.from_field = 'member_ids_ssim'
+  end
 
   def collection
     scope.collection
@@ -7,7 +13,7 @@ module Hydra::Collections::SearchBehaviors
   # include filters into the query to only include the collection memebers
   def include_collection_ids(solr_parameters)
     solr_parameters[:fq] ||= []
-    solr_parameters[:fq] << "{!join from=hasCollectionMember_ssim to=id}id:#{collection.id}"
+    solr_parameters[:fq] << "{!join from=#{from_field} to=id}id:#{collection.id}"
   end
 
   def some_rows(solr_parameters)
@@ -19,13 +25,6 @@ module Hydra::Collections::SearchBehaviors
     solr_parameters[:fq] << ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::Collection.to_class_uri)
   end
 
-  # Sort results by title if no query was supplied.
-  # This overrides the default 'relevance' sort.
-  def sort_by_title(solr_parameters)
-    return if solr_parameters[:q]
-    solr_parameters[:sort] ||= "#{sort_field} asc"
-  end
-
   def discovery_perms= perms
     @discovery_perms = perms
   end
@@ -34,8 +33,4 @@ module Hydra::Collections::SearchBehaviors
     @discovery_perms || super
   end
 
-  def sort_field
-    Solrizer.solr_name('title', :sortable)
-  end
-
 end

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "5.0.4"
+    VERSION = "6.0.0.alpha"
   end
 end

data/spec/controllers/collections_controller_spec.rb

@@ -10,11 +10,11 @@ describe CollectionsController, :type => :controller do
       config.default_solr_params = {:qf => 'label_tesim'}
     end
 
-    class GenericFile < ActiveFedora::Base
-      include Hydra::Collections::Collectible
+    class GenericWork < ActiveFedora::Base
       include Hydra::AccessControls::Permissions
+      include Hydra::Works::GenericWorkBehavior
 
-      property :title, predicate: ::RDF::Vocab::DC.title, multiple: false
+      property :title, predicate: ::RDF::DC.title, multiple: false
 
       def to_solr(solr_doc={})
         super.tap do |solr_doc|
@@ -25,7 +25,7 @@ describe CollectionsController, :type => :controller do
   end
 
   after(:all) do
-    Object.send(:remove_const, :GenericFile)
+    Object.send(:remove_const, :GenericWork)
   end
 
   let(:user) { FactoryGirl.create(:user) }
@@ -39,15 +39,15 @@ describe CollectionsController, :type => :controller do
   end
 
   describe "#index" do
-    let!(:collection1) { Collection.create(title: 'Beta') { |c| c.apply_depositor_metadata(user.user_key) } }
-    let!(:collection2) { Collection.create(title: 'Alpha') { |c| c.apply_depositor_metadata(user.user_key) } }
-    let!(:generic_file) { GenericFile.create }
+    let!(:collection1) { Collection.create { |c| c.apply_depositor_metadata(user.user_key) } }
+    let!(:collection2) { Collection.create { |c| c.apply_depositor_metadata(user.user_key) } }
+    let!(:generic_file) { GenericWork.create }
 
-    it "shows a list of collections sorted alphabetically" do
+    it "should show a list of collections" do
       get :index
       expect(response).to be_successful
       expect(assigns[:document_list].map(&:id)).not_to include generic_file.id
-      expect(assigns[:document_list].map(&:id)).to eq [collection2.id, collection1.id]
+      expect(assigns[:document_list].map(&:id)).to eq [collection1.id, collection2.id]
     end
   end
 
@@ -69,10 +69,10 @@ describe CollectionsController, :type => :controller do
       expect(response).to redirect_to collections.collection_path(assigns[:collection])
     end
     it "should add docs to collection if batch ids provided" do
-      @asset1 = ActiveFedora::Base.create!
-      @asset2 = ActiveFedora::Base.create!
+      @asset1 = GenericWork.create!
+      @asset2 = GenericWork.create!
       post :create, batch_document_ids: [@asset1, @asset2], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
-      expect(assigns[:collection].members).to match_array [@asset1, @asset2]
+      expect(assigns[:collection].members).to eq([@asset1, @asset2])
     end
     it "should call after_create" do
        expect(controller).to receive(:after_create).and_call_original
@@ -80,26 +80,26 @@ describe CollectionsController, :type => :controller do
     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!
+      @asset1 = GenericWork.create!
       post :create, batch_document_ids: [@asset1], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
       expect(assigns[:collection].members).to eq [@asset1]
       asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
       expect(asset_results["response"]["numFound"]).to eq(1)
       doc = asset_results["response"]["docs"].first
       expect(doc["id"]).to eq(@asset1.id)
-      afterupdate = GenericFile.find(@asset1.id)
+      afterupdate = GenericWork.find(@asset1.id)
       expect(doc[Solrizer.solr_name(:collection)]).to eq(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!
+      @asset1 = GenericWork.create!
+      @asset2 = GenericWork.create!
       post :create, batch_document_ids: [@asset1,@asset2], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
-      expect(assigns[:collection].members).to match_array [@asset1, @asset2]
+      expect(assigns[:collection].members).to eq([@asset1,@asset2])
       asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
       expect(asset_results["response"]["numFound"]).to eq(1)
       doc = asset_results["response"]["docs"].first
       expect(doc["id"]).to eq(@asset1.id)
-      afterupdate = GenericFile.find(@asset1.id)
+      afterupdate = GenericWork.find(@asset1.id)
       expect(doc[Solrizer.solr_name(:collection)]).to eq(afterupdate.to_solr[Solrizer.solr_name(:collection)])
     end
   end
@@ -107,9 +107,9 @@ describe CollectionsController, :type => :controller do
   describe "#update" do
     before do
       @collection = Collection.create { |c| c.apply_depositor_metadata(user.user_key) }
-      @asset1 = GenericFile.create!
-      @asset2 = GenericFile.create!
-      @asset3 = GenericFile.create!
+      @asset1 = GenericWork.create!
+      @asset2 = GenericWork.create!
+      @asset3 = GenericWork.create!
       allow(controller).to receive(:authorize!).and_return(true)
       expect(controller).to receive(:authorize!).at_least(:once)
     end
@@ -187,27 +187,25 @@ describe CollectionsController, :type => :controller do
         expect(controller).to receive(:authorize!).and_return(true)
       end
 
-      it "should delete collection" do
+      it "deletes the collection" do
         delete :destroy, id: @collection
         expect(response).to redirect_to Rails.application.routes.url_helpers.catalog_index_path
         expect(flash[:notice]).to eq("Collection was successfully deleted.")
       end
 
-      it "should after_destroy" do
+      it "calls after_destroy" do
         expect(controller).to receive(:after_destroy).and_call_original
         delete :destroy, id: @collection
       end
 
-      it "should call update members" do
-        @asset1 = GenericFile.create!
-        @collection.members << @asset1
-        @collection.save
-        @asset1 = @asset1.reload
-        @asset1.update_index
-        expect(@asset1.collections).to eq [@collection]
+      it "updates members" do
+        asset1 = GenericWork.create!
+        @collection.members << asset1
+        @collection.save!
+        expect(asset1.parent_collections).to eq [@collection]
 
         delete :destroy, id: @collection
-        expect(@asset1.reload.collections).to eq []
+        expect(asset1.parent_collections).to eq []
       end
     end
 
@@ -232,9 +230,9 @@ describe CollectionsController, :type => :controller do
     end
 
     context "with a number of assets" do
-      let(:asset1) { GenericFile.create!(title: "First of the Assets", read_users: [user.user_key]) }
-      let(:asset2) { GenericFile.create!(title: "Second of the Assets", read_users: [user.user_key]) }
-      let(:asset3) { GenericFile.create!(title: "Third of the Assets", read_users: [user.user_key]) }
+      let(:asset1) { GenericWork.create!(title: "First of the Assets", read_users: [user.user_key]) }
+      let(:asset2) { GenericWork.create!(title: "Second of the Assets", read_users: [user.user_key]) }
+      let(:asset3) { GenericWork.create!(title: "Third of the Assets", read_users: [user.user_key]) }
       let!(:collection) do
         Collection.create!(id: "abc123", title: "My collection",
                            members: [asset1, asset2, asset3]) do |col|
@@ -256,7 +254,7 @@ describe CollectionsController, :type => :controller do
       end
 
       describe "additional collections" do
-        let(:asset4) { GenericFile.create!(title: "#{asset1.id}", read_users: [user.user_key]) }
+        let(:asset4) { GenericWork.create!(title: "#{asset1.id}", read_users: [user.user_key]) }
         let!(:collection2) do
           Collection.create!(id: "abc1234", title: "Other collection", members: [asset4]) do |col|
             col.apply_depositor_metadata(user.user_key)
@@ -277,8 +275,8 @@ describe CollectionsController, :type => :controller do
 
       context "When there are search matches that are not in the collection" do
         before do
-          GenericFile.create!(title: "#{asset1.id} #{asset1.title}")
-          GenericFile.create!(title: asset1.title.to_s)
+          GenericWork.create!(title: "#{asset1.id} #{asset1.title}")
+          GenericWork.create!(title: asset1.title.to_s)
         end
         # NOTE: This test depends on title_tesim being in the qf in solrconfig.xml
         it "only shows the collection assets" do

data/spec/controllers/other_collections_controller_spec.rb

@@ -5,13 +5,11 @@ describe OtherCollectionsController, :type => :controller do
   before(:all) do
     class OtherCollection < ActiveFedora::Base
       include Hydra::Collection
-      include Hydra::Collections::Collectible
     end
 
     class Member < ActiveFedora::Base
       include Hydra::Collections::Collectible
       include Hydra::AccessControls::Permissions
-      attr_accessor :title
     end
   end
 
@@ -20,19 +18,17 @@ describe OtherCollectionsController, :type => :controller do
     Object.send(:remove_const, :OtherCollection)
   end
 
-  let(:user) { FactoryGirl.find_or_create(:user) }
+  let(:user) { FactoryGirl.create(:user) }
 
   before do
     allow(controller).to receive(:has_access?).and_return(true)
     sign_in user
-    # allow_any_instance_of(User).to receive(:groups).and_return([])
-    # allow(controller).to receive(:clear_session_user) ## Don't clear out the authenticated session
   end
 
   describe "#show" do
-    let(:asset1) { Member.create!(title: "First of the Assets", read_users: [user.user_key]) }
-    let(:asset2) { Member.create!(title: "Second of the Assets", read_users: [user.user_key]) }
-    let(:asset3) { Member.create!(title: "Third of the Assets", read_users: [user.user_key]) }
+    let(:asset1) { Member.create!(read_users: [user.user_key]) }
+    let(:asset2) { Member.create!(read_users: [user.user_key]) }
+    let(:asset3) { Member.create!(read_users: [user.user_key]) }
     let(:collection) do
       OtherCollection.create(id: 'foo123', title: "My collection",
                              members: [asset1, asset2, asset3]) do |collection|
@@ -44,7 +40,7 @@ describe OtherCollectionsController, :type => :controller do
       allow(controller).to receive(:apply_gated_search)
     end
 
-    it "should show the collections" do
+    it "shows the collections" do
       get :show, id: collection
       expect(assigns[:collection].title).to eq collection.title
       ids = assigns[:member_docs].map(&:id)

data/spec/controllers/selects_collections_spec.rb

@@ -11,8 +11,8 @@ end
 describe SelectsCollectionsController, :type => :controller do
 
   describe "#find_collections" do
-    it "uses collection_search_params_logic" do
-      expect(subject.collection_search_params_logic).to eq [:default_solr_parameters, :add_query_to_solr, :add_access_controls_to_solr_params, :add_collection_filter, :some_rows, :sort_by_title]
+    it "should use collection_search_params_logic" do
+      expect(subject.collection_search_params_logic).to eq([:default_solr_parameters, :add_query_to_solr, :add_access_controls_to_solr_params, :add_collection_filter, :some_rows])
       expect(Hydra::Collections::SearchBuilder).to receive(:new).with(subject.collection_search_params_logic, subject).and_call_original
       subject.find_collections
     end
@@ -47,14 +47,13 @@ describe SelectsCollectionsController, :type => :controller do
       context "when there are more than 10" do
         before do
           11.times do |i|
-            Collection.new(title:"Test Public #{i}").tap do |col|
+            Collection.create(title:"Test Public #{i}", read_groups: ["public"]) do |col|
               col.apply_depositor_metadata(@user.user_key)
-              col.read_groups = ["public"]
-              col.save!
             end
           end
         end
-        it "should return all public collections" do
+
+        it "returns all public collections" do
           subject.find_collections
           expect(assigns[:user_collections].count).to eq(12)
         end
@@ -91,11 +90,6 @@ describe SelectsCollectionsController, :type => :controller do
           subject.find_collections_with_edit_access
           expect(assigns[:user_collections].map(&:id)).to match_array [@collection.id, @collection3.id]
         end
-
-        it "should return only public or editable collections & instructions" do
-          subject.find_collections_with_edit_access(true)
-          expect(assigns[:user_collections].map(&:id)).to match_array [-1, @collection.id, @collection3.id]
-        end
       end
     end
   end

data/spec/lib/collectible_spec.rb

@@ -7,33 +7,32 @@ describe Hydra::Collections::Collectible do
     end
   end
 
-  let(:collection1) { FactoryGirl.create(:collection) }
+  let(:collection1) { FactoryGirl.build(:collection) }
   let(:collection2) { FactoryGirl.create(:collection) }
-  let(:collectible) { CollectibleThing.new }
+  let(:collectible) { CollectibleThing.create }
 
   after do
     Object.send(:remove_const, :CollectibleThing)
   end
 
   describe "collections associations" do
-    it "should allow adding and removing" do
-      collectible.save
+    before do
       collection1.members << collectible
       collection1.save
-      collectible.collections << collection2
-      reloaded = CollectibleThing.find(collectible.id)
-      expect(collection2.reload.members).to eq [collectible]
-      expect(reloaded.collections).to eq [collection1, collection2]
+      collection2.members << collectible
+      collection2.save
+    end
+
+    it "queries the members" do
+      expect(collectible.reload.collections).to eq [collection1, collection2]
+    end
+
+    it "counts the members" do
+      expect(collectible.reload.collections.size).to eq 2
     end
-  end
 
-  describe "index_collection_ids" do
-    it "should add ids for all associated collections" do
-      collectible.save
-      collectible.collections << collection1
-      collectible.collections << collection2
-      expect(Deprecation).to receive(:warn)
-      expect(collectible.index_collection_ids["collection_sim"]).to eq [collection1.id, collection2.id]
+    it "queries the ids" do
+      expect(collectible.reload.collection_ids).to eq [collection1.id, collection2.id]
     end
   end
 end

data/spec/models/collection_spec.rb

@@ -14,7 +14,6 @@ describe Collection, :type => :model do
 
   let(:gf1) { GenericFile.create }
   let(:gf2) { GenericFile.create }
-  let(:gf3) { GenericFile.create }
 
   let(:user) { @user }
 
@@ -23,9 +22,8 @@ describe Collection, :type => :model do
 
     subject { collection.to_solr }
 
-    it "has title and depositor information" do
+    it "should have title and depositor information" do
       expect(subject['title_tesim']).to eq ['A good title']
-      expect(subject['title_si']).to eq 'A good title'
       expect(subject['depositor_tesim']).to eq [user.user_key]
       expect(subject['depositor_ssim']).to eq [user.user_key]
     end
@@ -49,12 +47,8 @@ describe Collection, :type => :model do
   end
 
   describe "the ability" do
-    let(:collection) do
-      Collection.new.tap do |collection|
-        collection.apply_depositor_metadata(user)
-        collection.save
-      end
-    end
+    let(:collection) { Collection.create { |c| c.apply_depositor_metadata(user) } }
+
     subject { Ability.new(user) }
 
     it "should allow the depositor to edit and read" do
@@ -73,7 +67,7 @@ describe Collection, :type => :model do
         subject { Collection.create(members: [gf1, gf2]) }
 
         it "should have many files" do
-          expect(subject.reload.members).to match_array [gf1, gf2]
+          expect(subject.reload.members).to eq [gf1, gf2]
         end
       end
 
@@ -86,14 +80,7 @@ describe Collection, :type => :model do
           subject.reload
           subject.members << gf2
           subject.save
-          expect(subject.reload.members).to match_array [gf1, gf2]
-        end
-
-        it "should allow multiple files to be added" do
-          subject.reload
-          subject.add_members [gf2.id, gf3.id]
-          subject.save
-          expect(subject.reload.members).to match_array [gf1, gf2, gf3]
+          expect(subject.reload.members).to eq [gf1, gf2]
         end
       end
     end
@@ -102,11 +89,13 @@ describe Collection, :type => :model do
     context "removing members" do
       before do
         subject.members = [gf1, gf2]
-        subject.save
+        subject.save!
       end
 
-      it "should allow files to be removed" do
-        expect(gf1.collections).to eq [subject] # This line forces the "collections" to be cached.
+      it "allows files to be removed" do
+        # force the "parent_collections" to be cached:
+        expect(gf1.parent_collections).to eq [subject]
+
         # We need to ensure that deleting causes the collection to be flushed.
         subject.reload.members.delete(gf1)
         subject.save

data/spec/spec_helper.rb

@@ -5,11 +5,12 @@ else
   require 'byebug'
 end
 
-ENV["RAILS_ENV"] ||= 'test'
 
-require 'engine_cart'
-EngineCart.load_application!
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+ENV["RAILS_ENV"] ||= 'test'
 
+require File.expand_path("config/environment", ENV['RAILS_ROOT'] || File.expand_path("../internal", __FILE__))
 require 'rspec/rails'
 require 'hydra-collections'
 

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

@@ -1,7 +1,7 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root File.expand_path("../../../../spec/test_app_templates", __FILE__)
+  source_root File.expand_path("../../../../test_app_templates", __FILE__)
 
   def update_gemfile
     append_to_file "Gemfile" do

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'collections/_thumbnail_default.html.erb' do
-  let(:document) { SolrDocument.new :id => 'xyz', :format => 'a', :thumbnail_url => 'http://localhost/logo.png' }
+  let(:document) { SolrDocument.new id: 'xyz', format: 'a', thumbnail_url: 'http://localhost/logo.png' }
   let :blacklight_config do
     Blacklight::Configuration.new do |config|
       config.index.thumbnail_field = :thumbnail_url
@@ -9,7 +9,7 @@ describe 'collections/_thumbnail_default.html.erb' do
   end
 
   before do
-    assign :response, double(:params => {}, :start => 0)
+    assign :response, double(start: 0)
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     allow(view).to receive(:render_grouped_response?).and_return(false)
     allow(view).to receive(:current_search_session).and_return nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 6.0.0.alpha
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.10'
 - !ruby/object:Gem::Dependency
-  name: rdf-vocab
+  name: hydra-works
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,6 @@ files:
 - app/models/concerns/hydra/collection.rb
 - app/models/concerns/hydra/collections/actions.rb
 - app/models/concerns/hydra/collections/metadata.rb
-- app/models/concerns/hydra/collections/relations.rb
 - app/models/solr_document.rb
 - app/search_builders/hydra/collections/search_builder.rb
 - app/views/batch_select/_add_button.html.erb
@@ -214,12 +213,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A rails engine for managing Hydra Collections

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

@@ -1,8 +0,0 @@
-module Hydra::Collections
-  module Relations
-    extend ActiveSupport::Concern
-    included do
-      has_and_belongs_to_many :members, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasCollectionMember, class_name: "ActiveFedora::Base"
-    end
-  end
-end