blacklight 5.7.2 → 5.8.0

data/spec/lib/blacklight/solr_repository_spec.rb

@@ -0,0 +1,113 @@
+require 'spec_helper'
+
+describe Blacklight::SolrRepository do
+
+  let :blacklight_config do
+    CatalogController.blacklight_config.deep_copy
+  end
+
+  subject do
+    Blacklight::SolrRepository.new blacklight_config
+  end
+
+  let :mock_response do
+    { response: { docs: [document]}}
+  end
+
+  let :document do
+    {}
+  end
+
+  describe "#find" do
+    it "should use the document-specific solr path" do
+      blacklight_config.document_solr_path = 'abc'
+      blacklight_config.solr_path = 'xyz'
+      allow(subject.blacklight_solr).to receive(:send_and_receive).with('abc', anything).and_return(mock_response)
+      expect(subject.find("123")).to be_a_kind_of Blacklight::SolrResponse
+    end
+
+    it "should use the default solr path" do
+      blacklight_config.solr_path = 'xyz'
+      allow(subject.blacklight_solr).to receive(:send_and_receive).with('xyz', anything).and_return(mock_response)
+      expect(subject.find("123")).to be_a_kind_of Blacklight::SolrResponse
+    end
+
+    it "should use a default :qt param" do
+      allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', hash_including(params: { id: '123', qt: 'document'})).and_return(mock_response)
+      expect(subject.find("123", {})).to be_a_kind_of Blacklight::SolrResponse
+    end
+
+    it "should use the provided :qt param" do
+      blacklight_config.document_solr_request_handler = 'xyz'
+      allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', hash_including(params: { id: '123', qt: 'abc'})).and_return(mock_response)
+      expect(subject.find("123", {qt: 'abc'})).to be_a_kind_of Blacklight::SolrResponse
+    end
+  end
+
+  describe "#search" do
+    it "should use the search-specific solr path" do
+      blacklight_config.solr_path = 'xyz'
+      allow(subject.blacklight_solr).to receive(:send_and_receive).with('xyz', anything).and_return(mock_response)
+      expect(subject.search({})).to be_a_kind_of Blacklight::SolrResponse
+    end
+
+    it "should use the default solr path" do
+      allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', anything).and_return(mock_response)
+      expect(subject.search({})).to be_a_kind_of Blacklight::SolrResponse
+    end
+
+    it "should use a default :qt param" do
+      blacklight_config.qt = 'xyz'
+      allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', hash_including(params: { qt: 'xyz'})).and_return(mock_response)
+      expect(subject.search({})).to be_a_kind_of Blacklight::SolrResponse
+    end
+
+    it "should use the provided :qt param" do
+      blacklight_config.qt = 'xyz'
+      allow(subject.blacklight_solr).to receive(:send_and_receive).with('select', hash_including(params: { qt: 'abc'})).and_return(mock_response)
+      expect(subject.search({qt: 'abc'})).to be_a_kind_of Blacklight::SolrResponse
+    end
+  end
+
+  describe "#send_and_receive" do
+    describe "http_method configuration" do
+      describe "using default" do
+
+        it "defaults to get" do
+          expect(blacklight_config.http_method).to eq :get
+          allow(subject.blacklight_solr).to receive(:send_and_receive) do |path, params|
+            expect(path).to eq 'select'
+            expect(params[:method]).to eq :get
+            expect(params[:params]).to include(:q)
+          end.and_return({'response'=>{'docs'=>[]}})
+          subject.search(:q => @all_docs_query)
+        end
+      end
+
+      describe "setting to post" do
+        let (:blacklight_config) {config = Blacklight::Configuration.new; config.http_method=:post; config}
+
+        it "keep value set to post" do
+          expect(blacklight_config.http_method).to eq :post
+          allow(subject.blacklight_solr).to receive(:send_and_receive) do |path, params|
+            expect(path).to eq 'select'
+            expect(params[:method]).to eq :post
+            expect(params[:data]).to include(:q)
+          end.and_return({'response'=>{'docs'=>[]}})
+          subject.search(:q => @all_docs_query)
+        end
+      end
+    end
+  end
+
+  describe "http_method configuration", integration: true do
+    let (:blacklight_config) {config = Blacklight::Configuration.new; config.http_method=:post; config}
+
+    it "should send a post request to solr and get a response back" do
+      response = subject.search(:q => @all_docs_query)
+      expect(response.docs.length).to be >= 1
+    end
+  end
+
+
+end

data/spec/lib/utils_spec.rb

@@ -92,5 +92,32 @@ describe 'Blacklight::Utils' do
         expect(subject.to_json).to eq ({a: 1, b:2}).to_json
       end
     end
+
+    describe "#deep_dup" do
+      subject { Blacklight::OpenStructWithHashAccess.new a: 1, b: { c: 1} }
+
+      it "should duplicate nested hashes" do
+        copy = subject.deep_dup
+        copy.a = 2
+        copy.b[:c] = 2
+
+        expect(subject.a).to eq 1
+        expect(subject.b[:c]).to eq 1
+        expect(copy.a).to eq 2
+        expect(copy.b[:c]).to eq 2
+      end
+
+      it "should preserve the current class" do
+        expect(Blacklight::NestedOpenStructWithHashAccess.new(Blacklight::NestedOpenStructWithHashAccess).deep_dup).to be_a_kind_of Blacklight::NestedOpenStructWithHashAccess
+      end
+
+      it "should preserve the default proc" do
+        nested = Blacklight::NestedOpenStructWithHashAccess.new Hash
+
+        copy = nested.deep_dup
+        copy.a[:b] = 1
+        expect(copy.a[:b]).to eq 1
+      end
+    end
   end
 end

data/spec/views/_user_util_links.html.erb_spec.rb

@@ -3,15 +3,18 @@ require 'spec_helper'
 describe "_user_util_links" do
 
   let :blacklight_config do
-    Blacklight::Configuration.new
+    Blacklight::Configuration.new.configure do |config|
+      config.navbar.partials = { bookmark: Blacklight::Configuration::ToolConfig.new(partial: 'blacklight/nav/bookmark', if: :render_bookmarks_control?) }
+    end
+
   end
 
   it "should render the correct bookmark count" do
     count = rand(99)
     allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     allow(view).to receive(:render_bookmarks_control?).and_return true
-    allow(view).to receive(:has_user_authentication_provider?). and_return false
-    allow(view).to receive_message_chain(:current_or_guest_user, :bookmarks, :count).and_return(count)  
+    allow(view).to receive(:has_user_authentication_provider?).and_return false
+    allow(view).to receive_message_chain(:current_or_guest_user, :bookmarks, :count).and_return(count)
     render :partial => "user_util_links"
     expect(rendered).to have_selector('#bookmarks_nav span[data-role=bookmark-counter]', text: "#{count}")
   end

data/spec/views/catalog/_show_sidebar.erb_spec.rb

@@ -4,12 +4,18 @@ require 'spec_helper'
 
 describe "/catalog/_show_sidebar.html.erb" do
 
-  before(:each) do
+  let(:blacklight_config) do
+    Blacklight::Configuration.new do |config|
+      config.index.title_field = 'title_display'
+    end
+  end
 
-    allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
+  before(:each) do
+    allow(view).to receive(:blacklight_config).and_return(blacklight_config)
     allow(view).to receive(:has_user_authentication_provider?).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(:document_actions).and_return([])
   end
 
   it "should show more-like-this titles in the sidebar" do

data/spec/views/catalog/_show_tools.html.erb_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+describe "catalog/_show_tools.html.erb" do
+  let :document do
+    SolrDocument.new :id => 'xyz', :format => 'a'
+  end
+
+  let :blacklight_config do
+    Blacklight::Configuration.new
+  end
+
+  before do
+    assign :response, double(:params => {})
+    assign :document, document
+    allow(view).to receive(:blacklight_config).and_return blacklight_config
+    allow(view).to receive(:has_user_authentication_provider?).and_return false
+  end
+
+  describe "document actions" do
+
+    let :document_actions do
+      blacklight_config.show.document_actions
+    end
+
+
+    it "should render a document action" do
+      allow(view).to receive(:some_action_test_path).with(id: document).and_return "x"
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action'
+      render partial: 'catalog/show_tools'
+      expect(rendered).to have_link "Some action", href: "x"
+    end
+
+    it "should use the provided label" do
+      allow(view).to receive(:some_action_test_path).and_return "x"
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new label: "Some label", partial: 'document_action'
+      render partial: 'catalog/show_tools'
+      expect(rendered).to have_selector '.some_action', text: "Some label"
+    end
+
+    it "should evaluate a document action's if configurations" do
+      allow(view).to receive(:some_action_test_path).and_return "x"
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new if: false, partial: 'document_action'
+      render partial: 'catalog/show_tools'
+      expect(rendered).not_to have_selector '.some_action', text: "Some action"
+    end
+
+    it "should evaluate a document action's if configuration with a proc" do
+      allow(view).to receive(:some_action_test_path).and_return "x"
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', if: Proc.new { |config, doc| doc.id == "xyz" }
+      render partial: 'catalog/show_tools'
+      expect(rendered).not_to have_selector '.some_action', text: "Some action"
+    end
+
+    it "should evaluate a document action's unless configurations" do
+      allow(view).to receive(:some_action_test_path).and_return "x"
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', unless: true
+      render partial: 'catalog/show_tools'
+      expect(rendered).not_to have_selector '.some_action', text: "Some action"
+    end
+
+    it "should allow the tool to have a custom id" do
+      allow(view).to receive(:some_action_test_path).and_return "x"
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', id: "some_action"
+      render partial: 'catalog/show_tools'
+      expect(rendered).to have_selector '#some_action', text: "Some action"
+    end
+
+    it "should default to modal behavior" do
+      allow(view).to receive(:some_action_test_path).and_return "x"
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action'
+      render partial: 'catalog/show_tools'
+      expect(rendered).to have_selector '.some_action > a[data-ajax-modal="trigger"]', text: "Some action"
+    end
+
+    it "should allow configuration to opt out of modal behavior" do
+      allow(view).to receive(:some_action_test_path).and_return "x"
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', modal: false
+      render partial: 'catalog/show_tools'
+      expect(rendered).not_to have_selector '.some_action > a[data-ajax-modal="trigger"]', text: "Some action"
+    end
+  end
+end

data/spec/views/catalog/_sort_and_per_page.html.erb_spec.rb

@@ -7,10 +7,14 @@ describe "catalog/_sort_and_per_page" do
   end
 
   before do
+    blacklight_config.add_results_collection_tool(:sort_widget)
+    blacklight_config.add_results_collection_tool(:per_page_widget)
+    blacklight_config.add_results_collection_tool(:view_type_group)
     allow(view).to receive_messages(blacklight_config: blacklight_config)
   end
 
   it "should render the pagination, sort, per page and view type controls" do
+    assign(:response, double("SolrResponse", limit_value: 1))
     stub_template "catalog/_paginate_compact.html.erb" => "paginate_compact"
     stub_template "catalog/_sort_widget.html.erb" => "sort_widget"
     stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"
@@ -22,4 +26,14 @@ describe "catalog/_sort_and_per_page" do
     expect(rendered).to match /view_type_group/
   end
 
-end
+  it "should not render the pagination controls with bad limit values" do
+    assign(:response, double("SolrResponse", limit_value: 0))
+    stub_template "catalog/_paginate_compact.html.erb" => "paginate_compact"
+    stub_template "catalog/_sort_widget.html.erb" => "sort_widget"
+    stub_template "catalog/_per_page_widget.html.erb" => "per_page_widget"
+    stub_template "catalog/_view_type_group.html.erb" => "view_type_group"
+    render
+    expect(rendered).not_to match /paginate_compact/
+  end
+
+end

data/tasks/blacklight.rake

@@ -1,4 +1,4 @@
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.9.0.zip"
+ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.2.zip"
 
 require 'jettywrapper'
 require 'engine_cart/rake_task'
@@ -40,4 +40,28 @@ namespace :blacklight do
   desc "Create the test rails app"
   task :generate => ['engine_cart:generate'] do
   end
+
+  task :server do
+    if File.exists? 'spec/internal'
+      within_test_app do
+        system "bundle update"
+      end
+    else
+      Rake::Task['engine_cart:generate'].invoke
+    end
+
+    unless File.exists? 'jetty'
+      Rake::Task['jetty:clean'].invoke
+    end
+
+    jetty_params = Jettywrapper.load_config
+    jetty_params[:startup_wait]= 60
+
+    Jettywrapper.wrap(jetty_params) do
+      within_test_app do
+        system "rake solr:marc:index_test_data"
+        system "bundle exec rails s"
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.7.2
+  version: 5.8.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -288,16 +288,19 @@ files:
 - app/controllers/search_history_controller.rb
 - app/helpers/blacklight/blacklight_helper_behavior.rb
 - app/helpers/blacklight/catalog_helper_behavior.rb
+- app/helpers/blacklight/component_helper_behavior.rb
 - app/helpers/blacklight/configuration_helper_behavior.rb
 - app/helpers/blacklight/facets_helper_behavior.rb
 - app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb
 - app/helpers/blacklight/render_constraints_helper_behavior.rb
+- app/helpers/blacklight/render_partials_helper.rb
 - app/helpers/blacklight/search_history_constraints_helper_behavior.rb
 - app/helpers/blacklight/url_helper_behavior.rb
 - app/helpers/blacklight_configuration_helper.rb
 - app/helpers/blacklight_helper.rb
 - app/helpers/blacklight_url_helper.rb
 - app/helpers/catalog_helper.rb
+- app/helpers/component_helper.rb
 - app/helpers/facets_helper.rb
 - app/helpers/hash_as_hidden_fields_helper.rb
 - app/helpers/render_constraints_helper.rb
@@ -308,6 +311,9 @@ files:
 - app/models/solr_document.rb
 - app/views/_flash_msg.html.erb
 - app/views/_user_util_links.html.erb
+- app/views/blacklight/nav/_bookmark.html.erb
+- app/views/blacklight/nav/_saved_searches.html.erb
+- app/views/blacklight/nav/_search_history.html.erb
 - app/views/bookmarks/_tools.html.erb
 - app/views/bookmarks/index.html.erb
 - app/views/catalog/_bookmark_control.html.erb
@@ -316,6 +322,7 @@ files:
 - app/views/catalog/_constraints_element.html.erb
 - app/views/catalog/_did_you_mean.html.erb
 - app/views/catalog/_document.html.erb
+- app/views/catalog/_document_action.html.erb
 - app/views/catalog/_document_list.html.erb
 - app/views/catalog/_email_form.html.erb
 - app/views/catalog/_facet_layout.html.erb
@@ -353,6 +360,7 @@ files:
 - app/views/catalog/citation.js.erb
 - app/views/catalog/email.html.erb
 - app/views/catalog/email_sent.html.erb
+- app/views/catalog/email_success.html.erb
 - app/views/catalog/facet.html.erb
 - app/views/catalog/index.atom.builder
 - app/views/catalog/index.html.erb
@@ -364,6 +372,7 @@ files:
 - app/views/catalog/show.refworks.erb
 - app/views/catalog/sms.html.erb
 - app/views/catalog/sms_sent.html.erb
+- app/views/catalog/sms_success.html.erb
 - app/views/kaminari/blacklight/_first_page.html.erb
 - app/views/kaminari/blacklight/_gap.html.erb
 - app/views/kaminari/blacklight/_last_page.html.erb
@@ -395,7 +404,9 @@ files:
 - db/migrate/20140320000000_add_polymorphic_type_to_bookmarks.rb
 - lib/blacklight.rb
 - lib/blacklight/base.rb
+- lib/blacklight/bookmarks.rb
 - lib/blacklight/catalog.rb
+- lib/blacklight/catalog/component_configuration.rb
 - lib/blacklight/catalog/search_context.rb
 - lib/blacklight/configurable.rb
 - lib/blacklight/configuration.rb
@@ -404,6 +415,7 @@ files:
 - lib/blacklight/configuration/search_field.rb
 - lib/blacklight/configuration/solr_field.rb
 - lib/blacklight/configuration/sort_field.rb
+- lib/blacklight/configuration/tool_config.rb
 - lib/blacklight/configuration/view_config.rb
 - lib/blacklight/controller.rb
 - lib/blacklight/document_presenter.rb
@@ -426,6 +438,7 @@ files:
 - lib/blacklight/solr/facet_paginator.rb
 - lib/blacklight/solr/request.rb
 - lib/blacklight/solr_helper.rb
+- lib/blacklight/solr_repository.rb
 - lib/blacklight/solr_response.rb
 - lib/blacklight/solr_response/facets.rb
 - lib/blacklight/solr_response/group.rb
@@ -434,6 +447,7 @@ files:
 - lib/blacklight/solr_response/pagination_methods.rb
 - lib/blacklight/solr_response/response.rb
 - lib/blacklight/solr_response/spelling.rb
+- lib/blacklight/token_based_user.rb
 - lib/blacklight/user.rb
 - lib/blacklight/utils.rb
 - lib/blacklight/version.rb
@@ -451,6 +465,7 @@ files:
 - lib/generators/blacklight/test_support_generator.rb
 - lib/railties/blacklight.rake
 - solr/sample_solr_documents.yml
+- spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
@@ -478,6 +493,7 @@ files:
 - spec/helpers/render_constraints_helper_spec.rb
 - spec/helpers/search_history_constraints_helper_spec.rb
 - spec/helpers/url_helper_spec.rb
+- spec/lib/blacklight/catalog/component_configuration_spec.rb
 - spec/lib/blacklight/configurable_spec.rb
 - spec/lib/blacklight/configuration_spec.rb
 - spec/lib/blacklight/facet_paginator_spec.rb
@@ -490,6 +506,7 @@ files:
 - spec/lib/blacklight/solr/document_spec.rb
 - spec/lib/blacklight/solr/request_spec.rb
 - spec/lib/blacklight/solr_helper_spec.rb
+- spec/lib/blacklight/solr_repository_spec.rb
 - spec/lib/blacklight/solr_response/facets_spec.rb
 - spec/lib/blacklight/solr_response/group_response_spec.rb
 - spec/lib/blacklight/solr_response/group_spec.rb
@@ -524,6 +541,7 @@ files:
 - spec/views/catalog/_search_header.erb_spec.rb
 - spec/views/catalog/_show_default.erb_spec.rb
 - spec/views/catalog/_show_sidebar.erb_spec.rb
+- spec/views/catalog/_show_tools.html.erb_spec.rb
 - spec/views/catalog/_sort_and_per_page.html.erb_spec.rb
 - spec/views/catalog/_thumbnail_default.erb_spec.rb
 - spec/views/catalog/_view_type_group.html.erb_spec.rb
@@ -560,6 +578,7 @@ specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)
   index.
 test_files:
+- spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
@@ -587,6 +606,7 @@ test_files:
 - spec/helpers/render_constraints_helper_spec.rb
 - spec/helpers/search_history_constraints_helper_spec.rb
 - spec/helpers/url_helper_spec.rb
+- spec/lib/blacklight/catalog/component_configuration_spec.rb
 - spec/lib/blacklight/configurable_spec.rb
 - spec/lib/blacklight/configuration_spec.rb
 - spec/lib/blacklight/facet_paginator_spec.rb
@@ -599,6 +619,7 @@ test_files:
 - spec/lib/blacklight/solr/document_spec.rb
 - spec/lib/blacklight/solr/request_spec.rb
 - spec/lib/blacklight/solr_helper_spec.rb
+- spec/lib/blacklight/solr_repository_spec.rb
 - spec/lib/blacklight/solr_response/facets_spec.rb
 - spec/lib/blacklight/solr_response/group_response_spec.rb
 - spec/lib/blacklight/solr_response/group_spec.rb
@@ -633,6 +654,7 @@ test_files:
 - spec/views/catalog/_search_header.erb_spec.rb
 - spec/views/catalog/_show_default.erb_spec.rb
 - spec/views/catalog/_show_sidebar.erb_spec.rb
+- spec/views/catalog/_show_tools.html.erb_spec.rb
 - spec/views/catalog/_sort_and_per_page.html.erb_spec.rb
 - spec/views/catalog/_thumbnail_default.erb_spec.rb
 - spec/views/catalog/_view_type_group.html.erb_spec.rb