hydra-collections 4.0.0 → 5.0.0

data/spec/controllers/selects_collections_spec.rb

@@ -5,24 +5,19 @@ class SelectsCollectionsController < ApplicationController
   include Hydra::Controller::ControllerBehavior
   include Hydra::Collections::SelectsCollections
 
-  SelectsCollectionsController.solr_search_params_logic += [:add_access_controls_to_solr_params]
-
+  SelectsCollectionsController.search_params_logic += [:add_access_controls_to_solr_params]
 end
 
-
 describe SelectsCollectionsController, :type => :controller do
 
   describe "#find_collections" do
-    it "should override solr_search_params_logic to use collection_search_params_logic, then switch it back" do
-      # Looks like we can only test this indirectly b/c blacklight doesn't let you explicitly pass solr_search_params_logic when running searches -- you have to set the controller's solr_search_params_logic class attribute
-      original_solr_logic = subject.solr_search_params_logic
-      expect(subject.collection_search_params_logic).to eq([:default_solr_parameters, :add_query_to_solr, :add_access_controls_to_solr_params, :add_collection_filter])
-      expect(subject.class).to receive(:solr_search_params_logic=).with(subject.collection_search_params_logic)
-      expect(subject.class).to receive(:solr_search_params_logic=).with(original_solr_logic)
+    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
   end
-  
+
   describe "Select Collections" do
     before do
       @user = FactoryGirl.find_or_create(:user)
@@ -37,20 +32,16 @@ describe SelectsCollectionsController, :type => :controller do
       @collection3 = Collection.new title:"Test Edit"
       @collection3.apply_depositor_metadata('abc123@test.com')
       @collection3.edit_users = [@user.user_key]
-      @collection3.save 
+      @collection3.save
       @collection4 = Collection.new title:"Test No Access"
       @collection4.apply_depositor_metadata('abc123@test.com')
       @collection4.save
     end
 
     describe "Public Access" do
-      let(:user_collections) do
-        subject.find_collections
-        subject.instance_variable_get(:@user_collections)
-      end
-
       it "should only return public collections" do
-        expect(user_collections.map(&:id)).to match_array [@collection.id]
+        subject.find_collections
+        expect(assigns[:user_collections].map(&:id)).to match_array [@collection.id]
       end
 
       context "when there are more than 10" do
@@ -64,7 +55,8 @@ describe SelectsCollectionsController, :type => :controller do
           end
         end
         it "should return all public collections" do
-          expect(user_collections.count).to eq(12)
+          subject.find_collections
+          expect(assigns[:user_collections].count).to eq(12)
         end
       end
     end
@@ -78,14 +70,10 @@ describe SelectsCollectionsController, :type => :controller do
       describe "signed in" do
         before { sign_in @user }
 
-        let(:user_collections) do
+        it "should return only public and read access (edit access implies read) collections" do
           subject.find_collections_with_read_access
-          subject.instance_variable_get(:@user_collections)
+          expect(assigns[:user_collections].map(&:id)).to match_array [@collection.id, @collection2.id, @collection3.id]
         end
-
-        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 
       end
     end
 
@@ -99,14 +87,10 @@ describe SelectsCollectionsController, :type => :controller do
       describe "signed in" do
         before { sign_in @user }
 
-        let(:user_collections) do
+        it "should return only public or editable collections" do
           subject.find_collections_with_edit_access
-          subject.instance_variable_get(:@user_collections)
+          expect(assigns[:user_collections].map(&:id)).to match_array [@collection.id, @collection3.id]
         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

data/spec/helpers/collections_helper_spec.rb

@@ -9,7 +9,7 @@ describe CollectionsHelper, :type => :helper do
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
       expect(form.attr('action')).to eq("#{collections.new_collection_path}")
-      i = form.children.first.children.first
+      i = form.xpath('.//input').first
       expect(i.attr('type')).to eq('submit')
     end
     it "should create a button with my text" do
@@ -17,7 +17,7 @@ describe CollectionsHelper, :type => :helper do
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
       expect(form.attr('action')).to eq("#{collections.new_collection_path}")
-      i = form.children.first.children.first
+      i = form.xpath('.//input').first
       expect(i.attr('value')).to eq('Create My Button')
     end
   end
@@ -31,7 +31,7 @@ describe CollectionsHelper, :type => :helper do
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
       expect(form.attr('action')).to eq collections.collection_path(@collection)
-      i = form.children.first.children[1]
+      i = form.xpath('.//input')[1]
       expect(i.attr('type')).to eq('submit')
     end
     it "should create a button with my text" do
@@ -39,7 +39,7 @@ describe CollectionsHelper, :type => :helper do
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
       expect(form.attr('action')).to eq collections.collection_path(@collection)
-      i = form.children.first.children[1]
+      i = form.xpath('.//input')[1]
       expect(i.attr('value')).to eq("Delete My Button")
     end
   end
@@ -93,7 +93,7 @@ describe CollectionsHelper, :type => :helper do
       doc = Nokogiri::HTML(str)
       form = doc.xpath('//form').first
       expect(form.attr('action')).to eq collections.collection_path(@collection)
-      i = form.children[2]
+      i = form.xpath('.//input')[2]
       expect(i.attr('value')).to eq("remove")
       expect(i.attr('name')).to eq("collection[members]")
     end

data/spec/lib/collectible_spec.rb

@@ -25,6 +25,7 @@ describe Hydra::Collections::Collectible 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]
     end
   end

data/spec/models/collection_spec.rb

@@ -5,13 +5,6 @@ describe Collection, :type => :model do
     @user = FactoryGirl.find_or_create(:user)
     class GenericFile < ActiveFedora::Base
       include Hydra::Collections::Collectible
-
-      def to_solr(solr_doc={}, opts={})
-        super(solr_doc, opts).tap do |solr_doc|
-          solr_doc = index_collection_ids(solr_doc)
-        end
-      end
-
     end
   end
   after(:all) do
@@ -34,6 +27,13 @@ describe Collection, :type => :model do
       expect(subject['depositor_tesim']).to eq [user.user_key]
       expect(subject['depositor_ssim']).to eq [user.user_key]
     end
+
+    context "with members" do
+      before do
+        collection.members << gf1
+      end
+
+    end
   end
 
   describe "#depositor" do
@@ -99,40 +99,13 @@ describe Collection, :type => :model do
       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.id).send(:solr_doc)
-        expect(solr_doc_before_remove["collection_tesim"]).to eq [subject.id]
         subject.reload.members.delete(gf1)
         subject.save
         expect(subject.reload.members).to eq [gf2]
-        solr_doc_after_remove = ActiveFedora::SolrInstanceLoader.new(ActiveFedora::Base, gf1.id).send(:solr_doc)
-        expect(solr_doc_after_remove["collection_tesim"]).to be_nil
       end
     end
   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
-  end
-
   it "should have a title" do
     subject.title = "title"
     subject.save

data/spec/spec_helper.rb

@@ -1,5 +1,10 @@
-require 'coveralls'
-Coveralls.wear!
+if ENV['CI']
+  require 'coveralls'
+  Coveralls.wear!
+else
+  require 'byebug'
+end
+
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -17,20 +22,11 @@ FactoryGirl.find_definitions
 # HttpLogger.ignore = [/localhost:8983\/solr/]
 # HttpLogger.colorize = false
 
-module EngineRoutes
-  def self.included(base)
-    base.routes { Hydra::Collections::Engine.routes }
-  end
-end
-
 require 'active_fedora/cleaner'
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
   config.include Devise::TestHelpers, :type => :controller
-  config.before(:each, type: "controller") { @routes = Hydra::Collections::Engine.routes }
-  config.include EngineRoutes, :type => :controller
   config.infer_spec_type_from_file_location!
-  # Stub out test stuff.
   config.before(:each) do
     ActiveFedora::Cleaner.clean!
   end

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1 @@
+gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'

data/spec/test_app_templates/app/controllers/other_collections_controller.rb

@@ -0,0 +1,8 @@
+class OtherCollectionsController < ApplicationController
+  include Hydra::CollectionsControllerBehavior
+
+  def show
+    super
+    redirect_to root_path
+  end
+end

data/spec/test_app_templates/app/views/catalog/_sort_and_per_page.html.erb

@@ -1,13 +1,8 @@
 <div id="sortAndPerPage">
-   <div class="page_links">
-     <%= render :partial => "paginate_compact" %>
-   </div>
-    <%= render :partial => 'sort_widget' %>
-
-    <%= render :partial => 'per_page_widget' %>
-
+  <div id="sortAndPerPage" class="clearfix">
+    <%= render "paginate_compact", object: @response if show_pagination? %>
     <%= button_for_create_collection %>
-
     <%= render partial: 'collections/form_for_select_collection', locals: {user_collections: @user_collections}  %>
+  </div>
 
 </div>

data/spec/test_app_templates/config/blacklight.yml

@@ -0,0 +1,22 @@
+# = jetty_path key
+# each environment can have a jetty_path with absolute or relative
+# (to app root) path to a jetty/solr install. This is used
+# by the rake tasks that start up solr automatically for testing
+# and by rake solr:marc:index.  
+#
+# jetty_path is not used by a running Blacklight application
+# at all. In general you do NOT need to deploy solr in Jetty, you can deploy it
+# however you want.  
+# jetty_path is only required for rake tasks that need to know
+# how to start up solr, generally for automated testing. 
+
+development:
+  adapter: solr
+  url: http://localhost:8983/solr/development
+test: &test
+  adapter: solr
+  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/test" %>
+production:
+  adapter: solr
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>
+

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

@@ -5,23 +5,22 @@ class TestAppGenerator < Rails::Generators::Base
 
   def update_gemfile
     append_to_file "Gemfile" do
-      "\n   gem 'factory_girl_rails'"
+      "\ngem 'factory_girl_rails'"
     end
   end
 
-
   def run_blacklight_generator
-    say_status("warning", "GENERATING BL", :yellow)       
+    say_status("warning", "GENERATING BL", :yellow)
 
     generate "blacklight:install", '--devise'
   end
 
   def run_hydra_head_generator
-    say_status("warning", "GENERATING HH", :yellow)       
+    say_status("warning", "GENERATING HH", :yellow)
 
     generate 'hydra:head', '-f'
   end
-  
+
   def run_migrations
     rake("db:migrate")
   end
@@ -29,8 +28,9 @@ class TestAppGenerator < Rails::Generators::Base
   # Inject call to Hydra::Collections.add_routes in config/routes.rb
   def inject_routes
     insert_into_file "config/routes.rb", :after => '.draw do' do
-      "\n  # Add Collections routes."
-      "\n  mount Hydra::Collections::Engine => '/'"
+      "\n  # Add Collections routes." +
+      "\n  mount Hydra::Collections::Engine => '/'" +
+      "\n  resources :other_collections, except: :index"
     end
   end
 
@@ -42,11 +42,19 @@ class TestAppGenerator < Rails::Generators::Base
     remove_file("public/index.html")
     remove_file("test/factories/users.rb")
   end
-  
+
   def copy_view_overrides
     directory("app/views/catalog")
   end
-  
+
+  def copy_test_controller
+    copy_file "app/controllers/other_collections_controller.rb"
+  end
+
+  def overwrite_blacklight_config
+    copy_file 'config/blacklight.yml', force: true
+  end
+
   # Inject javascript into application.js
   def inject_javascript
     insert_into_file "app/assets/javascripts/application.js", :after => '//= require_tree .' do

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

@@ -0,0 +1,25 @@
+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 :blacklight_config do
+    Blacklight::Configuration.new do |config|
+      config.index.thumbnail_field = :thumbnail_url
+    end
+  end
+
+  before do
+    assign :response, double(:params => {})
+    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
+    allow(view).to receive(:search_session).and_return({})
+    allow(view).to receive(:url_for_document).and_return('/foo')
+    allow(view).to receive(:session_tracking_params).and_return({})
+    render 'collections/thumbnail_default', document: document, document_counter: 1
+  end
+
+  it "renders a thumbnail" do
+    expect(rendered).to have_selector 'div.document-thumbnail a img[src="http://localhost/logo.png"]'
+  end
+end

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

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe 'collections/show.html.erb' do
+  let(:response) { Blacklight::SolrResponse.new(sample_response, {}) }
+  let(:collection) { mock_model(Collection, id: '123', title: "My Collection", description: "Just a collection") }
+
+  let(:blacklight_config) { CatalogController.blacklight_config }
+  let(:member_docs) { [ SolrDocument.new(id: '234'), SolrDocument.new(id: '456') ] }
+  before do
+    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
+    allow(view).to receive(:search_session).and_return({})
+    allow(view).to receive(:current_search_session).and_return nil
+    allow(view).to receive(:render_index_doc_actions).and_return nil
+    view.lookup_context.prefixes += ['catalog']
+    assign(:response, response)
+    assign(:collection, collection)
+    assign(:member_docs, member_docs)
+    stub_template 'catalog/_index_header_default.html.erb' => 'Document Title'
+    render
+  end
+
+  it "draws the page" do
+    expect(rendered).to have_content "My Collection"
+  end
+
+  let(:sample_response) do
+    {"responseHeader" => {"params" =>{"rows" => 3}},
+     "docs" =>[]
+    }
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-collections
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Carolyn Cole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.1
+        version: '9.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.1
+        version: '9.1'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: blacklight
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -94,10 +108,15 @@ files:
 - app/helpers/collections_search_helper.rb
 - app/models/collection.rb
 - 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
 - app/views/batch_select/_check_all.html.erb
 - app/views/batch_select/_tools.html.erb
+- app/views/collections/_bookmark_control.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
@@ -108,11 +127,19 @@ files:
 - app/views/collections/_form.html.erb
 - app/views/collections/_form_for_select_collection.html.erb
 - app/views/collections/_form_for_select_destination_collection.html.erb
+- app/views/collections/_index_default.html.erb
+- app/views/collections/_index_header_default.html.erb
+- app/views/collections/_paginate_compact.html.erb
+- app/views/collections/_results_pagination.html.erb
 - app/views/collections/_search_form.html.erb
+- app/views/collections/_search_results.html.erb
 - app/views/collections/_single_item_action_fields.html.erb
+- app/views/collections/_thumbnail_default.html.erb
 - app/views/collections/edit.html.erb
+- app/views/collections/index.html.erb
 - app/views/collections/new.html.erb
 - app/views/collections/show.html.erb
+- app/views/layouts/collections.html.erb
 - config/jetty.yml
 - config/routes.rb
 - fedora_conf/conf/development/fedora.fcfg
@@ -142,14 +169,19 @@ files:
 - spec/lib/search_service_spec.rb
 - spec/models/collection_spec.rb
 - spec/spec_helper.rb
+- spec/test_app_templates/Gemfile.extra
+- spec/test_app_templates/app/controllers/other_collections_controller.rb
 - spec/test_app_templates/app/models/sample.rb
 - spec/test_app_templates/app/models/solr_document.rb
 - spec/test_app_templates/app/views/catalog/_document_header.html.erb
 - spec/test_app_templates/app/views/catalog/_index_collection.html.erb
 - spec/test_app_templates/app/views/catalog/_sort_and_per_page.html.erb
+- spec/test_app_templates/config/blacklight.yml
 - spec/test_app_templates/db/migrate/20111101221803_create_searches.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/lib/tasks/rspec.rake
+- spec/views/collections/_thumbnail_default.html.erb_spec.rb
+- spec/views/collections/show.html.erb_spec.rb
 - tasks/hydra-collections-dev.rake
 - tasks/jetty.rake
 homepage: https://github.com/projecthydra-labs/hydra-collections
@@ -172,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A rails engine for managing Hydra Collections
@@ -190,11 +222,16 @@ test_files:
 - spec/lib/search_service_spec.rb
 - spec/models/collection_spec.rb
 - spec/spec_helper.rb
+- spec/test_app_templates/Gemfile.extra
+- spec/test_app_templates/app/controllers/other_collections_controller.rb
 - spec/test_app_templates/app/models/sample.rb
 - spec/test_app_templates/app/models/solr_document.rb
 - spec/test_app_templates/app/views/catalog/_document_header.html.erb
 - spec/test_app_templates/app/views/catalog/_index_collection.html.erb
 - spec/test_app_templates/app/views/catalog/_sort_and_per_page.html.erb
+- spec/test_app_templates/config/blacklight.yml
 - spec/test_app_templates/db/migrate/20111101221803_create_searches.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - spec/test_app_templates/lib/tasks/rspec.rake
+- spec/views/collections/_thumbnail_default.html.erb_spec.rb
+- spec/views/collections/show.html.erb_spec.rb