blacklight 6.14.1 → 6.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0781d81bd7e6f463adbda8b8c18ce4e36b1d942e'
-  data.tar.gz: 9eb7e235b9c918d98a464a67970d4ada88d7305f
+  metadata.gz: 06d38d95ca2b94c85c6bfe14077f338c8fa276f8
+  data.tar.gz: f35d49bcdf90238709a06a7f16dfa898dd38a761
 SHA512:
-  metadata.gz: 712ee1f20420f59b322bcfa87f2fcbde9485e4b592f336cf83a40a6d4c36c3ba35ea40f3eb68b609fb81414729540789c610aa74fd0646425b7f34823bae8ed7
-  data.tar.gz: 75adfcc650cb16ee515d0a6180a0e9de4bfd12d2d85ac4faf22db20dfa21dbd46345da050321eb334428d0511bcf23dd0662ab79aa11e47d6a81a3b2bc7a9c4f
+  metadata.gz: 3562e9f56ffb61d1c5995f9312f138384b5f47d7d0ce150fcbcf348fe91e3cd3fc9584f021e3e21e53728da1bf97d10408f5b5f4346bc213c6a9b274607d959c
+  data.tar.gz: 1584a23ffb76aabe4b21a6260be9fafe46dadeae7fd96834c79ad2c223b2714073d69b838acce7af65fc58955b585e80828efd3db702523d5635dcafecf6a93b

data/.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:

data/VERSION

@@ -1 +1 @@
-6.14.1
+6.15.0

data/app/assets/javascripts/blacklight/checkbox_submit.js

@@ -49,7 +49,7 @@
         var unique_id = form.attr("data-doc-id") || Math.random();
         // if form is currently using method delete to change state, 
         // then checkbox is currently checked
-        var checked = (form.find("input[name=_method][value=delete]").size() != 0);
+        var checked = (form.find("input[name=_method][value=delete]").length != 0);
             
         var checkbox = $('<input type="checkbox">')	    
           .addClass( options.css_class )

data/app/assets/javascripts/blacklight/core.js

@@ -9,31 +9,22 @@ Blacklight = function() {
       for(var i = 0; i < buffer.length; i++) {
         buffer[i].call();
       }
-    },
-
-    listeners: function () {
-      var listeners = [];
-      if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
-        // Turbolinks 5
-        if (Turbolinks.BrowserAdapter) {
-          listeners.push('turbolinks:load');
-        } else {
-          // Turbolinks < 5
-          listeners.push('page:load', 'ready');
-        }
-      } else {
-        listeners.push('ready');
-      }
-
-      return listeners.join(' ');
     }
   };
 }();
 
 // turbolinks triggers page:load events on page transition
-// If app isn't using turbolinks, this event will never be triggered, no prob. 
-$(document).on(Blacklight.listeners(), function() {
-  Blacklight.activate();  
-});
-
-
+// If app isn't using turbolinks, this event will never be triggered, no prob.
+// $(document).on('ready') is deprecated in JQuery 1.8
+if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
+  // Turbolinks 5
+  if (Turbolinks.BrowserAdapter) {
+    $(document).on('turbolinks:load', function() { Blacklight.activate(); });
+  } else {
+    // Turbolinks < 5
+    $(document).on('page:load', function() { Blacklight.activate(); });
+    $(document).ready(function() { Blacklight.activate(); });
+  }
+} else {
+  $(document).ready(function() { Blacklight.activate(); });
+}

data/app/controllers/concerns/blacklight/catalog.rb

@@ -56,7 +56,7 @@ module Blacklight::Catalog
       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

data/app/controllers/concerns/blacklight/token_based_user.rb

@@ -42,7 +42,22 @@ module Blacklight::TokenBasedUser
   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

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -116,7 +116,9 @@ module Blacklight::BlacklightHelperBehavior
   # @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
 
   ##

data/app/helpers/blacklight/component_helper_behavior.rb

@@ -18,6 +18,8 @@ module Blacklight
     ##
     # 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]

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

@@ -8,6 +8,11 @@ module Blacklight::Document
     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

data/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' %>">

data/lib/blacklight/configuration.rb

@@ -39,7 +39,7 @@ module Blacklight
           ##
           # === 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,

data/lib/generators/blacklight/assets_generator.rb

@@ -9,12 +9,12 @@ module Blacklight
       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 @@ module Blacklight
 
     # 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?

data/spec/features/facets_spec.rb

@@ -50,7 +50,19 @@ describe "Facets" do
     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

data/spec/helpers/blacklight_helper_spec.rb

@@ -240,7 +240,7 @@ describe BlacklightHelper do
       response = double(total: 10)
       expect(helper.should_show_spellcheck_suggestions? response).to be false
     end
-    it "onlies show suggestions if there are very few results" do
+    it "only shows suggestions if there are very few results" do
       response = double(total: 4, spelling: double(words: [1]))
       expect(helper.should_show_spellcheck_suggestions? response).to be true
     end
@@ -248,6 +248,10 @@ describe BlacklightHelper do
       response = double(total: 4, spelling: double(words: []))
       expect(helper.should_show_spellcheck_suggestions? response).to be false
     end
+    it "does not show suggestions if spelling is not available" do
+      response = double(total: 4, spelling: nil)
+      expect(helper.should_show_spellcheck_suggestions? response).to be false
+    end
   end
 
   describe "#render_document_partials" do

data/spec/test_app_templates/Gemfile.extra

@@ -1,4 +1,5 @@
 if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^5\./ || ENV['RAILS_VERSION'] == 'edge'
   gem 'rails-controller-testing'
+  gem 'thor', '~> 0.20'
   gem 'deprecation'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.14.1
+  version: 6.15.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails