blacklight_range_limit 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9a1df533f008f45eb3b248ee4e6e57fa6df93025
-  data.tar.gz: fb650f88d4d59bb30434d62377558e9cc57cf4a7
+SHA256:
+  metadata.gz: 4e2a5aa17aa736b2bc939d622f6deea8a3ab7fa38949c62c00a32899f9eb52a3
+  data.tar.gz: 34ee34583c8b812c3a9b6ad16c546b3e4cdb55aa0a7ba878d64181ab6a24df1f
 SHA512:
-  metadata.gz: afb426238097c41d11212ea824a41925242a948a43b5abe80d5208ecdbbaeeaa4b95beb1726b86232ff552312aec3c2908e0168fc62d684926c02f66696e01c9
-  data.tar.gz: ca5957d0215cd424cccc44ed8d44d110b05cfaa079e73aa6e1148bc5b8fe977e095685fcd471c96492267ebbce8221830cbbfd8a0a2b1cee32083a848a38b733
+  metadata.gz: 95b4a333f786f604b850108475bf2cd77aea298a0a2624536cfd4a6ae9219e89c99d56f3b2cb8ca2caf40f0ba5861fccf3ec8a4b6db7f9801a4c872434f3d1a6
+  data.tar.gz: c3e8a9c91a0fd0d405052a9896ec63642e22cc377faac8cd304e8aab43a5c89bf192ade6745482c9b4cecadfc6275191fefd3afb18a3cafc0802a1ebf80722e4

data/.github/workflows/ruby.yml

@@ -0,0 +1,44 @@
+# 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

data/Gemfile

@@ -27,12 +27,8 @@ else
   end
 
   case ENV['RAILS_VERSION']
-  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'
+  when /^5.[12]/, /^6.0/
+    gem 'sass-rails', '~> 5.0'
   end
 end
 # END ENGINE_CART BLOCK

data/README.md

@@ -1,6 +1,6 @@
 BlacklightRangeLimit:  integer range limiting and profiling for Blacklight applications
 
-[![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)
+![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)
 
 ![Screen shot](doc/example-screenshot.png)
 

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 @@
-7.0.0
+7.0.1

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

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+1,
-        value: [min, max+1],
+        max: max,
+        value: [min, max],
         tooltip: "hide"
       });
 
@@ -57,7 +57,7 @@ $(".range_limit .profile .range.slider_js").each(function() {
   begin_el.val(min);
   end_el.val(max);
         
-  begin_el.change( function() {
+  begin_el.on('input', 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.change( function() {
+  end_el.on('inout', function() {
      var val = BlacklightRangeLimit.parseNum($(this).val());
      if ( isNaN(val) || val > max ) {
        //weird entry, set slider to max
@@ -77,7 +77,27 @@ $(".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/blacklight_range_limit.gemspec

@@ -27,6 +27,9 @@ Gem::Specification.new do |s|
   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 '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
 end

data/solr/conf/schema.xml

@@ -175,16 +175,6 @@
     <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" />
 
@@ -263,9 +253,6 @@
      -->
     <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
@@ -350,7 +337,6 @@
       <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>
@@ -359,7 +345,6 @@
     <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,6 +19,7 @@
   <!-- 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/test_app_templates/Gemfile.extra

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_range_limit
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,32 +139,74 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
+  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: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: engine_cart
+  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: '1.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  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
@@ -172,10 +214,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".solr_wrapper.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -259,9 +301,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Blacklight Range Limit plugin
-test_files: []
+test_files:
+- 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/spec_helper.rb
+- spec/test_app_templates/Gemfile.extra
+- spec/test_app_templates/lib/generators/test_app_generator.rb

data/.travis.yml

@@ -1,20 +0,0 @@
-notifications:
-  email: false
-
-language: ruby
-sudo: false
-rvm:
-  - 2.3.1
-
-before_install:
-  - gem install bundler
-
-notifications:
-  irc: "irc.freenode.org#blacklight"
-  email:
-      - blacklight-commits@googlegroups.com
-
-global_env:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-
-jdk: oraclejdk8