diff --git a/app/controllers/concerns/blacklight/bookmarks.rb b/app/controllers/concerns/blacklight/bookmarks.rb index 47aa2736c0..5322bef62e 100644 --- a/app/controllers/concerns/blacklight/bookmarks.rb +++ b/app/controllers/concerns/blacklight/bookmarks.rb @@ -129,7 +129,7 @@ def clear redirect_to :action => "index" end - protected + private def verify_user unless current_or_guest_user || (action == "index" && token_or_current_or_guest_user) diff --git a/app/controllers/concerns/blacklight/catalog.rb b/app/controllers/concerns/blacklight/catalog.rb index 4e9a06b858..d6ce198217 100644 --- a/app/controllers/concerns/blacklight/catalog.rb +++ b/app/controllers/concerns/blacklight/catalog.rb @@ -140,7 +140,7 @@ def facet_limit_for(facet_field) end end - protected + private # # non-routable methods -> diff --git a/app/controllers/concerns/blacklight/controller.rb b/app/controllers/concerns/blacklight/controller.rb index d4060ce392..8c77bd8b65 100644 --- a/app/controllers/concerns/blacklight/controller.rb +++ b/app/controllers/concerns/blacklight/controller.rb @@ -50,7 +50,7 @@ def default_catalog_controller delegate :blacklight_config, to: :default_catalog_controller - protected + private ## # Context in which to evaluate blacklight configuration conditionals diff --git a/app/controllers/concerns/blacklight/saved_searches.rb b/app/controllers/concerns/blacklight/saved_searches.rb index c7a1d7173c..571a0c227a 100644 --- a/app/controllers/concerns/blacklight/saved_searches.rb +++ b/app/controllers/concerns/blacklight/saved_searches.rb @@ -63,7 +63,7 @@ def clear redirect_to blacklight.saved_searches_url end - protected + private def verify_user flash[:notice] = I18n.t('blacklight.saved_searches.need_login') && raise(Blacklight::Exceptions::AccessDenied) unless current_user diff --git a/app/controllers/concerns/blacklight/search_context.rb b/app/controllers/concerns/blacklight/search_context.rb index 693a3e9b4b..7d00c9fe51 100644 --- a/app/controllers/concerns/blacklight/search_context.rb +++ b/app/controllers/concerns/blacklight/search_context.rb @@ -15,7 +15,7 @@ def record_search_parameters opts = { only: :index } end end - protected + private # sets up the session[:search] hash if it doesn't already exist def search_session diff --git a/app/controllers/concerns/blacklight/token_based_user.rb b/app/controllers/concerns/blacklight/token_based_user.rb index e7173d01c4..671a0d44ac 100644 --- a/app/controllers/concerns/blacklight/token_based_user.rb +++ b/app/controllers/concerns/blacklight/token_based_user.rb @@ -10,7 +10,7 @@ module Blacklight::TokenBasedUser end end - protected + private def token_or_current_or_guest_user token_user || current_or_guest_user @@ -49,8 +49,6 @@ def message_encryptor ActiveSupport::MessageEncryptor.new(export_secret_token) end - private - # Ruby 2.4 requires keys of very particular lengths def key_len if ActiveSupport::MessageEncryptor.respond_to? :key_len diff --git a/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb b/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb index 1d168c8b9f..a5c0dea5c1 100644 --- a/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb +++ b/app/helpers/blacklight/hash_as_hidden_fields_helper_behavior.rb @@ -28,7 +28,7 @@ def render_hash_as_hidden_fields(hash) safe_join(hidden_fields, "\n") end - protected + private def flatten_hash(hash = params, ancestor_names = []) flat_hash = {} diff --git a/app/helpers/blacklight/render_partials_helper_behavior.rb b/app/helpers/blacklight/render_partials_helper_behavior.rb index 51d828e542..036c839b40 100644 --- a/app/helpers/blacklight/render_partials_helper_behavior.rb +++ b/app/helpers/blacklight/render_partials_helper_behavior.rb @@ -96,7 +96,7 @@ def document_index_path_templates ] end - protected + private ## # Return a partial name for rendering a document @@ -161,8 +161,6 @@ def document_partial_path_templates ] end - private - def find_document_show_template_with_view view_type, base_name, format, locals document_partial_path_templates.each do |str| partial = format(str, action_name: base_name, format: format, index_view_type: view_type) diff --git a/app/helpers/blacklight/url_helper_behavior.rb b/app/helpers/blacklight/url_helper_behavior.rb index 102aaa1f0b..65d6d86ad1 100644 --- a/app/helpers/blacklight/url_helper_behavior.rb +++ b/app/helpers/blacklight/url_helper_behavior.rb @@ -26,7 +26,7 @@ def link_to_document(doc, field_or_opts = nil, opts = { :counter => nil }) def document_link_params(doc, opts) session_tracking_params(doc, opts[:counter]).deep_merge(opts.except(:label, :counter)) end - protected :document_link_params + private :document_link_params ## # Link to the previous document in the current search context @@ -62,7 +62,7 @@ def session_tracking_params document, counter { data: { :'context-href' => path } } end - protected :session_tracking_params + private :session_tracking_params ## # Get the URL for tracking search sessions across pages using polymorphic routing diff --git a/app/presenters/blacklight/rendering/abstract_step.rb b/app/presenters/blacklight/rendering/abstract_step.rb index c0ee5f24aa..7872a4d603 100644 --- a/app/presenters/blacklight/rendering/abstract_step.rb +++ b/app/presenters/blacklight/rendering/abstract_step.rb @@ -12,7 +12,7 @@ def initialize(values, config, document, context, options, stack) attr_reader :values, :config, :document, :context, :options, :stack - protected + private def next_step(output_values) first, *rest = *stack diff --git a/app/presenters/blacklight/rendering/pipeline.rb b/app/presenters/blacklight/rendering/pipeline.rb index 832efeb9e4..5e7bd09bd5 100644 --- a/app/presenters/blacklight/rendering/pipeline.rb +++ b/app/presenters/blacklight/rendering/pipeline.rb @@ -26,7 +26,7 @@ def render first.new(values, config, document, context, options, rest).render end - protected + private # Ordered list of operations, Terminator must be at the end. def stack diff --git a/lib/blacklight/abstract_repository.rb b/lib/blacklight/abstract_repository.rb index 5b1a7ffeb0..a6baeb24e6 100644 --- a/lib/blacklight/abstract_repository.rb +++ b/lib/blacklight/abstract_repository.rb @@ -32,7 +32,7 @@ def search(_params = {}) raise NotImplementedError end - protected + private def connection_config blacklight_config.connection_config diff --git a/lib/blacklight/configuration/fields.rb b/lib/blacklight/configuration/fields.rb index 02c5f1b8eb..655372b0bd 100644 --- a/lib/blacklight/configuration/fields.rb +++ b/lib/blacklight/configuration/fields.rb @@ -135,7 +135,7 @@ def add_blacklight_field config_key, *args, &block self[config_key.pluralize][field_config.key] = field_config end - protected + private def luke_fields if @table[:luke_fields] == false @@ -194,8 +194,6 @@ def hash_arg_to_config(hash_arg, klass) end end - private - # convert a config key to the appropriate Field class def field_class_from_key key "Blacklight::Configuration::#{key.camelcase}".constantize diff --git a/lib/blacklight/search_builder.rb b/lib/blacklight/search_builder.rb index a2f96ec381..aae7183fbe 100644 --- a/lib/blacklight/search_builder.rb +++ b/lib/blacklight/search_builder.rb @@ -235,7 +235,7 @@ def search_field blacklight_config.search_fields[blacklight_params[:search_field]] end - protected + private def request Blacklight::Solr::Request.new diff --git a/lib/blacklight/solr/repository.rb b/lib/blacklight/solr/repository.rb index e5e06f8194..69d3cc193d 100644 --- a/lib/blacklight/solr/repository.rb +++ b/lib/blacklight/solr/repository.rb @@ -49,7 +49,7 @@ def send_and_receive(path, solr_params = {}) raise Blacklight::Exceptions::InvalidRequest, e.message end - protected + private def build_connection RSolr.connect(connection_config.merge(adapter: connection_config[:http_adapter]))