Skip to content
This repository has been archived by the owner on May 14, 2022. It is now read-only.

Commit

Permalink
Merge pull request #802 from pulibrary/db-minter-state
Browse files Browse the repository at this point in the history 
Use the database for minter state
  • Loading branch information
Trey Pendragon committed Nov 2, 2016
2 parents cdb3096 + 97899a2 commit fb97ffd
Show file tree
Hide file tree
Showing 19 changed files with 126 additions and 132 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ gem 'prawn'
# Copied from curation_concerns Gemfile.extra
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 'hydra-derivatives', '3.1.3'
gem 'active-fedora', '11.0.0.rc7'
gem 'active-triples', '~> 0.10.0'
gem 'active_fedora-noid', '2.0.0.beta6'
Expand Down
121 changes: 54 additions & 67 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,36 @@ GIT

GIT
remote: git://github.com/projecthydra-labs/browse-everything.git
revision: 344433d31bc6dd0f198a4930363b822d4d850b8b
revision: b4c814c21f417203e75e5962ac334cb5503bfa62
specs:
browse-everything (0.10.4)
browse-everything (0.10.5)
bootstrap-sass
dropbox-sdk (>= 1.6.2)
font-awesome-rails
google-api-client (~> 0.8.6)
google-api-client (~> 0.9)
google_drive
httparty
rails (>= 3.1)
ruby-box
sass-rails
signet
skydrive

GIT
remote: git://github.com/projecthydra-labs/curation_concerns.git
revision: c2fca95e3a5146864543cd633ecf745c692e9fd7
revision: 082e146c20eaf66dfa9c90316aaf700879e7f67c
branch: member_of_replace
specs:
curation_concerns (1.5.0)
curation_concerns (1.6.1)
active-fedora (>= 10.3.0.rc1)
active_attr
active_fedora-noid (~> 2.0.0.beta1)
awesome_nested_set (~> 3.0)
blacklight (~> 6.3)
blacklight_advanced_search (~> 6.0)
breadcrumbs_on_rails (>= 3.0.1, < 4)
browse-everything (~> 0.10)
clipboard-rails (~> 1.5)
highcharts-rails
hydra-editor (>= 2, < 4)
hydra-head (>= 10.0.0, < 11)
hydra-pcdm (~> 0.9.0)
Expand All @@ -56,7 +57,7 @@ GIT

GIT
remote: git://github.com/projecthydra-labs/hydra-pcdm.git
revision: 854e13cc324e95fd329eb0a812815d2d78abf951
revision: 29358612e5a0cdbe361d7287bd2d01b78b14ba96
branch: master
specs:
hydra-pcdm (0.9.0)
Expand All @@ -74,18 +75,6 @@ GIT
hydra-pcdm (>= 0.8)
om (~> 3.1)

GIT
remote: git://github.com/projecthydra/hydra-derivatives.git
revision: 8098a1b32144f692e47d99c36e48142c97254c3e
branch: master
specs:
hydra-derivatives (3.1.3)
active-fedora (>= 9.0, < 12)
activesupport (>= 4.0, < 6)
deprecation
mime-types (> 2.0, < 4.0)
mini_magick (>= 3.2, < 5)

GIT
remote: git://github.com/pulibrary/pul_metadata_services.git
revision: c485eeff36d56c12255a95e5449727370820d53e
Expand Down Expand Up @@ -163,7 +152,7 @@ GEM
activemodel (= 4.2.7.1)
activesupport (= 4.2.7.1)
arel (~> 6.0)
activerecord-import (0.15.0)
activerecord-import (0.16.1)
activerecord (>= 3.2)
activesupport (4.2.7.1)
i18n (~> 0.7)
Expand All @@ -181,11 +170,7 @@ GEM
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.4.1.1)
autoprefixer-rails (6.5.1.1)
execjs
awesome_nested_set (3.1.1)
activerecord (>= 4.0.0, < 5.1)
Expand All @@ -196,23 +181,19 @@ GEM
bcrypt (3.1.11)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
blacklight (6.6.1)
blacklight (6.7.2)
bootstrap-sass (~> 3.2)
deprecation
globalid
kaminari (>= 0.15)
nokogiri (~> 1.6)
rails (>= 4.2, < 6)
rsolr (~> 1.0, >= 1.0.6)
rsolr (>= 1.0.6, < 3)
twitter-typeahead-rails (= 0.11.1.pre.corejavascript)
blacklight-access_controls (0.6.0)
blacklight-access_controls (0.6.1)
blacklight (~> 6.0)
cancancan (~> 1.8)
deprecation (~> 1.0)
blacklight_advanced_search (6.0.2)
blacklight (~> 6.0, >= 6.0.1)
parslet
blankslate (3.1.3)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
Expand Down Expand Up @@ -244,7 +225,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
clipboard-rails (1.5.10)
clipboard-rails (1.5.15)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
Expand Down Expand Up @@ -287,7 +268,6 @@ GEM
sxp (~> 1.0)
erubis (2.7.0)
execjs (2.7.0)
extlib (0.9.16)
ezid-client (1.5.0)
hashie (~> 3.4, >= 3.4.3)
factory_girl (4.7.0)
Expand All @@ -300,26 +280,23 @@ GEM
fcrepo_wrapper (0.6.0)
ruby-progressbar
ffi (1.9.14)
font-awesome-rails (4.6.3.1)
font-awesome-rails (4.7.0.0)
railties (>= 3.2, < 5.1)
globalid (0.3.7)
activesupport (>= 4.1.0)
google-api-client (0.8.7)
activesupport (>= 3.2, < 5.0)
google-api-client (0.9.19)
addressable (~> 2.3)
autoparse (~> 0.3)
extlib (~> 0.9)
faraday (~> 0.9)
googleauth (~> 0.3)
launchy (~> 2.4)
multi_json (~> 1.10)
retriable (~> 1.4)
signet (~> 0.6)
google_drive (1.0.6)
google-api-client (>= 0.7.0, < 0.9)
nokogiri (>= 1.4.4, != 1.5.2, != 1.5.1)
oauth (>= 0.3.6)
oauth2 (>= 0.5.0)
googleauth (~> 0.5)
httpclient (~> 2.7)
hurley (~> 0.1)
memoist (~> 0.11)
mime-types (>= 1.6)
representable (~> 2.3.0)
retriable (~> 2.0)
google_drive (2.1.1)
google-api-client (>= 0.9.0, < 1.0.0)
googleauth (>= 0.5.0, < 1.0.0)
nokogiri (>= 1.5.3, < 2.0.0)
googleauth (0.5.1)
faraday (~> 0.9)
jwt (~> 1.4)
Expand All @@ -333,6 +310,8 @@ GEM
hashdiff (0.3.0)
hashery (2.1.2)
hashie (3.4.4)
highcharts-rails (4.2.5)
railties (>= 3.1)
httmultiparty (0.3.16)
httparty (>= 0.7.3)
mimemagic
Expand All @@ -342,17 +321,25 @@ GEM
http_logger (0.5.1)
httparty (0.14.0)
multi_xml (>= 0.5.2)
hydra-access-controls (10.3.0)
httpclient (2.8.2.4)
hurley (0.2)
hydra-access-controls (10.3.2)
active-fedora (>= 10.0.0, < 12)
activesupport (>= 4, < 6)
blacklight (>= 5.16)
blacklight-access_controls (~> 0.6)
cancancan (~> 1.8)
deprecation (~> 1.0)
hydra-core (10.3.0)
hydra-access-controls (= 10.3.0)
hydra-core (10.3.2)
hydra-access-controls (= 10.3.2)
railties (>= 4.0.0, < 6)
hydra-editor (3.1.0)
hydra-derivatives (3.1.3)
active-fedora (>= 9.0, < 12)
activesupport (>= 4.0, < 6)
deprecation
mime-types (> 2.0, < 4.0)
mini_magick (>= 3.2, < 5)
hydra-editor (3.1.2)
active-fedora (>= 9.0.0)
almond-rails (~> 0.0.3)
cancancan (~> 1.8)
Expand All @@ -361,9 +348,9 @@ GEM
sprockets-es6
hydra-file_characterization (0.3.3)
activesupport (>= 3.0.0)
hydra-head (10.3.0)
hydra-access-controls (= 10.3.0)
hydra-core (= 10.3.0)
hydra-head (10.3.2)
hydra-access-controls (= 10.3.2)
hydra-core (= 10.3.2)
rails (>= 3.2.6)
hydra-role-management (0.2.2)
blacklight
Expand Down Expand Up @@ -391,7 +378,7 @@ GEM
json-ld (2.1.0)
multi_json (~> 1.11)
rdf (~> 2.1)
jwt (1.5.4)
jwt (1.5.6)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
Expand Down Expand Up @@ -441,7 +428,6 @@ GEM
noid (0.9.0)
nokogiri (1.6.6.4)
mini_portile (~> 0.6.0)
oauth (0.5.1)
oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
Expand All @@ -466,10 +452,8 @@ GEM
os (0.9.6)
parser (2.3.1.2)
ast (~> 2.2)
parslet (1.7.1)
blankslate (>= 2.0, <= 4.0)
pdf-core (0.6.1)
pg (0.18.4)
pg (0.19.0)
phantomjs (2.1.1.0)
posix-spawn (0.3.11)
powerpack (0.1.1)
Expand All @@ -485,7 +469,7 @@ GEM
pry (~> 0.10)
pry-rails (0.3.4)
pry (>= 0.9.10)
qa (0.10.0)
qa (0.10.2)
activerecord-import
deprecation
faraday
Expand Down Expand Up @@ -550,13 +534,15 @@ GEM
redis (~> 3.0, >= 3.0.4)
redlock (0.1.8)
redis (~> 3, >= 3.0.0)
representable (2.3.0)
uber (~> 0.0.7)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
retriable (1.4.1)
retriable (2.1.0)
rsolr (1.1.2)
builder (>= 2.1.2)
rspec-core (3.5.3)
Expand Down Expand Up @@ -646,15 +632,15 @@ GEM
sprockets (3.5.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-es6 (0.9.1)
sprockets-es6 (0.9.2)
babel-source (>= 5.8.11)
babel-transpiler
sprockets (>= 3.0.0)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.11)
sqlite3 (1.3.12)
sshkit (1.11.2)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
Expand All @@ -676,6 +662,7 @@ GEM
railties (>= 3.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uber (0.0.15)
uglifier (3.0.2)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
Expand Down Expand Up @@ -721,7 +708,7 @@ DEPENDENCIES
ezid-client
factory_girl_rails
fcrepo_wrapper (~> 0.6.0)
hydra-derivatives!
hydra-derivatives (= 3.1.3)
hydra-pcdm!
hydra-role-management (~> 0.2.0)
hydra-works!
Expand Down
2 changes: 1 addition & 1 deletion app/forms/curation_concerns/curation_concerns_form.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class CurationConcernsForm < CurationConcerns::Forms::WorkForm
delegate :collection_ids, to: :model

def notable_rights_statement?
RightsStatementService.notable?(rights_statement)
RightsStatementService.new.notable?(rights_statement)
end

def self.multiple?(field)
Expand Down
29 changes: 0 additions & 29 deletions app/models/minter_state.rb
View file

This file was deleted.

2 changes: 1 addition & 1 deletion app/presenters/all_collections_presenter.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ def initialize(current_ability = nil)
end

def title
"Plum Collections"
["Plum Collections"]
end

def description
Expand Down

0 comments on commit fb97ffd

Please sign in to comment.