hydra-collections 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef2d245ae222f9d4aa4164e6e6293facd7ae8af7
-  data.tar.gz: 2e785a983145507e7ca33cf38b0deabd4bfd0f68
+  metadata.gz: 66c141437035384dcd06f340506ab837348c902a
+  data.tar.gz: a817c59334b68041937292aabe05532713bd08a9
 SHA512:
-  metadata.gz: 9975569dca4f4f8b6b7c5b426cb24045e0d8c07669af92982378f629cc02b8f2c56efeceb8101c7dcaf2a1dc8fd39f5aec8a059332ce5ad6c7bf1214ab4e68ba
-  data.tar.gz: 7c3d2f47293e9899e300fae0e5bbe82492518e7825a2565ba05a8c7c04ab43ec6e7d04ea8921ad6201214d88c8751cb05c371c5a883e4f1b3cca1656ca4b3d85
+  metadata.gz: 4b4b34237bd666aa7f5ff1b7223f158111085c4a9c52260eea3998b5a01aff1e3969474f41b473633b2405c663b1a9be08f2abcd31905d39fe8c6aab0dfee7e7
+  data.tar.gz: 3390a8a96bb94996a2101111a12a9060a554985c3da39bc4469429f055d3eb7627843d0b61c4c03e102bf893eb57737091eba1423d432fdf3e8c70245c0fe929

data/.rspec

@@ -1,2 +1 @@
 --colour
---backtrace

data/Changelog.md

@@ -1,3 +1,15 @@
+# 5.0.1
+
+* Fixed bug where access controls were not enforced by default
+
+# 5.0.0
+
+* Support for Blacklight 5.10 (HydraHead 9.1)
+
+# 4.0.0
+
+* Works with Fedora 4 (ActiveFedora/HydraHead 9)
+
 # 2.0.4
 
 * Updating dependencies

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

@@ -131,7 +131,7 @@ module Hydra
 
     # Defines which search_params_logic should be used when searching for Collection members
     def collection_member_search_logic
-      search_params_logic + [:include_collection_ids]
+      search_params_logic + [:include_collection_ids, :add_access_controls_to_solr_params]
     end
 
     def collection_params

data/lib/hydra/collections/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Collections
-    VERSION = "5.0.0"
+    VERSION = "5.0.1"
   end
 end

data/spec/controllers/collections_controller_spec.rb

@@ -12,6 +12,7 @@ describe CollectionsController, :type => :controller do
 
     class GenericFile < ActiveFedora::Base
       include Hydra::Collections::Collectible
+      include Hydra::AccessControls::Permissions
 
       property :title, predicate: ::RDF::DC.title, multiple: false
 
@@ -215,73 +216,77 @@ describe CollectionsController, :type => :controller do
     end
   end
 
-  describe "with a number of assets #show" do
+  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(id:"abc123")
-      @collection.title = "My collection"
-      @collection.apply_depositor_metadata(user.user_key)
-      @collection.members = [@asset1, @asset2, @asset3]
-      @collection.save!
       expect(controller).to receive(:authorize!).and_return(true)
-      allow(controller).to receive(:apply_gated_search)
     end
 
-    describe "additional collections" do
-      before do
-        @asset4 = GenericFile.create!(title: "#{@asset1.id}")
-        @collection2 = Collection.new(id: "abc1234")
-        @collection2.title = "Other collection"
-        @collection2.apply_depositor_metadata(user.user_key)
-        @collection2.members = [@asset4]
-        @collection2.save
+    context "when there are no assets in the collection" do
+      let(:collection) { Collection.create(title: "Empty collection") }
+      it "shows no assets" do
+        get :show, id: collection
+        expect(response).to be_successful
+        expect(assigns[:collection].title).to eq("Empty collection")
+        expect(assigns[:member_docs]).to be_empty
       end
+    end
 
-      it "should show only the collections assets" do
-        get :show, id: @collection
-        expect(assigns[:collection].title).to eq @collection.title
-        expect(assigns[:member_docs].map(&:id)).to match_array [@asset1.id, @asset2.id, @asset3.id]
+    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!(:collection) do
+        Collection.create!(id: "abc123", title: "My collection",
+                           members: [asset1, asset2, asset3]) do |col|
+          col.apply_depositor_metadata(user.user_key)
+        end
       end
 
-      it "should show only the other collections assets" do
-        get :show, id: @collection2
-        expect(assigns[:collection].title).to eq @collection2.title
-        expect(assigns[:member_docs].map(&:id)).to match_array [@asset4.id]
+      # NOTE: This test depends on title_tesim being in the qf in solrconfig.xml
+      it "queries the collections" do
+        get :show, id: collection, cq:"\"#{asset1.title}\""
+        expect(assigns[:collection].title).to eq collection.title
+        expect(assigns[:member_docs].map(&:id)).to match_array [asset1.id]
       end
-    end
 
-    it "when the collection is empty it should show no assets" do
-      get :show, id: Collection.create(title: "Empty collection")
-      expect(assigns[:collection].title).to eq("Empty collection")
-      expect(assigns[:member_docs]).to be_empty
-    end
+      it "returns the specified number of rows" do
+        get :show, id: collection, rows: "2"
+        expect(assigns[:collection].title).to eq collection.title
+        expect(assigns[:member_docs].size).to eq 2
+      end
 
-    # NOTE: This test depends on title_tesim being in the qf in solrconfig.xml
-    it "should query the collections" do
-      get :show, id: @collection.id, cq:"\"#{@asset1.title}\""
-      expect(assigns[:collection].title).to eq @collection.title
-      expect(assigns[:member_docs].map(&:id)).to match_array [@asset1.id]
-    end
+      describe "additional collections" do
+        let(:asset4) { GenericFile.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)
+          end
+        end
+        it "shows only the collections assets" do
+          get :show, id: collection
+          expect(assigns[:collection].title).to eq collection.title
+          expect(assigns[:member_docs].map(&:id)).to match_array [asset1.id, asset2.id, asset3.id]
+        end
 
-    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)
-      end
-      # NOTE: This test depends on title_tesim being in the qf in solrconfig.xml
-      it "should query the collections and show only the collection assets" do
-        get :show, id: @collection, cq: "\"#{@asset1.title}\""
-        expect(assigns[:collection].title).to eq @collection.title
-        expect(assigns[:member_docs].map(&:id)).to match_array [@asset1.id]
+        it "shows only the other collections assets" do
+          get :show, id: collection2
+          expect(assigns[:collection].title).to eq collection2.title
+          expect(assigns[:member_docs].map(&:id)).to match_array [asset4.id]
+        end
       end
-    end
 
-    it "should query the collections with rows" do
-      get :show, id: @collection, rows:"2"
-      expect(assigns[:collection].title).to eq @collection.title
-      expect(assigns[:member_docs].size).to eq 2
+      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)
+        end
+        # NOTE: This test depends on title_tesim being in the qf in solrconfig.xml
+        it "only shows the collection assets" do
+          get :show, id: collection, cq: "\"#{asset1.title}\""
+          expect(assigns[:collection].title).to eq collection.title
+          expect(assigns[:member_docs].map(&:id)).to match_array [asset1.id]
+        end
+      end
     end
   end
 end

data/spec/controllers/other_collections_controller_spec.rb

@@ -10,6 +10,7 @@ describe OtherCollectionsController, :type => :controller do
 
     class Member < ActiveFedora::Base
       include Hydra::Collections::Collectible
+      include Hydra::AccessControls::Permissions
       attr_accessor :title
     end
   end
@@ -29,9 +30,9 @@ describe OtherCollectionsController, :type => :controller do
   end
 
   describe "#show" do
-    let(:asset1) { Member.create!(title: "First of the Assets") }
-    let(:asset2) { Member.create!(title: "Second of the Assets") }
-    let(:asset3) { Member.create!(title: "Third of the Assets") }
+    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(:collection) do
       OtherCollection.create(id: 'foo123', title: "My collection",
                              members: [asset1, asset2, asset3]) do |collection|

data/tasks/hydra-collections-dev.rake

@@ -5,7 +5,9 @@ require 'engine_cart/rake_task'
 
 Jettywrapper.hydra_jetty_version = "v8.1.0"
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = ['--backtrace'] if ENV['CI']
+end
 
 desc 'Spin up hydra-jetty and run specs'
 task ci: ['engine_cart:clean', 'engine_cart:generate', 'jetty:clean'] do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head