blacklight 6.0.0.pre5 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7626335c66be4201927a8a1afbe8df051da1b4b0
-  data.tar.gz: 5bd3bfaac1b8b69940573d3172c7e0e8a97522af
+  metadata.gz: 2802ea5dc5949b20ebc3b5c5e2366d61946d7715
+  data.tar.gz: adadf86841b374b3715c107107837311a321ba2a
 SHA512:
-  metadata.gz: 814188a4b39df6c79dc2c993e0bc1ab879028b071b4341efcd4ebdb30594d1c3a8efb64b317d2f8e808d9dbc7ad029f5d313aff387711f2c21d6e8d7ac9107b0
-  data.tar.gz: 11a6ea22038b58e3240397a7e36dfe16c8c28730e18cbcedbe6fca188887fcce3ad8ff511757b5fe0d7c013420a458a424de3cb0c10fc4d01415c6c703248b3a
+  metadata.gz: f4751dfa6d0dca7e851681d115cd16c0f843e2336b077dd83b0a7c96396776f2558396ac98e7df3f27abc5ec6afb742af25b5136624b0fe32d5c81c7351929e2
+  data.tar.gz: 7a88648e6077a5da60640e8b819daad72784ecb893cea39698ec80e7195cf247b26b573f721cdc838c857eef60d265c74bdd36fe655dc856a8d0bd25470dd09c

data/.travis.yml

@@ -8,25 +8,25 @@ notifications:
   email: false
 
 rvm:
-  - 2.2.3
+  - 2.3.0
 
 matrix:
   include:
-    - rvm: 2.2.2
-      env: "RAILS_VERSION=4.1.13"
     - rvm: 2.1.6
-      env: "RAILS_VERSION=4.2.4"
-    - rvm: jruby-9.0.1.0
-      env: "RAILS_VERSION=4.2.4 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
+      env: "RAILS_VERSION=4.2.5"
+    - rvm: 2.2.4
+      env: "RAILS_VERSION=4.2.5"
+    - rvm: jruby-9.0.4.0
+      env: "RAILS_VERSION=4.2.5 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
   allow_failures:
-    - rvm: jruby-9.0.1.0
+    - rvm: jruby-9.0.4.0
   fast_finish: true
 
 before_install:
   - gem install bundler
 
 env:
- - "RAILS_VERSION=4.2.4"
+ - "RAILS_VERSION=4.2.5"
 
 notifications:
   irc: "irc.freenode.org#blacklight"

data/Gemfile

@@ -25,11 +25,20 @@ if File.exist?(file)
 else
   Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
 
-  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+  if ENV['RAILS_VERSION']
+    if ENV['RAILS_VERSION'] == 'edge'
+      gem 'rails', github: 'rails/rails'
+      ENV['ENGINE_CART_RAILS_OPTIONS']= "--edge --skip-turbolinks"
+    else
+      gem 'rails', ENV['RAILS_VERSION']
+    end
+  end
 
-  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
+  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4\.2/
     gem 'responders', "~> 2.0"
     gem 'sass-rails', ">= 5.0"
+  elsif ENV['RAILS_VERSION'] =~ /^5\.0/ || ENV['RAILS_VERSION'] == 'edge'
+    # nop
   else
     gem 'bootstrap-sass', '< 3.3.5' # 3.3.5 requires sass 3.3, incompatible with sass-rails 4.x
     gem 'sass-rails', "< 5.0"

data/VERSION

@@ -1 +1 @@
-6.0.0.pre5
+6.0.0

data/app/assets/stylesheets/blacklight/_facets.scss

@@ -68,17 +68,8 @@
   }
 
   @mixin hyphens-auto {
-    // breaks long words apart so they don't cause the containing div to
-    // be too big, also fix hypenation
-    -ms-word-break: keep-all;
-    word-break: keep-all;
-
-    // Non standard for webkit
-    word-break: break-word;
-
+    overflow-wrap: break-word;
     -webkit-hyphens: auto;
-    -moz-hyphens: auto;
-    -ms-hyphens: auto;
     -o-hyphens: auto;
     hyphens: auto;
   }

data/app/controllers/bookmarks_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class BookmarksController < CatalogController  
 
   include Blacklight::Bookmarks

data/app/controllers/catalog_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CatalogController < ApplicationController  
 
   include Blacklight::Catalog

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Blacklight::Base
   extend ActiveSupport::Concern
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # note that while this is mostly restful routing, the #update and #destroy actions
 # take the Solr document ID as the :id, NOT the id of the actual Bookmark action.
 module Blacklight::Bookmarks
@@ -90,7 +91,12 @@ module Blacklight::Bookmarks
         flash[:error] = I18n.t('blacklight.bookmarks.add.failure', :count => @bookmarks.length)
       end
 
-      redirect_to :back
+      if respond_to? :redirect_back
+        redirect_back fallback_location: bookmarks_path
+      else
+        # Deprecated in Rails 5.0
+        redirect_to :back
+      end
     end
   end
 
@@ -102,14 +108,20 @@ module Blacklight::Bookmarks
     if bookmark && bookmark.delete && bookmark.destroyed?
       if request.xhr?
         render(json: { bookmarks: { count: current_or_guest_user.bookmarks.count }})
+      elsif respond_to? :redirect_back
+        redirect_back fallback_location: bookmarks_path, notice: I18n.t('blacklight.bookmarks.remove.success')
       else
+        # Deprecated in Rails 5.0
         redirect_to :back, notice: I18n.t('blacklight.bookmarks.remove.success')
       end
     else
       if request.xhr?
         # ajaxy request needs no redirect and should not have flash set
         render(:text => "", :status => "500")
+      elsif respond_to? :redirect_back
+        redirect_back fallback_location: bookmarks_path, flash: { error: I18n.t('blacklight.bookmarks.remove.failure') }
       else
+        # Deprecated in Rails 5.0
         redirect_to :back, flash: { error: I18n.t('blacklight.bookmarks.remove.failure') }
       end
     end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Blacklight::Catalog
   extend ActiveSupport::Concern
 
@@ -147,6 +148,8 @@ module Blacklight::Catalog
             instance_exec &config
           when Symbol, String
             send config
+          else
+            render({})
           end
         end
       end
@@ -189,7 +192,10 @@ module Blacklight::Catalog
     # By default, any search action from a Blacklight::Catalog controller
     # should use the current controller when constructing the route.
     def search_action_url options = {}
-      url_for(options.merge(:action => 'index'))
+      raise "Options was not a hash (#{options.class}" unless options.is_a? Hash
+      # We don't want to permit here because one of the options could be :only_path, which is an option, but not a parameter
+      # options.permit!
+      url_for(options.merge(action: 'index'))
     end
 
      # Email Action (this will render the appropriate view on GET requests and process the form and send the email on POST requests)

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

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 # Filters added to this controller apply to all controllers in the hosting application
 # as this module is mixed-in to the application controller in the hosting app on installation.
-module Blacklight::Controller 
+module Blacklight::Controller
 
   extend ActiveSupport::Concern
-  
+
   included do
     include Blacklight::SearchFields
     helper Blacklight::SearchFields
@@ -11,9 +12,9 @@ module Blacklight::Controller
     include ActiveSupport::Callbacks
 
     # now in application.rb file under config.filter_parameters
-    # filter_parameter_logging :password, :password_confirmation 
+    # filter_parameter_logging :password, :password_confirmation
     helper_method :current_user_session, :current_user, :current_or_guest_user
-    after_filter :discard_flash_if_xhr    
+    after_action :discard_flash_if_xhr
 
     # handle basic authorization exception with #access_denied
     rescue_from Blacklight::Exceptions::AccessDenied, :with => :access_denied
@@ -76,7 +77,6 @@ module Blacklight::Controller
     end
 
     def search_action_path *args
-
       if args.first.is_a? Hash
         args.first[:only_path] = true
       end
@@ -85,7 +85,8 @@ module Blacklight::Controller
     end
 
     def search_facet_url options = {}
-      url_for params.merge(action: "facet").merge(options).except(:page)
+      opts = search_state.to_h.merge(action: "facet").merge(options).except(:page)
+      url_for opts
     end
 
     # Returns a list of Searches from the ids in the user's history.

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Blacklight
   module DefaultComponentConfiguration
     extend ActiveSupport::Concern

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Blacklight
   # These are methods that are used at both the view helper and controller layers
   # They are only dependent on `blacklight_config` and `@response`

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Blacklight
   module RequestBuilders
     extend ActiveSupport::Concern

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Blacklight::SearchContext
   extend ActiveSupport::Concern
 
@@ -14,24 +15,24 @@ module Blacklight::SearchContext
       before_action :current_search_session, opts
     end
   end
-  
+
   protected
 
   # sets up the session[:search] hash if it doesn't already exist
   def search_session
     session[:search] ||= {}
   end
-  
-  # The current search session 
+
+  # The current search session
   def current_search_session
 
     @current_search_session ||= if start_new_search_session?
-      find_or_initialize_search_session_from_params params
+      find_or_initialize_search_session_from_params search_state.to_h
     elsif params[:search_context].present?
       find_or_initialize_search_session_from_params JSON.load(params[:search_context])
     elsif params[:search_id].present?
       begin
-        # TODO : check the search id signature.      
+        # TODO: check the search id signature.
         searches_from_history.find(params[:search_id])
       rescue ActiveRecord::RecordNotFound
         nil
@@ -63,10 +64,8 @@ module Blacklight::SearchContext
 
     saved_search = searches_from_history.find { |x| x.query_params == params_copy }
 
-    saved_search ||= begin
-      s = Search.create(:query_params => params_copy)
+    saved_search ||= Search.create(query_params: params_copy).tap do |s|
       add_to_search_history(s)
-      s
     end
   end
 
@@ -77,13 +76,11 @@ module Blacklight::SearchContext
     session[:history].unshift(search.id)
 
     if session[:history].length > blacklight_config.search_history_window
-
       session[:history] = session[:history].slice(0, blacklight_config.search_history_window )
-      
     end
   end
 
-  # A list of query parameters that should not be persisted for a search      
+  # A list of query parameters that should not be persisted for a search
   def blacklisted_search_session_params
     [:commit, :counter, :total, :search_id, :page, :per_page]
   end
@@ -103,5 +100,4 @@ module Blacklight::SearchContext
   rescue Blacklight::Exceptions::InvalidRequest => e
     logger.warn "Unable to setup next and previous documents: #{e}"
   end
-
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Module to deal with accessing (and setting some defaults) in an array of
 # hashes that describe Blacklight search fields.  Requires the base class this

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # SearchHelper is a controller layer mixin. It is in the controller scope: request params, session etc.
 # 
 # NOTE: Be careful when creating variables here as they may be overriding something that already exists.
@@ -76,7 +77,7 @@ module Blacklight::SearchHelper
   # @return [Blacklight::Solr::Response, Blacklight::SolrDocument] the solr response object and the first document
   def fetch(id=nil, extra_controller_params={})
     if id.is_a? Array
-      fetch_many(id, params, extra_controller_params)
+      fetch_many(id, search_state.to_h, extra_controller_params)
     else
       fetch_one(id, extra_controller_params)
     end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+module Blacklight
+  module SearchHistory
+    extend ActiveSupport::Concern
+    include Blacklight::Configurable
+
+    included do
+      copy_blacklight_config_from(CatalogController)
+    end
+
+    def index
+      @searches = searches_from_history
+    end
+
+    # TODO: we may want to remove unsaved (those without user_id) items from
+    # the database when removed from history
+    def clear
+      if session[:history].clear
+        flash[:notice] = I18n.t('blacklight.search_history.clear.success')
+      else
+        flash[:error] = I18n.t('blacklight.search_history.clear.failure')
+      end
+
+      if respond_to? :redirect_back
+        redirect_back fallback_location: blacklight.search_history_path
+      else
+        # Deprecated in Rails 5.0
+        redirect_to :back
+      end
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Blacklight
   module Suggest
     extend ActiveSupport::Concern

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Blacklight
   class SuggestSearch
     attr_reader :request_params, :repository

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Blacklight::TokenBasedUser
   extend ActiveSupport::Concern
 

data/app/controllers/saved_searches_controller.rb

@@ -1,22 +1,28 @@
+# frozen_string_literal: true
 class SavedSearchesController < ApplicationController
   include Blacklight::Configurable
 
   copy_blacklight_config_from(CatalogController)
   before_action :require_user_authentication_provider
   before_action :verify_user
-  
+
   def index
     @searches = current_user.searches
   end
-  
-  def save    
+
+  def save
     current_user.searches << searches_from_history.find(params[:id])
     if current_user.save
       flash[:notice] = I18n.t('blacklight.saved_searches.add.success')
     else
       flash[:error] = I18n.t('blacklight.saved_searches.add.failure')
     end
-    redirect_to :back
+    if respond_to? :redirect_back
+      redirect_back fallback_location: blacklight.saved_searches_path
+    else
+      # Deprecated in Rails 5.0
+      redirect_to :back
+    end
   end
 
   # Only dereferences the user rather than removing the item in case it
@@ -30,22 +36,27 @@ class SavedSearchesController < ApplicationController
     else
       flash[:error] = I18n.t('blacklight.saved_searches.remove.failure')
     end
-    redirect_to :back
+    if respond_to? :redirect_back
+      redirect_back fallback_location: blacklight.saved_searches_path
+    else
+      # Deprecated in Rails 5.0
+      redirect_to :back
+    end
   end
-  
+
   # Only dereferences the user rather than removing the items in case they
   # are in the session[:history]
-  def clear    
+  def clear
     if current_user.searches.update_all("user_id = NULL")
       flash[:notice] = I18n.t('blacklight.saved_searches.clear.success')
     else
-      flash[:error] = I18n.t('blacklight.saved_searches.clear.failure') 
+      flash[:error] = I18n.t('blacklight.saved_searches.clear.failure')
     end
     redirect_to blacklight.saved_searches_url
   end
 
-
   protected
+
   def verify_user
     flash[:notice] = I18n.t('blacklight.saved_searches.need_login') and raise Blacklight::Exceptions::AccessDenied unless current_user
   end