blacklight_advanced_search 6.4.1 → 8.0.0.alpha2

data/config/jetty.yml

@@ -1,4 +0,0 @@
-default:
-  startup_wait: 15
-  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %> 
-  <%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>

data/config/locales/blacklight_advanced_search.en.yml

@@ -1,12 +0,0 @@
-en:
-  blacklight_advanced_search:
-    all: all
-    any: any
-    form:
-      title: More Search Options
-      search_context: Within search
-      limit_criteria_heading_html: "<strong>AND</strong> have these attributes"
-      query_criteria_heading_html: "Find items that match %{select_menu} of"
-      sort_label: "Sort results by"
-      start_over: "Start over"
-      search_btn: 'Search'

data/lib/blacklight_advanced_search/catalog_helper_override.rb

@@ -1,30 +0,0 @@
-module BlacklightAdvancedSearch::CatalogHelperOverride
-  # Special display for facet limits that include adv search inclusive
-  # or limits.
-  def facet_partial_name(display_facet = nil)
-    return "blacklight_advanced_search/facet_limit" if advanced_query && advanced_query.filters.keys.include?(display_facet.name)
-    super
-  end
-
-  def remove_advanced_facet_param(field, value, my_params = params)
-    my_params = Blacklight::SearchState.new(my_params, blacklight_config).to_h
-    if (my_params[:f_inclusive] &&
-        my_params[:f_inclusive][field] &&
-        my_params[:f_inclusive][field].include?(value))
-
-      my_params[:f_inclusive] = my_params[:f_inclusive].dup
-      my_params[:f_inclusive][field] = my_params[:f_inclusive][field].dup
-      my_params[:f_inclusive][field].delete(value)
-
-      my_params[:f_inclusive].delete(field) if my_params[:f_inclusive][field].empty?
-
-      my_params.delete(:f_inclusive) if my_params[:f_inclusive].empty?
-    end
-
-    my_params.delete_if do |key, _value|
-      [:page, :id, :counter, :commit].include?(key)
-    end
-
-    my_params
-  end
-end

data/lib/blacklight_advanced_search/filter_parser.rb

@@ -1,11 +0,0 @@
-module BlacklightAdvancedSearch::FilterParser
-  # Returns an array of solr :fq params. taking advanced search inclusive
-  # facet value lists out of params.
-  def generate_solr_fq
-    filters.map do |solr_field, value_list|
-      "#{solr_field}:(" +
-        Array(value_list).collect { |v| '"' + v.gsub('"', '\"') + '"' }.join(" OR  ") +
-        ")"
-    end
-  end
-end

data/lib/blacklight_advanced_search/parsing_nesting_parser.rb

@@ -1,15 +0,0 @@
-require 'parsing_nesting/tree'
-module BlacklightAdvancedSearch::ParsingNestingParser
-  def process_query(_params, config)
-    queries = keyword_queries.map do |field, query|
-      ParsingNesting::Tree.parse(query, config.advanced_search[:query_parser]).to_query(local_param_hash(field, config))
-    end
-    queries.join(" #{keyword_op} ")
-  end
-
-  def local_param_hash(key, config)
-    field_def = config.search_fields[key]
-
-    (field_def[:solr_adv_parameters] || field_def[:solr_parameters] || {}).merge(field_def[:solr_local_parameters] || {})
-  end
-end

data/lib/blacklight_advanced_search/render_constraints_override.rb

@@ -1,136 +0,0 @@
-# Meant to be applied on top of Blacklight view helpers, to over-ride
-# certain methods from RenderConstraintsHelper (newish in BL),
-# to effect constraints rendering and search history rendering,
-module BlacklightAdvancedSearch::RenderConstraintsOverride
-  def query_has_constraints?(localized_params = params)
-    if is_advanced_search? localized_params
-      true
-    else
-      !(localized_params[:q].blank? && localized_params[:f].blank? && localized_params[:f_inclusive].blank?)
-    end
-  end
-
-  # Over-ride of Blacklight method, provide advanced constraints if needed,
-  # otherwise call super.
-  def render_constraints_query(my_params = params)
-    if (advanced_query.nil? || advanced_query.keyword_queries.empty?)
-      return super(my_params)
-    else
-      content = []
-      advanced_query.keyword_queries.each_pair do |field, query|
-        label = search_field_def_for_key(field)[:label]
-        content << render_constraint_element(
-          label, query,
-          :remove =>
-            search_action_path(remove_advanced_keyword_query(field, my_params).except(:controller, :action))
-        )
-      end
-      if (advanced_query.keyword_op == "OR" &&
-          advanced_query.keyword_queries.length > 1)
-        content.unshift content_tag(:span, "Any of:", class: 'operator')
-        content_tag :span, class: "inclusive_or appliedFilter well" do
-          safe_join(content.flatten, "\n")
-        end
-      else
-        safe_join(content.flatten, "\n")
-      end
-    end
-  end
-
-  # Over-ride of Blacklight method, provide advanced constraints if needed,
-  # otherwise call super.
-  def render_constraints_filters(my_params = params)
-    content = super(my_params)
-
-    if advanced_query
-      advanced_query.filters.each_pair do |field, value_list|
-        label = facet_field_label(field)
-        content << render_constraint_element(label,
-          safe_join(Array(value_list), " <strong class='text-muted constraint-connector'>OR</strong> ".html_safe),
-          :remove => search_action_path(remove_advanced_filter_group(field, my_params).except(:controller, :action))
-                                            )
-      end
-    end
-
-    content
-  end
-
-  # override of BL method, so our inclusive facet selections
-  # are still recgonized for eg highlighting facet with selected
-  # values.
-  def facet_field_in_params?(field)
-    return true if super
-
-    # otherwise use our own logic.
-    query = BlacklightAdvancedSearch::QueryParser.new(params, self.blacklight_config)
-    return true if query.filters.keys.include?(field)
-
-    false
-  end
-
-  def render_search_to_s_filters(my_params)
-    content = super(my_params)
-
-    advanced_query = BlacklightAdvancedSearch::QueryParser.new(my_params, blacklight_config)
-
-    unless advanced_query.filters.empty?
-      advanced_query.filters.each_pair do |field, values|
-        # old-style, may still be in history
-        values = values.keys if values.is_a? Hash
-
-        label = facet_field_label(field)
-
-        content << render_search_to_s_element(
-          label,
-          values.join(" OR ")
-        )
-      end
-    end
-    content
-  end
-
-  def render_search_to_s_q(my_params)
-    content = super(my_params)
-
-    advanced_query = BlacklightAdvancedSearch::QueryParser.new(my_params, blacklight_config)
-
-    if (advanced_query.keyword_queries.length > 1 &&
-        advanced_query.keyword_op == "OR")
-      # Need to do something to make the inclusive-or search clear
-
-      display_as = advanced_query.keyword_queries.collect do |field, query|
-        h(search_field_def_for_key(field)[:label] + ": " + query)
-      end.join(" ; ")
-
-      content << render_search_to_s_element("Any of",
-        display_as,
-        :escape_value => false
-                                           )
-    elsif !advanced_query.keyword_queries.empty?
-      advanced_query.keyword_queries.each_pair do |field, query|
-        label = search_field_def_for_key(field)[:label]
-
-        content << render_search_to_s_element(label, query)
-      end
-    end
-
-    content
-  end
-
-  def remove_advanced_keyword_query(field, my_params = params)
-    my_params = Blacklight::SearchState.new(my_params, blacklight_config).to_h
-    my_params.delete(field)
-    my_params
-  end
-
-  def remove_advanced_filter_group(field, my_params = params)
-    if (my_params[:f_inclusive])
-      my_params = Blacklight::SearchState.new(my_params, blacklight_config).to_h
-      my_params[:f_inclusive] = my_params[:f_inclusive].dup
-      my_params[:f_inclusive].delete(field)
-
-      my_params.delete :f_inclusive if my_params[:f_inclusive].empty?
-    end
-    my_params
-  end
-end

data/lib/generators/blacklight_advanced_search/assets_generator.rb

@@ -1,53 +0,0 @@
-# Copy BlacklightAdvancedSearch assets to public folder in current app.
-# If you want to do this on application startup, you can
-# add this next line to your one of your environment files --
-# generally you'd only want to do this in 'development', and can
-# add it to environments/development.rb:
-#       require File.join(BlacklightAdvancedSearch.root, "lib", "generators", "blacklight", "assets_generator.rb")
-#       BlacklightAdvancedSearch::AssetsGenerator.start(["--force", "--quiet"])
-
-# Need the requires here so we can call the generator from environment.rb
-# as suggested above.
-require 'rails/generators'
-require 'rails/generators/base'
-module BlacklightAdvancedSearch
-  class AssetsGenerator < Rails::Generators::Base
-    source_root File.join(BlacklightAdvancedSearch::Engine.root, 'app', 'assets')
-
-    def css_asset
-      application_css_location = Dir["app/assets/stylesheets/application{.css,.scss,.css.scss}"].first
-
-      unless application_css_location
-        say_status "skipped", "Can not find an application.css, did not insert our require", :red
-        return
-      end
-
-      original_css = File.binread(application_css_location)
-      if original_css.include?("require 'blacklight_advanced_search'")
-        say_status("skipped", "insert into app/assets/stylesheets/application.css", :yellow)
-      else
-        insert_into_file application_css_location, :before => "*/" do
-          "\n *= require 'blacklight_advanced_search'\n\n"
-        end
-      end
-    end
-
-    def js_asset
-      application_js_location = Dir["app/assets/javascripts/application{.js,.coffee,.js.coffee}"].first
-
-      unless application_js_location
-        say_status "skipped", "Can not find an application.js, did not insert our require", :red
-        return
-      end
-
-      original_js = File.binread(application_js_location)
-      if original_js.include?("require 'blacklight_advanced_search'")
-        say_status("skipped", "insert into app/assets/javascripts/application.js", :yellow)
-      else
-        insert_into_file application_js_location, :after => %r{//= require ['"]?jquery['"]?$} do
-          "\n//= require 'blacklight_advanced_search'\n\n"
-        end
-      end
-    end
-  end
-end

data/lib/generators/blacklight_advanced_search/templates/advanced_controller.rb

@@ -1,56 +0,0 @@
-class AdvancedController < BlacklightAdvancedSearch::AdvancedController
-  blacklight_config.configure do |config|
-    # name of Solr request handler, leave unset to use the same one your Blacklight
-    # is ordinarily using (recommended if possible)
-    # config.advanced_search.qt = 'advanced'
-
-    ##
-    # The advanced search form displays facets as a limit option.
-    # By default it will use whatever facets, if any, are returned
-    # by the Solr request handler in use. However, you can use
-    # this config option to have it request other facet params than
-    # default in the Solr request handler, in desired.
-    config.advanced_search.form_solr_parameters = {}
-
-    # name of key in Blacklight URL, no reason to change usually.
-    config.advanced_search.url_key = 'advanced'
-
-    # We are going to completely override the inherited search fields
-    config.search_fields.clear
-
-    config.add_search_field 'author' do |field|
-      field.solr_local_parameters = {
-        :pf => "$pf_author",
-        :qf => "$qf_author"
-      }
-    end
-
-    config.add_search_field 'title' do |field|
-      field.solr_local_parameters = {
-        :pf => "$pf_title",
-        :qf => "$qf_title"
-      }
-    end
-
-    config.add_search_field 'subject' do |field|
-      field.solr_local_parameters = {
-        :pf => "$pf_subject",
-        :qf => "$qf_subject"
-      }
-    end
-
-    config.add_search_field 'keyword' do |field|
-      field.solr_local_parameters = {
-        :pf => "$pf_keyword",
-        :qf => "$qf_keyword"
-      }
-    end
-
-    config.add_search_field 'number' do |field|
-      field.solr_local_parameters = {
-        :pf => "$pf_number",
-        :qf => "$qf_number"
-      }
-    end
-  end
-end

data/lib/generators/blacklight_advanced_search/templates/saved_searches_controller.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-class SavedSearchesController < ApplicationController
-  include Blacklight::SavedSearches
-
-  helper BlacklightAdvancedSearch::RenderConstraintsOverride
-end

data/lib/generators/blacklight_advanced_search/templates/search_history_controller.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-class SearchHistoryController < ApplicationController
-  include Blacklight::SearchHistory
-
-  helper BlacklightAdvancedSearch::RenderConstraintsOverride
-end