blacklight 7.11.1 → 7.12.0

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

@@ -16,56 +16,56 @@ RSpec.describe "catalog/_show_tools.html.erb" do
 
     it "renders a document action" do
       allow(view).to receive(:some_action_solr_document_path).with(document, any_args).and_return 'x'
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action'
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).to have_link "Some action", href: "x"
     end
 
     it "uses the provided label" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new label: "Some label", partial: 'document_action'
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, label: "Some label", partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).to have_selector '.some_action', text: "Some label"
     end
 
     it "evaluates a document action's if configurations" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new if: false, partial: 'document_action'
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, if: false, partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).not_to have_selector '.some_action', text: "Some action"
     end
 
     it "evaluates a document action's if configuration with a proc" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', if: proc { |_config, doc| doc.id == "xyz" }
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action', if: proc { |_config, doc| doc.id == "xyz" }
       render partial: 'catalog/show_tools'
       expect(rendered).not_to have_selector '.some_action', text: "Some action"
     end
 
     it "evaluates a document action's unless configurations" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', unless: true
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action', unless: true
       render partial: 'catalog/show_tools'
       expect(rendered).not_to have_selector '.some_action', text: "Some action"
     end
 
     it "allows the tool to have a custom id" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', id: "some_action"
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action', id: "some_action"
       render partial: 'catalog/show_tools'
       expect(rendered).to have_selector '#some_action', text: "Some action"
     end
 
     it "defaults to modal behavior" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action'
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action'
       render partial: 'catalog/show_tools'
       expect(rendered).to have_selector '.some_action > a[data-blacklight-modal="trigger"]', text: "Some action"
     end
 
     it "allows configuration to opt out of modal behavior" do
       allow(view).to receive(:some_action_solr_document_path).and_return "x"
-      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new partial: 'document_action', modal: false
+      document_actions[:some_action] = Blacklight::Configuration::ToolConfig.new key: :some_action, name: :some_action, partial: 'document_action', modal: false
       render partial: 'catalog/show_tools'
       expect(rendered).not_to have_selector '.some_action > a[data-blacklight-modal="trigger"]', text: "Some action"
     end

data/spec/views/catalog/show.json.jbuilder_spec.rb

@@ -17,6 +17,7 @@ RSpec.describe "catalog/show.json" do
 
   before do
     allow(view).to receive(:blacklight_config).and_return(config)
+    allow(view).to receive(:action_name).and_return('show')
     assign :document, document
   end
 

data/tasks/blacklight.rake

@@ -10,25 +10,40 @@ end
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop)
 
+require 'solr_wrapper'
+require 'open3'
+
+def system_with_error_handling(*args)
+  Open3.popen3(*args) do |stdout, stderr, status, _thread|
+    puts stdout.read
+    raise "Unable to run #{args.inspect}: #{stderr.read}" unless status.success?
+  end
+end
+
 def with_solr
-  puts "Starting Solr"
-  system "docker-compose up -d solr"
-  yield
-ensure
-  puts "Stopping Solr"
-  system "docker-compose stop solr"
+  if system('docker-compose')
+    begin
+      puts "Starting Solr"
+      system_with_error_handling "docker-compose up -d solr"
+      yield
+    ensure
+      puts "Stopping Solr"
+      system_with_error_handling "docker-compose stop solr"
+    end
+  else
+    SolrWrapper.wrap do |solr|
+      solr.with_collection do
+        yield
+      end
+    end
+  end
 end
 
 # rubocop:disable Rails/RakeEnvironment
 desc "Run test suite"
 task :ci do
   with_solr do
-    Rake::Task['engine_cart:generate'].invoke
-
-    within_test_app do
-      system "RAILS_ENV=test bin/rake blacklight:index:seed"
-    end
-
+    Rake::Task['blacklight:internal:seed'].invoke
     Rake::Task['blacklight:coverage'].invoke
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.11.1
+  version: 7.12.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -311,6 +311,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: solr_wrapper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   Blacklight is an open source Solr user interface discovery platform.
       You can use Blacklight to enable searching and browsing of your
@@ -332,6 +346,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".solr_wrapper.yml"
 - ".travis.yml"
 - ".yardopts"
 - CONTRIBUTING.md
@@ -366,23 +381,39 @@ files:
 - app/assets/stylesheets/blacklight/blacklight.scss
 - app/assets/stylesheets/blacklight/blacklight_defaults.scss
 - app/builders/blacklight/action_builder.rb
+- app/components/blacklight/constraint_component.html.erb
+- app/components/blacklight/constraint_component.rb
 - app/components/blacklight/constraint_layout_component.html.erb
 - app/components/blacklight/constraint_layout_component.rb
+- app/components/blacklight/constraints_component.html.erb
+- app/components/blacklight/constraints_component.rb
+- app/components/blacklight/document/action_component.html.erb
+- app/components/blacklight/document/action_component.rb
+- app/components/blacklight/document/actions_component.html.erb
+- app/components/blacklight/document/actions_component.rb
 - app/components/blacklight/document/bookmark_component.html.erb
 - app/components/blacklight/document/bookmark_component.rb
 - app/components/blacklight/document/citation_component.html.erb
 - app/components/blacklight/document/citation_component.rb
+- app/components/blacklight/document/group_component.html.erb
+- app/components/blacklight/document/group_component.rb
 - app/components/blacklight/document/more_like_this_component.html.erb
 - app/components/blacklight/document/more_like_this_component.rb
+- app/components/blacklight/document/thumbnail_component.html.erb
+- app/components/blacklight/document/thumbnail_component.rb
 - app/components/blacklight/document_component.html.erb
 - app/components/blacklight/document_component.rb
 - app/components/blacklight/document_metadata_component.html.erb
 - app/components/blacklight/document_metadata_component.rb
 - app/components/blacklight/facet_field_component.html.erb
 - app/components/blacklight/facet_field_component.rb
+- app/components/blacklight/facet_field_filter_component.html.erb
+- app/components/blacklight/facet_field_filter_component.rb
 - app/components/blacklight/facet_field_list_component.html.erb
 - app/components/blacklight/facet_field_list_component.rb
 - app/components/blacklight/facet_field_no_layout_component.rb
+- app/components/blacklight/facet_field_pagination_component.html.erb
+- app/components/blacklight/facet_field_pagination_component.rb
 - app/components/blacklight/facet_item_component.rb
 - app/components/blacklight/facet_item_pivot_component.rb
 - app/components/blacklight/metadata_field_component.html.erb
@@ -397,12 +428,16 @@ files:
 - app/components/blacklight/response/sort_component.rb
 - app/components/blacklight/response/spellcheck_component.html.erb
 - app/components/blacklight/response/spellcheck_component.rb
+- app/components/blacklight/response/view_type_component.html.erb
+- app/components/blacklight/response/view_type_component.rb
 - app/components/blacklight/search_bar_component.html.erb
 - app/components/blacklight/search_bar_component.rb
 - app/components/blacklight/search_context_component.html.erb
 - app/components/blacklight/search_context_component.rb
 - app/components/blacklight/system/dropdown_component.html.erb
 - app/components/blacklight/system/dropdown_component.rb
+- app/components/blacklight/system/flash_message_component.html.erb
+- app/components/blacklight/system/flash_message_component.rb
 - app/components/blacklight/system/modal_component.html.erb
 - app/components/blacklight/system/modal_component.rb
 - app/controllers/bookmarks_controller.rb
@@ -576,6 +611,7 @@ files:
 - blacklight.gemspec
 - config/i18n-tasks.yml
 - config/locales/blacklight.ar.yml
+- config/locales/blacklight.ca.yml
 - config/locales/blacklight.de.yml
 - config/locales/blacklight.en.yml
 - config/locales/blacklight.es.yml
@@ -595,11 +631,14 @@ files:
 - lib/blacklight/abstract_repository.rb
 - lib/blacklight/configuration.rb
 - lib/blacklight/configuration/context.rb
+- lib/blacklight/configuration/display_field.rb
 - lib/blacklight/configuration/facet_field.rb
 - lib/blacklight/configuration/field.rb
 - lib/blacklight/configuration/fields.rb
+- lib/blacklight/configuration/index_field.rb
 - lib/blacklight/configuration/null_field.rb
 - lib/blacklight/configuration/search_field.rb
+- lib/blacklight/configuration/show_field.rb
 - lib/blacklight/configuration/sort_field.rb
 - lib/blacklight/configuration/tool_config.rb
 - lib/blacklight/configuration/view_config.rb
@@ -666,12 +705,15 @@ files:
 - lib/railties/blacklight.rake
 - package.json
 - spec/components/blacklight/constraint_layout_component_spec.rb
+- spec/components/blacklight/document/action_component_spec.rb
+- spec/components/blacklight/document/group_component_spec.rb
 - spec/components/blacklight/document_component_spec.rb
 - spec/components/blacklight/document_metadata_component_spec.rb
 - spec/components/blacklight/facet_field_list_component_spec.rb
 - spec/components/blacklight/facet_item_component_spec.rb
 - spec/components/blacklight/facet_item_pivot_component_spec.rb
 - spec/components/blacklight/metadata_field_component_spec.rb
+- spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/blacklight/base_spec.rb
@@ -826,12 +868,15 @@ summary: Blacklight provides a discovery interface for any Solr (http://lucene.a
   index.
 test_files:
 - spec/components/blacklight/constraint_layout_component_spec.rb
+- spec/components/blacklight/document/action_component_spec.rb
+- spec/components/blacklight/document/group_component_spec.rb
 - spec/components/blacklight/document_component_spec.rb
 - spec/components/blacklight/document_metadata_component_spec.rb
 - spec/components/blacklight/facet_field_list_component_spec.rb
 - spec/components/blacklight/facet_item_component_spec.rb
 - spec/components/blacklight/facet_item_pivot_component_spec.rb
 - spec/components/blacklight/metadata_field_component_spec.rb
+- spec/components/blacklight/system/flash_message_component_spec.rb
 - spec/controllers/alternate_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/blacklight/base_spec.rb