blacklight_range_limit 7.0.0.rc1 → 7.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.github/workflows/ruby.yml +44 -0
- data/Gemfile +2 -6
- data/README.md +1 -1
- data/Rakefile +0 -2
- data/VERSION +1 -1
- data/app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js +5 -5
- data/app/assets/javascripts/blacklight_range_limit/range_limit_slider.js +25 -5
- data/app/assets/javascripts/blacklight_range_limit.js +0 -2
- data/blacklight_range_limit.gemspec +5 -2
- data/solr/conf/schema.xml +0 -15
- data/solr/conf/solrconfig.xml +1 -0
- data/spec/test_app_templates/Gemfile.extra +2 -1
- metadata +53 -12
- data/.travis.yml +0 -20
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: 4e2a5aa17aa736b2bc939d622f6deea8a3ab7fa38949c62c00a32899f9eb52a3
|
4
|
+
data.tar.gz: 34ee34583c8b812c3a9b6ad16c546b3e4cdb55aa0a7ba878d64181ab6a24df1f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 95b4a333f786f604b850108475bf2cd77aea298a0a2624536cfd4a6ae9219e89c99d56f3b2cb8ca2caf40f0ba5861fccf3ec8a4b6db7f9801a4c872434f3d1a6
|
7
|
+
data.tar.gz: c3e8a9c91a0fd0d405052a9896ec63642e22cc377faac8cd304e8aab43a5c89bf192ade6745482c9b4cecadfc6275191fefd3afb18a3cafc0802a1ebf80722e4
|
@@ -0,0 +1,44 @@
|
|
1
|
+
# This workflow uses actions that are not certified by GitHub.
|
2
|
+
# They are provided by a third-party and are governed by
|
3
|
+
# separate terms of service, privacy policy, and support
|
4
|
+
# documentation.
|
5
|
+
# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
|
6
|
+
# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
|
7
|
+
|
8
|
+
name: CI
|
9
|
+
|
10
|
+
on:
|
11
|
+
push:
|
12
|
+
branches: [ main, release-7.x, release-7.0.x ]
|
13
|
+
pull_request:
|
14
|
+
branches: [ main, release-7.x, release-7.0.x ]
|
15
|
+
|
16
|
+
jobs:
|
17
|
+
test:
|
18
|
+
runs-on: ubuntu-latest
|
19
|
+
name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }})
|
20
|
+
strategy:
|
21
|
+
matrix:
|
22
|
+
ruby: [2.7, '3.0']
|
23
|
+
rails_version: ['6.1.5', '7.0.2.3']
|
24
|
+
additional_engine_cart_rails_options: ['']
|
25
|
+
include:
|
26
|
+
- ruby: '2.7'
|
27
|
+
rails_version: '5.2.4.2'
|
28
|
+
- ruby: '3.1'
|
29
|
+
rails_version: '7.0.2.3'
|
30
|
+
- ruby: '3.0'
|
31
|
+
rails_version: '7.0.2.3'
|
32
|
+
env:
|
33
|
+
RAILS_VERSION: ${{ matrix.rails_version }}
|
34
|
+
ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test ${{ matrix.engine_cart_rails_options }}"
|
35
|
+
steps:
|
36
|
+
- uses: actions/checkout@v3
|
37
|
+
- name: Set up Ruby
|
38
|
+
uses: ruby/setup-ruby@v1
|
39
|
+
with:
|
40
|
+
ruby-version: ${{ matrix.ruby }}
|
41
|
+
- name: Install dependencies
|
42
|
+
run: bundle install
|
43
|
+
- name: Run tests
|
44
|
+
run: bundle exec rake ci
|
data/Gemfile
CHANGED
@@ -27,12 +27,8 @@ else
|
|
27
27
|
end
|
28
28
|
|
29
29
|
case ENV['RAILS_VERSION']
|
30
|
-
when /^
|
31
|
-
gem '
|
32
|
-
gem 'sass-rails', '>= 5.0'
|
33
|
-
gem 'coffee-rails', '~> 4.1.0'
|
34
|
-
when /^4.[01]/
|
35
|
-
gem 'sass-rails', '< 5.0'
|
30
|
+
when /^5.[12]/, /^6.0/
|
31
|
+
gem 'sass-rails', '~> 5.0'
|
36
32
|
end
|
37
33
|
end
|
38
34
|
# END ENGINE_CART BLOCK
|
data/README.md
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
BlacklightRangeLimit: integer range limiting and profiling for Blacklight applications
|
2
2
|
|
3
|
-
|
3
|
+
![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)
|
4
4
|
|
5
5
|
![Screen shot](doc/example-screenshot.png)
|
6
6
|
|
data/Rakefile
CHANGED
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
7.0.
|
1
|
+
7.0.1
|
@@ -232,24 +232,24 @@ Blacklight.onLoad(function() {
|
|
232
232
|
|
233
233
|
var slider_placeholder = $(container).closest(".limit_content").find("[data-slider-placeholder]");
|
234
234
|
if (slider_placeholder) {
|
235
|
-
slider_placeholder.slider("setValue", [from, to
|
235
|
+
slider_placeholder.slider("setValue", [from, to]);
|
236
236
|
}
|
237
237
|
}
|
238
238
|
});
|
239
239
|
|
240
240
|
var form = $(container).closest(".limit_content").find("form.range_limit");
|
241
|
-
form.find("input.range_begin, input.range_end").
|
242
|
-
|
241
|
+
form.find("input.range_begin, input.range_end").on('input', function () {
|
242
|
+
plot.setSelection( form_selection(form, min, max), true );
|
243
243
|
});
|
244
244
|
$(container).closest(".limit_content").find(".profile .range").on("slide", function(event, ui) {
|
245
245
|
var values = $(event.target).data("slider").getValue();
|
246
246
|
form.find("input.range_begin").val(values[0]);
|
247
247
|
form.find("input.range_end").val(values[1]);
|
248
|
-
plot.setSelection( normalized_selection(values[0], Math.max(values[0], values[1]
|
248
|
+
plot.setSelection( normalized_selection(values[0], Math.max(values[0], values[1])), true);
|
249
249
|
});
|
250
250
|
|
251
251
|
// initially entirely selected, to match slider
|
252
|
-
plot.setSelection(
|
252
|
+
plot.setSelection(normalized_selection(min, max));
|
253
253
|
}
|
254
254
|
}
|
255
255
|
|
@@ -23,8 +23,8 @@ $(".range_limit .profile .range.slider_js").each(function() {
|
|
23
23
|
if (placeholder_input.slider !== undefined) {
|
24
24
|
placeholder_input.slider({
|
25
25
|
min: min,
|
26
|
-
max: max
|
27
|
-
value: [min, max
|
26
|
+
max: max,
|
27
|
+
value: [min, max],
|
28
28
|
tooltip: "hide"
|
29
29
|
});
|
30
30
|
|
@@ -57,7 +57,7 @@ $(".range_limit .profile .range.slider_js").each(function() {
|
|
57
57
|
begin_el.val(min);
|
58
58
|
end_el.val(max);
|
59
59
|
|
60
|
-
begin_el.
|
60
|
+
begin_el.on('input', function() {
|
61
61
|
var val = BlacklightRangeLimit.parseNum($(this).val());
|
62
62
|
if ( isNaN(val) || val < min) {
|
63
63
|
//for weird data, set slider at min
|
@@ -68,7 +68,7 @@ $(".range_limit .profile .range.slider_js").each(function() {
|
|
68
68
|
placeholder_input.slider("setValue", values);
|
69
69
|
});
|
70
70
|
|
71
|
-
end_el.
|
71
|
+
end_el.on('inout', function() {
|
72
72
|
var val = BlacklightRangeLimit.parseNum($(this).val());
|
73
73
|
if ( isNaN(val) || val > max ) {
|
74
74
|
//weird entry, set slider to max
|
@@ -77,7 +77,27 @@ $(".range_limit .profile .range.slider_js").each(function() {
|
|
77
77
|
var values = placeholder_input.data("slider").getValue();
|
78
78
|
values[1] = val;
|
79
79
|
placeholder_input.slider("setValue", values);
|
80
|
-
});
|
80
|
+
});
|
81
|
+
|
82
|
+
begin_el.change(function() {
|
83
|
+
var val1 = BlacklightRangeLimit.parseNum(begin_el.val());
|
84
|
+
var val2 = BlacklightRangeLimit.parseNum(end_el.val());
|
85
|
+
|
86
|
+
if (val2 < val1) {
|
87
|
+
begin_el.val(val2);
|
88
|
+
end_el.val(val1);
|
89
|
+
}
|
90
|
+
});
|
91
|
+
|
92
|
+
end_el.change(function() {
|
93
|
+
var val1 = BlacklightRangeLimit.parseNum(begin_el.val());
|
94
|
+
var val2 = BlacklightRangeLimit.parseNum(end_el.val());
|
95
|
+
|
96
|
+
if (val2 < val1) {
|
97
|
+
begin_el.val(val2);
|
98
|
+
end_el.val(val1);
|
99
|
+
}
|
100
|
+
});
|
81
101
|
|
82
102
|
});
|
83
103
|
|
@@ -27,6 +27,9 @@ Gem::Specification.new do |s|
|
|
27
27
|
s.add_development_dependency 'capybara'
|
28
28
|
s.add_development_dependency 'sqlite3'
|
29
29
|
s.add_development_dependency 'launchy'
|
30
|
-
s.add_development_dependency 'solr_wrapper'
|
31
|
-
s.add_development_dependency 'engine_cart', '~> 1
|
30
|
+
s.add_development_dependency 'solr_wrapper'
|
31
|
+
s.add_development_dependency 'engine_cart', '~> 2.1'
|
32
|
+
s.add_development_dependency 'selenium-webdriver', '>= 3.13.1'
|
33
|
+
s.add_development_dependency 'webdrivers', '~>3.0'
|
34
|
+
s.add_development_dependency 'rexml' # pending https://github.com/SeleniumHQ/selenium/issues/9001
|
32
35
|
end
|
data/solr/conf/schema.xml
CHANGED
@@ -175,16 +175,6 @@
|
|
175
175
|
<dynamicField name="*_coordinate" type="tdouble" indexed="true" stored="false" />
|
176
176
|
|
177
177
|
|
178
|
-
<!-- location (_ll...) -->
|
179
|
-
|
180
|
-
<dynamicField name="*_lli" type="location" stored="false" indexed="true" multiValued="false"/>
|
181
|
-
<dynamicField name="*_llim" type="location" stored="false" indexed="true" multiValued="true"/>
|
182
|
-
|
183
|
-
<dynamicField name="*_lls" type="location" stored="true" indexed="false" multiValued="false"/>
|
184
|
-
<dynamicField name="*_llsm" type="location" stored="true" indexed="false" multiValued="true"/>
|
185
|
-
<dynamicField name="*_llsi" type="location" stored="true" indexed="true" multiValued="false"/>
|
186
|
-
<dynamicField name="*_llsim" type="location" stored="true" indexed="true" multiValued="true"/>
|
187
|
-
|
188
178
|
<dynamicField name="*_srpt" type="location_rpt" stored="true" indexed="true" multiValued="true" />
|
189
179
|
<dynamicField name="*_bbox" type="bbox" stored="true" indexed="true" />
|
190
180
|
|
@@ -263,9 +253,6 @@
|
|
263
253
|
-->
|
264
254
|
<fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
|
265
255
|
|
266
|
-
<!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
|
267
|
-
<fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
|
268
|
-
|
269
256
|
<!-- An alternative geospatial field type new to Solr 4. It supports multiValued and polygon shapes.
|
270
257
|
For more information about this and other Spatial fields new to Solr 4, see:
|
271
258
|
http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
|
@@ -350,7 +337,6 @@
|
|
350
337
|
<analyzer>
|
351
338
|
<tokenizer class="solr.StandardTokenizerFactory"/>
|
352
339
|
<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
|
353
|
-
<filter class="solr.StandardFilterFactory"/>
|
354
340
|
<filter class="solr.LowerCaseFilterFactory"/>
|
355
341
|
<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
|
356
342
|
</analyzer>
|
@@ -359,7 +345,6 @@
|
|
359
345
|
<fieldType name="textSuggest" class="solr.TextField" positionIncrementGap="100">
|
360
346
|
<analyzer>
|
361
347
|
<tokenizer class="solr.KeywordTokenizerFactory"/>
|
362
|
-
<filter class="solr.StandardFilterFactory"/>
|
363
348
|
<filter class="solr.LowerCaseFilterFactory"/>
|
364
349
|
<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
|
365
350
|
</analyzer>
|
data/solr/conf/solrconfig.xml
CHANGED
@@ -19,6 +19,7 @@
|
|
19
19
|
<!-- solr lib dirs -->
|
20
20
|
<lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
|
21
21
|
<lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
|
22
|
+
<lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
|
22
23
|
|
23
24
|
<dataDir>${solr.data.dir:}</dataDir>
|
24
25
|
|
@@ -1 +1,2 @@
|
|
1
|
-
gem '
|
1
|
+
gem 'rails-controller-testing'
|
2
|
+
gem 'blacklight', ENV['BLACKLIGHT_VERSION'] if ENV['BLACKLIGHT_VERSION']
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: blacklight_range_limit
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 7.0.
|
4
|
+
version: 7.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jonathan Rochkind
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date:
|
12
|
+
date: 2022-08-24 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
@@ -139,32 +139,74 @@ dependencies:
|
|
139
139
|
version: '0'
|
140
140
|
- !ruby/object:Gem::Dependency
|
141
141
|
name: solr_wrapper
|
142
|
+
requirement: !ruby/object:Gem::Requirement
|
143
|
+
requirements:
|
144
|
+
- - ">="
|
145
|
+
- !ruby/object:Gem::Version
|
146
|
+
version: '0'
|
147
|
+
type: :development
|
148
|
+
prerelease: false
|
149
|
+
version_requirements: !ruby/object:Gem::Requirement
|
150
|
+
requirements:
|
151
|
+
- - ">="
|
152
|
+
- !ruby/object:Gem::Version
|
153
|
+
version: '0'
|
154
|
+
- !ruby/object:Gem::Dependency
|
155
|
+
name: engine_cart
|
142
156
|
requirement: !ruby/object:Gem::Requirement
|
143
157
|
requirements:
|
144
158
|
- - "~>"
|
145
159
|
- !ruby/object:Gem::Version
|
146
|
-
version: '
|
160
|
+
version: '2.1'
|
147
161
|
type: :development
|
148
162
|
prerelease: false
|
149
163
|
version_requirements: !ruby/object:Gem::Requirement
|
150
164
|
requirements:
|
151
165
|
- - "~>"
|
152
166
|
- !ruby/object:Gem::Version
|
153
|
-
version: '
|
167
|
+
version: '2.1'
|
154
168
|
- !ruby/object:Gem::Dependency
|
155
|
-
name:
|
169
|
+
name: selenium-webdriver
|
170
|
+
requirement: !ruby/object:Gem::Requirement
|
171
|
+
requirements:
|
172
|
+
- - ">="
|
173
|
+
- !ruby/object:Gem::Version
|
174
|
+
version: 3.13.1
|
175
|
+
type: :development
|
176
|
+
prerelease: false
|
177
|
+
version_requirements: !ruby/object:Gem::Requirement
|
178
|
+
requirements:
|
179
|
+
- - ">="
|
180
|
+
- !ruby/object:Gem::Version
|
181
|
+
version: 3.13.1
|
182
|
+
- !ruby/object:Gem::Dependency
|
183
|
+
name: webdrivers
|
156
184
|
requirement: !ruby/object:Gem::Requirement
|
157
185
|
requirements:
|
158
186
|
- - "~>"
|
159
187
|
- !ruby/object:Gem::Version
|
160
|
-
version: '
|
188
|
+
version: '3.0'
|
161
189
|
type: :development
|
162
190
|
prerelease: false
|
163
191
|
version_requirements: !ruby/object:Gem::Requirement
|
164
192
|
requirements:
|
165
193
|
- - "~>"
|
166
194
|
- !ruby/object:Gem::Version
|
167
|
-
version: '
|
195
|
+
version: '3.0'
|
196
|
+
- !ruby/object:Gem::Dependency
|
197
|
+
name: rexml
|
198
|
+
requirement: !ruby/object:Gem::Requirement
|
199
|
+
requirements:
|
200
|
+
- - ">="
|
201
|
+
- !ruby/object:Gem::Version
|
202
|
+
version: '0'
|
203
|
+
type: :development
|
204
|
+
prerelease: false
|
205
|
+
version_requirements: !ruby/object:Gem::Requirement
|
206
|
+
requirements:
|
207
|
+
- - ">="
|
208
|
+
- !ruby/object:Gem::Version
|
209
|
+
version: '0'
|
168
210
|
description:
|
169
211
|
email:
|
170
212
|
- blacklight-development@googlegroups.com
|
@@ -172,10 +214,10 @@ executables: []
|
|
172
214
|
extensions: []
|
173
215
|
extra_rdoc_files: []
|
174
216
|
files:
|
217
|
+
- ".github/workflows/ruby.yml"
|
175
218
|
- ".gitignore"
|
176
219
|
- ".rspec"
|
177
220
|
- ".solr_wrapper.yml"
|
178
|
-
- ".travis.yml"
|
179
221
|
- Gemfile
|
180
222
|
- LICENSE
|
181
223
|
- README.md
|
@@ -255,12 +297,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
255
297
|
version: '0'
|
256
298
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
257
299
|
requirements:
|
258
|
-
- - "
|
300
|
+
- - ">="
|
259
301
|
- !ruby/object:Gem::Version
|
260
|
-
version:
|
302
|
+
version: '0'
|
261
303
|
requirements: []
|
262
|
-
|
263
|
-
rubygems_version: 2.6.11
|
304
|
+
rubygems_version: 3.1.6
|
264
305
|
signing_key:
|
265
306
|
specification_version: 4
|
266
307
|
summary: Blacklight Range Limit plugin
|
data/.travis.yml
DELETED
@@ -1,20 +0,0 @@
|
|
1
|
-
notifications:
|
2
|
-
email: false
|
3
|
-
|
4
|
-
language: ruby
|
5
|
-
sudo: false
|
6
|
-
rvm:
|
7
|
-
- 2.3.1
|
8
|
-
|
9
|
-
before_install:
|
10
|
-
- gem install bundler
|
11
|
-
|
12
|
-
notifications:
|
13
|
-
irc: "irc.freenode.org#blacklight"
|
14
|
-
email:
|
15
|
-
- blacklight-commits@googlegroups.com
|
16
|
-
|
17
|
-
global_env:
|
18
|
-
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true
|
19
|
-
|
20
|
-
jdk: oraclejdk8
|