blacklight 7.17.0 → 7.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e26542ca54e79594290b86c0506e4bc3a26a225d84e17537893381b4ad2c421
-  data.tar.gz: c812f19a30e663a1350888600307e7ba1b089b8794570eeadb38f89a6de57d27
+  metadata.gz: f227a710168987edeacfacb142e75e3f4da8d8b97459e12d78d7d417dbd120e0
+  data.tar.gz: 0ac65066624e2f63adce77f2c12e5d27ed2c73e5d829e61698453ceac1f138ce
 SHA512:
-  metadata.gz: 8f167c42362e5372a681777ce1cd1a72bf6ca9f5762098686bc6bb8872f59afd3f110312d15c1436320b511df272281ddb04be6cf9c10620535389aa87c91169
-  data.tar.gz: 9ae4c4178d7eff8eb4656d03353fe4fb2cd4f66e32fffdebd8645275f213b26aadd9c8204c2feba9f6479160ad925ba220ce6e1ec59bff42f9ca298dfd7cbb5c
+  metadata.gz: 05d7e1930528ab837b325789d10f10bf9c5a32eacda6fccacf06a342d240a2d74390af8ee6e4e6a1dd891df059c44e4071ed3298d412e7cb09de05884b4e9dc8
+  data.tar.gz: 16457df300d3fb08648c21505161a6da11974008bb4923030cdc88181ca3ee5570a9476ff0cd55dee74b0639f9cd70c2a7b20b7d9aa33f7f7d5fdd57c5f732d4

data/VERSION

@@ -1 +1 @@
-7.17.0
+7.17.1

data/app/components/blacklight/response/view_type_button_component.rb

@@ -15,7 +15,9 @@ module Blacklight
       end
 
       def icon
-        @view_context.render_view_type_group_icon(@view)
+        Deprecation.silence(Blacklight::CatalogHelperBehavior) do
+          @view_context.render_view_type_group_icon(@view.icon || @key)
+        end
       end
 
       def label

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -253,11 +253,13 @@ module Blacklight::CatalogHelperBehavior
   ##
   # Render the view type icon for the results view picker
   #
+  # @deprecated
   # @param [String] view
   # @return [String]
   def render_view_type_group_icon view
     blacklight_icon(view)
   end
+  deprecation_deprecate render_view_type_group_icon: 'call blacklight_icon instead'
 
   ##
   # Get the default view type classes for a view in the results view picker

data/lib/blacklight/configuration/view_config.rb

@@ -11,6 +11,8 @@ class Blacklight::Configuration
     #   @return [String, Symbol] solr field to use to render a document title
     # @!attribute display_type_field
     #   @return [String, Symbol] solr field to use to render format-specific partials
+    # @!attribute icon
+    #   @return [String, Symbol] icon file to use in the view picker
     # @!attribute document_actions
     #   @return [NestedOpenStructWithHashAccess{Symbol => Blacklight::Configuration::ToolConfig}] 'tools' to render for each document
     def search_bar_presenter_class

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

@@ -3,13 +3,9 @@
 RSpec.describe "catalog/_view_type_group" do
   let(:blacklight_config) { Blacklight::Configuration.new }
   let(:response) { instance_double(Blacklight::Solr::Response, empty?: false) }
-  let(:icon_instance) { instance_double(Blacklight::Icon) }
 
   before do
     allow(view).to receive(:view_label), &:to_s
-    allow(Blacklight::Icon).to receive(:new).and_return icon_instance
-    allow(icon_instance).to receive(:svg).and_return '<svg></svg>'
-    allow(icon_instance).to receive(:options).and_return({})
     allow(view).to receive_messages(how_sort_and_per_page?: true, blacklight_config: blacklight_config)
     controller.request.path_parameters[:action] = 'index'
     assign(:response, response)
@@ -24,13 +20,16 @@ RSpec.describe "catalog/_view_type_group" do
   it "displays the group" do
     blacklight_config.configure do |config|
       config.view.delete(:list)
-      config.view.a
-      config.view.b
-      config.view.c
+      config.view.a.icon = :list
+      config.view.b.icon = :list
+      config.view.c.icon = :list
     end
     render partial: 'catalog/view_type_group'
     expect(rendered).to have_selector('.btn-group.view-type-group')
     expect(rendered).to have_selector('.view-type-a', text: 'a')
+    within '.view-type-a' do
+      expect(rendered).to have_selector 'svg'
+    end
     expect(rendered).to have_selector('.view-type-b', text: 'b')
     expect(rendered).to have_selector('.view-type-c', text: 'c')
   end
@@ -38,8 +37,8 @@ RSpec.describe "catalog/_view_type_group" do
   it "sets the current view to 'active'" do
     blacklight_config.configure do |config|
       config.view.delete(:list)
-      config.view.a
-      config.view.b
+      config.view.a.icon = :list
+      config.view.b.icon = :list
     end
     render partial: 'catalog/view_type_group'
     expect(rendered).to have_selector('.active', text: 'a')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.17.0
+  version: 7.17.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails