europeana-blacklight 0.3.1 → 0.3.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d64e1e6023e91a1ddcabdaa53da88fd9562503b5
4
- data.tar.gz: 540b8b4b23d6bcf5d3eae70bf3047d6f30d48537
3
+ metadata.gz: d892f236445610a975019d0aed2ff675ad0801f4
4
+ data.tar.gz: 8d65e30ff5da21e187c64999a25fed6f2a29d225
5
5
  SHA512:
6
- metadata.gz: 9d09ddc0e3381b9e7e03a782603654fa1cc433f2bf9e8a50d9e8b2f848288891f9b4e8ed4992f4cc17ed1ecdddd559d8bced6f54d7cd266f70a5691763122774
7
- data.tar.gz: 6e9a01296e3118835a307a74527f544ea961451bceff56f689d2f89080f21cd7b1004bb8a3decf1fe89a0047761ec1a28d7e02ba3d6e933321b603cf785f2ddf
6
+ metadata.gz: 8a72fc7996052249b3ada8dee2421b22d3969cd51f927db36441c8909f847fc52100c89a02903fdd48a4eb576bdbb7f9a4ce3d02202088e0a7158b7af1e2156f
7
+ data.tar.gz: 9b7142747a9b6687dfc1f11b6343490bf113119b6d949108d09a421317907a5864a7cb906270fc71b684ff94c89454d16d9be840825d1ad4f7ebe7f2f2f48c6e
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
21
21
  spec.required_ruby_version = '>= 2.0.0'
22
22
 
23
23
  spec.add_dependency 'activesupport', '>= 4.0', '< 5.0'
24
- spec.add_dependency 'blacklight', '>= 5.12.0', '< 6.0.0'
24
+ spec.add_dependency 'blacklight', '>= 5.12.0', '< 5.16.0'
25
25
  spec.add_dependency 'europeana-api', '~> 0.4.1'
26
26
  spec.add_dependency 'iso-639', '~> 0.2.5'
27
27
  spec.add_dependency 'kaminari', '~> 0.16'
@@ -115,7 +115,7 @@ module Europeana
115
115
 
116
116
  salient_facets = blacklight_params[:f].select do |k, _v|
117
117
  facet = blacklight_config.facet_fields[k]
118
- facet.query && (facet.include_in_request || (facet.include_in_request.nil? && blacklight_config.add_facet_fields_to_solr_request))
118
+ facet.present? && facet.query && (facet.include_in_request || (facet.include_in_request.nil? && blacklight_config.add_facet_fields_to_solr_request))
119
119
  end
120
120
 
121
121
  salient_facets.each_pair do |facet_field, value_list|
@@ -149,7 +149,7 @@ module Europeana
149
149
  end.uniq.join(',')
150
150
 
151
151
  api_request_facet_fields.each do |field_name, facet|
152
- api_parameters[:"f.#{facet.field}.facet.limit"] = (facet_limit_for(field_name) + 1) if facet_limit_for(field_name)
152
+ api_parameters[:"f.#{facet.field}.facet.limit"] = facet_limit_for(field_name) if facet_limit_for(field_name)
153
153
  end
154
154
  end
155
155
 
@@ -27,7 +27,7 @@ module Europeana
27
27
 
28
28
  # Need to set as f.facet_field.facet.* to make sure we
29
29
  # override any field-specific default in the solr request handler.
30
- api_parameters[:"f.#{facet}.facet.limit"] = limit + 1
30
+ api_parameters[:"f.#{facet}.facet.limit"] = limit
31
31
  api_parameters[:"f.#{facet}.facet.offset"] = offset
32
32
  api_parameters[:rows] = 0
33
33
  end
@@ -13,8 +13,13 @@ module Europeana
13
13
  def add_mlt_to_api(api_parameters)
14
14
  return unless blacklight_params[:mlt]
15
15
  repository = blacklight_config.repository_class.new(blacklight_config)
16
- doc_response = repository.find(blacklight_params[:mlt])
17
- query = doc_response.documents.first.more_like_this_query(blacklight_params[:mltf])
16
+ if blacklight_params[:mlt].respond_to?(:more_like_this_query)
17
+ doc = blacklight_params[:mlt]
18
+ else
19
+ doc_response = repository.find(blacklight_params[:mlt])
20
+ doc = doc_response.documents.first
21
+ end
22
+ query = doc.more_like_this_query(blacklight_params[:mltf])
18
23
  append_to_query_param(api_parameters, query)
19
24
  end
20
25
  end
@@ -1,5 +1,5 @@
1
1
  module Europeana
2
2
  module Blacklight
3
- VERSION = '0.3.1'
3
+ VERSION = '0.3.2'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: europeana-blacklight
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.1
4
+ version: 0.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Richard Doe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-11-05 00:00:00.000000000 Z
11
+ date: 2015-12-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -39,7 +39,7 @@ dependencies:
39
39
  version: 5.12.0
40
40
  - - "<"
41
41
  - !ruby/object:Gem::Version
42
- version: 6.0.0
42
+ version: 5.16.0
43
43
  type: :runtime
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
49
49
  version: 5.12.0
50
50
  - - "<"
51
51
  - !ruby/object:Gem::Version
52
- version: 6.0.0
52
+ version: 5.16.0
53
53
  - !ruby/object:Gem::Dependency
54
54
  name: europeana-api
55
55
  requirement: !ruby/object:Gem::Requirement