blacklight 6.21.0 → 6.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 481b96adfac07b1cb0009bc9969f299a3a5bab9f519b38c5f0b0f1ccd7a45ec6
-  data.tar.gz: 0c237ece3ec9a48dfd7ddfa45086ca64c807bef013f5f2a0357f47bebe84b0be
+  metadata.gz: fd14b6772e7c5627ce2b623fba876af4d008965be530552de9d3b879edada1f9
+  data.tar.gz: dbc0fe7d619a9259adabe10a8a92655ec56b2c4b7f00474d89914b86e10740f5
 SHA512:
-  metadata.gz: b94d6eb3e43c0fa7d5144370f43e3990491e5014977258782a775939bc12610b5fd7aa1c5521e3bbfb51785f652ca1fb8afdefd9f88ed078f56fdf3130152f20
-  data.tar.gz: 7dfc79605ae0f1763eed7322273dcdb1b66c9655c94522a5795dc9d122c412fb855aac1ecc43f43bc9b0eb7a0a037c494769f4265b4bfa2418ccef6305583c2a
+  metadata.gz: c4bd4e37af22eb9055ce3a6fb596f607aed1bedea8a215bebfbaf7863f16f8dac2d852528520116c1518daa0277168d92ab2599d5d8c274a2b8afe19f3d95a84
+  data.tar.gz: 7670f38bf4afe72c7697f4dbcd095aadf9cdb858659419c9f1979cf19fb25c83e0fc0736a0a55cba86a5b6fd4abec420c886f0a1f454c5db37e8a395d66a840b

data/VERSION

@@ -1 +1 @@
-6.21.0
+6.22.0

data/app/models/concerns/blacklight/document.rb

@@ -144,6 +144,22 @@ module Blacklight::Document
     def unique_key
       @unique_key ||= 'id'
     end
+
+    # Define an attribute reader on a document model
+    # @Example
+    #   class SolrDocument
+    #     include Blacklight::Solr::Document
+    #     attribute :title, Blacklight::Types::String, 'title_tesim'
+    #   end
+    #
+    #   doc = SolrDocument.new(title_tesim: ["One flew over the cuckoo's nest"])
+    #   doc.title
+    #   #=> "One flew over the cuckoo's nest"
+    def attribute(name, type, field)
+      define_method name do
+        type.coerce(self[field])
+      end
+    end
   end
 
   private

data/app/values/blacklight/types.rb

@@ -0,0 +1,28 @@
+module Blacklight
+  # These are data types that blacklight can use to coerce values from the index
+  module Types
+    class Array
+      def self.coerce(input)
+        ::Array.wrap(input)
+      end
+    end
+
+    class String
+      def self.coerce(input)
+        ::Array.wrap(input).first
+      end
+    end
+
+    class Date
+      def self.coerce(input)
+        field = String.coerce(input)
+        return if field.blank?
+        begin
+          ::Date.parse(field)
+        rescue ArgumentError
+          Rails.logger.info "Unable to parse date: #{field.first.inspect}"
+        end
+      end
+    end
+  end
+end

data/app/views/catalog/_per_page_widget.html.erb

@@ -7,7 +7,7 @@
   </button>
   <ul class="dropdown-menu" role="menu">
     <%- per_page_options_for_select.each do |(label, count)| %>
-      <li><%= link_to(label, url_for(search_state.params_for_search(per_page: count))) %></li>
+      <li role="menuitem"><%= link_to(label, url_for(search_state.params_for_search(per_page: count))) %></li>
     <%- end -%>
   </ul>
 </div>

data/app/views/catalog/_sort_widget.html.erb

@@ -6,7 +6,7 @@
 
   <ul class="dropdown-menu" role="menu">
       <%- active_sort_fields.each do |sort_key, field_config| %>
-        <li><%= link_to(sort_field_label(sort_key), url_for(search_state.params_for_search(sort: sort_key))) %></li>
+        <li role="menuitem"><%= link_to(sort_field_label(sort_key), url_for(search_state.params_for_search(sort: sort_key))) %></li>
       <%- end -%>
   </ul>
 </div>

data/spec/models/solr_document_spec.rb

@@ -18,10 +18,34 @@ RSpec.describe SolrDocument do
         it { is_expected.to eq ['Book'] }
       end
     end
-    
+
     describe "#id" do
       subject { solrdoc.id }
       it { is_expected.to eq '00282214' }
     end
   end
+
+  describe '.attribute' do
+    subject(:title) { document.title }
+    let(:doc_class) do
+      Class.new(SolrDocument) do
+        attribute :title, Blacklight::Types::String, 'title_tesim'
+        attribute :author, Blacklight::Types::Array, 'author_tesim'
+        attribute :date, Blacklight::Types::Date, 'date_dtsi'
+
+      end
+    end
+    let(:document) do
+      doc_class.new(id: '123',
+                    title_tesim: ['Good Omens'],
+                    author_tesim: ['Neil Gaiman', 'Terry Pratchett'],
+                    date_dtsi: '1990-01-01T00:00:00Z')
+    end
+
+    it "casts the attributes" do
+      expect(document.title).to eq 'Good Omens'
+      expect(document.author).to eq ['Neil Gaiman', 'Terry Pratchett']
+      expect(document.date).to eq Date.new(1990)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.21.0
+  version: 6.22.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -478,6 +478,7 @@ files:
 - app/presenters/blacklight/rendering/terminator.rb
 - app/presenters/blacklight/show_presenter.rb
 - app/services/blacklight/field_retriever.rb
+- app/values/blacklight/types.rb
 - app/views/_flash_msg.html.erb
 - app/views/_user_util_links.html.erb
 - app/views/blacklight/nav/_bookmark.html.erb