blacklight_range_limit 7.0.1 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e2a5aa17aa736b2bc939d622f6deea8a3ab7fa38949c62c00a32899f9eb52a3
-  data.tar.gz: 34ee34583c8b812c3a9b6ad16c546b3e4cdb55aa0a7ba878d64181ab6a24df1f
+  metadata.gz: fcbdbc78c473e59d57bd6453adf5f6c09eec1786f5a537b57b53077a736602c8
+  data.tar.gz: 0eccabe9cd9231a0cb62d80d470762a056881aa93e34ea655a28268369d034ee
 SHA512:
-  metadata.gz: 95b4a333f786f604b850108475bf2cd77aea298a0a2624536cfd4a6ae9219e89c99d56f3b2cb8ca2caf40f0ba5861fccf3ec8a4b6db7f9801a4c872434f3d1a6
-  data.tar.gz: c3e8a9c91a0fd0d405052a9896ec63642e22cc377faac8cd304e8aab43a5c89bf192ade6745482c9b4cecadfc6275191fefd3afb18a3cafc0802a1ebf80722e4
+  metadata.gz: 34088b2dab05fb33d092fca7b4e407e8d0418e4531995c58fc3371da00ff7dd1a27bb6d4e2a52ecb47ed27309ca586befb24ae52c03ce4d3e3e10793a2cade13
+  data.tar.gz: a6f1480b8b63f8ba8f1a2bed53518f45f9dca2efe42f73ff92af2553814650f25d74e46fc2c07222f7225afa06c9da287fa6f158c2d47041dc0019df103872de

data/.travis.yml

@@ -0,0 +1,25 @@
+notifications:
+  email: false
+
+addons:
+  chrome: stable
+
+language: ruby
+sudo: false
+rvm:
+  - 2.5.5
+
+before_install:
+  - gem install bundler
+  - google-chrome-stable --headless --no-sandbox --disable-gpu --remote-debugging-port=9222 http://localhost &
+
+
+notifications:
+  irc: "irc.freenode.org#blacklight"
+  email:
+      - blacklight-commits@googlegroups.com
+
+global_env:
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+
+jdk: oraclejdk8

data/Gemfile

@@ -27,8 +27,12 @@ else
   end
 
   case ENV['RAILS_VERSION']
-  when /^5.[12]/, /^6.0/
-    gem 'sass-rails', '~> 5.0'
+  when /^4.2/
+    gem 'responders', '~> 2.0'
+    gem 'sass-rails', '>= 5.0'
+    gem 'coffee-rails', '~> 4.1.0'
+  when /^4.[01]/
+    gem 'sass-rails', '< 5.0'
   end
 end
 # END ENGINE_CART BLOCK

data/README.md

@@ -1,29 +1,29 @@
 BlacklightRangeLimit:  integer range limiting and profiling for Blacklight applications
 
-![Build Status](https://github.com/projectblacklight/blacklight/workflows/CI/badge.svg) [![Gem Version](https://badge.fury.io/rb/blacklight_range_limit.png)](http://badge.fury.io/rb/blacklight_range_limit)
+[![Build Status](https://travis-ci.org/projectblacklight/blacklight_range_limit.png?branch=v5.0.0)](https://travis-ci.org/projectblacklight/blacklight_range_limit) [![Gem Version](https://badge.fury.io/rb/blacklight_range_limit.png)](http://badge.fury.io/rb/blacklight_range_limit)
 
 ![Screen shot](doc/example-screenshot.png)
 
 # Description
 
-The BlacklightRangeLimit plugin provides a 'facet' or limit for integer fields, that lets the user enter range limits with a text box or a slider, and also provides area charts giving a sense of the distribution of values (with drill down). 
+The BlacklightRangeLimit plugin provides a 'facet' or limit for integer fields, that lets the user enter range limits with a text box or a slider, and also provides area charts giving a sense of the distribution of values (with drill down).
 
-The primary use case of this plugin is for 'year' data, but it should work for any integer field. It may not work right for negative numbers, however. 
+The primary use case of this plugin is for 'year' data, but it should work for any integer field. It may not work right for negative numbers, however.
 
-Decimal numbers and Dates are NOT supported; they theoretically could be in the future, although it gets tricky. 
+Decimal numbers and Dates are NOT supported; they theoretically could be in the future, although it gets tricky.
 
 
 # Requirements
 
-A Solr integer field. Depending on your data, it may or may not be advantageous to use a tint (trie with non-zero precision) type field. 
+A Solr integer field. Depending on your data, it may or may not be advantageous to use a tint (trie with non-zero precision) type field.
 
 ## Note on solr field types
 
-If all your integers are the same number of digits, you can use just about any solr type, including string/type, and all will be well. But if your integers vary in digits, strings won't sort correctly, making your numbers behave oddly in partitions and limits. This is also true if you use a pre-1.4 "integer"/pint/solr.IntField  field -- these are not "sortable". 
+If all your integers are the same number of digits, you can use just about any solr type, including string/type, and all will be well. But if your integers vary in digits, strings won't sort correctly, making your numbers behave oddly in partitions and limits. This is also true if you use a pre-1.4 "integer"/pint/solr.IntField  field -- these are not "sortable".
 
-You need to use a "sortable" numeric-type field. In Solr 1.4, the standard "int"/solr.TrieIntField should work fine and is probably prefered. For some distributions of data, it may be more efficient to use "tint" (solr.TrieIntField with non-zero precision). 
+You need to use a "sortable" numeric-type field. In Solr 1.4, the standard "int"/solr.TrieIntField should work fine and is probably prefered. For some distributions of data, it may be more efficient to use "tint" (solr.TrieIntField with non-zero precision).
 
-The pre Solr 1.4 now deprecated sint or slong types should work fine too. 
+The pre Solr 1.4 now deprecated sint or slong types should work fine too.
 
 # Installation
 
@@ -33,9 +33,9 @@ Add
 
     gem "blacklight_range_limit"
 
-to your Gemfile. Run "bundle install". 
+to your Gemfile. Run "bundle install".
 
-Then run 
+Then run
 
     rails generate blacklight_range_limit:install
 
@@ -46,43 +46,43 @@ This will install some asset references in your application.js and application.c
 You have at least one solr field you want to display as a range limit, that's why you've installed this plugin. In your CatalogController, the facet configuration should look like:
 
 ```ruby
-config.add_facet_field 'pub_date', label: 'Publication Year', range: true 
+config.add_facet_field 'pub_date', label: 'Publication Year', range: true
 ```
-  
-You should now get range limit display. More complicated configuration is available if desired, see Range Facet Configuration below. 
+
+You should now get range limit display. More complicated configuration is available if desired, see Range Facet Configuration below.
 
 
 You can also configure the look and feel of the Flot chart using the jQuery .data() method. On the `.facet_limit` container you want to configure, add a Flot options associative array (documented at http://people.iola.dk/olau/flot/API.txt) as the `plot-config` key. The `plot-config` key to set the `plot-config` key on the appropriate `.facet_limit` container. In order to customize the plot colors, for example, you could use this code:
 
 ```javascript
-$('.blacklight-year_i').data('plot-config', { 
-    selection: { color: '#C0FF83' }, 
-    colors: ['#ffffff'], 
-    series: { lines: { fillColor: 'rgba(255,255,255, 0.5)' }}, 
-    grid: { color: '#aaaaaa', tickColor: '#aaaaaa', borderWidth: 0 }  
+$('.blacklight-year_i').data('plot-config', {
+    selection: { color: '#C0FF83' },
+    colors: ['#ffffff'],
+    series: { lines: { fillColor: 'rgba(255,255,255, 0.5)' }},
+    grid: { color: '#aaaaaa', tickColor: '#aaaaaa', borderWidth: 0 }
 });
 ```
 You can add this configuration in app/assets/javascript/application.js, or anywhere else loaded before the blacklight range limit javascript.
 
 ## A note on AJAX use
 
-In order to calculate distribution segment ranges, we need to first know the min and max boundaries. But we don't really know that until we've fetched the result set (we use the Solr Stats component to get min and max with a result set). 
+In order to calculate distribution segment ranges, we need to first know the min and max boundaries. But we don't really know that until we've fetched the result set (we use the Solr Stats component to get min and max with a result set).
 
-So, ordinarily, after we've gotten the result set, only then can we calculate the segment ranges, and then we need to do another Solr request to actually fetch the segment range counts. 
+So, ordinarily, after we've gotten the result set, only then can we calculate the segment ranges, and then we need to do another Solr request to actually fetch the segment range counts.
 
-The plugin uses an AJAX request on the result page to do this. This means that for every application results display that includes any values at all in your range field, your application will get a second AJAX http request, and make a second solr request. 
+The plugin uses an AJAX request on the result page to do this. This means that for every application results display that includes any values at all in your range field, your application will get a second AJAX http request, and make a second solr request.
 
-If you'd like to avoid this, you can turn off segment display altogether with the :segment option below; or you can set :assumed_boundaries below to use fixed boundaries for not-yet-limited segments instead of taking boundaries from the result set. 
+If you'd like to avoid this, you can turn off segment display altogether with the :segment option below; or you can set :assumed_boundaries below to use fixed boundaries for not-yet-limited segments instead of taking boundaries from the result set.
 
 Note that a drill-down will never require the second request, because boundaries on a drill-down are always taken from the specified limits.
 
- 
+
 ## Range Facet Configuration
 
-Instead of simply passing "true", you can pass a hash with additional configuration. Here's an example with all the available keys, you don't need to use them all, just the ones you want to set to non-default values. 
+Instead of simply passing "true", you can pass a hash with additional configuration. Here's an example with all the available keys, you don't need to use them all, just the ones you want to set to non-default values.
 
 ```ruby
-config.add_facet_field 'pub_date', label: 'Publication Year', 
+config.add_facet_field 'pub_date', label: 'Publication Year',
                        range: {
                          num_segments: 6,
                          assumed_boundaries: [1100, Time.now.year + 2],
@@ -92,31 +92,29 @@ config.add_facet_field 'pub_date', label: 'Publication Year',
 ```
 
 * **:num_segments** :
-  * Default 10. Approximately how many segments to divide the range into for segment facets, which become segments on the chart. Actual segments are calculated to be 'nice' values, so may not exactly match your setting.  
+  * Default 10. Approximately how many segments to divide the range into for segment facets, which become segments on the chart. Actual segments are calculated to be 'nice' values, so may not exactly match your setting.
 * **:assumed_boundaries** :
-  * Default null. For a result set that has not yet been limited, instead of taking boundaries from results and making a second AJAX request to fetch segments, just assume these given boundaries. If you'd like to avoid this second AJAX Solr call, you can set :assumed_boundaries to a two-element array of integers instead, and the assumed boundaries will always be used. Note this is live ruby code, you can put calculations in there like Time.now.year + 2. 
+  * Default null. For a result set that has not yet been limited, instead of taking boundaries from results and making a second AJAX request to fetch segments, just assume these given boundaries. If you'd like to avoid this second AJAX Solr call, you can set :assumed_boundaries to a two-element array of integers instead, and the assumed boundaries will always be used. Note this is live ruby code, you can put calculations in there like Time.now.year + 2.
 * **:segments** :
-  * Default true. If set to false, then distribution segment facets will not be loaded at all.  
+  * Default true. If set to false, then distribution segment facets will not be loaded at all.
 * **:maxlength** :
   * Default 4. Changes the value of the `maxlength` attribute of the text boxes, which determines how many digits can be entered.
-   
-## Javascript dependencies
 
-The selectable histograms/barcharts are done with Javascript, using [Flot](http://code.google.com/p/flot/). Flot requires JQuery, as well as support for the HTML5 canvas element. In IE previous to IE9, canvas element support can be added with [excanvas](http://excanvas.sourceforge.net/). For the slider, [bootstrap-slider](http://www.eyecon.ro/bootstrap-slider/) is used (bootstrap-slider is actually third party, not officially bootstrap). Flot and bootstrap-slider are both directly included in blacklight_range_limit in vendor. 
+## Javascript dependencies
 
-A `require 'blacklight_range_limit'` in a Rails asset pipeline manifest file will automatically include all of these things. The blacklight_range_limit adds just this line to your `app/assets/application.js`. 
+The selectable histograms/barcharts are done with Javascript, using [Flot](http://code.google.com/p/flot/). Flot requires JQuery, as well as support for the HTML5 canvas element. In IE previous to IE9, canvas element support can be added with [excanvas](http://excanvas.sourceforge.net/). For the slider, [bootstrap-slider](http://www.eyecon.ro/bootstrap-slider/) is used (bootstrap-slider is actually third party, not officially bootstrap). Flot and bootstrap-slider are both directly included in blacklight_range_limit in vendor, rather than referenced as dependencies.
 
-There is a copy of flot vendored in this gem for this purpose. jquery is obtained from the jquery-rails gem, which this gem depends on. 
+The blacklight_range_limit installer will add `require 'blacklight_range_limit'` to your `application.js` sprockets manifest. This will include flot, bootstrap-slider, and the blacklight_range_limit glue JS.
 
-Note this means a copy of jquery, from the jquery-rails gem, will be included in your assets by blacklight_range_limit even if you didn't include it yourself explicitly in application.js. Flot will also be included.
+Both flot and blacklight_range_limit's own JS depend on JQuery; the host app is expected to include JQuery; a default Blacklight-generated app already does. (Jquery 1, 2, or 3 should work)
 
-If you don't want any of this gem's JS, you can simply remove the `require 'blacklight_range_limit'` line from your application.js, and hack something else together yourself. 
+If you don't want any of this gem's JS, you can simply remove the `require 'blacklight_range_limit'` line from your application.js, and hack something else together yourself.
 
 ## IE8, excanvas
 
-IE8 and below do not support the 'canvas' element, needed for flot to render the chart. 
+IE8 and below do not support the 'canvas' element, needed for flot to render the chart.
 Without canvas, view will cleanly degrade to an ordinary textual listing of range segments
-as facets. 
+as facets.
 
 Or, you can use excanvas.js to add canvas support to IE.  `blacklight_range_limit` includes
 the `excanvas.js` file, but you'll have to manually add a reference to it to your Rails layout
@@ -130,17 +128,17 @@ local custom layout instead. Then add this to the html `<head>` section:
 For touch screens, one wants the UI to work well. The slider used is
 [bootstrap_slider](http://www.eyecon.ro/bootstrap-slider/), which says if you add
 Modernizr to your page, touch events will be supported. We haven't tested it
-ourselves yet. 
+ourselves yet.
 
 Also not sure how well the flot select UI works on a touch screen. The slider
-is probably the best touch UI anyway, if it can be made to work well. 
+is probably the best touch UI anyway, if it can be made to work well.
 
 # Tests
 
 Test coverage is not great, but there are some tests, using rspec.  Run `bundle exec rake ci` or just `bundle exec rake` to seed and
-start a demo jetty server, build a clean test app, and run tests. 
+start a demo jetty server, build a clean test app, and run tests.
 
-Just `bundle exec rake spec` to just run tests against an existing test app and jetty server. 
+Just `bundle exec rake spec` to just run tests against an existing test app and jetty server.
 
 ## Local Testing
 If you want to iterate on a test locally and do not want to rebuild the
@@ -159,7 +157,7 @@ Once you are done iterating on your test you will need to stop the application s
 
 # Possible future To Do
 
-* StatsComponent replacement. We use StatsComponent to get min/max of result set, as well as missing count. StatsComponent is included on every non-drilldown request, so ranges and slider can be displayed. However, StatsComponent really can slow down the solr response with a large result set. So replace StatsComponent with other strategies. No ideal ones, we can use facet.missing to get missing count instead, but RSolr makes it harder than it should be to grab this info. We can use seperate solr queries to get min/max (sort on our field, asc and desc), but this is more complicated, more solr queries, and possibly requires redesign of AJAXy stuff, so even a lone slider can have min/max. 
+* StatsComponent replacement. We use StatsComponent to get min/max of result set, as well as missing count. StatsComponent is included on every non-drilldown request, so ranges and slider can be displayed. However, StatsComponent really can slow down the solr response with a large result set. So replace StatsComponent with other strategies. No ideal ones, we can use facet.missing to get missing count instead, but RSolr makes it harder than it should be to grab this info. We can use seperate solr queries to get min/max (sort on our field, asc and desc), but this is more complicated, more solr queries, and possibly requires redesign of AJAXy stuff, so even a lone slider can have min/max.
 * tests
-* In cases where an AJAX request is needed to fetch more results, don't trigger the AJAX until the range facet has actually been opened/shown. Currently it's done on page load. 
-* If :assumed_boundaries ends up popular, we could provide a method to fetch min and max values from entire corpus on app startup or in a rake task, and automatically use these as :assumed_boundaries. 
+* In cases where an AJAX request is needed to fetch more results, don't trigger the AJAX until the range facet has actually been opened/shown. Currently it's done on page load.
+* If :assumed_boundaries ends up popular, we could provide a method to fetch min and max values from entire corpus on app startup or in a rake task, and automatically use these as :assumed_boundaries.

data/VERSION

@@ -1 +1 @@
-7.0.1
+7.1.0

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

@@ -232,24 +232,24 @@ Blacklight.onLoad(function() {
 
               var slider_placeholder = $(container).closest(".limit_content").find("[data-slider-placeholder]");
               if (slider_placeholder) {
-                slider_placeholder.slider("setValue", [from, to]);
+                slider_placeholder.slider("setValue", [from, to+1]);
               }
             }
         });
 
         var form = $(container).closest(".limit_content").find("form.range_limit");
-        form.find("input.range_begin, input.range_end").on('input', function () {
-          plot.setSelection( form_selection(form, min, max), true );
+        form.find("input.range_begin, input.range_end").change(function () {
+           plot.setSelection( form_selection(form, min, max) , true );
         });
         $(container).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]);
-          plot.setSelection( normalized_selection(values[0], Math.max(values[0], values[1])), true);
+          plot.setSelection( normalized_selection(values[0], Math.max(values[0], values[1]-1)), true);
         });
 
         // initially entirely selected, to match slider
-        plot.setSelection(normalized_selection(min, max));
+        plot.setSelection( {xaxis: { from:min, to:max+0.9999}}  );
       }
     }
 

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

@@ -23,8 +23,8 @@ $(".range_limit .profile .range.slider_js").each(function() {
      if (placeholder_input.slider !== undefined) {
       placeholder_input.slider({
         min: min,
-        max: max,
-        value: [min, max],
+        max: max+1,
+        value: [min, max+1],
         tooltip: "hide"
       });
 
@@ -57,7 +57,7 @@ $(".range_limit .profile .range.slider_js").each(function() {
   begin_el.val(min);
   end_el.val(max);
         
-  begin_el.on('input', function() {
+  begin_el.change( function() {
     var val = BlacklightRangeLimit.parseNum($(this).val());
     if ( isNaN(val)  || val < min) {
       //for weird data, set slider at min           
@@ -68,7 +68,7 @@ $(".range_limit .profile .range.slider_js").each(function() {
     placeholder_input.slider("setValue", values);
   });
         
-  end_el.on('inout', function() {
+  end_el.change( function() {
      var val = BlacklightRangeLimit.parseNum($(this).val());
      if ( isNaN(val) || val > max ) {
        //weird entry, set slider to max
@@ -77,27 +77,7 @@ $(".range_limit .profile .range.slider_js").each(function() {
     var values = placeholder_input.data("slider").getValue();
     values[1] = val;
     placeholder_input.slider("setValue", values);
-  });
-
-  begin_el.change(function() {
-    var val1 = BlacklightRangeLimit.parseNum(begin_el.val());
-    var val2 = BlacklightRangeLimit.parseNum(end_el.val());
-
-    if (val2 < val1) {
-      begin_el.val(val2);
-      end_el.val(val1);
-    }
-  });
-
-  end_el.change(function() {
-    var val1 = BlacklightRangeLimit.parseNum(begin_el.val());
-    var val2 = BlacklightRangeLimit.parseNum(end_el.val());
-
-    if (val2 < val1) {
-      begin_el.val(val2);
-      end_el.val(val1);
-    }
-  });
+  });    
    
 });
 

data/app/assets/javascripts/blacklight_range_limit.js

@@ -1,8 +1,10 @@
 // Master manifest file for engine, so local app can require
 // this one file, but get all our files -- and local app
 // require does not need to change if we change file list.
+//
+// Note JQuery is required to be loaded for flot and blacklight_range_limit
+// JS to work, expect host app to load it.
 
-//= require 'jquery'
 
 //= require 'flot/jquery.flot.js'
 //= require 'flot/jquery.flot.selection.js'

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

@@ -13,10 +13,10 @@
       <li class="selected">
         <span class="facet-label">
           <span class="selected"><%= range_display(field_name) %></span>
-           <%= link_to remove_range_param(field_name), :class=>"remove", :title => t('blacklight.range_limit.remove_limit') do %>
-            <span class="glyphicon glyphicon-remove"></span>
+          <%= link_to remove_range_param(field_name), :class=>"remove", :title => t('blacklight.range_limit.remove_limit') do %>
+            <span class="remove-icon">✖</span>
             <span class="sr-only">[<%= t('blacklight.range_limit.remove_limit') %>]</span>
-           <% end %>
+          <% end %>
         </span>
         <span class="selected facet-count"><%= number_with_delimiter(@response.total) %></span>
       </li>
@@ -51,7 +51,7 @@
 
         <% if (min = range_results_endpoint(field_name, :min)) &&
               (max = range_results_endpoint(field_name, :max)) %>
-          <p class="range subsection <%= "slider_js" unless field_config[:slider_js] == false  %>">
+          <p class="range subsection <%= "slider_js" unless field_config[:slider_js] == false %>">
             Current results range from <span class="min"><%= range_results_endpoint(field_name, :min) %></span> to <span class="max"><%= range_results_endpoint(field_name, :max) %></span>
           </p>
 
@@ -71,17 +71,15 @@
           <% end %>
         <% end %>
 
-
-
         <% if (stats = stats_for_field(field_name)) && stats["missing"] > 0 %>
           <ul class="missing list-unstyled facet-values subsection">
             <li>
               <span class="facet-label">
                 <%= link_to BlacklightRangeLimit.labels[:missing], add_range_missing(field_name) %>
               </span>
-              <span class="facet-count">
-                <%= number_with_delimiter(stats["missing"]) %>
-              </span>
+              <%# note important there be no whitespace inside facet-count to avoid
+                  bug in some versions of Blacklight (including 7.1.0.alpha) %>
+              <span class="facet-count"><%= number_with_delimiter(stats["missing"]) %></span>
             </li>
           </ul>
         <% end %>

data/blacklight_range_limit.gemspec

@@ -18,18 +18,15 @@ Gem::Specification.new do |s|
   s.license     = 'Apache 2.0'
 
   s.add_dependency 'rails', '>= 3.0'
-  s.add_dependency 'jquery-rails' # our JS needs jquery_rails
-  s.add_dependency 'blacklight'
-  s.add_dependency 'tether-rails'
+  s.add_dependency 'blacklight', '>= 7.0'
 
   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'
-  s.add_development_dependency 'engine_cart', '~> 2.1'
-  s.add_development_dependency 'selenium-webdriver', '>= 3.13.1'
-  s.add_development_dependency 'webdrivers', '~>3.0'
-  s.add_development_dependency 'rexml' # pending https://github.com/SeleniumHQ/selenium/issues/9001
+  s.add_development_dependency 'solr_wrapper', '~> 0.14'
+  s.add_development_dependency 'engine_cart', '~> 2.0'
+  s.add_development_dependency 'selenium-webdriver', '~> 3.12.0'
+  s.add_development_dependency 'webdrivers'
 end

data/lib/blacklight_range_limit/engine.rb

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

data/lib/generators/blacklight_range_limit/assets_generator.rb

@@ -41,9 +41,6 @@ module BlacklightRangeLimit
 
 }
       end
-      inject_into_file 'app/assets/javascripts/application.js', before: '// Required by Blacklight' do
-        "\n//= require tether\n"
-      end
     end
 
 

data/lib/generators/blacklight_range_limit/install_generator.rb

@@ -16,7 +16,7 @@ module BlacklightRangeLimit
 
     def install_search_builder
       path = 'app/models/search_builder.rb'
-      if File.exists? path
+      if File.exist? path
         inject_into_file path, after: /include Blacklight::Solr::SearchBuilderBehavior.*$/ do
           "\n  include BlacklightRangeLimit::RangeLimitBuilder\n"
         end
@@ -25,8 +25,20 @@ module BlacklightRangeLimit
       end
     end
 
+    # Adds range limit behavior to search history controller
     def install_search_history_controller
-     copy_file "search_history_controller.rb", "app/controllers/search_history_controller.rb"
+      path = 'app/controllers/search_history_controller.rb'
+
+      # If local copy of search history controller exists, add range limit helpers
+      if File.exist? path
+        inject_into_file path, after: /include Blacklight::SearchHistory.*$/ do
+          "\n  helper BlacklightRangeLimit::ViewHelperOverride"\
+          "\n  helper RangeLimitHelper"
+        end
+      # Otherwise copies search history controller to application
+      else
+        copy_file 'search_history_controller.rb', path
+      end
     end
 
     def install_routing_concern

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

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

data/solr/conf/schema.xml

@@ -175,6 +175,16 @@
     <dynamicField name="*_coordinate" type="tdouble" indexed="true"  stored="false" />
 
 
+    <!-- location (_ll...) -->
+
+    <dynamicField name="*_lli" type="location" stored="false" indexed="true" multiValued="false"/>
+    <dynamicField name="*_llim" type="location" stored="false" indexed="true" multiValued="true"/>
+
+    <dynamicField name="*_lls" type="location" stored="true" indexed="false" multiValued="false"/>
+    <dynamicField name="*_llsm" type="location" stored="true" indexed="false" multiValued="true"/>
+    <dynamicField name="*_llsi" type="location" stored="true" indexed="true" multiValued="false"/>
+    <dynamicField name="*_llsim" type="location" stored="true" indexed="true" multiValued="true"/>
+
     <dynamicField name="*_srpt" type="location_rpt" stored="true" indexed="true" multiValued="true" />
     <dynamicField name="*_bbox" type="bbox" stored="true" indexed="true" />
 
@@ -253,6 +263,9 @@
      -->
     <fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
 
+    <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
+    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
+
     <!-- An alternative geospatial field type new to Solr 4.  It supports multiValued and polygon shapes.
       For more information about this and other Spatial fields new to Solr 4, see:
       http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
@@ -337,6 +350,7 @@
       <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
+        <filter class="solr.StandardFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
       </analyzer>
@@ -345,6 +359,7 @@
     <fieldType  name="textSuggest" class="solr.TextField" positionIncrementGap="100">
        <analyzer>
           <tokenizer class="solr.KeywordTokenizerFactory"/>
+          <filter class="solr.StandardFilterFactory"/>
           <filter class="solr.LowerCaseFilterFactory"/>
           <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
        </analyzer>

data/solr/conf/solrconfig.xml

@@ -19,7 +19,6 @@
   <!-- solr lib dirs -->
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
-  <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
 
   <dataDir>${solr.data.dir:}</dataDir>
 

data/spec/features/blacklight_range_limit_spec.rb

@@ -24,7 +24,7 @@ describe "Blacklight Range Limit" do
     click_link 'View distribution'
     click_link '2000 to 2008'
 
-    expect(page).to have_content "2000 to 2008 [remove] 12"
+    expect(page).to have_content "2000 to 2008 ✖ [remove] 12"
   end
 
   it "should not include page parameter" do
@@ -61,9 +61,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_si_begin"]', :text => 'from publication date'

data/spec/features/javascript_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'JavaScript', js: true do
+  it 'initializes canvas chart' do
+    visit search_catalog_path
+    click_link 'Publication Date'
+    expect(page).to have_css '.flot-base'
+  end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,9 @@ EngineCart.load_application!
 
 require 'rspec/rails'
 require 'capybara/rspec'
+require 'selenium-webdriver'
+
+Capybara.javascript_driver = :selenium_chrome_headless
 
 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

@@ -1,2 +1 @@
-gem 'rails-controller-testing'
-gem 'blacklight', ENV['BLACKLIGHT_VERSION'] if ENV['BLACKLIGHT_VERSION']
+gem 'blacklight', github: 'projectblacklight/blacklight', branch: 'master'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.1.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,48 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: tether-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -141,60 +113,46 @@ dependencies:
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.13.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.13.1
-- !ruby/object:Gem::Dependency
-  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
-  name: rexml
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -214,10 +172,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".solr_wrapper.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -271,6 +229,7 @@ files:
 - solr/conf/xslt/luke.xsl
 - solr/sample_solr_documents.yml
 - spec/features/blacklight_range_limit_spec.rb
+- spec/features/javascript_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
@@ -301,12 +260,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Blacklight Range Limit plugin
 test_files:
 - spec/features/blacklight_range_limit_spec.rb
+- spec/features/javascript_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

data/.github/workflows/ruby.yml

@@ -1,44 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: CI
-
-on:
-  push:
-    branches: [ main, release-7.x, release-7.0.x ]
-  pull_request:
-    branches: [ main, release-7.x, release-7.0.x ]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }})
-    strategy:
-      matrix:
-        ruby: [2.7, '3.0']
-        rails_version: ['6.1.5', '7.0.2.3']
-        additional_engine_cart_rails_options: ['']
-        include:
-        - ruby: '2.7'
-          rails_version: '5.2.4.2'
-        - ruby: '3.1'
-          rails_version: '7.0.2.3'
-        - ruby: '3.0'
-          rails_version: '7.0.2.3'
-    env:
-      RAILS_VERSION: ${{ matrix.rails_version }}
-      ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test ${{ matrix.engine_cart_rails_options }}"
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake ci