hydra-core 9.8.0 → 9.8.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/hydra/content_negotiation/fedora_uri_replacer.rb +1 -1
- data/lib/generators/hydra/head_generator.rb +7 -9
- data/lib/generators/hydra/templates/catalog_controller.rb +23 -23
- data/lib/hydra-head/version.rb +1 -1
- data/lib/tasks/hydra.rake +9 -1
- data/spec/controllers/catalog_controller_spec.rb +1 -1
- metadata +5 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0e6bce4c322a2015039716338e6ce76ee2dd280e
|
4
|
+
data.tar.gz: da5239427f902aaa159fd3405c7bc864cf425cc4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2232d4cee1da5b52e3c99b332743820212c7ddcbe74a78cb051982243c87e6e69dd6fb41134e1d53ca2f68a8d38cf94e55b156d379b7adc95412aedf9925cb8c
|
7
|
+
data.tar.gz: b155e70aaba5ec97d09a221fbacbdc1c3dbd13f0117117966681e10301e02494492ce888238b75ded5e3df10de35467ddea660e56d6120ccc0e8dcfa9d83fbea
|
@@ -21,9 +21,15 @@ module Hydra
|
|
21
21
|
#
|
22
22
|
# Config Files & Initializers
|
23
23
|
#
|
24
|
-
|
24
|
+
#
|
25
|
+
def add_gems
|
25
26
|
gem_group :development, :test do
|
26
27
|
gem "fcrepo_wrapper"
|
28
|
+
gem "rspec-rails" unless options[:'skip-rspec']
|
29
|
+
end
|
30
|
+
|
31
|
+
Bundler.with_clean_env do
|
32
|
+
run "bundle install"
|
27
33
|
end
|
28
34
|
end
|
29
35
|
|
@@ -35,14 +41,6 @@ module Hydra
|
|
35
41
|
" g.test_framework :rspec, :spec => true\n" <<
|
36
42
|
" end\n\n"
|
37
43
|
)
|
38
|
-
|
39
|
-
gem_group :development, :test do
|
40
|
-
gem "rspec-rails"
|
41
|
-
end
|
42
|
-
|
43
|
-
Bundler.with_clean_env do
|
44
|
-
run "bundle install"
|
45
|
-
end
|
46
44
|
end
|
47
45
|
|
48
46
|
def overwrite_catalog_controller
|
@@ -60,32 +60,32 @@ class CatalogController < ApplicationController
|
|
60
60
|
|
61
61
|
# solr fields to be displayed in the index (search results) view
|
62
62
|
# The ordering of the field names is the order of the display
|
63
|
-
config.add_index_field solr_name('title', :stored_searchable, type: :string), label: 'Title
|
64
|
-
config.add_index_field solr_name('title_vern', :stored_searchable, type: :string), label: 'Title
|
65
|
-
config.add_index_field solr_name('author', :stored_searchable, type: :string), label: 'Author
|
66
|
-
config.add_index_field solr_name('author_vern', :stored_searchable, type: :string), label: 'Author
|
67
|
-
config.add_index_field solr_name('format', :symbol), label: 'Format
|
68
|
-
config.add_index_field solr_name('language', :stored_searchable, type: :string), label: 'Language
|
69
|
-
config.add_index_field solr_name('published', :stored_searchable, type: :string), label: 'Published
|
70
|
-
config.add_index_field solr_name('published_vern', :stored_searchable, type: :string), label: 'Published
|
71
|
-
config.add_index_field solr_name('lc_callnum', :stored_searchable, type: :string), label: 'Call number
|
63
|
+
config.add_index_field solr_name('title', :stored_searchable, type: :string), label: 'Title'
|
64
|
+
config.add_index_field solr_name('title_vern', :stored_searchable, type: :string), label: 'Title'
|
65
|
+
config.add_index_field solr_name('author', :stored_searchable, type: :string), label: 'Author'
|
66
|
+
config.add_index_field solr_name('author_vern', :stored_searchable, type: :string), label: 'Author'
|
67
|
+
config.add_index_field solr_name('format', :symbol), label: 'Format'
|
68
|
+
config.add_index_field solr_name('language', :stored_searchable, type: :string), label: 'Language'
|
69
|
+
config.add_index_field solr_name('published', :stored_searchable, type: :string), label: 'Published'
|
70
|
+
config.add_index_field solr_name('published_vern', :stored_searchable, type: :string), label: 'Published'
|
71
|
+
config.add_index_field solr_name('lc_callnum', :stored_searchable, type: :string), label: 'Call number'
|
72
72
|
|
73
73
|
# solr fields to be displayed in the show (single result) view
|
74
74
|
# The ordering of the field names is the order of the display
|
75
|
-
config.add_show_field solr_name('title', :stored_searchable, type: :string), label: 'Title
|
76
|
-
config.add_show_field solr_name('title_vern', :stored_searchable, type: :string), label: 'Title
|
77
|
-
config.add_show_field solr_name('subtitle', :stored_searchable, type: :string), label: 'Subtitle
|
78
|
-
config.add_show_field solr_name('subtitle_vern', :stored_searchable, type: :string), label: 'Subtitle
|
79
|
-
config.add_show_field solr_name('author', :stored_searchable, type: :string), label: 'Author
|
80
|
-
config.add_show_field solr_name('author_vern', :stored_searchable, type: :string), label: 'Author
|
81
|
-
config.add_show_field solr_name('format', :symbol), label: 'Format
|
82
|
-
config.add_show_field solr_name('url_fulltext_tsim', :stored_searchable, type: :string), label: 'URL
|
83
|
-
config.add_show_field solr_name('url_suppl_tsim', :stored_searchable, type: :string), label: 'More Information
|
84
|
-
config.add_show_field solr_name('language', :stored_searchable, type: :string), label: 'Language
|
85
|
-
config.add_show_field solr_name('published', :stored_searchable, type: :string), label: 'Published
|
86
|
-
config.add_show_field solr_name('published_vern', :stored_searchable, type: :string), label: 'Published
|
87
|
-
config.add_show_field solr_name('lc_callnum', :stored_searchable, type: :string), label: 'Call number
|
88
|
-
config.add_show_field solr_name('isbn', :stored_searchable, type: :string), label: 'ISBN
|
75
|
+
config.add_show_field solr_name('title', :stored_searchable, type: :string), label: 'Title'
|
76
|
+
config.add_show_field solr_name('title_vern', :stored_searchable, type: :string), label: 'Title'
|
77
|
+
config.add_show_field solr_name('subtitle', :stored_searchable, type: :string), label: 'Subtitle'
|
78
|
+
config.add_show_field solr_name('subtitle_vern', :stored_searchable, type: :string), label: 'Subtitle'
|
79
|
+
config.add_show_field solr_name('author', :stored_searchable, type: :string), label: 'Author'
|
80
|
+
config.add_show_field solr_name('author_vern', :stored_searchable, type: :string), label: 'Author'
|
81
|
+
config.add_show_field solr_name('format', :symbol), label: 'Format'
|
82
|
+
config.add_show_field solr_name('url_fulltext_tsim', :stored_searchable, type: :string), label: 'URL'
|
83
|
+
config.add_show_field solr_name('url_suppl_tsim', :stored_searchable, type: :string), label: 'More Information'
|
84
|
+
config.add_show_field solr_name('language', :stored_searchable, type: :string), label: 'Language'
|
85
|
+
config.add_show_field solr_name('published', :stored_searchable, type: :string), label: 'Published'
|
86
|
+
config.add_show_field solr_name('published_vern', :stored_searchable, type: :string), label: 'Published'
|
87
|
+
config.add_show_field solr_name('lc_callnum', :stored_searchable, type: :string), label: 'Call number'
|
88
|
+
config.add_show_field solr_name('isbn', :stored_searchable, type: :string), label: 'ISBN'
|
89
89
|
|
90
90
|
# "fielded" search configuration. Used by pulldown among other places.
|
91
91
|
# For supported keys in hash, see rdoc for Blacklight::SearchFields
|
data/lib/hydra-head/version.rb
CHANGED
data/lib/tasks/hydra.rake
CHANGED
@@ -6,7 +6,15 @@ namespace :hydra do
|
|
6
6
|
with_server('development',
|
7
7
|
fcrepo_port: ENV.fetch('FCREPO_PORT', '8984'),
|
8
8
|
solr_port: ENV.fetch('SOLR_PORT', '8983')) do
|
9
|
-
|
9
|
+
IO.popen('rails server') do |io|
|
10
|
+
begin
|
11
|
+
io.each do |line|
|
12
|
+
puts line
|
13
|
+
end
|
14
|
+
rescue Interrupt
|
15
|
+
puts "Stopping server"
|
16
|
+
end
|
17
|
+
end
|
10
18
|
end
|
11
19
|
end
|
12
20
|
end
|
@@ -91,7 +91,7 @@ describe CatalogController do
|
|
91
91
|
end
|
92
92
|
context "with a configured subject converter" do
|
93
93
|
before do
|
94
|
-
Hydra.config.id_to_resource_uri = lambda { |id| "http://hydra.box/catalog/#{id}" }
|
94
|
+
Hydra.config.id_to_resource_uri = lambda { |id, _| "http://hydra.box/catalog/#{id}" }
|
95
95
|
get 'show', :id => asset.id, :format => :nt
|
96
96
|
end
|
97
97
|
it "should convert it" do
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: hydra-core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 9.8.
|
4
|
+
version: 9.8.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2016-02-
|
12
|
+
date: 2016-02-25 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
@@ -31,14 +31,14 @@ dependencies:
|
|
31
31
|
requirements:
|
32
32
|
- - '='
|
33
33
|
- !ruby/object:Gem::Version
|
34
|
-
version: 9.8.
|
34
|
+
version: 9.8.1
|
35
35
|
type: :runtime
|
36
36
|
prerelease: false
|
37
37
|
version_requirements: !ruby/object:Gem::Requirement
|
38
38
|
requirements:
|
39
39
|
- - '='
|
40
40
|
- !ruby/object:Gem::Version
|
41
|
-
version: 9.8.
|
41
|
+
version: 9.8.1
|
42
42
|
- !ruby/object:Gem::Dependency
|
43
43
|
name: active-fedora
|
44
44
|
requirement: !ruby/object:Gem::Requirement
|
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
199
199
|
version: '0'
|
200
200
|
requirements: []
|
201
201
|
rubyforge_project:
|
202
|
-
rubygems_version: 2.
|
202
|
+
rubygems_version: 2.5.1
|
203
203
|
signing_key:
|
204
204
|
specification_version: 4
|
205
205
|
summary: Hydra-Head Rails Engine (requires Rails3)
|