Skip to content
This repository has been archived by the owner on Nov 18, 2020. It is now read-only.

Commit

Permalink
Updating ActiveFedora
Browse files Browse the repository at this point in the history 
Avoids a bug where removed resources were being reloaded from cache:
samvera/active_fedora#1202
  • Loading branch information
@awead @carolyncole
awead authored and carolyncole committed Nov 1, 2017
1 parent 5edc1f8 commit 8f957a4
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 133 deletions.
4 changes: 2 additions & 2 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ gem 'rails', '4.2.7.1'
gem 'mysql2', '~> 0.3.17' unless ENV['CI']

# Hydra gems
gem 'active-fedora', '~> 10.3.0.rc2'
gem 'active-fedora', '~> 11.1.3'
gem 'sufia', '7.4.1'
gem 'blacklight_advanced_search', '~> 6.0'

Expand All @@ -28,7 +28,7 @@ gem 'nest'
gem 'newrelic_rpm'
gem 'rack-maintenance'
gem 'rainbow'
gem 'rdf', '~> 1.99'
gem 'rdf'
gem 'resque-pool'
gem 'rsolr'
gem 'sass-rails'
Expand Down
192 changes: 65 additions & 127 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,19 @@ GEM
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
active-fedora (10.3.0)
active-triples (~> 0.7.1)
active-fedora (11.1.6)
active-triples (~> 0.11.0)
activemodel (>= 4.2, < 6)
activesupport (>= 4.2.4, < 6)
deprecation
ldp (~> 0.5.0)
nom-xml (>= 0.5.1)
om (~> 3.1)
rdf-rdfxml (~> 1.1)
rsolr (~> 1.0, >= 1.0.10)
solrizer (~> 3.4)
active-triples (0.7.6)
ldp (~> 0.6.0)
rsolr (>= 1.1.2, < 3)
solrizer (>= 3.4, < 5)
active-triples (0.11.0)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
deprecation (~> 1.0)
linkeddata (~> 1.1)
rdf (~> 1.1)
rdf (~> 2.0, >= 2.0.2)
rdf-vocab
active_attr (0.10.2)
activemodel (>= 3.0.2, < 5.2)
activesupport (>= 3.0.2, < 5.2)
Expand All @@ -62,8 +58,8 @@ GEM
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
airbrussh (1.1.2)
sshkit (>= 1.6.1, != 1.7.0)
almond-rails (0.0.3)
Expand Down Expand Up @@ -91,8 +87,6 @@ GEM
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
bcp47 (0.3.3)
i18n
bcrypt (3.1.11)
better_errors (2.1.1)
coderay (>= 1.0.0)
Expand Down Expand Up @@ -228,7 +222,7 @@ GEM
simple_form (~> 3.1)
solrizer (~> 3.4)
sprockets-es6
daemons (1.2.4)
daemons (1.2.5)
database_cleaner (1.5.3)
debug_inspector (0.0.2)
declarative (0.0.10)
Expand Down Expand Up @@ -278,9 +272,9 @@ GEM
dry-equalizer (~> 0.2)
dry-logic (~> 0.4, >= 0.4.0)
dry-types (~> 0.12.0)
ebnf (1.0.0)
rdf (~> 1.1)
sxp (~> 0.1, >= 0.1.3)
ebnf (1.1.1)
rdf (~> 2.2)
sxp (~> 1.0)
equivalent-xml (0.6.0)
nokogiri (>= 1.4.3)
erubis (2.7.0)
Expand All @@ -292,7 +286,7 @@ GEM
railties (>= 3.0.0)
faker (1.8.4)
i18n (~> 0.5)
faraday (0.12.1)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
fcrepo_wrapper (0.6.0)
ruby-progressbar
Expand Down Expand Up @@ -326,8 +320,11 @@ GEM
multi_json (~> 1.11)
os (~> 0.9)
signet (~> 0.7)
haml (4.0.7)
haml (5.0.4)
temple (>= 0.8.0)
tilt
hamster (3.0.0)
concurrent-ruby (~> 1.0)
hashdiff (0.3.0)
highcharts-rails (5.0.7)
railties (>= 3.1)
Expand Down Expand Up @@ -400,9 +397,9 @@ GEM
jquery-ui-rails (5.0.5)
railties (>= 3.2.16)
json (1.8.6)
json-ld (1.99.2)
multi_json (~> 1.11)
rdf (~> 1.99)
json-ld (2.1.7)
multi_json (~> 1.12)
rdf (~> 2.2, >= 2.2.8)
json-schema (2.8.0)
addressable (>= 2.4)
jwt (1.5.6)
Expand All @@ -419,38 +416,20 @@ GEM
mail (~> 2.6)
namae (= 0.9.3)
net-ldap (= 0.13.0)
ldp (0.5.0)
ldp (0.6.4)
deprecation
faraday
http_logger
linkeddata (>= 1.1)
rdf-vocab
json-ld
rdf (>= 1.1)
rdf-isomorphic
rdf-turtle
rdf-vocab (>= 0.8)
slop
legato (0.7.0)
multi_json
libv8 (3.16.14.17)
link_header (0.0.8)
linkeddata (1.99.0)
equivalent-xml (~> 0.6)
json-ld (~> 1.99)
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)
little-plugger (1.1.4)
logging (2.2.2)
little-plugger (~> 1.1)
Expand All @@ -468,16 +447,15 @@ GEM
mime-types-data (3.2016.0521)
mini_magick (4.8.0)
mini_portile2 (2.3.0)
minitest (5.10.2)
minitest (5.10.3)
mono_logger (1.1.0)
multi_json (1.12.1)
multi_json (1.12.2)
multi_xml (0.6.0)
multipart-post (2.0.0)
mysql2 (0.3.21)
namae (0.9.3)
nest (2.1.0)
redic
net-http-persistent (2.9.4)
net-ldap (0.13.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
Expand All @@ -486,10 +464,6 @@ GEM
noid (0.9.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
nom-xml (0.6.0)
activesupport (>= 3.2.18)
i18n
nokogiri
oauth (0.5.3)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
Expand Down Expand Up @@ -518,7 +492,7 @@ GEM
posix-spawn (0.3.13)
power_converter (0.1.2)
powerpack (0.1.1)
public_suffix (2.0.5)
public_suffix (3.0.0)
qa (0.11.1)
activerecord-import
deprecation
Expand Down Expand Up @@ -562,57 +536,31 @@ GEM
rake
raindrops (0.17.0)
rake (12.0.0)
rdf (1.99.1)
rdf (2.2.11)
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.2.0)
rdf (~> 2.0)
rdf-isomorphic (2.0.0)
rdf (~> 2.0)
rdf-rdfa (2.2.3)
haml (~> 5.0)
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)
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.2)
rdf-aggregate-repo (~> 2.2)
rdf-xsd (~> 2.1)
rdf-rdfxml (2.2.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)
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)
rdf (~> 2.0)
rdf-rdfa (~> 2.0)
rdf-xsd (~> 2.0)
rdf-turtle (2.2.1)
ebnf (~> 1.1)
rdf (~> 2.2)
rdf-vocab (2.2.8)
rdf (~> 2.2)
rdf-xsd (2.2.0)
rdf (~> 2.1)
redic (1.5.0)
hiredis
redis (3.3.2)
Expand Down Expand Up @@ -642,8 +590,9 @@ GEM
resque (~> 1.26)
rufus-scheduler (~> 3.2)
retriable (3.1.1)
rsolr (1.1.2)
rsolr (2.0.2)
builder (>= 2.1.2)
faraday
rspec (3.5.0)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
Expand Down Expand Up @@ -723,7 +672,7 @@ GEM
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
sitemap (0.3.3)
slop (4.4.1)
slop (4.6.0)
solr_wrapper (0.19.0)
faraday
ruby-progressbar
Expand All @@ -734,19 +683,6 @@ GEM
nokogiri
stomp
xml-simple
sparql (1.99.1)
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.1)
json (~> 1.8)
net-http-persistent (~> 2.9)
rdf (>= 1.99, < 3)
tins (= 1.6.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
Expand All @@ -762,7 +698,7 @@ GEM
sshkit (1.12.0)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
stomp (1.4.3)
stomp (1.4.4)
sufia (7.4.1)
almond-rails (~> 0.0.1)
blacklight (~> 6.6, < 6.10)
Expand Down Expand Up @@ -795,16 +731,18 @@ GEM
tinymce-rails (~> 4.1)
tinymce-rails-imageupload (~> 4.0.16.beta)
yaml_db (~> 0.2)
sxp (0.1.5)
sxp (1.0.0)
rdf (~> 2.0)
temple (0.8.0)
term-ansicolor (1.6.0)
tins (~> 1.0)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.7)
tins (1.6.0)
tilt (2.0.8)
tins (1.15.0)
tinymce-rails (4.7.1)
railties (>= 3.1.1)
tinymce-rails-imageupload (4.0.17.beta.3)
Expand All @@ -817,7 +755,7 @@ GEM
actionpack (>= 3.1)
jquery-rails
railties (>= 3.1)
tzinfo (1.2.3)
tzinfo (1.2.4)
thread_safe (~> 0.1)
uber (0.1.0)
uglifier (3.0.3)
Expand Down Expand Up @@ -856,7 +794,7 @@ PLATFORMS
ruby

DEPENDENCIES
active-fedora (~> 10.3.0.rc2)
active-fedora (~> 11.1.3)
better_errors
binding_of_caller
blacklight_advanced_search (~> 6.0)
Expand Down Expand Up @@ -893,7 +831,7 @@ DEPENDENCIES
rack-maintenance
rails (= 4.2.7.1)
rainbow
rdf (~> 1.99)
rdf
resque-pool
rsolr
rspec
Expand Down
3 changes: 0 additions & 3 deletions app/controllers/curation_concerns/generic_works_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

class CurationConcerns::GenericWorksController < ApplicationController
include CurationConcerns::CurationConcernController
# Adds Sufia behaviors to the controller.
include Sufia::WorksControllerBehavior

include Sufia::WorksControllerBehavior

self.curation_concern_type = GenericWork
Expand Down
Loading

0 comments on commit 8f957a4

Please sign in to comment.