hydra-collections 3.0.0.beta3 → 4.0.0.beta1

data/spec/controllers/other_collections_controller_spec.rb

@@ -14,21 +14,21 @@ class OtherCollection < ActiveFedora::Base
   include Hydra::Collection
   include Hydra::Collections::Collectible
 
-  def to_solr(solr_doc={}, opts={})
-    super(solr_doc, opts)
-    solr_doc = index_collection_pids(solr_doc)
-    return solr_doc
+  def to_solr(solr_doc={})
+    super.tap do |solr_doc|
+      index_collection_ids(solr_doc)
+    end
   end
-
 end
+
 class Member < ActiveFedora::Base
   include Hydra::Collections::Collectible
   attr_accessor :title
 
-  def to_solr(solr_doc={}, opts={})
-    super(solr_doc, opts)
-    solr_doc = index_collection_pids(solr_doc)
-    return solr_doc
+  def to_solr(solr_doc={})
+    super.tap do |solr_doc|
+      index_collection_ids(solr_doc)
+    end
   end
 
 end
@@ -75,12 +75,10 @@ describe OtherCollectionsController, :type => :controller do
     end
     it "should show the collections" do
       routes.draw { resources :other_collections, except: :index }
-      get :show, id: collection.id
-      expect(assigns[:collection].title).to eq(collection.title)
-      ids = assigns[:member_docs].map {|d| d.id}
-      expect(ids).to include asset1.pid
-      expect(ids).to include asset2.pid
-      expect(ids).to include asset3.pid
+      get :show, id: collection
+      expect(assigns[:collection].title).to eq collection.title
+      ids = assigns[:member_docs].map(&:id)
+      expect(ids).to include(asset1.id, asset2.id, asset3.id)
     end
   end
 

data/spec/controllers/selects_collections_spec.rb

@@ -24,7 +24,7 @@ describe SelectsCollectionsController, :type => :controller do
   end
   
   describe "Select Collections" do
-    before (:all) do
+    before do
       @user = FactoryGirl.find_or_create(:user)
       @collection = Collection.new title:"Test Public"
       @collection.apply_depositor_metadata(@user.user_key)
@@ -41,36 +41,34 @@ describe SelectsCollectionsController, :type => :controller do
       @collection4 = Collection.new title:"Test No Access"
       @collection4.apply_depositor_metadata('abc123@test.com')
       @collection4.save
-      @collections = []
-      (1..11).each do |i|
-        collection = Collection.new title:"Test Public #{i}"
-        collection.apply_depositor_metadata(@user.user_key)
-        collection.read_groups = ["public"]
-        collection.save
-        @collections << collection
-      end
-    end
-    after (:all) do
-      Collection.delete_all
     end
+
     describe "Public Access" do
-      before (:each) do
+      let(:user_collections) do
         subject.find_collections
-        @user_collections =  subject.instance_variable_get (:@user_collections)
-        expect(@user_collections).to be_kind_of(Array)
+        subject.instance_variable_get(:@user_collections)
       end
-      it "should return public collections" do
-        expect(@user_collections.index{|d| d.id == @collection.id}).not_to be_nil
+
+      it "should only return public collections" do
+        expect(user_collections.map(&:id)).to match_array [@collection.id]
       end
-      it "should return all public collections" do
-        expect(@user_collections.count).to eq(12)
+
+      context "when there are more than 10" do
+        before do
+          11.times do |i|
+            Collection.new(title:"Test Public #{i}").tap 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
+          expect(user_collections.count).to eq(12)
+        end
       end
-      it "should not return non public collections" do
-        expect(@user_collections.index{|d| d.id == @collection2.id}).to be_nil
-        expect(@user_collections.index{|d| d.id == @collection3.id}).to be_nil
-        expect(@user_collections.index{|d| d.id == @collection4.id}).to be_nil
-       end
     end
+
     describe "Read Access" do
       describe "not signed in" do
         it "should error if the user is not signed in" do
@@ -78,45 +76,38 @@ describe SelectsCollectionsController, :type => :controller do
         end
       end
       describe "signed in" do
-        before (:each) do
-          sign_in @user
+        before { sign_in @user }
+
+        let(:user_collections) do
           subject.find_collections_with_read_access
-          @user_collections =  subject.instance_variable_get (:@user_collections)
-          expect(@user_collections).to be_kind_of(Array)
+          subject.instance_variable_get(:@user_collections)
         end
-        it "should return public and read access (edit access implies read) collections" do
-          expect(@user_collections.index{|d| d.id == @collection.id}).not_to be_nil
-          expect(@user_collections.index{|d| d.id == @collection2.id}).not_to be_nil
-          expect(@user_collections.index{|d| d.id == @collection3.id}).not_to be_nil
+
+        it "should return only public and read access (edit access implies read) collections" do
+          expect(user_collections.map(&:id)).to match_array [@collection.id, @collection2.id, @collection3.id]
         end 
-        it "should not return non public collections" do
-          expect(@user_collections.index{|d| d.id == @collection4.id}).to 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
+        before { sign_in @user }
+
+        let(:user_collections) do
           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
-          expect(@user_collections.index{|d| d.id == @collection.id}).not_to be_nil
-          expect(@user_collections.index{|d| d.id == @collection3.id}).not_to be_nil
-        end 
-        it "should not return non public or editable collections" do
-          expect(@user_collections.index{|d| d.id == @collection2.id}).to be_nil
-          expect(@user_collections.index{|d| d.id == @collection4.id}).to be_nil
+          subject.instance_variable_get(:@user_collections)
         end
+
+        it "should return only public or editable collections" do
+          expect(user_collections.map(&:id)).to match_array [@collection.id, @collection3.id]
+        end 
       end
     end
   end
-  
 end

data/spec/factories.rb

@@ -1,17 +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.
-
 FactoryGirl.define do
   factory :collection 
 end

data/spec/factories/users.rb

@@ -1,17 +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.
-
 FactoryGirl.define do
   factory :user, :class => User do |u|
     email 'jilluser@example.com'

data/spec/helpers/collections_helper_spec.rb

@@ -22,17 +22,15 @@ describe CollectionsHelper, :type => :helper do
     end
   end
   describe "button_for_delete_collection" do
-    before (:all) do
+    before 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
       str = button_for_delete_collection @collection
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq("#{collections.collection_path(@collection.pid)}")
+      expect(form.attr('action')).to eq collections.collection_path(@collection)
       i = form.children.first.children[1]
       expect(i.attr('type')).to eq('submit')
     end
@@ -40,7 +38,7 @@ describe CollectionsHelper, :type => :helper do
       str = button_for_delete_collection @collection, "Delete My Button"
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq("#{collections.collection_path(@collection.pid)}")
+      expect(form.attr('action')).to eq collections.collection_path(@collection)
       i = form.children.first.children[1]
       expect(i.attr('value')).to eq("Delete My Button")
     end
@@ -55,7 +53,7 @@ describe CollectionsHelper, :type => :helper do
       str = button_for_remove_from_collection item
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq("#{collections.collection_path(@collection.pid)}")
+      expect(form.attr('action')).to eq collections.collection_path(@collection)
       expect(form.css('input#collection_members[type="hidden"][value="remove"]')).not_to be_empty
       expect(form.css('input[type="hidden"][name="batch_document_ids[]"][value="changeme:123"]')).not_to be_empty
     end
@@ -77,34 +75,34 @@ describe CollectionsHelper, :type => :helper do
         str = button_for_remove_from_collection item
         doc = Nokogiri::HTML(str)
         form = doc.xpath('//form').first
-        expect(form.attr('action')).to eq("#{collections.collection_path(@collection.pid)}")
+        expect(form.attr('action')).to eq collections.collection_path(@collection)
         expect(form.css('input#collection_members[type="hidden"][value="remove"]')).not_to be_empty
         expect(form.css('input[type="hidden"][name="batch_document_ids[]"][value="changeme:123"]')).not_to be_empty
       end
 
     end
-  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
+    before do
+      @collection = Collection.create title: "Test Public"
     end
+
     it " should create a button to the collections delete path" do
       str = button_for_remove_selected_from_collection @collection
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
-      expect(form.attr('action')).to eq("#{collections.collection_path(@collection.pid)}")
+      expect(form.attr('action')).to eq collections.collection_path(@collection)
       i = form.children[2]
       expect(i.attr('value')).to eq("remove")
       expect(i.attr('name')).to eq("collection[members]")
     end
+
     it "should create a button with my text" do
       str = button_for_remove_selected_from_collection @collection, "Remove My Button"
       doc = Nokogiri::HTML(str)
       form = doc.css('form').first
-      expect(form.attr('action')).to eq collections.collection_path(@collection.id)
+      expect(form.attr('action')).to eq collections.collection_path(@collection)
       expect(form.css('input[type="submit"]').attr('value').value).to eq "Remove My Button"
     end
   end

data/spec/helpers/collections_search_helper_spec.rb

@@ -4,11 +4,13 @@ describe CollectionsSearchHelper, :type => :helper do
   describe "collection_name" do
     let (:collection_without_title) { Collection.create() }
     let (:collection_with_title) { Collection.create(title: "Title of Collection 2") }
+
     it "should return the pid if no title available" do
-      expect(collection_name(collection_without_title.pid)).to eq(collection_without_title.pid)
+      expect(collection_name(collection_without_title.id)).to eq collection_without_title.id
     end
+
     it "should return the title value associated with the given pid" do
-      expect(collection_name(collection_with_title.pid)).to eq("Title of Collection 2")
+      expect(collection_name(collection_with_title.id)).to eq "Title of Collection 2"
     end
   end
 end

data/spec/lib/collectible_spec.rb

@@ -15,17 +15,17 @@ describe Hydra::Collections::Collectible do
       @collection1.members << @collectible
       @collection1.save
       @collectible.collections << @collection2
-      reloaded = CollectibleThing.find(@collectible.pid)
-      expect(@collection2.reload.members).to eq([@collectible])
-      expect(reloaded.collections).to eq([@collection1, @collection2])
+      reloaded = CollectibleThing.find(@collectible.id)
+      expect(@collection2.reload.members).to eq [@collectible]
+      expect(reloaded.collections).to eq [@collection1, @collection2]
     end
   end
-  describe "index_collection_pids" do
-    it "should add pids for all associated collections" do
+  describe "index_collection_ids" do
+    it "should add ids for all associated collections" do
       @collectible.save
       @collectible.collections << @collection1
       @collectible.collections << @collection2
-      expect(@collectible.index_collection_pids["collection_sim"]).to eq([@collection1.pid, @collection2.pid])
+      expect(@collectible.index_collection_ids["collection_sim"]).to eq [@collection1.id, @collection2.id]
     end
   end
-end
+end

data/spec/models/collection_spec.rb

@@ -7,9 +7,9 @@ describe Collection, :type => :model do
       include Hydra::Collections::Collectible
 
       def to_solr(solr_doc={}, opts={})
-        super(solr_doc, opts)
-        solr_doc = index_collection_pids(solr_doc)
-        return solr_doc
+        super(solr_doc, opts).tap do |solr_doc|
+          solr_doc = index_collection_ids(solr_doc)
+        end
       end
 
     end
@@ -18,175 +18,120 @@ describe Collection, :type => :model do
     @user.destroy
     Object.send(:remove_const, :GenericFile)
   end
-  let(:gf1) { GenericFile.create }
-  let(:gf2) { GenericFile.create }
-
-  let(:user) { @user }
-
-  describe "#to_solr" do
-    let(:collection) { Collection.new(title: "A good title") }
-
-    subject { collection.to_solr }
 
-    it "should have title" do
-      expect(subject['desc_metadata__title_tesim']).to eq ['A good title']
-    end
+  before do
+    @collection = Collection.new
+    @collection.apply_depositor_metadata(@user.user_key)
+    @collection.save!
+    @gf1 = GenericFile.create
+    @gf2 = GenericFile.create
   end
 
-  describe "#depositor" do
-    before do
-      subject.apply_depositor_metadata(user)
-    end
-
-    it "should have a depositor" do
-      expect(subject.depositor).to eq(user.user_key)
-    end
+  it "should have a depositor" do
+    expect(@collection.depositor).to eq(@user.user_key)
   end
 
-  describe "the ability" do
-    let(:collection) do
-      Collection.new.tap do |collection|
-        collection.apply_depositor_metadata(user)
-        collection.save
-      end
-    end
-    subject { Ability.new(user) }
-
-    it "should allow the depositor to edit and read" do
-      expect(subject.can?(:read, collection)).to be true
-      expect(subject.can?(:edit, collection)).to be true
-    end
+  it "should allow the depositor to edit and read" do
+    ability = Ability.new(@user)
+    expect(ability.can?(:read, @collection)).to be true
+    expect(ability.can?(:edit, @collection)).to be true
   end
 
-  describe "#members" do
-    it "should be empty by default" do
-      expect(subject.members).to be_empty
-    end
-
-    context "adding members" do
-      context "using assignment" do
-        subject { Collection.create(members: [gf1, gf2]) }
-
-        it "should have many files" do
-          expect(subject.reload.members).to eq [gf1, gf2]
-        end
-      end
-
-      context "using append" do
-        before do
-          subject.members = [gf1]
-          subject.save
-        end
-        it "should allow new files to be added" do
-          subject.reload
-          subject.members << gf2
-          subject.save
-          expect(subject.reload.members).to eq [gf1, gf2]
-        end
-      end
-    end
-
+  it "should be empty by default" do
+    expect(@collection.members).to be_empty
+  end
 
-    context "removing members" do
-      before do
-        subject.members = [gf1, gf2]
-        subject.save
-      end
+  it "should have many files" do
+    @collection.members = [@gf1, @gf2]
+    @collection.save
+    expect(@collection.reload.members).to match_array [@gf1, @gf2]
+  end
 
-      it "should allow files to be removed" do
-        expect(gf1.collections).to eq [subject] # This line forces the "collections" to be cached.
-        # We need to ensure that deleting causes the collection to be flushed.
-        solr_doc_before_remove = ActiveFedora::SolrInstanceLoader.new(ActiveFedora::Base, gf1.pid).send(:solr_doc)
-        expect(solr_doc_before_remove["collection_tesim"]).to eq [subject.pid]
-        subject.reload.members.delete(gf1)
-        subject.save
-        expect(subject.reload.members).to eq [gf2]
-        solr_doc_after_remove = ActiveFedora::SolrInstanceLoader.new(ActiveFedora::Base, gf1.pid).send(:solr_doc)
-        expect(solr_doc_after_remove["collection_tesim"]).to be_nil
-      end
-    end
+  it "should allow new files to be added" do
+    @collection.members = [@gf1]
+    @collection.save
+    @collection.reload
+    @collection.members << @gf2
+    @collection.save
+    expect(@collection.reload.members).to match_array [@gf1, @gf2]
   end
 
   it "should set the date uploaded on create" do
-    subject.save
-    expect(subject.date_uploaded).to be_kind_of(Date)
-  end
-
-  describe "when updating" do
-    let(:gf1) { GenericFile.create }
-
-    it "should update the date modified on update" do
-      uploaded_date = Date.today
-      modified_date = Date.tomorrow
-      subject.save
-      allow(Date).to receive(:today).and_return(uploaded_date, modified_date)
-      subject.save
-      expect(subject.date_modified).to eq uploaded_date
-      subject.members = [gf1]
-      subject.save
-      expect(subject.date_modified).to eq modified_date
-      expect(gf1.reload.collections).to include(subject)
-      expect(gf1.to_solr[Solrizer.solr_name(:collection)]).to eq [subject.id]
-    end
+    @collection.save
+    expect(@collection.date_uploaded).to be_kind_of(Date)
+  end
+  it "should update the date modified on update" do
+    uploaded_date = Date.today
+    modified_date = Date.tomorrow
+    expect(Date).to receive(:today).twice.and_return(uploaded_date, modified_date)
+    @collection.save
+    expect(@collection.date_modified).to eq(uploaded_date)
+    @collection.members = [@gf1]
+    @collection.save
+    expect(@collection.date_modified).to eq(modified_date)
+    @gf1 = @gf1.reload
+    expect(@gf1.collections).to include(@collection)
+    expect(@gf1.to_solr[Solrizer.solr_name(:collection)]).to eq([@collection.id])
   end
-
   it "should have a title" do
-    subject.title = "title"
-    subject.save
-    expect(subject.title).to eq "title"
+    @collection.title = "title"
+    @collection.save
+    expect(Collection.find(@collection.id).title).to eq(@collection.title)
   end
-
   it "should have a description" do
-    subject.description = "description"
-    subject.save
-    expect(subject.reload.description).to eq "description"
+    @collection.description = "description"
+    @collection.save
+    expect(Collection.find(@collection.id).description).to eq(@collection.description)
   end
 
   it "should have the expected display terms" do
-    expect(subject.terms_for_display).to eq([:part_of, :contributor, :creator, :title, :description, :publisher, :date_created, :date_uploaded, :date_modified, :subject, :language, :rights, :resource_type, :identifier, :based_near, :tag, :related_url])
+    expect(@collection.terms_for_display).to include(
+      :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
-    expect(subject.terms_for_editing).to eq([:part_of, :contributor, :creator, :title, :description, :publisher, :date_created, :subject, :language, :rights, :resource_type, :identifier, :based_near, :tag, :related_url])
+    expect(@collection.terms_for_editing).to include(
+      :part_of, :contributor, :creator, :title, :description, :publisher, :date_created,
+      :subject, :language, :rights, :resource_type, :identifier, :based_near, :tag, :related_url
+     )
   end
-
-  describe "#destroy" do
-    before do
-      subject.members = [gf1, gf2]
-      subject.save
-      subject.destroy
-    end
-
-    it "should not delete member files when deleted" do
-      expect(GenericFile.exists?(gf1.pid)).to be true
-      expect(GenericFile.exists?(gf2.pid)).to be true
-    end
+  it "should not delete member files when deleted" do
+    @collection.members = [@gf1, @gf2]
+    @collection.save
+    @collection.destroy
+    expect(GenericFile).to exist(@gf1.id)
+    expect(GenericFile).to exist(@gf2.id)
   end
 
   describe "Collection by another name" do
-    before do
+    before (:all) do
       class OtherCollection < ActiveFedora::Base
         include Hydra::Collection
-        include Hydra::Collections::Collectible
       end
+
       class Member < ActiveFedora::Base
         include Hydra::Collections::Collectible
       end
     end
-    after do
+    after(:all) do
       Object.send(:remove_const, :OtherCollection)
       Object.send(:remove_const, :Member)
     end
 
-    it "have members that know about the collection" do
-      collection = OtherCollection.new
-      member = Member.create
+    let(:member) { Member.create }
+    let(:collection) { OtherCollection.new }
+
+    before do
       collection.members << member
       collection.save
+    end
+
+    it "have members that know about the collection" do
       member.reload
-      expect(member.collections).to eq([collection])
-      collection.destroy
-      member.destroy
+      expect(member.collections).to eq [collection]
     end
   end
+
 end