blacklight-marc 7.0.0.rc1 → 7.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.travis.yml +10 -6
- data/Gemfile +5 -0
- data/app/helpers/blacklight_marc_helper.rb +3 -3
- data/blacklight-marc.gemspec +3 -4
- data/lib/blacklight/marc/engine.rb +2 -0
- data/lib/blacklight/marc/version.rb +1 -1
- data/solr/conf/schema.xml +20 -22
- data/spec/controllers/catalog_controller_spec.rb +1 -1
- data/spec/views/catalog/index.atom.builder_spec.rb +1 -1
- metadata +15 -36
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: 982fc53944ac08a10b9fee904da008efa6c7a80a4c17a6abd7230a6d530afb09
|
4
|
+
data.tar.gz: 2df11802581af3d7f66ce71a174e3e1866f88b48a8587146e8273532ea74181e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 85d9056f0e7962ea4b0c2b5353456c2a0334f1833073224f92e3bbbb5ec13b8baf6074724f371423b7d784e6a811963bf0a6f2f3e43a37f8151575a85c6307ce
|
7
|
+
data.tar.gz: 8666db8e8109679087f4c774a1b7eb4a70a4d91075668f08115b11d527827c8225da37b98d904c27b7464bf5d9e2534594745bdd940ef15b6b6b76b65ce25d6f
|
data/.travis.yml
CHANGED
@@ -4,10 +4,14 @@ sudo: false
|
|
4
4
|
notifications:
|
5
5
|
email: false
|
6
6
|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
7
|
+
matrix:
|
8
|
+
include:
|
9
|
+
- rvm: 2.7.1
|
10
|
+
env: "RAILS_VERSION=6.0.3.2"
|
11
|
+
- rvm: 2.6.6
|
12
|
+
env: "RAILS_VERSION=6.0.3.2"
|
13
|
+
- rvm: 2.6.6
|
14
|
+
env: "RAILS_VERSION=5.2.4.3"
|
11
15
|
|
12
16
|
before_install:
|
13
17
|
- gem install bundler
|
@@ -19,5 +23,5 @@ notifications:
|
|
19
23
|
|
20
24
|
global_env:
|
21
25
|
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true
|
22
|
-
|
23
|
-
jdk:
|
26
|
+
|
27
|
+
jdk: openjdk11
|
data/Gemfile
CHANGED
@@ -1,18 +1,18 @@
|
|
1
1
|
module BlacklightMarcHelper
|
2
2
|
|
3
3
|
# This method should move to BlacklightMarc in Blacklight 6.x
|
4
|
-
def refworks_export_url params = {}
|
4
|
+
def refworks_export_url params = {}, *_
|
5
5
|
"http://www.refworks.com/express/expressimport.asp?vendor=#{CGI.escape(params[:vendor] || application_name)}&filter=#{CGI.escape(params[:filter] || "MARC Format")}&encoding=65001" + (("&url=#{CGI.escape(params[:url])}" if params[:url]) || "")
|
6
6
|
end
|
7
7
|
|
8
|
-
def refworks_solr_document_path opts = {}
|
8
|
+
def refworks_solr_document_path opts = {}, *_
|
9
9
|
if opts[:id]
|
10
10
|
refworks_export_url(url: solr_document_url(opts[:id], format: :refworks_marc_txt))
|
11
11
|
end
|
12
12
|
end
|
13
13
|
|
14
14
|
# For exporting a single endnote document. (endnote_catalog_path is defined by blacklight-marc and it is used for multiple document export)
|
15
|
-
def single_endnote_catalog_path opts = {}
|
15
|
+
def single_endnote_catalog_path opts = {}, *_
|
16
16
|
solr_document_path(opts.merge(format: 'endnote'))
|
17
17
|
end
|
18
18
|
|
data/blacklight-marc.gemspec
CHANGED
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
|
|
18
18
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
19
19
|
spec.require_paths = ["lib"]
|
20
20
|
|
21
|
-
spec.add_dependency 'blacklight', '
|
21
|
+
spec.add_dependency 'blacklight', '~> 7.0'
|
22
22
|
spec.add_dependency "library_stdnums"
|
23
23
|
spec.add_dependency "rails"
|
24
24
|
# Let's allow future versions of marc, count on
|
@@ -27,13 +27,12 @@ Gem::Specification.new do |spec|
|
|
27
27
|
spec.add_dependency "traject", "~>3.0"
|
28
28
|
spec.add_dependency 'marc-fastxmlwriter' # NO REXML
|
29
29
|
|
30
|
-
spec.add_development_dependency "bundler"
|
30
|
+
spec.add_development_dependency "bundler"
|
31
31
|
spec.add_development_dependency "rake"
|
32
|
-
spec.add_development_dependency "rspec-rails", '~>
|
32
|
+
spec.add_development_dependency "rspec-rails", '~> 4.0'
|
33
33
|
spec.add_development_dependency "rspec-activemodel-mocks"
|
34
34
|
spec.add_development_dependency "solr_wrapper"
|
35
35
|
spec.add_development_dependency "capybara"
|
36
|
-
spec.add_development_dependency "coveralls"
|
37
36
|
spec.add_development_dependency "simplecov"
|
38
37
|
spec.add_development_dependency "engine_cart", "~> 2.0"
|
39
38
|
end
|
@@ -14,6 +14,8 @@ module Blacklight::Marc
|
|
14
14
|
end
|
15
15
|
|
16
16
|
initializer 'blacklight_marc.initialize' do |app|
|
17
|
+
require 'blacklight/solr/document'
|
18
|
+
|
17
19
|
Mime::Type.register_alias "text/plain", :refworks_marc_txt
|
18
20
|
Mime::Type.register_alias "text/plain", :openurl_kev
|
19
21
|
Mime::Type.register "application/x-endnote-refer", :endnote
|
data/solr/conf/schema.xml
CHANGED
@@ -71,7 +71,7 @@
|
|
71
71
|
<dynamicField name="*_isi" type="int" stored="true" indexed="true" multiValued="false"/>
|
72
72
|
<dynamicField name="*_isim" type="int" stored="true" indexed="true" multiValued="true"/>
|
73
73
|
|
74
|
-
<!--
|
74
|
+
<!-- IntegerPointField (_it...) (for faster range queries) -->
|
75
75
|
|
76
76
|
<dynamicField name="*_iti" type="tint" stored="false" indexed="true" multiValued="false"/>
|
77
77
|
<dynamicField name="*_itim" type="tint" stored="false" indexed="true" multiValued="true"/>
|
@@ -93,7 +93,7 @@
|
|
93
93
|
<dynamicField name="*_dtsi" type="date" stored="true" indexed="true" multiValued="false"/>
|
94
94
|
<dynamicField name="*_dtsim" type="date" stored="true" indexed="true" multiValued="true"/>
|
95
95
|
|
96
|
-
<!--
|
96
|
+
<!-- DatePointField (_dtt...) (for faster range queries) -->
|
97
97
|
|
98
98
|
<dynamicField name="*_dtti" type="tdate" stored="false" indexed="true" multiValued="false"/>
|
99
99
|
<dynamicField name="*_dttim" type="tdate" stored="false" indexed="true" multiValued="true"/>
|
@@ -113,7 +113,7 @@
|
|
113
113
|
<dynamicField name="*_lsi" type="long" stored="true" indexed="true" multiValued="false"/>
|
114
114
|
<dynamicField name="*_lsim" type="long" stored="true" indexed="true" multiValued="true"/>
|
115
115
|
|
116
|
-
<!--
|
116
|
+
<!-- LongPointField (_lt...) (for faster range queries) -->
|
117
117
|
|
118
118
|
<dynamicField name="*_lti" type="tlong" stored="false" indexed="true" multiValued="false"/>
|
119
119
|
<dynamicField name="*_ltim" type="tlong" stored="false" indexed="true" multiValued="true"/>
|
@@ -133,7 +133,7 @@
|
|
133
133
|
<dynamicField name="*_dbsi" type="double" stored="true" indexed="true" multiValued="false"/>
|
134
134
|
<dynamicField name="*_dbsim" type="double" stored="true" indexed="true" multiValued="true"/>
|
135
135
|
|
136
|
-
<!--
|
136
|
+
<!-- DoublePointField (_dbt...) (for faster range queries) -->
|
137
137
|
|
138
138
|
<dynamicField name="*_dbti" type="tdouble" stored="false" indexed="true" multiValued="false"/>
|
139
139
|
<dynamicField name="*_dbtim" type="tdouble" stored="false" indexed="true" multiValued="true"/>
|
@@ -153,7 +153,7 @@
|
|
153
153
|
<dynamicField name="*_fsi" type="float" stored="true" indexed="true" multiValued="false"/>
|
154
154
|
<dynamicField name="*_fsim" type="float" stored="true" indexed="true" multiValued="true"/>
|
155
155
|
|
156
|
-
<!--
|
156
|
+
<!-- FloatPointField (_ft...) (for faster range queries) -->
|
157
157
|
|
158
158
|
<dynamicField name="*_fti" type="tfloat" stored="false" indexed="true" multiValued="false"/>
|
159
159
|
<dynamicField name="*_ftim" type="tfloat" stored="false" indexed="true" multiValued="true"/>
|
@@ -231,23 +231,23 @@
|
|
231
231
|
<fieldType name="rand" class="solr.RandomSortField" omitNorms="true"/>
|
232
232
|
|
233
233
|
<!-- Default numeric field types. -->
|
234
|
-
<fieldType name="int" class="solr.
|
235
|
-
<fieldType name="float" class="solr.
|
236
|
-
<fieldType name="long" class="solr.
|
237
|
-
<fieldType name="double" class="solr.
|
234
|
+
<fieldType name="int" class="solr.IntPointField" docValues="true"/>
|
235
|
+
<fieldType name="float" class="solr.FloatPointField" docValues="true"/>
|
236
|
+
<fieldType name="long" class="solr.LongPointField" docValues="true"/>
|
237
|
+
<fieldType name="double" class="solr.DoublePointField" docValues="true"/>
|
238
238
|
|
239
|
-
<!--
|
240
|
-
<fieldType name="tint" class="solr.
|
241
|
-
<fieldType name="tfloat" class="solr.
|
242
|
-
<fieldType name="tlong" class="solr.
|
243
|
-
<fieldType name="tdouble" class="solr.
|
239
|
+
<!-- PointField numeric field types for faster range queries -->
|
240
|
+
<fieldType name="tint" class="solr.IntPointField" docValues="true"/>
|
241
|
+
<fieldType name="tfloat" class="solr.FloatPointField" docValues="true"/>
|
242
|
+
<fieldType name="tlong" class="solr.LongPointField" docValues="true"/>
|
243
|
+
<fieldType name="tdouble" class="solr.DoublePointField" docValues="true"/>
|
244
244
|
|
245
245
|
<!-- The format for this date field is of the form 1995-12-31T23:59:59Z
|
246
246
|
Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
|
247
247
|
-->
|
248
|
-
<fieldType name="date" class="solr.
|
249
|
-
<!-- A
|
250
|
-
<fieldType name="tdate" class="solr.
|
248
|
+
<fieldType name="date" class="solr.DatePointField" docValues="true"/>
|
249
|
+
<!-- A PointField based date field for faster date range queries and date faceting. -->
|
250
|
+
<fieldType name="tdate" class="solr.DatePointField" docValues="true"/>
|
251
251
|
|
252
252
|
|
253
253
|
<!-- This point type indexes the coordinates as separate fields (subFields)
|
@@ -263,8 +263,8 @@
|
|
263
263
|
-->
|
264
264
|
<fieldType name="point" class="solr.PointType" dimension="2" subFieldSuffix="_d"/>
|
265
265
|
|
266
|
-
<!-- A specialized field for geospatial search
|
267
|
-
<fieldType name="location" class="solr.
|
266
|
+
<!-- A specialized field for geospatial search filters and distance sorting. -->
|
267
|
+
<fieldType name="location" class="solr.LatLonPointSpatialField" docValues="true"/>
|
268
268
|
|
269
269
|
<!-- An alternative geospatial field type new to Solr 4. It supports multiValued and polygon shapes.
|
270
270
|
For more information about this and other Spatial fields new to Solr 4, see:
|
@@ -276,7 +276,7 @@
|
|
276
276
|
<field name="bbox" type="bbox" />
|
277
277
|
<fieldType name="bbox" class="solr.BBoxField"
|
278
278
|
geo="true" distanceUnits="kilometers" numberType="_bbox_coord" storeSubFields="false"/>
|
279
|
-
<fieldType name="_bbox_coord" class="solr.
|
279
|
+
<fieldType name="_bbox_coord" class="solr.DoublePointField" docValues="true" stored="false"/>
|
280
280
|
|
281
281
|
<fieldType name="text" class="solr.TextField" omitNorms="false">
|
282
282
|
<analyzer>
|
@@ -350,7 +350,6 @@
|
|
350
350
|
<analyzer>
|
351
351
|
<tokenizer class="solr.StandardTokenizerFactory"/>
|
352
352
|
<filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
|
353
|
-
<filter class="solr.StandardFilterFactory"/>
|
354
353
|
<filter class="solr.LowerCaseFilterFactory"/>
|
355
354
|
<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
|
356
355
|
</analyzer>
|
@@ -359,7 +358,6 @@
|
|
359
358
|
<fieldType name="textSuggest" class="solr.TextField" positionIncrementGap="100">
|
360
359
|
<analyzer>
|
361
360
|
<tokenizer class="solr.KeywordTokenizerFactory"/>
|
362
|
-
<filter class="solr.StandardFilterFactory"/>
|
363
361
|
<filter class="solr.LowerCaseFilterFactory"/>
|
364
362
|
<filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
|
365
363
|
</analyzer>
|
@@ -14,7 +14,7 @@ describe "catalog/index" do
|
|
14
14
|
@params = { :content_format => 'marc', :f => { :format => ['Book'] }, :page => 2 }
|
15
15
|
|
16
16
|
# run a solr query to get our data
|
17
|
-
service = CatalogController.search_service_class.new(@config, @params)
|
17
|
+
service = CatalogController.search_service_class.new(config: @config, user_params: @params)
|
18
18
|
@response, _ = service.search_results
|
19
19
|
@document_list = @response.documents
|
20
20
|
end
|
metadata
CHANGED
@@ -1,35 +1,29 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: blacklight-marc
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 7.0.0
|
4
|
+
version: 7.0.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Justin Coyne
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2020-08-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: blacklight
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - "
|
18
|
-
- !ruby/object:Gem::Version
|
19
|
-
version: 7.0.0.a
|
20
|
-
- - "<"
|
17
|
+
- - "~>"
|
21
18
|
- !ruby/object:Gem::Version
|
22
|
-
version:
|
19
|
+
version: '7.0'
|
23
20
|
type: :runtime
|
24
21
|
prerelease: false
|
25
22
|
version_requirements: !ruby/object:Gem::Requirement
|
26
23
|
requirements:
|
27
|
-
- - "
|
28
|
-
- !ruby/object:Gem::Version
|
29
|
-
version: 7.0.0.a
|
30
|
-
- - "<"
|
24
|
+
- - "~>"
|
31
25
|
- !ruby/object:Gem::Version
|
32
|
-
version:
|
26
|
+
version: '7.0'
|
33
27
|
- !ruby/object:Gem::Dependency
|
34
28
|
name: library_stdnums
|
35
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -110,16 +104,16 @@ dependencies:
|
|
110
104
|
name: bundler
|
111
105
|
requirement: !ruby/object:Gem::Requirement
|
112
106
|
requirements:
|
113
|
-
- - "
|
107
|
+
- - ">="
|
114
108
|
- !ruby/object:Gem::Version
|
115
|
-
version: '
|
109
|
+
version: '0'
|
116
110
|
type: :development
|
117
111
|
prerelease: false
|
118
112
|
version_requirements: !ruby/object:Gem::Requirement
|
119
113
|
requirements:
|
120
|
-
- - "
|
114
|
+
- - ">="
|
121
115
|
- !ruby/object:Gem::Version
|
122
|
-
version: '
|
116
|
+
version: '0'
|
123
117
|
- !ruby/object:Gem::Dependency
|
124
118
|
name: rake
|
125
119
|
requirement: !ruby/object:Gem::Requirement
|
@@ -140,14 +134,14 @@ dependencies:
|
|
140
134
|
requirements:
|
141
135
|
- - "~>"
|
142
136
|
- !ruby/object:Gem::Version
|
143
|
-
version: '
|
137
|
+
version: '4.0'
|
144
138
|
type: :development
|
145
139
|
prerelease: false
|
146
140
|
version_requirements: !ruby/object:Gem::Requirement
|
147
141
|
requirements:
|
148
142
|
- - "~>"
|
149
143
|
- !ruby/object:Gem::Version
|
150
|
-
version: '
|
144
|
+
version: '4.0'
|
151
145
|
- !ruby/object:Gem::Dependency
|
152
146
|
name: rspec-activemodel-mocks
|
153
147
|
requirement: !ruby/object:Gem::Requirement
|
@@ -190,20 +184,6 @@ dependencies:
|
|
190
184
|
- - ">="
|
191
185
|
- !ruby/object:Gem::Version
|
192
186
|
version: '0'
|
193
|
-
- !ruby/object:Gem::Dependency
|
194
|
-
name: coveralls
|
195
|
-
requirement: !ruby/object:Gem::Requirement
|
196
|
-
requirements:
|
197
|
-
- - ">="
|
198
|
-
- !ruby/object:Gem::Version
|
199
|
-
version: '0'
|
200
|
-
type: :development
|
201
|
-
prerelease: false
|
202
|
-
version_requirements: !ruby/object:Gem::Requirement
|
203
|
-
requirements:
|
204
|
-
- - ">="
|
205
|
-
- !ruby/object:Gem::Version
|
206
|
-
version: '0'
|
207
187
|
- !ruby/object:Gem::Dependency
|
208
188
|
name: simplecov
|
209
189
|
requirement: !ruby/object:Gem::Requirement
|
@@ -341,12 +321,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
341
321
|
version: '0'
|
342
322
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
343
323
|
requirements:
|
344
|
-
- - "
|
324
|
+
- - ">="
|
345
325
|
- !ruby/object:Gem::Version
|
346
|
-
version:
|
326
|
+
version: '0'
|
347
327
|
requirements: []
|
348
|
-
|
349
|
-
rubygems_version: 2.6.11
|
328
|
+
rubygems_version: 3.1.2
|
350
329
|
signing_key:
|
351
330
|
specification_version: 4
|
352
331
|
summary: MARC support for Blacklight
|