diff --git a/Gemfile b/Gemfile
index cdb25562c..e75623363 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.4'
+gem 'rails', '4.2.6'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# Use SCSS for stylesheets
@@ -33,10 +33,10 @@ gem 'modernizr-rails'
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development
-gem 'curation_concerns', github:'projecthydra-labs/curation_concerns', branch: :master
+gem 'curation_concerns', github:'projecthydra-labs/curation_concerns', branch: "update_at"
gem 'pul_metadata_services', github:'pulibrary/pul_metadata_services', branch: :master
gem 'hydra-role-management', '~> 0.2.0'
-gem 'rsolr', '~> 1.0.6'
+gem 'rsolr', '~> 1.1.0'
gem 'devise', '~> 3.0'
gem 'devise-guests', '~> 0.3'
gem 'iiif-presentation'
@@ -49,7 +49,7 @@ gem 'prawn'
gem 'hydra-works', github: 'projecthydra-labs/hydra-works', branch: 'master'
gem 'hydra-pcdm', github: 'projecthydra-labs/hydra-pcdm', branch: 'master'
gem 'hydra-derivatives', github: 'projecthydra/hydra-derivatives', branch: 'master'
-gem 'active-fedora', github: 'projecthydra/active_fedora', branch: 'master'
+gem 'active-fedora', github: 'projecthydra/active_fedora', branch: 'test_speed_updates'
gem 'rubocop', '~> 0.34.0', require: false
gem 'rubocop-rspec', '~> 1.3.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 79584ee56..aacfefa91 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
GIT
remote: git://github.com/projecthydra-labs/browse-everything.git
- revision: 5d298d54ef502f30677ee7c63de15d4efb8a7429
+ revision: db1e5303adb26b5543604bb4dafd249db182166c
specs:
- browse-everything (0.10.0)
+ browse-everything (0.10.3)
bootstrap-sass
dropbox-sdk (>= 1.6.2)
font-awesome-rails
- google-api-client
+ google-api-client (~> 0.8.6)
google_drive
httparty
rails (>= 3.1)
@@ -16,27 +16,26 @@ GIT
GIT
remote: git://github.com/projecthydra-labs/curation_concerns.git
- revision: e41c4117a47da17a312000aeda33d4fd006a1698
- branch: master
+ revision: 8b6b6b76e1878e2d58620770a09f88b01814fb07
+ branch: update_at
specs:
- curation_concerns (1.0.0.beta7)
+ curation_concerns (1.1.2)
active_attr
- active_fedora-noid (~> 1.0)
+ active_fedora-noid (~> 2.0.0.beta1)
awesome_nested_set (~> 3.0)
- blacklight (~> 6.1)
+ blacklight (~> 6.3)
blacklight_advanced_search (~> 6.0)
breadcrumbs_on_rails (~> 2.3)
browse-everything (~> 0.10)
deprecation (~> 1.0)
- hydra-editor (~> 2.0)
- hydra-head (>= 10.0.0.beta1, < 11)
+ hydra-editor (>= 2, < 4)
+ hydra-head (>= 10.0.0, < 11)
hydra-works (>= 0.12.0)
jquery-ui-rails
kaminari_route_prefix (~> 0.0.1)
qa (~> 0.5)
rails_autolink
- rdf (~> 1.99)
- rdf-vocab (~> 0)
+ rdf (~> 2.0)
redlock (~> 0.1.2)
simple_form (~> 3.1)
solrizer (~> 3.4)
@@ -44,11 +43,11 @@ GIT
GIT
remote: git://github.com/projecthydra-labs/hydra-pcdm.git
- revision: c684320d7334ea00e09be501bf46570b7a0756bc
+ revision: 559b2886e6f9381af9f2a02a2ea65ad2df87bc0b
branch: master
specs:
hydra-pcdm (0.8.0)
- active-fedora (~> 10.0.0.beta2)
+ active-fedora (~> 11.0.0.alpha)
mime-types (>= 1)
GIT
@@ -63,11 +62,11 @@ GIT
GIT
remote: git://github.com/projecthydra/active_fedora.git
- revision: 29933f5ee03605ac48e797885484d807f501f654
- branch: master
+ revision: f6ac3fbe04d5c0fedb64b7c04a34ca207d29f7f7
+ branch: test_speed_updates
specs:
- active-fedora (10.0.0.beta2)
- active-triples (~> 0.7.1)
+ active-fedora (11.0.0.alpha)
+ active-triples (~> 0.10.0)
activemodel (>= 4.2, < 6)
activesupport (>= 4.2.4, < 6)
deprecation
@@ -75,7 +74,7 @@ GIT
linkeddata
nom-xml (>= 0.5.1)
om (~> 3.1)
- rdf-rdfxml (~> 1.1)
+ rdf-rdfxml
rsolr (~> 1.0, >= 1.0.10)
solrizer (~> 3.4)
@@ -104,7 +103,7 @@ GIT
GIT
remote: git://github.com/yob/pdf-reader.git
- revision: 57ce8244763259bbc7068fe824564176b5db1015
+ revision: fb1de686d2895a6bf98a10bc64bd548babad6f15
specs:
pdf-reader (1.4.0)
Ascii85 (~> 1.0.0)
@@ -118,51 +117,52 @@ GEM
remote: https://rails-assets.org/
specs:
Ascii85 (1.0.2)
- aasm (4.10.0)
- actionmailer (4.2.4)
- actionpack (= 4.2.4)
- actionview (= 4.2.4)
- activejob (= 4.2.4)
+ aasm (4.11.0)
+ actionmailer (4.2.6)
+ actionpack (= 4.2.6)
+ actionview (= 4.2.6)
+ activejob (= 4.2.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.4)
- actionview (= 4.2.4)
- activesupport (= 4.2.4)
+ actionpack (4.2.6)
+ actionview (= 4.2.6)
+ activesupport (= 4.2.6)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (4.2.4)
- activesupport (= 4.2.4)
+ actionview (4.2.6)
+ activesupport (= 4.2.6)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- active-triples (0.7.6)
+ active-triples (0.10.0)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
deprecation (~> 1.0)
- linkeddata (~> 1.1)
- rdf (~> 1.1)
+ linkeddata (~> 2.0)
+ rdf (~> 2.0, >= 2.0.2)
active_attr (0.9.0)
activemodel (>= 3.0.2, < 5.1)
activesupport (>= 3.0.2, < 5.1)
- active_fedora-noid (1.1.0)
+ active_fedora-noid (2.0.0.beta1)
active-fedora (>= 9.7, < 11)
- noid (~> 0.7)
- activejob (4.2.4)
- activesupport (= 4.2.4)
+ noid (~> 0.9)
+ rails (~> 4.2.6)
+ activejob (4.2.6)
+ activesupport (= 4.2.6)
globalid (>= 0.3.0)
- activemodel (4.2.4)
- activesupport (= 4.2.4)
+ activemodel (4.2.6)
+ activesupport (= 4.2.6)
builder (~> 3.1)
- activerecord (4.2.4)
- activemodel (= 4.2.4)
- activesupport (= 4.2.4)
+ activerecord (4.2.6)
+ activemodel (= 4.2.6)
+ activesupport (= 4.2.6)
arel (~> 6.0)
- activerecord-import (0.13.0)
- activerecord (>= 3.0)
- activesupport (4.2.4)
+ activerecord-import (0.15.0)
+ activerecord (>= 3.2)
+ activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@@ -173,14 +173,14 @@ GEM
amq-protocol (2.0.1)
arabic-letter-connector (0.1.1)
arel (6.0.3)
- ast (2.2.0)
+ ast (2.3.0)
astrolabe (1.3.1)
parser (~> 2.2)
autoparse (0.3.3)
addressable (>= 2.3.1)
extlib (>= 0.9.15)
multi_json (>= 1.0.0)
- autoprefixer-rails (6.3.6.1)
+ autoprefixer-rails (6.3.7)
execjs
awesome_nested_set (3.1.1)
activerecord (>= 4.0.0, < 5.1)
@@ -193,7 +193,7 @@ GEM
bcrypt (3.1.11)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
- blacklight (6.2.0)
+ blacklight (6.3.1)
bootstrap-sass (~> 3.2)
deprecation
globalid
@@ -202,9 +202,10 @@ GEM
rails (>= 4.2, < 6)
rsolr (~> 1.0, >= 1.0.6)
twitter-typeahead-rails (~> 0.11)
- blacklight-access_controls (0.3.0)
+ blacklight-access_controls (0.5.1)
blacklight (~> 6.0)
cancancan (~> 1.8)
+ deprecation (~> 1.0)
blacklight_advanced_search (6.0.2)
blacklight (~> 6.0, >= 6.0.1)
parslet
@@ -212,13 +213,13 @@ GEM
bootstrap-sass (3.3.6)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
- bootstrap_form (2.3.0)
+ bootstrap_form (2.4.0)
breadcrumbs_on_rails (2.3.1)
builder (3.2.2)
- bunny (2.3.1)
+ bunny (2.4.0)
amq-protocol (>= 2.0.1)
- byebug (8.2.5)
- cancancan (1.14.0)
+ byebug (9.0.5)
+ cancancan (1.15.0)
capistrano (3.4.0)
i18n
rake (>= 10.0.0)
@@ -228,7 +229,7 @@ GEM
sshkit (~> 1.2)
capistrano-passenger (0.2.0)
capistrano (~> 3.0)
- capistrano-rails (1.1.6)
+ capistrano-rails (1.1.7)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
capistrano-rails-console (1.0.2)
@@ -262,7 +263,7 @@ GEM
debug_inspector (0.0.2)
deprecation (1.0.0)
activesupport
- devise (3.5.9)
+ devise (3.5.10)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
@@ -273,13 +274,13 @@ GEM
devise
diff-lcs (1.2.5)
docile (1.1.5)
- domain_name (0.5.20160310)
+ domain_name (0.5.20160615)
unf (>= 0.0.5, < 1.0.0)
dropbox-sdk (1.6.5)
json
- ebnf (1.0.0)
- rdf (~> 1.1)
- sxp (~> 0.1, >= 0.1.3)
+ ebnf (1.0.1)
+ rdf (~> 2.0)
+ sxp (~> 1.0)
equivalent-xml (0.6.0)
nokogiri (>= 1.4.3)
erubis (2.7.0)
@@ -294,9 +295,9 @@ GEM
railties (>= 3.0.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
- fcrepo_wrapper (0.5.0)
+ fcrepo_wrapper (0.5.2)
ruby-progressbar
- font-awesome-rails (4.6.2.0)
+ font-awesome-rails (4.6.3.1)
railties (>= 3.2, < 5.1)
globalid (0.3.6)
activesupport (>= 4.1.0)
@@ -326,6 +327,8 @@ GEM
signet (~> 0.7)
haml (4.0.7)
tilt
+ hamster (3.0.0)
+ concurrent-ruby (~> 1.0)
hashdiff (0.3.0)
hashery (2.1.2)
hashie (3.4.4)
@@ -340,15 +343,15 @@ GEM
httparty (0.13.7)
json (~> 1.8)
multi_xml (>= 0.5.2)
- hydra-access-controls (10.0.0.beta4)
+ hydra-access-controls (10.0.2)
active-fedora (>= 10.0.0.beta1, < 11)
- activesupport (~> 4.0)
+ activesupport (>= 4, < 6)
blacklight (>= 5.16)
- blacklight-access_controls (~> 0.1)
+ blacklight-access_controls (~> 0.5)
cancancan (~> 1.8)
deprecation (~> 1.0)
- hydra-core (10.0.0.beta4)
- hydra-access-controls (= 10.0.0.beta4)
+ hydra-core (10.0.2)
+ hydra-access-controls (= 10.0.2)
rails (~> 4.0)
hydra-editor (2.0.0)
active-fedora (>= 9.0.0)
@@ -357,28 +360,28 @@ GEM
simple_form (~> 3.1.0)
hydra-file_characterization (0.3.3)
activesupport (>= 3.0.0)
- hydra-head (10.0.0.beta4)
- hydra-access-controls (= 10.0.0.beta4)
- hydra-core (= 10.0.0.beta4)
+ hydra-head (10.0.2)
+ hydra-access-controls (= 10.0.2)
+ hydra-core (= 10.0.2)
rails (>= 3.2.6)
hydra-role-management (0.2.2)
blacklight
bootstrap_form
cancancan
i18n (0.7.0)
- iiif-presentation (0.0.5)
+ iiif-presentation (0.1.0)
activesupport (>= 3.2.18)
faraday (~> 0.9.0)
json
- iso-639 (0.2.5)
+ iso-639 (0.2.8)
jasmine-core (2.4.1)
jasmine-jquery-rails (2.0.3)
- jasmine-rails (0.12.4)
+ jasmine-rails (0.12.6)
jasmine-core (>= 1.3, < 3.0)
phantomjs (>= 1.9)
railties (>= 3.2.0)
sprockets-rails
- jbuilder (2.4.1)
+ jbuilder (2.5.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.1.1)
@@ -388,17 +391,23 @@ GEM
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (1.8.3)
- json-ld (1.99.2)
+ json-ld (2.0.0.1)
multi_json (~> 1.11)
- rdf (~> 1.99)
- jwt (1.5.1)
- kaminari (0.16.3)
+ rdf (~> 2.0)
+ jwt (1.5.4)
+ kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kaminari_route_prefix (0.0.1)
kaminari (>= 0.16, < 2)
launchy (2.4.3)
addressable (~> 2.3)
+ ld-patch (0.3.0)
+ ebnf (~> 1.0, >= 1.0.1)
+ rdf (~> 2.0)
+ rdf-xsd (~> 2.0)
+ sparql (~> 2.0)
+ sxp (~> 1.0)
ldp (0.5.0)
deprecation
faraday
@@ -407,27 +416,28 @@ GEM
rdf-vocab
slop
link_header (0.0.8)
- linkeddata (1.99.0)
+ linkeddata (2.0.0)
equivalent-xml (~> 0.6)
- json-ld (~> 1.99)
+ json-ld (~> 2.0)
+ ld-patch (~> 0.3)
nokogiri (~> 1.6)
- rdf (~> 1.99)
- rdf-aggregate-repo (~> 1.99)
- rdf-isomorphic (~> 1.99)
- rdf-json (~> 1.1, >= 1.1.2)
- rdf-microdata (~> 2.0, >= 2.0.2)
- rdf-n3 (~> 1.99)
- rdf-rdfa (~> 1.99)
- rdf-rdfxml (~> 1.1, >= 1.1.5)
- rdf-reasoner (~> 0.3)
- rdf-tabular (~> 0.3)
- rdf-trig (~> 1.99, >= 1.99.0.1)
- rdf-trix (~> 1.99)
- rdf-turtle (~> 1.99)
- rdf-vocab (~> 0.8, >= 0.8.6)
- rdf-xsd (~> 1.1, >= 1.1.5)
- sparql (~> 1.99)
- sparql-client (~> 1.99)
+ rdf (~> 2.0)
+ rdf-aggregate-repo (~> 2.0)
+ rdf-isomorphic (~> 2.0)
+ rdf-json (~> 2.0)
+ rdf-microdata (~> 2.0)
+ rdf-n3 (~> 2.0)
+ rdf-rdfa (~> 2.0)
+ rdf-rdfxml (~> 2.0)
+ rdf-reasoner (~> 0.4)
+ rdf-tabular (~> 0.4)
+ rdf-trig (~> 2.0)
+ rdf-trix (~> 2.0)
+ rdf-turtle (~> 2.0)
+ rdf-vocab (~> 2.0)
+ rdf-xsd (~> 2.0)
+ sparql (~> 2.0)
+ sparql-client (~> 2.0)
little-plugger (1.1.4)
logging (2.1.0)
little-plugger (~> 1.1)
@@ -441,7 +451,7 @@ GEM
unf
memoist (0.14.0)
method_source (0.8.2)
- mime-types (2.99.1)
+ mime-types (2.99.2)
mimemagic (0.3.1)
mini_magick (4.5.1)
mini_portile (0.6.2)
@@ -453,9 +463,9 @@ GEM
net-http-persistent (2.9.4)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
- net-ssh (3.1.1)
+ net-ssh (3.2.0)
netrc (0.11.0)
- newrelic_rpm (3.15.2.317)
+ newrelic_rpm (3.16.0.318)
noid (0.9.0)
nokogiri (1.6.6.4)
mini_portile (~> 0.6.0)
@@ -464,13 +474,13 @@ GEM
i18n
nokogiri
oauth (0.5.1)
- oauth2 (1.1.0)
+ oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
- jwt (~> 1.0, < 1.5.2)
+ jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
- om (3.1.0)
+ om (3.1.1)
activemodel
activesupport
nokogiri (>= 1.4.2)
@@ -486,7 +496,7 @@ GEM
rails (> 3.2.0)
orm_adapter (0.5.0)
os (0.9.6)
- parser (2.3.1.0)
+ parser (2.3.1.2)
ast (~> 2.2)
parslet (1.7.1)
blankslate (>= 2.0, <= 4.0)
@@ -498,16 +508,16 @@ GEM
prawn (2.1.0)
pdf-core (~> 0.6.1)
ttfunk (~> 1.4.0)
- pry (0.10.3)
+ pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
- pry-byebug (3.3.0)
- byebug (~> 8.0)
+ pry-byebug (3.4.0)
+ byebug (~> 9.0)
pry (~> 0.10)
pry-rails (0.3.4)
pry (>= 0.9.10)
- qa (0.6.0)
+ qa (0.8.0)
activerecord-import
deprecation
faraday
@@ -518,22 +528,22 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.2.4)
- actionmailer (= 4.2.4)
- actionpack (= 4.2.4)
- actionview (= 4.2.4)
- activejob (= 4.2.4)
- activemodel (= 4.2.4)
- activerecord (= 4.2.4)
- activesupport (= 4.2.4)
+ rails (4.2.6)
+ actionmailer (= 4.2.6)
+ actionpack (= 4.2.6)
+ actionview (= 4.2.6)
+ activejob (= 4.2.6)
+ activemodel (= 4.2.6)
+ activerecord (= 4.2.6)
+ activesupport (= 4.2.6)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.4)
+ railties (= 4.2.6)
sprockets-rails
rails-assets-babel-polyfill (0.0.1)
rails-assets-bootstrap-select (1.9.4)
rails-assets-jquery (>= 1.8)
- rails-assets-jquery (2.2.3)
- rails-assets-jqueryui-timepicker-addon (1.6.1)
+ rails-assets-jquery (3.1.0)
+ rails-assets-jqueryui-timepicker-addon (1.6.3)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
@@ -544,67 +554,74 @@ GEM
loofah (~> 2.0)
rails_autolink (1.1.6)
rails (> 3.1)
- railties (4.2.4)
- actionpack (= 4.2.4)
- activesupport (= 4.2.4)
+ railties (4.2.6)
+ actionpack (= 4.2.6)
+ activesupport (= 4.2.6)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
- rake (11.1.2)
- rdf (1.99.1)
+ rake (11.2.2)
+ rdf (2.0.2)
+ hamster (~> 3.0)
link_header (~> 0.0, >= 0.0.8)
- rdf-aggregate-repo (1.99.0)
- rdf (~> 1.99)
- rdf-isomorphic (1.99.0)
- rdf (~> 1.99)
- rdf-json (1.99.0)
- rdf (~> 1.99)
- rdf-microdata (2.0.2)
+ rdf-aggregate-repo (2.0.0)
+ rdf (~> 2.0)
+ rdf-isomorphic (2.0.0)
+ rdf (~> 2.0)
+ rdf-json (2.0.0)
+ rdf (~> 2.0)
+ rdf-microdata (2.0.3)
htmlentities (~> 4.3)
nokogiri (~> 1.6)
- rdf (~> 1.1)
- rdf-xsd (~> 1.1)
- rdf-n3 (1.99.0)
- rdf (~> 1.99)
- rdf-rdfa (1.99.1)
+ rdf (~> 2.0)
+ rdf-xsd (~> 2.0)
+ rdf-n3 (2.0.0)
+ rdf (~> 2.0)
+ rdf-rdfa (2.0.1)
haml (~> 4.0)
htmlentities (~> 4.3)
- rdf (~> 1.99)
- rdf-aggregate-repo (~> 1.1)
- rdf-xsd (~> 1.1)
- rdf-rdfxml (1.99.0)
+ rdf (~> 2.0)
+ rdf-aggregate-repo (~> 2.0)
+ rdf-xsd (~> 2.0)
+ rdf-rdfxml (2.0.0)
htmlentities (~> 4.3)
- rdf (~> 1.99)
- rdf-rdfa (~> 1.99)
- rdf-xsd (~> 1.99)
- rdf-reasoner (0.3.0)
- rdf (~> 1.1, >= 1.1.4.2)
- rdf-turtle (~> 1.1)
- rdf-vocab (~> 0.8)
- rdf-xsd (~> 1.1)
- rdf-tabular (0.3.0)
+ rdf (~> 2.0)
+ rdf-rdfa (~> 2.0)
+ rdf-xsd (~> 2.0)
+ rdf-reasoner (0.4.0)
+ rdf (~> 2.0)
+ rdf-spec (~> 2.0)
+ rdf-vocab (~> 2.0)
+ rdf-xsd (~> 2.0)
+ rdf-spec (2.0.0)
+ rdf (~> 2.0)
+ rdf-isomorphic (~> 2.0)
+ rspec (~> 3.0)
+ rspec-its (~> 1.0)
+ webmock (~> 1.17)
+ rdf-tabular (0.4.0)
addressable (~> 2.3)
bcp47 (~> 0.3, >= 0.3.3)
- json-ld (~> 1.1)
- rdf (~> 1.1, >= 1.1.7)
- rdf-vocab (~> 0.8)
- rdf-xsd (~> 1.1)
- rdf-trig (1.99.0.1)
- ebnf (~> 1.0)
- rdf (~> 1.99)
- rdf-turtle (~> 1.99)
- rdf-trix (1.99.0)
- rdf (~> 1.1)
- rdf-turtle (1.99.0)
- ebnf (~> 1.0)
- rdf (~> 1.99)
- rdf-vocab (0.8.8)
- rdf (~> 1.1, >= 1.1.10)
- rdf-xsd (1.99.0)
- rdf (~> 1.99)
+ json-ld (~> 2.0)
+ rdf (~> 2.0)
+ rdf-vocab (~> 2.0)
+ rdf-xsd (~> 2.0)
+ rdf-trig (2.0.0)
+ ebnf (~> 1.0, >= 1.0.1)
+ rdf (~> 2.0)
+ rdf-turtle (~> 2.0)
+ rdf-trix (2.0.0)
+ rdf (~> 2.0)
+ rdf-turtle (2.0.0)
+ ebnf (~> 1.0, >= 1.0.1)
+ rdf (~> 2.0)
+ rdf-vocab (2.0.2)
+ rdf (~> 2.0)
+ rdf-xsd (2.0.0)
+ rdf (~> 2.0)
rdoc (4.2.2)
json (~> 1.4)
- redis (3.3.0)
+ redis (3.3.1)
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
redlock (0.1.8)
@@ -616,25 +633,32 @@ GEM
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
retriable (1.4.1)
- rsolr (1.0.13)
+ rsolr (1.1.1)
builder (>= 2.1.2)
- rspec-core (3.4.4)
- rspec-support (~> 3.4.0)
- rspec-expectations (3.4.0)
+ rspec (3.5.0)
+ rspec-core (~> 3.5.0)
+ rspec-expectations (~> 3.5.0)
+ rspec-mocks (~> 3.5.0)
+ rspec-core (3.5.1)
+ rspec-support (~> 3.5.0)
+ rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.4.0)
- rspec-mocks (3.4.1)
+ rspec-support (~> 3.5.0)
+ rspec-its (1.2.0)
+ rspec-core (>= 3.0.0)
+ rspec-expectations (>= 3.0.0)
+ rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.4.0)
- rspec-rails (3.4.2)
- actionpack (>= 3.0, < 4.3)
- activesupport (>= 3.0, < 4.3)
- railties (>= 3.0, < 4.3)
- rspec-core (~> 3.4.0)
- rspec-expectations (~> 3.4.0)
- rspec-mocks (~> 3.4.0)
- rspec-support (~> 3.4.0)
- rspec-support (3.4.1)
+ rspec-support (~> 3.5.0)
+ rspec-rails (3.5.1)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ railties (>= 3.0)
+ rspec-core (~> 3.5.0)
+ rspec-expectations (~> 3.5.0)
+ rspec-mocks (~> 3.5.0)
+ rspec-support (~> 3.5.0)
+ rspec-support (3.5.0)
rubocop (0.34.2)
astrolabe (~> 1.3)
parser (>= 2.2.2.5, < 3.0)
@@ -653,8 +677,8 @@ GEM
rubyzip (1.2.0)
safe_yaml (1.0.4)
sass (3.4.22)
- sass-rails (5.0.4)
- railties (>= 4.0.0, < 5.0)
+ sass-rails (5.0.5)
+ railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
@@ -663,11 +687,12 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
- sidekiq (4.1.2)
+ sidekiq (4.1.4)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
redis (~> 3.2, >= 3.2.1)
- signet (0.7.2)
+ sinatra (>= 1.4.7)
+ signet (0.7.3)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (~> 1.5)
@@ -690,7 +715,7 @@ GEM
httparty (>= 0.11.0)
oauth2 (>= 0.9.2)
slop (3.6.0)
- solr_wrapper (0.13.1)
+ solr_wrapper (0.13.2)
faraday
ruby-progressbar
rubyzip
@@ -700,18 +725,18 @@ GEM
nokogiri
stomp
xml-simple
- sparql (1.99.1)
+ sparql (2.0.0)
builder (~> 3.2)
- ebnf (~> 1.0)
- rdf (~> 1.99)
- rdf-aggregate-repo (~> 1.99)
- rdf-xsd (~> 1.1)
- sparql-client (~> 1.1)
- sxp (~> 0.1)
- sparql-client (1.99.0)
+ ebnf (~> 1.0, >= 1.0.1)
+ rdf (~> 2.0)
+ rdf-aggregate-repo (~> 2.0)
+ rdf-xsd (~> 2.0)
+ sparql-client (~> 2.0)
+ sxp (~> 1.0)
+ sparql-client (2.0.1)
net-http-persistent (~> 2.9)
- rdf (~> 1.1)
- spring (1.7.1)
+ rdf (~> 2.0)
+ spring (1.7.2)
sprockets (3.5.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
@@ -724,18 +749,19 @@ GEM
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.11)
- sshkit (1.10.0)
+ sshkit (1.11.1)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
- stomp (1.3.5)
+ stomp (1.4.1)
string_rtl (0.1.0)
- sxp (0.1.5)
+ sxp (1.0.0)
+ rdf (~> 2.0)
term-ansicolor (1.3.2)
tins (~> 1.0)
thor (0.19.1)
thread_safe (0.3.5)
- tilt (2.0.4)
- tins (1.10.1)
+ tilt (2.0.5)
+ tins (1.11.0)
ttfunk (1.4.0)
twitter-typeahead-rails (0.11.1)
actionpack (>= 3.1)
@@ -809,12 +835,12 @@ DEPENDENCIES
pry-byebug
pry-rails
pul_metadata_services!
- rails (= 4.2.4)
+ rails (= 4.2.6)
rails-assets-babel-polyfill!
rails-assets-bootstrap-select (= 1.9.4)!
rails-assets-jqueryui-timepicker-addon!
redis-namespace
- rsolr (~> 1.0.6)
+ rsolr (~> 1.1.0)
rspec-rails
rubocop (~> 0.34.0)
rubocop-rspec (~> 1.3.0)
@@ -837,4 +863,4 @@ DEPENDENCIES
webmock (~> 1.0)
BUNDLED WITH
- 1.12.3
+ 1.12.5
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index d42975f7c..34fda5c22 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -240,7 +240,8 @@ def self.search_config
# If there are more than this many search results, no spelling ("did you
# mean") suggestion is offered.
config.spell_max = 5
- config.document_presenter_class = RTLPresenter
+ config.index_presenter_class = RTLIndexPresenter
+ config.show_presenter_class = RTLShowPresenter
end
def admin_state_facet
return unless can? :create, ScannedResource
diff --git a/app/models/concerns/common_metadata.rb b/app/models/concerns/common_metadata.rb
index 00e3d6092..9dc0e715e 100644
--- a/app/models/concerns/common_metadata.rb
+++ b/app/models/concerns/common_metadata.rb
@@ -25,7 +25,9 @@ module CommonMetadata
validates_with ViewingHintValidator
def apply_remote_metadata
- self.source_metadata = remote_data.source.try(:force_encoding, 'utf-8')
+ if remote_data.source
+ self.source_metadata = remote_data.source.dup.try(:force_encoding, 'utf-8')
+ end
self.attributes = remote_data.attributes
end
diff --git a/app/models/file_set.rb b/app/models/file_set.rb
index b29049cce..a14c78493 100644
--- a/app/models/file_set.rb
+++ b/app/models/file_set.rb
@@ -3,7 +3,7 @@ class FileSet < ActiveFedora::Base
include ::CurationConcerns::FileSetBehavior
Hydra::Derivatives.output_file_service = PersistPairtreeDerivatives
- property :replaces, predicate: ::RDF::DC.replaces, multiple: false
+ property :replaces, predicate: ::RDF::Vocab::DC.replaces, multiple: false
apply_schema IIIFPageSchema, ActiveFedora::SchemaIndexingStrategy.new(
ActiveFedora::Indexers::GlobalIndexer.new([:stored_searchable, :symbol])
)
diff --git a/app/models/scanned_resource.rb b/app/models/scanned_resource.rb
index abb547835..fc9e62cfd 100644
--- a/app/models/scanned_resource.rb
+++ b/app/models/scanned_resource.rb
@@ -16,4 +16,8 @@ def to_solr(solr_doc = {})
doc[ActiveFedora.index_field_mapper.solr_name("ordered_by", :symbol)] += send(:ordered_by_ids)
end
end
+
+ def serializable_hash(*_args)
+ { id: id }
+ end
end
diff --git a/app/models/search_builder.rb b/app/models/search_builder.rb
index 4e483d4d7..71ca940d6 100644
--- a/app/models/search_builder.rb
+++ b/app/models/search_builder.rb
@@ -29,7 +29,7 @@ def hide_incomplete(solr_params)
solr_params[:fq] ||= []
state_field = ActiveFedora.index_field_mapper.solr_name('state', :symbol)
state_string = readable_states.map { |state| "#{state_field}:#{state}" }.join(" OR ")
- state_string += " OR active_fedora_model_ssi:Collection"
+ state_string += " OR has_model_ssim:Collection"
solr_params[:fq] << state_string
end
diff --git a/app/models/solr_document.rb b/app/models/solr_document.rb
index 84fa8995e..7f6a97d01 100644
--- a/app/models/solr_document.rb
+++ b/app/models/solr_document.rb
@@ -30,7 +30,7 @@ def state
end
def type
- self['active_fedora_model_ssi']
+ self['has_model_ssim'].first
end
def viewing_hint
diff --git a/app/presenters/all_collections_presenter.rb b/app/presenters/all_collections_presenter.rb
index e99961cad..925f68877 100644
--- a/app/presenters/all_collections_presenter.rb
+++ b/app/presenters/all_collections_presenter.rb
@@ -41,6 +41,6 @@ def current_ability
end
def ordered_ids
- ActiveFedora::SolrService.query("active_fedora_model_ssi:Collection", rows: 10_000, fl: "id").map { |x| x["id"] }
+ ActiveFedora::SolrService.query("has_model_ssim:Collection", rows: 10_000, fl: "id").map { |x| x["id"] }
end
end
diff --git a/app/presenters/curation_concerns_show_presenter.rb b/app/presenters/curation_concerns_show_presenter.rb
index 5d2ab5526..173391d08 100644
--- a/app/presenters/curation_concerns_show_presenter.rb
+++ b/app/presenters/curation_concerns_show_presenter.rb
@@ -8,7 +8,7 @@ def state_badge
end
def in_collections
- ActiveFedora::SolrService.query("active_fedora_model_ssi:Collection AND member_ids_ssim:#{id}")
+ ActiveFedora::SolrService.query("has_model_ssim:Collection AND member_ids_ssim:#{id}")
.map { |c| CurationConcerns::CollectionPresenter.new(SolrDocument.new(c), current_ability) }
end
diff --git a/app/presenters/multi_volume_work_show_presenter.rb b/app/presenters/multi_volume_work_show_presenter.rb
index 02acd8cc4..c4dc27e00 100644
--- a/app/presenters/multi_volume_work_show_presenter.rb
+++ b/app/presenters/multi_volume_work_show_presenter.rb
@@ -6,9 +6,9 @@ def viewing_hint
class DynamicShowPresenter
def new(*args)
solr_doc = args.first
- if solr_doc.fetch("active_fedora_model_ssi") == "ScannedResource"
+ if solr_doc.type == "ScannedResource"
ScannedResourceShowPresenter.new(*args)
- elsif solr_doc.fetch("active_fedora_model_ssi") == "MultiVolumeWork"
+ elsif solr_doc.type == "MultiVolumeWork"
MultiVolumeWorkShowPresenter.new(*args)
else
FileSetPresenter.new(*args)
diff --git a/app/presenters/rtl_index_presenter.rb b/app/presenters/rtl_index_presenter.rb
new file mode 100644
index 000000000..97fb11d31
--- /dev/null
+++ b/app/presenters/rtl_index_presenter.rb
@@ -0,0 +1,15 @@
+class RTLIndexPresenter < ::Blacklight::IndexPresenter
+ include RTLPresenter
+
+ def field_value(*args)
+ to_list(super)
+ end
+
+ def label(*args)
+ if args.first == @configuration.view_config(:show).title_field
+ to_list(super)
+ else
+ super
+ end
+ end
+end
diff --git a/app/presenters/rtl_presenter.rb b/app/presenters/rtl_presenter.rb
index 6f74fb26a..50b7945aa 100644
--- a/app/presenters/rtl_presenter.rb
+++ b/app/presenters/rtl_presenter.rb
@@ -1,38 +1,22 @@
-class RTLPresenter < ::Blacklight::DocumentPresenter
- def render_field_value(value = nil, field_config = nil)
- field_config ||= Blacklight::Configuration::Field.new
- field_config.separator_options ||= {
- words_connector: "
",
- last_word_connector: "
",
- two_words_connector: "
"
- }
- super
- end
-
- def render_document_show_field_value(*args)
- to_list(super)
- end
-
- def render_index_field_value(*args)
- to_list(super)
- end
+module RTLPresenter
+ extend ActiveSupport::Concern
- def render_document_index_label(*args)
- if args.first == @configuration.view_config(:show).title_field
- to_list(super)
- else
- super
+ included do
+ def field_config(field)
+ super(field).tap do |config|
+ config.separator_options = { words_connector: "
", last_word_connector: "
", two_words_connector: "
" } unless config.separator_options
+ end
end
- end
- private
+ private
- def to_list(values)
- string = "