blacklight_range_limit 7.8.2 → 7.9.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +2 -0
- data/VERSION +1 -1
- data/app/helpers/range_limit_helper.rb +8 -3
- data/app/views/blacklight_range_limit/_range_segments.html.erb +5 -4
- data/blacklight_range_limit.gemspec +2 -2
- data/spec/lib/blacklight_range_limit/view_helper_override_helper_spec.rb +7 -2
- data/spec/test_app_templates/Gemfile.extra +1 -0
- metadata +6 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 7bdd7d570174f761a17a7744d8b79796ebf4122e1ce4ef2bf1c366b31a7a82b3
|
4
|
+
data.tar.gz: e662b7bb3ab1272c4b110fae8ef3e3a8bd5aae0afe32a659a2b769941d8d8969
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: beb6a84a7ecb8cab0b9eaefc8ea1dea12224755676415bcda3f4d6252430e13d9d475254b914e2bfc638a7d9f03eb719aebefdc66380f7b378a69a2b4ebce7e2
|
7
|
+
data.tar.gz: b12a205a837bd3602eacd560b4d4370cabf4e47a960a62cbf57698fcb0f9ef567522fd1fe0b89d64aeb4a78f52de41bb0638a63e47123b881716c5da84f2ae3c
|
data/.travis.yml
CHANGED
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
7.
|
1
|
+
7.9.0
|
@@ -63,9 +63,14 @@ module RangeLimitHelper
|
|
63
63
|
|
64
64
|
##
|
65
65
|
# A method that is meant to be overridden downstream to format how a range
|
66
|
-
# label might be displayed to a user. By default it just returns the value
|
67
|
-
|
68
|
-
|
66
|
+
# label might be displayed to a user. By default it just returns the value
|
67
|
+
# as rendered by the presenter
|
68
|
+
def format_range_display_value(value, solr_field)
|
69
|
+
if respond_to?(:facet_item_presenter)
|
70
|
+
facet_item_presenter(facet_configuration_for_field(solr_field), value, solr_field).label
|
71
|
+
else
|
72
|
+
facet_display_value(solr_field, value)
|
73
|
+
end
|
69
74
|
end
|
70
75
|
|
71
76
|
# Show the limit area if:
|
@@ -7,10 +7,11 @@
|
|
7
7
|
<span class="facet-label">
|
8
8
|
<%= link_to(
|
9
9
|
t('blacklight.range_limit.range_html',
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
10
|
+
begin: format_range_display_value(hash[:from], solr_field),
|
11
|
+
begin_value: hash[:from],
|
12
|
+
end: format_range_display_value(hash[:to], solr_field),
|
13
|
+
end_value: hash[:to]
|
14
|
+
),
|
14
15
|
search_action_url(add_range(solr_field, hash[:from], hash[:to]).except(:controller, :action)),
|
15
16
|
class: 'facet_select'
|
16
17
|
) %>
|
@@ -17,14 +17,14 @@ Gem::Specification.new do |s|
|
|
17
17
|
|
18
18
|
s.license = 'Apache 2.0'
|
19
19
|
|
20
|
-
s.add_dependency 'blacklight', '
|
20
|
+
s.add_dependency 'blacklight', '~> 7.0'
|
21
21
|
|
22
22
|
s.add_development_dependency 'rspec', '~> 3.0'
|
23
23
|
s.add_development_dependency 'rspec-rails'
|
24
24
|
s.add_development_dependency 'capybara', '~> 3'
|
25
25
|
s.add_development_dependency 'sqlite3'
|
26
26
|
s.add_development_dependency 'launchy'
|
27
|
-
s.add_development_dependency 'solr_wrapper', '~> 0
|
27
|
+
s.add_development_dependency 'solr_wrapper', '~> 2.0'
|
28
28
|
s.add_development_dependency 'engine_cart', '~> 2.1'
|
29
29
|
s.add_development_dependency 'selenium-webdriver', '>= 3.13.1'
|
30
30
|
s.add_development_dependency 'webdrivers', '~>3.0'
|
@@ -7,7 +7,8 @@ RSpec.describe BlacklightRangeLimit::ViewHelperOverride, type: :helper do
|
|
7
7
|
facet_field_label: 'Date Range',
|
8
8
|
remove_range_param: {},
|
9
9
|
search_action_path: '/catalog',
|
10
|
-
blacklight_config: CatalogController.blacklight_config
|
10
|
+
blacklight_config: CatalogController.blacklight_config,
|
11
|
+
search_state: {},
|
11
12
|
)
|
12
13
|
allow(controller).to receive_messages(
|
13
14
|
search_state_class: Blacklight::SearchState,
|
@@ -37,7 +38,11 @@ RSpec.describe BlacklightRangeLimit::ViewHelperOverride, type: :helper do
|
|
37
38
|
|
38
39
|
describe 'render_search_to_s_filters' do
|
39
40
|
before do
|
40
|
-
allow(helper).to receive_messages(
|
41
|
+
allow(helper).to receive_messages(
|
42
|
+
facet_field_label: 'Date Range',
|
43
|
+
blacklight_config: CatalogController.blacklight_config,
|
44
|
+
search_state: {},
|
45
|
+
)
|
41
46
|
end
|
42
47
|
|
43
48
|
it 'does not return any content when the range parameter invalid' do
|
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.
|
4
|
+
version: 7.9.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jonathan Rochkind
|
@@ -9,20 +9,20 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2020-06
|
12
|
+
date: 2020-07-06 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: blacklight
|
16
16
|
requirement: !ruby/object:Gem::Requirement
|
17
17
|
requirements:
|
18
|
-
- - "
|
18
|
+
- - "~>"
|
19
19
|
- !ruby/object:Gem::Version
|
20
20
|
version: '7.0'
|
21
21
|
type: :runtime
|
22
22
|
prerelease: false
|
23
23
|
version_requirements: !ruby/object:Gem::Requirement
|
24
24
|
requirements:
|
25
|
-
- - "
|
25
|
+
- - "~>"
|
26
26
|
- !ruby/object:Gem::Version
|
27
27
|
version: '7.0'
|
28
28
|
- !ruby/object:Gem::Dependency
|
@@ -101,14 +101,14 @@ dependencies:
|
|
101
101
|
requirements:
|
102
102
|
- - "~>"
|
103
103
|
- !ruby/object:Gem::Version
|
104
|
-
version: '0
|
104
|
+
version: '2.0'
|
105
105
|
type: :development
|
106
106
|
prerelease: false
|
107
107
|
version_requirements: !ruby/object:Gem::Requirement
|
108
108
|
requirements:
|
109
109
|
- - "~>"
|
110
110
|
- !ruby/object:Gem::Version
|
111
|
-
version: '0
|
111
|
+
version: '2.0'
|
112
112
|
- !ruby/object:Gem::Dependency
|
113
113
|
name: engine_cart
|
114
114
|
requirement: !ruby/object:Gem::Requirement
|