Merge pull request #1869 from projectblacklight/release-6.x-backports

Release 6.x backports

Author: jcoyne

.travis.yml

@@ -5,20 +5,22 @@ notifications:
   email: false
 
 rvm:
-  - 2.4.1
+  - 2.5.0
 
 matrix:
   include:
-    - rvm: 2.4.1
-      env: "RAILS_VERSION=4.2.8"
-    - rvm: 2.2.7
-      env: "RAILS_VERSION=5.0.3"
-    - rvm: 2.3.4
-      env: "RAILS_VERSION=5.1.1"
-    - rvm: jruby-9.1.7.0
-      env: "RAILS_VERSION=5.0.3 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
+    - rvm: 2.5.0
+      env: "RAILS_VERSION=5.2.0"
+    - rvm: 2.4.4
+      env: "RAILS_VERSION=4.2.10"
+    - rvm: 2.2.10
+      env: "RAILS_VESION=5.0.7"
+    - rvm: 2.3.7
+      env: "RAILS_VERSION=5.1.6"
+    - rvm: jruby-9.1.17.0
+      env: "RAILS_VERSION=5.2.0 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
   allow_failures:
-    - rvm: jruby-9.1.7.0
+    - rvm: jruby-9.1.17.0
   fast_finish: true
 
 before_install:

app/controllers/concerns/blacklight/catalog.rb

@@ -56,7 +56,7 @@ def track
       search_session['id'] = params[:search_id]
       search_session['per_page'] = params[:per_page]
 
-      if params[:redirect] and (params[:redirect].starts_with?('/') or params[:redirect] =~ URI.regexp)
+      if params[:redirect] and (params[:redirect].starts_with?('/') or params[:redirect] =~ URI::DEFAULT_PARSER.make_regexp)
         uri = URI.parse(params[:redirect])
         path = uri.query ? "#{uri.path}?#{uri.query}" : uri.path
         redirect_to path, status: 303

app/controllers/concerns/blacklight/token_based_user.rb

@@ -42,7 +42,22 @@ def encrypt_user_id(user_id, current_time = nil)
   end
 
   def export_secret_token
-    ActiveSupport::KeyGenerator.new(Rails.application.secrets.secret_key_base).generate_key('encrypted user session key')[0..(key_len - 1)]
+    secret_key_generator.generate_key('encrypted user session key')[0..(key_len - 1)]
+  end
+
+  def secret_key_generator
+    @secret_key_generator ||= begin
+      app = Rails.application
+
+      secret_key_base = if app.respond_to?(:credentials)
+                          # Rails 5.2+
+                          app.credentials.secret_key_base
+                        else
+                          # Rails <= 5.1
+                          app.secrets.secret_key_base
+                        end
+      ActiveSupport::KeyGenerator.new(secret_key_base)
+    end
   end
 
   def message_encryptor

app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -116,7 +116,9 @@ def document_has_value? document, field_config
   # @param [Blacklight::Solr::Response] response
   # @return [Boolean]
   def should_show_spellcheck_suggestions? response
-    response.total <= spell_check_max and response.spelling.words.any?
+    response.total <= spell_check_max &&
+      !response.spelling.nil? &&
+      response.spelling.words.any?
   end
 
   ##

app/helpers/blacklight/component_helper_behavior.rb

@@ -18,6 +18,8 @@ def document_action_path action_opts, url_opts = nil
     ##
     # Render "document actions" area for navigation header
     # (normally renders "Saved Searches", "History", "Bookmarks")
+    # These things are added by add_nav_action and the default config is
+    # provided by DefaultComponentConfiguration
     #
     # @param [Hash] options
     # @return [String]

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

@@ -8,6 +8,11 @@ module ActiveModelShim
     include ::ActiveModel::Conversion
 
     module ClassMethods
+      # This is actually an ActiveRecord method starting in Rails 5.2
+      def polymorphic_name
+        base_class.name
+      end
+
       def primary_key
         unique_key
       end

app/views/catalog/_facet_layout.html.erb

@@ -1,7 +1,7 @@
 <div class="panel panel-default facet_limit blacklight-<%= facet_field.key.parameterize %> <%= 'facet_limit-active' if facet_field_in_params?(facet_field.key) %>">
   <div class="<%= "collapsed" if should_collapse_facet?(facet_field) %> collapse-toggle panel-heading" data-toggle="collapse" data-target="#<%= facet_field_id(facet_field) %>">
     <h3 class="panel-title facet-field-heading">
-      <%= link_to facet_field_label(facet_field.key), "#", :"data-no-turbolink" => true %>
+      <%= link_to facet_field_label(facet_field.key), "#", :"data-turbolinks" => false, :"data-no-turbolink" => true %>
     </h3>
   </div>
   <div id="<%= facet_field_id(facet_field) %>" class="panel-collapse facet-content <%= should_collapse_facet?(facet_field) ? 'collapse' : 'in' %>">

lib/blacklight/configuration.rb

@@ -39,7 +39,7 @@ def default_values
           ##
           # === Single document request configuration
           ##
-          # The solr rqeuest handler to use when requesting only a single document
+          # The solr request handler to use when requesting only a single document
           document_solr_request_handler: 'document',
           # THe path to send single document requests to solr
           document_solr_path: nil,

lib/generators/blacklight/assets_generator.rb

@@ -9,12 +9,12 @@ def assets
       return if has_blacklight_assets?
 
       contents = "\n//\n// Required by Blacklight\n"
-      contents += "//= require jquery\n" if rails_5_1?
+      contents += "//= require jquery\n" if needs_jquery?
       contents += "//= require blacklight/blacklight\n"
 
       marker = if turbolinks?
                  '//= require turbolinks'
-               elsif rails_5_1?
+               elsif needs_jquery?
                  '//= require rails-ujs'
                else
                  '//= require jquery_ujs'
@@ -27,13 +27,13 @@ def assets
 
     # This is not a default in Rails 5.1
     def add_jquery
-      gem 'jquery-rails' if rails_5_1?
+      gem 'jquery-rails' if needs_jquery?
     end
 
     private
 
-    def rails_5_1?
-      Rails.version =~ /5\.1/
+    def needs_jquery?
+      Rails.version >= '5.1'
     end
 
     def turbolinks?

spec/features/facets_spec.rb

@@ -50,7 +50,19 @@
     expect(page).to have_selector '.facet-values li:first', text: "Japanese drama"
     expect(page).to have_css '.facet-values li', count: 20
   end
-  
+
+  it 'is able to expand facets when javascript is enabled', js: true do
+    visit root_path
+
+    expect(page).to have_css('#facet-format', visible: false)
+
+    page.find('h3.facet-field-heading a', text: 'Format').click
+
+    sleep(1) # let facet animation finish and wait for it to potentially re-collapse
+
+    expect(page).to have_css('#facet-format', visible: true) # assert that it didn't re-collapse
+  end
+
   describe '"More" links' do
     it 'has default more link with sr-only text' do
       visit root_path