blacklight_range_limit 6.3.0 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8a27e85542c4335df749cb76a165762c5cdc38fe
-  data.tar.gz: 6e60a7ef7cb7d86647e8ebb3be7646ac12239016
+SHA256:
+  metadata.gz: 454aced55fe12cf920d7f33fc5338f40707ae450e78f3863f2d99a7721c9dc40
+  data.tar.gz: 19b80f76873f3a1a3e59ffaa7291c1f8d2f7af680a7979a8e3f3655adf716296
 SHA512:
-  metadata.gz: 070e7fc8c3e8da294713841515bf16390538f2b2cad2065f38bb91135aac23f02a858f13b8e4123108321508f91711ff1fa0696c62d2f1c8bdeb634b3cb66831
-  data.tar.gz: 2814645e160bdd0f2af637c7409eaad5b495d77b90a70d3d005d067bfe67f2f3fd82f4a2f219cdd5d0812eb9d79b61478206819f8e6c3e751e873e10a79dbcb0
+  metadata.gz: d8e45fed92431f1f46db61c9c76986f4552a7c01aba77aa1f85890cae4a8fc0dee42812ef4c4de0a11473653fceb1dc1e8a4f07588ae67761ecae6fa52410bab
+  data.tar.gz: 2bf5fccb09e9f21de9c7a783e4f0e426d1eb5299010a0cea108619c30182d11d20e1df0ba58110d0f7ac036828fcdbd16e6dd243f50d8a1078a783f05317a049

data/.solr_wrapper.yml

@@ -1,6 +1,7 @@
 # Place any default configuration for solr_wrapper here
 port: 8983
 verbose: true
+version: 7.7.2
 collection:
   dir: solr/conf/
   name: blacklight-core

data/.travis.yml

@@ -4,10 +4,11 @@ notifications:
 language: ruby
 sudo: false
 rvm:
-  - 2.3.1
+  - 2.5.8
+  - 2.6.5
 
 before_install:
-  - gem install bundler
+  - google-chrome-stable --headless --disable-gpu --remote-debugging-port=9222 http://localhost &
 
 notifications:
   irc: "irc.freenode.org#blacklight"
@@ -17,4 +18,4 @@ notifications:
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 
-jdk: oraclejdk8
+jdk: oraclejdk9

data/Gemfile

@@ -36,3 +36,7 @@ else
   end
 end
 # END ENGINE_CART BLOCK
+
+if File.exists?('spec/test_app_templates/Gemfile.extra')
+  eval File.read('spec/test_app_templates/Gemfile.extra'), nil, 'spec/test_app_templates/Gemfile.extra'
+end

data/Rakefile

@@ -6,8 +6,6 @@ require 'rspec/core/rake_task'
 require 'engine_cart/rake_task'
 require 'solr_wrapper'
 
-EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
-
 task :default => :ci
 
 desc "Run specs"

data/VERSION

@@ -1 +1 @@
-6.3.0
+6.5.0

data/app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js

@@ -37,7 +37,7 @@ Blacklight.onLoad(function() {
     var container =  $(event.target).filter(".facet-content").find(".chart_js");
 
     // only if it doesn't already have a canvas, it isn't already drawn
-    if (container && container.find("canvas").size() == 0) {
+    if (container && container.find("canvas").length == 0) {
       // be willing to wait up to 1100ms for container to
       // have width -- right away on show.bs is too soon, but
       // shown.bs is later than we want, we want to start rendering

data/app/assets/javascripts/blacklight_range_limit/range_limit_slider.js

@@ -44,6 +44,15 @@ $(".range_limit .profile .range.slider_js").each(function() {
         slider_el.css("width", "100%");
       }
      }
+    
+     // Slider change should update text input values.
+     var parent = $(this).parent();
+     var form = $(parent).closest(".limit_content").find("form.range_limit");
+     $(parent).closest(".limit_content").find(".profile .range").on("slide", function(event, ui) {
+      var values = $(event.target).data("slider").getValue();
+      form.find("input.range_begin").val(values[0]);
+      form.find("input.range_end").val(values[1]);
+     });
    }
 
   begin_el.val(min);

data/app/helpers/range_limit_helper.rb

@@ -62,8 +62,12 @@ module RangeLimitHelper
     @response["stats"]["stats_fields"][solr_field] if @response["stats"] && @response["stats"]["stats_fields"]
   end
 
+  def stats_for_field?(solr_field)
+    stats_for_field(solr_field).present?
+  end
+
   def add_range_missing(solr_field, my_params = params)
-    my_params = Blacklight::SearchState.new(my_params, blacklight_config).to_h
+    my_params = Blacklight::SearchState.new(my_params.except(:page), blacklight_config).to_h
     my_params["range"] ||= {}
     my_params["range"][solr_field] ||= {}
     my_params["range"][solr_field]["missing"] = "true"
@@ -77,7 +81,7 @@ module RangeLimitHelper
   end
 
   def add_range(solr_field, from, to, my_params = params)
-    my_params = Blacklight::SearchState.new(my_params, blacklight_config).to_h
+    my_params = Blacklight::SearchState.new(my_params.except(:page), blacklight_config).to_h
     my_params["range"] ||= {}
     my_params["range"][solr_field] ||= {}
 
@@ -94,4 +98,18 @@ module RangeLimitHelper
     return my_params
   end
 
+  def has_selected_range_limit?(solr_field)
+    params["range"] &&
+    params["range"][solr_field] &&
+    (
+      params["range"][solr_field]["begin"].present? ||
+      params["range"][solr_field]["end"].present? ||
+      params["range"][solr_field]["missing"]
+    )
+  end
+
+  def selected_missing_for_range_limit?(solr_field)
+    params["range"] && params["range"][solr_field] && params["range"][solr_field]["missing"]
+  end
+
 end

data/app/views/blacklight_range_limit/_range_limit_panel.html.erb

@@ -7,12 +7,8 @@
   maxlength = field_config[:maxlength]
 -%>
 
-<div class="limit_content range_limit">  
-  <% if  params["range"] &&
-         params["range"][solr_field] &&
-         ( (! params["range"][solr_field]["begin"].blank?) ||
-           (! params["range"][solr_field]["end"].blank?) ||
-           params["range"][solr_field]["missing"]) %>
+<div class="limit_content range_limit">
+  <% if has_selected_range_limit?(solr_field) %>
     <ul class="current list-unstyled facet-values">
       <li class="selected">
         <span class="facet-label">
@@ -28,9 +24,9 @@
          
   <% end %>
 
-  <% unless params["range"] && params["range"][solr_field] && params["range"][solr_field]["missing"] %>  
+  <% unless selected_missing_for_range_limit?(solr_field) %>
     <%= form_tag search_action_path, :method => :get, class: [BlacklightRangeLimit.classes[:form], "range_#{solr_field}"].join(' ') do %>
-      <%= render_hash_as_hidden_fields(search_state.params_for_search) %>
+      <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:page)) %>
       
       <!-- we need to include a dummy search_field parameter if none exists,
            to trick blacklight into displaying actual search results instead
@@ -46,11 +42,14 @@
   <% end %>
     
   <!-- no results profile if missing is selected -->
-  <% unless params["range"] && params["range"][solr_field] && params["range"][solr_field]["missing"] %>
+  <% unless selected_missing_for_range_limit?(solr_field) %>
     <!-- you can hide this if you want, but it has to be on page if you want
          JS slider and calculated facets to show up, JS sniffs it. -->
     <div class="profile">
-    
+        <% if stats_for_field?(solr_field) %>
+          <!-- No stats information found for field  in search response -->
+        <% end %>
+
         <% if (min = range_results_endpoint(solr_field, :min)) &&
               (max = range_results_endpoint(solr_field, :max)) %>
           <p class="range subsection <%= "slider_js" unless field_config[:slider_js] == false  %>">

data/blacklight_range_limit.gemspec

@@ -17,15 +17,18 @@ Gem::Specification.new do |s|
 
   s.license     = 'Apache 2.0'
 
-  s.add_dependency 'rails', '>= 3.0'
+  s.add_dependency 'rails', '>= 4.2', '< 6'
   s.add_dependency 'jquery-rails' # our JS needs jquery_rails
-  s.add_dependency 'blacklight', '>= 6.0.2'
+  s.add_dependency 'blacklight', '~> 6.10'
 
+  s.add_development_dependency 'chromedriver-helper'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'launchy'
-  s.add_development_dependency 'solr_wrapper', '~> 0.14'
-  s.add_development_dependency 'engine_cart', '~> 1.0'
+  s.add_development_dependency 'selenium-webdriver'
+  s.add_development_dependency 'solr_wrapper', '~> 2.2'
+  s.add_development_dependency 'engine_cart', '~> 2.0'
+  s.add_development_dependency 'webdrivers'
 end

data/lib/blacklight_range_limit.rb

@@ -37,7 +37,7 @@ module BlacklightRangeLimit
   def self.range_config(blacklight_config, solr_field)
     field = blacklight_config.facet_fields[solr_field.to_s]
 
-    return false unless field.range
+    return false unless field && field.range
 
     config = field.range
     config = { partial: field.partial } if config === true

data/lib/blacklight_range_limit/controller_override.rb

@@ -9,6 +9,7 @@ module BlacklightRangeLimit
     included do
       helper BlacklightRangeLimit::ViewHelperOverride
       helper RangeLimitHelper
+      helper_method :has_range_limit_parameters?
     end
 
     # Action method of our own!
@@ -28,5 +29,18 @@ module BlacklightRangeLimit
 
       render('blacklight_range_limit/range_segments', :locals => {:solr_field => params[:range_field]}, :layout => !request.xhr?)
     end
+
+    # over-ride, call super, but make sure our range limits count too
+    def has_search_parameters?
+      super || has_range_limit_parameters?
+    end
+
+    def has_range_limit_parameters?(my_params = params)
+      my_params[:range] &&
+        my_params[:range].to_unsafe_h.any? do |key, v|
+          v.present? && v.respond_to?(:'[]') &&
+          (v["begin"].present? || v["end"].present? || v["missing"].present?)
+        end
+    end
   end
 end

data/lib/blacklight_range_limit/engine.rb

@@ -1,6 +1,7 @@
 require 'blacklight'
 require 'blacklight_range_limit'
 require 'rails'
+require 'jquery-rails'
 
 module BlacklightRangeLimit
   class Engine < Rails::Engine

data/lib/blacklight_range_limit/range_limit_builder.rb

@@ -12,46 +12,48 @@ module BlacklightRangeLimit
 
     # Method added to to fetch proper things for date ranges.
     def add_range_limit_params(solr_params)
-       ranged_facet_configs = 
-         blacklight_config.facet_fields.select { |key, config| config.range } 
+       ranged_facet_configs =
+         blacklight_config.facet_fields.select { |key, config| config.range }
        # In ruby 1.8, hash.select returns an array of pairs, in ruby 1.9
-       # it returns a hash. Turn it into a hash either way.  
+       # it returns a hash. Turn it into a hash either way.
        ranged_facet_configs = Hash[ ranged_facet_configs ] unless ranged_facet_configs.kind_of?(Hash)
-       
+
        ranged_facet_configs.each_pair do |solr_field, config|
         solr_params["stats"] = "true"
         solr_params["stats.field"] ||= []
-        solr_params["stats.field"] << solr_field    
-      
+        solr_params["stats.field"] << solr_field
+
+        range_config = BlacklightRangeLimit.range_config(blacklight_config, config.field)
+
         hash =  blacklight_params["range"] && blacklight_params["range"][solr_field] ?
           blacklight_params["range"][solr_field] :
           {}
-          
+
         if !hash["missing"].blank?
           # missing specified in request params
           solr_params[:fq] ||= []
           solr_params[:fq] << "-#{solr_field}:[* TO *]"
-          
+
         elsif !(hash["begin"].blank? && hash["end"].blank?)
           # specified in request params, begin and/or end, might just have one
           start = hash["begin"].blank? ? "*" : hash["begin"]
           finish = hash["end"].blank? ? "*" : hash["end"]
-  
+
           solr_params[:fq] ||= []
           solr_params[:fq] << "#{solr_field}: [#{start} TO #{finish}]"
-          
-          if (config.segments != false && start != "*" && finish != "*")
+
+          if (range_config[:segments] != false && start != "*" && finish != "*")
             # Add in our calculated segments, can only do with both boundaries.
             add_range_segments_to_solr!(solr_params, solr_field, start.to_i, finish.to_i)
           end
-          
-        elsif (config.segments != false &&
-               boundaries = config.assumed_boundaries)
+
+        elsif (range_config[:segments] != false &&
+               boundaries = range_config[:assumed_boundaries])
           # assumed_boundaries in config
           add_range_segments_to_solr!(solr_params, solr_field, boundaries[0], boundaries[1])
         end
       end
-      
+
       return solr_params
     end
 
@@ -59,10 +61,10 @@ module BlacklightRangeLimit
     # Another processing method, this one is NOT included in default processing chain,
     # it is specifically swapped in *instead of* add_range_limit_params for
     # certain ajax requests that only want to fetch range limit segments for
-    # ONE field. 
+    # ONE field.
     #
     # It turns off facetting and sets rows to 0 as well, only results for
-    # single specified field are needed. 
+    # single specified field are needed.
     #
     # Specified field and parameters are specified in incoming parameters
     # range_field, range_start, range_end
@@ -72,13 +74,13 @@ module BlacklightRangeLimit
       finish = blacklight_params[:range_end].to_i
 
       add_range_segments_to_solr!(solr_params, solr_field, start, finish )
-        
+
       # Remove all field faceting for efficiency, we won't be using it.
       solr_params.delete("facet.field")
       solr_params.delete("facet.field".to_sym)
 
       # We don't need any actual rows either
-      solr_params[:rows] = 0      
+      solr_params[:rows] = 0
 
       return solr_params
     end

data/lib/blacklight_range_limit/segment_calculation.rb

@@ -16,6 +16,8 @@ module BlacklightRangeLimit
 
       field_config = BlacklightRangeLimit.range_config(blacklight_config, solr_field)
 
+      return solr_params unless field_config
+
       solr_params[:"facet.query"] ||= []
 
       boundaries = boundaries_for_range_facets(min, max, (field_config[:num_segments] || 10) )
@@ -28,7 +30,7 @@ module BlacklightRangeLimit
         solr_params[:"facet.query"] << "#{solr_field}:[#{first} TO #{last}]"
       end
 
-      return solr_params
+      solr_params
     end
 
     # returns an array of 'boundaries' for producing approx num_div

data/lib/blacklight_range_limit/view_helper_override.rb

@@ -11,19 +11,6 @@
       super
     end
 
-    def has_range_limit_parameters?(my_params = params)
-      my_params[:range] &&
-        my_params[:range].to_unsafe_h.any? do |key, v|
-          v.present? && v.respond_to?(:'[]') &&
-          (v["begin"].present? || v["end"].present? || v["missing"].present?)
-        end
-    end
-
-    # over-ride, call super, but make sure our range limits count too
-    def has_search_parameters?
-      super || has_range_limit_parameters?
-    end
-
     def query_has_constraints?(my_params = params)
       super || has_range_limit_parameters?(my_params)
     end
@@ -42,39 +29,26 @@
     end
 
     def render_constraints_filters(my_params = params)
-      content = super(my_params)
       # add a constraint for ranges?
-      unless my_params[:range].blank?
-        my_params[:range].each_pair do |solr_field, hash|
-
-          next unless hash["missing"] || (!hash["begin"].blank?) || (!hash["end"].blank?)
-          content << render_constraint_element(
-            facet_field_label(solr_field),
-            range_display(solr_field, my_params),
-            :escape_value => false,
-            :remove => remove_range_param(solr_field, my_params)
-          )
-        end
+      range_params(my_params).keys.each_with_object(super) do |solr_field, content|
+        content << render_constraint_element(
+          facet_field_label(solr_field),
+          range_display(solr_field, my_params),
+          escape_value: false,
+          remove: remove_range_param(solr_field, my_params)
+        )
       end
-      return content
     end
 
     def render_search_to_s_filters(my_params)
-      content = super(my_params)
       # add a constraint for ranges?
-      unless my_params[:range].blank?
-        my_params[:range].each_pair do |solr_field, hash|
-          next unless hash["missing"] || (!hash["begin"].blank?) || (! hash["end"].blank?)
-
-          content << render_search_to_s_element(
-            facet_field_label(solr_field),
-            range_display(solr_field, my_params),
-            :escape_value => false
-          )
-
-        end
+      range_params(my_params).keys.each_with_object(super) do |solr_field, content|
+        content << render_search_to_s_element(
+          facet_field_label(solr_field),
+          range_display(solr_field, my_params),
+          escape_value: false
+        )
       end
-      return content
     end
 
     def remove_range_param(solr_field, my_params = params)
@@ -110,4 +84,17 @@
       BlacklightRangeLimit.range_config(blacklight_config, solr_field)
     end
 
+    private
+
+    def range_params(my_params = params)
+      return {} unless my_params[:range].is_a?(ActionController::Parameters) || my_params[:range].is_a?(Hash)
+
+      my_params[:range].select do |_solr_field, range_options|
+        next unless range_options
+
+        [range_options['missing'].presence,
+         range_options['begin'].presence,
+         range_options['end'].presence].any?
+      end
+    end
   end

data/lib/generators/blacklight_range_limit/install_generator.rb

@@ -9,7 +9,7 @@ module BlacklightRangeLimit
     end
 
     def install_catalog_controller_mixin
-      inject_into_class 'app/controllers/catalog_controller.rb', CatalogController do
+      inject_into_file 'app/controllers/catalog_controller.rb', after: /include Blacklight::Catalog.*$/ do
         "\n  include BlacklightRangeLimit::ControllerOverride\n"
       end
     end

data/solr/conf/schema.xml

@@ -544,12 +544,6 @@
    -->
  <uniqueKey>id</uniqueKey>
 
- <!-- field for the QueryParser to use when an explicit fieldname is absent -->
- <defaultSearchField>text</defaultSearchField>
-
- <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
- <solrQueryParser defaultOperator="OR"/>
-
   <!-- copyField commands copy one field to another at the time a document
         is added to the index.  It's used either to index the same field differently,
         or to add multiple fields to the same field for easier/faster searching.  -->

data/spec/features/a_javascript_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'JavaScript', js: true do
+  context 'when assumed boundaries configured' do
+    before do
+      CatalogController.blacklight_config.facet_fields['pub_date_sort'].range = {
+        assumed_boundaries: [1990, 2000]
+      }
+    end
+
+    after do
+      CatalogController.blacklight_config.facet_fields['pub_date_sort'].range = true
+    end
+
+    it 'should show the range limit with set boundaries' do
+      visit '/catalog'
+
+      click_link 'Publication Date Sort'
+      expect(page).to have_field :range_pub_date_sort_begin, with: '1990'
+      expect(page).to have_field :range_pub_date_sort_end, with: '2000'
+    end
+  end
+end

data/spec/features/blacklight_range_limit_spec.rb

@@ -24,7 +24,23 @@ describe "Blacklight Range Limit" do
     click_link 'View distribution'
     click_link '2000 to 2008'
 
-    expect(page).to have_content "2000 to 2008 [remove] 12"
+    within '.blacklight-pub_date_sort' do
+      expect(page).to have_content "2000 to 2008 [remove] 12"
+    end
+
+    within '#appliedParams'  do
+      expect(page).to have_content '2000 to 2008'
+    end
+
+    expect(page).to have_content '1 - 10 of 12'
+  end
+
+  it "should not include page parameter" do
+    visit search_catalog_path(page: 2)
+    click_link 'View distribution'
+    click_link '2000 to 2008'
+    click_button 'Limit'
+    expect(page.current_url).not_to include('page')
   end
 
   context 'when I18n translation is available' do
@@ -53,9 +69,9 @@ describe "Blacklight Range Limit with configured input labels" do
         maxlength: 6
       }
       config.default_solr_params[:'facet.field'] = config.facet_fields.keys
-    end  
-  end    
-  
+    end
+  end
+
   it "should show the range limit facet with configured labels and maxlength" do
     visit '/catalog'
     expect(page).to have_selector 'label.sr-only[for="range_pub_date_sort_begin"]', :text => 'from publication date'

data/spec/helpers/blacklight_range_limit_helper_spec.rb

@@ -16,4 +16,22 @@ describe "Blacklight Range Limit Helper" do
     expect(html_maxlength_6).to have_css 'input.form-control.range_begin#range_pub_date_begin[maxlength="6"]'
   end
 
+  context "when building requests" do
+    let(:config) { Blacklight::Configuration.new }
+    before do
+      allow(helper).to receive(:blacklight_config).and_return(config)
+    end
+
+    it "should exclude page when adding a range" do
+      params = { q: '', page: '2' }
+      updated_params = helper.add_range('test', '1900', '1995', params)
+      expect(updated_params).not_to include(:page)
+    end
+
+    it "should exclude page when adding a missing range" do
+      params = { q: '', page: '2' }
+      updated_params = helper.add_range_missing('test', params)
+      expect(updated_params).not_to include(:page)
+    end
+  end
 end

data/spec/lib/blacklight_range_limit/segment_calculation_spec.rb

@@ -4,6 +4,10 @@ RSpec.describe BlacklightRangeLimit::SegmentCalculation do
   let(:dummy_class) do
     Class.new do
       include BlacklightRangeLimit::SegmentCalculation
+
+      def blacklight_config
+        Blacklight::Configuration.new
+      end
     end
   end
 
@@ -45,5 +49,15 @@ RSpec.describe BlacklightRangeLimit::SegmentCalculation do
                                           'The min date must be before the max date'
       end
     end
+
+    context 'when a field that does not exist is passed in' do
+      let(:min) { 100 }
+      let(:max) { 800 }
+      let(:solr_field) { 'i_am_not_real' }
+
+      it 'returns the original solr_params (and does not raise an error)' do
+        expect(subject).to eq({})
+      end
+    end
   end
 end

data/spec/lib/blacklight_range_limit/view_helper_override_helper_spec.rb

@@ -0,0 +1,127 @@
+require 'spec_helper'
+
+RSpec.describe BlacklightRangeLimit::ViewHelperOverride, type: :helper do
+  describe '#render_constraints_filters' do
+    before do
+      allow(helper).to receive_messages(
+        facet_field_label: 'Date Range',
+        remove_range_param: '/remove'
+      )
+    end
+
+    it 'does not return any content when the range parameter invalid' do
+      params = ActionController::Parameters.new(range: 'garbage')
+
+      expect(helper.render_constraints_filters(params)).to eq ''
+    end
+
+    it 'renders a constraint for the given data in the range param' do
+      params = ActionController::Parameters.new(
+        range: { range_field: { 'begin' => 1900, 'end' => 2000 } }
+      )
+      constraints = helper.render_constraints_filters(params)
+
+      expect(constraints).to have_css(
+        '.constraint .filterName', text: 'Date Range'
+      )
+      expect(constraints).to have_css(
+        '.constraint .filterValue', text: '1900 to 2000'
+      )
+    end
+  end
+
+  describe 'render_search_to_s_filters' do
+    before do
+      allow(helper).to receive_messages(facet_field_label: 'Date Range')
+    end
+
+    it 'does not return any content when the range parameter invalid' do
+      params = ActionController::Parameters.new(range: 'garbage')
+
+      expect(helper.render_search_to_s_filters(params)).to eq ''
+    end
+
+    it 'renders a constraint for the given data in the range param' do
+      params = ActionController::Parameters.new(
+        range: { range_field: { 'begin' => 1900, 'end' => 2000 } }
+      )
+      constraints = helper.render_search_to_s_filters(params)
+
+      expect(constraints).to have_css(
+        '.constraint .filterName', text: 'Date Range:'
+      )
+      expect(constraints).to have_css(
+        '.constraint .filterValues', text: '1900 to 2000'
+      )
+    end
+  end
+
+  describe '#range_params' do
+    it 'handles no range input' do
+      expect(
+        helper.send(:range_params, ActionController::Parameters.new(q: 'blah'))
+      ).to eq({})
+    end
+
+    it 'handles non-compliant range input' do
+      expect(
+        helper.send(:range_params, ActionController::Parameters.new(range: 'blah'))
+      ).to eq({})
+
+      expect(
+        helper.send(:range_params, ActionController::Parameters.new(range: ['blah']))
+      ).to eq({})
+
+      expect(
+        helper.send(:range_params, ActionController::Parameters.new(range: { 'wrong' => 'data' }))
+      ).to eq({})
+
+      expect(
+        helper.send(
+          :range_params,
+          ActionController::Parameters.new(range: { field_name: { 'wrong' => 'data' } })
+        )
+      ).to eq({})
+
+      expect(
+        helper.send(
+          :range_params,
+          ActionController::Parameters.new(range: { field_name: { 'begin' => '', 'end' => '' } })
+        )
+      ).to eq({})
+    end
+
+    it 'returns the range parameters that are present' do
+      expect(
+        helper.send(
+          :range_params,
+          ActionController::Parameters.new(range: { field_name: { 'missing' => true } })
+        ).permit!.to_h
+      ).to eq({ 'field_name' => { 'missing' => true } })
+
+      expect(
+        helper.send(
+          :range_params,
+          ActionController::Parameters.new(range: { field_name: { 'begin' => '1800', 'end' => '1900' } })
+        ).permit!.to_h
+      ).to eq({ 'field_name' => { 'begin' => '1800', 'end' => '1900' } })
+
+      expect(
+        helper.send(
+          :range_params,
+          ActionController::Parameters.new(
+            range: {
+              field_name: { 'begin' => '1800', 'end' => '1900' },
+              field_name2: { 'begin' => '1800', 'end' => '1900' }
+            }
+          )
+        ).permit!.to_h
+      ).to eq(
+        {
+          'field_name' => { 'begin' => '1800', 'end' => '1900' },
+          'field_name2' => { 'begin' => '1800', 'end' => '1900' }
+        }
+      )
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,21 @@ EngineCart.load_application!
 
 require 'rspec/rails'
 require 'capybara/rspec'
+require 'selenium-webdriver'
+require 'webdrivers'
+
+Capybara.javascript_driver = :headless_chrome
+
+Capybara.register_driver :headless_chrome do |app|
+  Capybara::Selenium::Driver.load_selenium
+  browser_options = ::Selenium::WebDriver::Chrome::Options.new.tap do |opts|
+    opts.args << '--headless'
+    opts.args << '--disable-gpu'
+    opts.args << '--no-sandbox'
+    opts.args << '--window-size=1280,1696'
+  end
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options)
+end
 
 RSpec.configure do |config|
   # rspec-rails 3 will no longer automatically infer an example group's spec type

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1 @@
+gem 'sprockets', '< 4'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.5.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -43,16 +49,30 @@ dependencies:
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '6.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.10'
+- !ruby/object:Gem::Dependency
+  name: chromedriver-helper
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -123,34 +143,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - blacklight-development@googlegroups.com
@@ -214,11 +262,14 @@ files:
 - solr/conf/xslt/example_rss.xsl
 - solr/conf/xslt/luke.xsl
 - solr/sample_solr_documents.yml
+- spec/features/a_javascript_spec.rb
 - spec/features/blacklight_range_limit_spec.rb
 - spec/fixtures/solr_documents/zero_year.yml
 - spec/helpers/blacklight_range_limit_helper_spec.rb
 - spec/lib/blacklight_range_limit/segment_calculation_spec.rb
+- spec/lib/blacklight_range_limit/view_helper_override_helper_spec.rb
 - spec/spec_helper.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
 - vendor/assets/javascripts/bootstrap-slider.js
 - vendor/assets/javascripts/flot/excanvas.min.js
@@ -244,15 +295,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Blacklight Range Limit plugin
 test_files:
+- spec/features/a_javascript_spec.rb
 - spec/features/blacklight_range_limit_spec.rb
 - spec/fixtures/solr_documents/zero_year.yml
 - spec/helpers/blacklight_range_limit_helper_spec.rb
 - spec/lib/blacklight_range_limit/segment_calculation_spec.rb
+- spec/lib/blacklight_range_limit/view_helper_override_helper_spec.rb
 - spec/spec_helper.rb
+- spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb