diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 285f016..27c8eb0 100755 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -97,3 +97,6 @@ Security/MarshalLoad: Exclude: - 'app/models/concerns/hyrax/user.rb' +RSpec/PredicateMatcher: + Enabled: false + diff --git a/.solr_wrapper b/.solr_wrapper index 0a8f912..d4186ed 100644 --- a/.solr_wrapper +++ b/.solr_wrapper @@ -1,5 +1,5 @@ # Place any default configuration for solr_wrapper here -version: 6.6.1 +# version: 6.0.0 # port: 8983 instance_dir: tmp/solr-development collection: diff --git a/Gemfile b/Gemfile index 4c5662f..68e9b30 100644 --- a/Gemfile +++ b/Gemfile @@ -1,58 +1,64 @@ source 'https://rubygems.org' +git_source(:github) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://github.com/#{repo_name}.git" +end + # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 5.0.0', '>= 5.0.0.1' +gem 'rails', '~> 5.0.5' # Use sqlite3 as the database for Active Record gem 'sqlite3' # Use Puma as the app server -gem 'puma', '~> 3.8.2' +gem 'puma', '~> 3.0' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '3.2.0' +gem 'uglifier', '>= 1.3.0' # Use CoffeeScript for .coffee assets and views -gem 'coffee-rails', '~> 4.2.0' +gem 'coffee-rails', '~> 4.2' # See https://github.com/rails/execjs#readme for more supported runtimes # gem 'therubyracer', platforms: :ruby gem 'factory_girl', '~> 4.0' # Use jquery as the JavaScript library gem 'jquery-rails' -# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks +# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks gem 'turbolinks', '~> 5' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -gem 'jbuilder', '~> 2.6.3' +gem 'jbuilder', '~> 2.5' # Use Redis adapter to run Action Cable in production # gem 'redis', '~> 3.0' # bundle exec rake doc:rails generates the API under doc/api. -gem 'sdoc', '~> 0.4.0', group: :doc -gem 'json', '~> 1.8.6' -gem 'coveralls', '~> 0.8.21', require: false gem "blacklight_advanced_search" gem 'sitemap_generator', '~> 5.3.1' # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' -# Use Unicorn as the app server -# gem 'unicorn' - # Use Capistrano for deployment # gem 'capistrano-rails', group: :development group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console - gem 'byebug' + gem 'byebug', platform: :mri + gem 'capybara', '~> 2.14.0' + gem 'factory_girl_rails', '~> 4.4' + gem 'rspec-activemodel-mocks', '~> 1.0' + gem 'rspec-mocks', '3.6.0' + gem 'simplecov', '~> 0.14.1' + gem 'rails_autolink', '~> 1.1.6' + gem 'unicorn', '~> 5.3.0' gem 'rubocop', '~> 0.49.1' gem 'rubocop-rspec', '~> 1.15.1' end group :development do - # Access an IRB console on exception pages or by using <%= console %> in views - gem 'web-console', '~> 3.5.0' - gem 'listen', '~> 3.1.5' + # Access an IRB console on exception pages or by using <%= console %> anywhere in the code. + gem 'web-console', '>= 3.3.0' + gem 'listen', '~> 3.0.5' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring - gem 'spring', '~> 2.0.1' + gem 'spring' gem 'spring-watcher-listen', '~> 2.0.0' end @@ -65,39 +71,28 @@ gem 'capistrano-bundler', '~> 1.2.0' # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] -gem 'hyrax', '2.0.0.beta4', github: 'samvera/hyrax', ref: 'a8873d1c3647bbe7a326221192e726de77a76e5d' +gem 'hyrax', '2.0.0.beta4' gem 'hydra-role-management' - -gem 'nokogiri', '~> 1.7.1' -gem 'sidekiq', '~> 5.0.0' -gem 'rubyXL' - -gem 'openseadragon', '~> 0.4.0' - group :development, :test do - gem 'capybara', '~> 2.14.0' - gem 'factory_girl_rails', '~> 4.4' - gem 'rspec-activemodel-mocks', '~> 1.0' - gem 'rspec-mocks', '3.6.0' - gem 'simplecov', '~> 0.14.1' - gem 'rails_autolink', '~> 1.1.6' - gem 'unicorn', '~> 5.3.0' - gem 'solr_wrapper', '~> 1.0.0' - gem 'database_cleaner', '~> 1.6.0' - gem 'rails-controller-testing', '~> 1.0.1' + gem 'solr_wrapper', '>= 0.3' end -gem 'rsolr', '~> 2.0.1' -gem 'devise', '~> 4.2.1' -gem 'devise-guests', '~> 0.6.0' +gem 'rsolr', '>= 1.0' +gem 'devise' +gem 'devise-guests', '~> 0.6' +gem 'rubyXL' gem 'omniauth', '1.6.1' gem 'omniauth-shibboleth', '1.2.1' gem 'net-ldap' gem 'flexmock' gem 'fakeldap' gem 'ruby-ldapserver', '~> 0.5.0' +gem 'sidekiq', '~> 5.0.0' +gem 'openseadragon', '~> 0.4.0' group :development, :test do - gem 'fcrepo_wrapper', '~> 0.8.0' + gem 'fcrepo_wrapper' gem 'rspec-rails', '~> 3.6.0' + gem 'database_cleaner', '~> 1.6.0' + gem 'rails-controller-testing', '~> 1.0.1' end diff --git a/Gemfile.lock b/Gemfile.lock index cf86e24..8e0dad6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,74 +1,25 @@ -GIT - remote: git://github.com/samvera/hyrax.git - revision: a8873d1c3647bbe7a326221192e726de77a76e5d - ref: a8873d1c3647bbe7a326221192e726de77a76e5d - specs: - hyrax (2.0.0.beta4) - active-fedora (>= 11.3.1) - active_fedora-noid (~> 2.0, >= 2.0.2) - almond-rails (~> 0.1) - awesome_nested_set (~> 3.1) - blacklight (~> 6.9) - blacklight-gallery (~> 0.7) - breadcrumbs_on_rails (~> 3.0) - browse-everything (>= 0.10.5) - carrierwave (~> 1.0) - clipboard-rails (~> 1.5) - dry-equalizer (~> 0.2) - dry-struct (~> 0.1) - dry-validation (~> 0.9) - flipflop (~> 2.3) - flot-rails (~> 0.0.6) - font-awesome-rails (~> 4.2) - hydra-derivatives (~> 3.3) - hydra-editor (~> 3.3) - hydra-head (>= 10.5.0) - hydra-works (~> 0.16) - jquery-datatables-rails (~> 3.4) - jquery-ui-rails (~> 5.0) - json-schema - kaminari_route_prefix (~> 0.1.1) - legato (~> 0.3) - linkeddata - mailboxer (~> 0.12) - nest (~> 2.0) - oauth - oauth2 (~> 1.2) - posix-spawn - power_converter (~> 0.1, >= 0.1.2) - qa (~> 1.0) - rails (~> 5.0) - rails_autolink (~> 1.1) - rdf-rdfxml - redis-namespace (~> 1.5) - redlock (>= 0.1.2) - retriable (>= 2.9, < 4.0) - select2-rails (~> 3.5) - signet - tinymce-rails (~> 4.1) - GEM remote: https://rubygems.org/ specs: - actioncable (5.0.5) - actionpack (= 5.0.5) + actioncable (5.0.6) + actionpack (= 5.0.6) nio4r (>= 1.2, < 3.0) websocket-driver (~> 0.6.1) - actionmailer (5.0.5) - actionpack (= 5.0.5) - actionview (= 5.0.5) - activejob (= 5.0.5) + actionmailer (5.0.6) + actionpack (= 5.0.6) + actionview (= 5.0.6) + activejob (= 5.0.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.5) - actionview (= 5.0.5) - activesupport (= 5.0.5) + actionpack (5.0.6) + actionview (= 5.0.6) + activesupport (= 5.0.6) rack (~> 2.0) rack-test (~> 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.5) - activesupport (= 5.0.5) + actionview (5.0.6) + activesupport (= 5.0.6) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 2.0) @@ -95,31 +46,31 @@ GEM active-fedora (>= 9.7, < 12) noid (~> 0.9) rails (>= 5.0.0, < 6) - activejob (5.0.5) - activesupport (= 5.0.5) + activejob (5.0.6) + activesupport (= 5.0.6) globalid (>= 0.3.6) - activemodel (5.0.5) - activesupport (= 5.0.5) - activerecord (5.0.5) - activemodel (= 5.0.5) - activesupport (= 5.0.5) + activemodel (5.0.6) + activesupport (= 5.0.6) + activerecord (5.0.6) + activemodel (= 5.0.6) + activesupport (= 5.0.6) arel (~> 7.0) activerecord-import (0.20.2) activerecord (>= 3.2) - activesupport (5.0.5) + activesupport (5.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) 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.2.0) sshkit (>= 1.6.1, != 1.7.0) almond-rails (0.1.0) rails (>= 4.2, < 6) arel (7.1.4) ast (2.3.0) - autoprefixer-rails (7.1.2.2) + autoprefixer-rails (7.1.6) execjs awesome_nested_set (3.1.3) activerecord (>= 4.0.0, < 5.2) @@ -244,7 +195,7 @@ GEM aws-sdk-dynamodbstreams (1.0.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-ec2 (1.11.0) + aws-sdk-ec2 (1.10.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-ecr (1.1.0) @@ -265,7 +216,7 @@ GEM aws-sdk-elasticloadbalancing (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-elasticloadbalancingv2 (1.4.0) + aws-sdk-elasticloadbalancingv2 (1.3.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-elasticsearchservice (1.0.0) @@ -358,7 +309,7 @@ GEM aws-sdk-opsworks (1.1.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) - aws-sdk-opsworkscm (1.1.0) + aws-sdk-opsworkscm (1.0.0) aws-sdk-core (~> 3) aws-sigv4 (~> 1.0) aws-sdk-organizations (1.4.0) @@ -562,10 +513,11 @@ GEM i18n bcrypt (3.1.11) bindex (0.5.0) - blacklight (6.10.1) + blacklight (6.11.2) bootstrap-sass (~> 3.2) deprecation globalid + jbuilder kaminari (>= 0.15) nokogiri (~> 1.6) rails (>= 4.2, < 6) @@ -603,7 +555,7 @@ GEM signet skydrive builder (3.2.3) - byebug (9.0.6) + byebug (9.1.0) cancancan (1.17.0) capistrano (3.8.1) airbrussh (>= 1.0.0) @@ -640,22 +592,17 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.0.5) connection_pool (2.2.1) - coveralls (0.8.21) - json (>= 1.8, < 3) - simplecov (~> 0.14.1) - term-ansicolor (~> 1.3) - thor (~> 0.19.4) - tins (~> 1.6) + crass (1.0.2) daemons (1.2.4) database_cleaner (1.6.1) declarative (0.0.10) declarative-option (0.1.0) deprecation (1.0.0) activesupport - devise (4.2.1) + devise (4.3.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.1) + railties (>= 4.1.0, < 5.2) responders warden (~> 1.2.3) devise-guests (0.6.0) @@ -710,7 +657,7 @@ GEM factory_girl (~> 4.8.0) railties (>= 3.0.0) fakeldap (0.1) - faraday (0.12.1) + faraday (0.12.2) multipart-post (>= 1.2, < 3) faraday-encoding (0.0.4) faraday @@ -724,17 +671,17 @@ GEM jquery-rails font-awesome-rails (4.7.0.2) railties (>= 3.2, < 5.2) - globalid (0.4.0) + globalid (0.4.1) activesupport (>= 4.2.0) - google-api-client (0.15.0) + google-api-client (0.13.6) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.5) httpclient (>= 2.8.1, < 3.0) mime-types (~> 3.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google_drive (2.1.3) - google-api-client (>= 0.11.0, < 1.0.0) + google_drive (2.1.6) + google-api-client (>= 0.11.0, < 0.14.0) googleauth (>= 0.5.0, < 1.0.0) nokogiri (>= 1.5.3, < 2.0.0) googleauth (0.5.3) @@ -804,11 +751,55 @@ GEM hydra-file_characterization (~> 0.3, >= 0.3.3) hydra-pcdm (>= 0.9) om (~> 3.1) - i18n (0.8.6) + hyrax (2.0.0.beta4) + active-fedora (>= 11.3.1) + active_fedora-noid (~> 2.0, >= 2.0.2) + almond-rails (~> 0.1) + awesome_nested_set (~> 3.1) + blacklight (~> 6.9) + blacklight-gallery (~> 0.7) + breadcrumbs_on_rails (~> 3.0) + browse-everything (>= 0.10.5) + carrierwave (~> 1.0) + clipboard-rails (~> 1.5) + dry-equalizer (~> 0.2) + dry-struct (~> 0.1) + dry-validation (~> 0.9) + flipflop (~> 2.3) + flot-rails (~> 0.0.6) + font-awesome-rails (~> 4.2) + hydra-derivatives (~> 3.3) + hydra-editor (~> 3.3) + hydra-head (>= 10.5.0) + hydra-works (~> 0.16) + jquery-datatables-rails (~> 3.4) + jquery-ui-rails (~> 5.0) + json-schema + kaminari_route_prefix (~> 0.1.1) + legato (~> 0.3) + linkeddata + mailboxer (~> 0.12) + nest (~> 2.0) + oauth + oauth2 (~> 1.2) + posix-spawn + power_converter (~> 0.1, >= 0.1.2) + qa (~> 1.0) + rails (~> 5.0) + rails_autolink (~> 1.1) + rdf-rdfxml + redis-namespace (~> 1.5) + redlock (>= 0.1.2) + retriable (>= 2.9, < 4.0) + select2-rails (~> 3.5) + signet + tinymce-rails (~> 4.1) + i18n (0.9.0) + concurrent-ruby (~> 1.0) ice_nine (0.11.2) inflecto (0.0.2) - jbuilder (2.6.4) - activesupport (>= 3.0.0) + jbuilder (2.7.0) + activesupport (>= 4.2.0) multi_json (>= 1.2) jmespath (1.3.1) jquery-datatables-rails (3.4.0) @@ -822,7 +813,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - json (1.8.6) + json (2.1.0) json-ld (2.1.7) multi_json (~> 1.12) rdf (~> 2.2, >= 2.2.8) @@ -833,18 +824,18 @@ GEM json-schema (2.8.0) addressable (>= 2.4) jwt (1.5.6) - kaminari (1.0.1) + kaminari (1.1.1) activesupport (>= 4.1.0) - kaminari-actionview (= 1.0.1) - kaminari-activerecord (= 1.0.1) - kaminari-core (= 1.0.1) - kaminari-actionview (1.0.1) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) actionview - kaminari-core (= 1.0.1) - kaminari-activerecord (1.0.1) + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) activerecord - kaminari-core (= 1.0.1) - kaminari-core (1.0.1) + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) kaminari_route_prefix (0.1.1) kaminari (~> 1.0) kgio (2.11.0) @@ -891,31 +882,32 @@ GEM shex (~> 0.5) sparql (~> 2.1) sparql-client (~> 2.1) - listen (3.1.5) + listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - loofah (2.0.3) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.0) + mini_mime (>= 0.1.1) mailboxer (0.15.1) carrierwave (>= 0.5.8) rails (>= 5.0.0) memoist (0.16.0) - method_source (0.8.2) + method_source (0.9.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.2) mini_magick (4.8.0) - mini_portile2 (2.1.0) + mini_mime (0.1.4) + mini_portile2 (2.3.0) minitest (5.10.3) - multi_json (1.12.1) + multi_json (1.12.2) multi_xml (0.6.0) multipart-post (2.0.0) nest (2.1.0) @@ -927,8 +919,8 @@ GEM net-ssh (4.1.0) nio4r (2.1.0) noid (0.9.0) - nokogiri (1.7.2) - mini_portile2 (~> 2.1.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) oauth (0.5.3) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) @@ -946,19 +938,19 @@ GEM rack (>= 1.6.2, < 3) omniauth-shibboleth (1.2.1) omniauth (>= 1.0.0) - rails (> 3.2.0) openseadragon (0.4.0) + rails (> 3.2.0) orm_adapter (0.5.0) os (0.9.6) - parallel (1.11.2) + parallel (1.12.0) parser (2.4.0.0) ast (~> 2.2) parslet (1.8.0) posix-spawn (0.3.13) power_converter (0.1.2) powerpack (0.1.1) - public_suffix (2.0.5) - puma (3.8.2) + public_suffix (3.0.0) + puma (3.10.0) qa (1.2.0) activerecord-import deprecation @@ -971,17 +963,17 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (5.0.5) - actioncable (= 5.0.5) - actionmailer (= 5.0.5) - actionpack (= 5.0.5) - actionview (= 5.0.5) - activejob (= 5.0.5) - activemodel (= 5.0.5) - activerecord (= 5.0.5) - activesupport (= 5.0.5) + rails (5.0.6) + actioncable (= 5.0.6) + actionmailer (= 5.0.6) + actionpack (= 5.0.6) + actionview (= 5.0.6) + activejob (= 5.0.6) + activemodel (= 5.0.6) + activerecord (= 5.0.6) + activesupport (= 5.0.6) bundler (>= 1.3.0) - railties (= 5.0.5) + railties (= 5.0.6) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.2) actionpack (~> 5.x, >= 5.0.1) @@ -994,16 +986,16 @@ GEM loofah (~> 2.0) rails_autolink (1.1.6) rails (> 3.1) - railties (5.0.5) - actionpack (= 5.0.5) - activesupport (= 5.0.5) + railties (5.0.6) + actionpack (= 5.0.6) + activesupport (= 5.0.6) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake raindrops (0.18.0) - rake (12.0.0) + rake (12.2.1) rb-fsevent (0.10.2) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) @@ -1060,10 +1052,9 @@ GEM rdf (~> 2.2) rdf-xsd (2.2.0) rdf (~> 2.1) - rdoc (4.3.0) redic (1.5.0) hiredis - redis (3.3.3) + redis (3.3.5) redis-namespace (1.5.3) redis (~> 3.0, >= 3.0.4) redlock (0.2.0) @@ -1115,26 +1106,22 @@ GEM multipart-post oauth2 ruby-ldapserver (0.5.3) - ruby-progressbar (1.8.1) + ruby-progressbar (1.9.0) rubyXL (3.3.23) nokogiri (>= 1.4.4) rubyzip (>= 1.1.6) - ruby_dep (1.5.0) rubyzip (1.2.1) - sass (3.5.0) - sass-listen (~> 3.0.7) - sass-listen (3.0.7) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9.7) + sass (3.5.3) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sdoc (0.4.2) - json (~> 1.7, >= 1.7.7) - rdoc (~> 4.0) select2-rails (3.5.10) thor (~> 0.14) shex (0.5.1) @@ -1216,12 +1203,9 @@ GEM sxp (1.0.0) rdf (~> 2.0) temple (0.8.0) - term-ansicolor (1.6.0) - tins (~> 1.0) - thor (0.19.4) + thor (0.20.0) thread_safe (0.3.6) - tilt (2.0.7) - tins (1.14.0) + tilt (2.0.8) tinymce-rails (4.6.7) railties (>= 3.1.1) turbolinks (5.0.1) @@ -1231,12 +1215,12 @@ 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.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (1.2.1) + unicode-display_width (1.3.0) unicorn (5.3.0) kgio (~> 2.6) raindrops (~> 0.7) @@ -1265,32 +1249,29 @@ DEPENDENCIES capistrano-rails (~> 1.2.3) capistrano-rbenv (~> 2.1.1) capybara (~> 2.14.0) - coffee-rails (~> 4.2.0) - coveralls (~> 0.8.21) + coffee-rails (~> 4.2) database_cleaner (~> 1.6.0) - devise (~> 4.2.1) - devise-guests (~> 0.6.0) + devise + devise-guests (~> 0.6) factory_girl (~> 4.0) factory_girl_rails (~> 4.4) fakeldap - fcrepo_wrapper (~> 0.8.0) + fcrepo_wrapper flexmock hydra-role-management - hyrax (= 2.0.0.beta4)! - jbuilder (~> 2.6.3) + hyrax (= 2.0.0.beta4) + jbuilder (~> 2.5) jquery-rails - json (~> 1.8.6) - listen (~> 3.1.5) + listen (~> 3.0.5) net-ldap - nokogiri (~> 1.7.1) omniauth (= 1.6.1) omniauth-shibboleth (= 1.2.1) openseadragon (~> 0.4.0) - puma (~> 3.8.2) - rails (~> 5.0.0, >= 5.0.0.1) + puma (~> 3.0) + rails (~> 5.0.5) rails-controller-testing (~> 1.0.1) rails_autolink (~> 1.1.6) - rsolr (~> 2.0.1) + rsolr (>= 1.0) rspec-activemodel-mocks (~> 1.0) rspec-mocks (= 3.6.0) rspec-rails (~> 3.6.0) @@ -1299,19 +1280,18 @@ DEPENDENCIES ruby-ldapserver (~> 0.5.0) rubyXL sass-rails (~> 5.0) - sdoc (~> 0.4.0) sidekiq (~> 5.0.0) simplecov (~> 0.14.1) sitemap_generator (~> 5.3.1) - solr_wrapper (~> 1.0.0) - spring (~> 2.0.1) + solr_wrapper (>= 0.3) + spring spring-watcher-listen (~> 2.0.0) sqlite3 turbolinks (~> 5) tzinfo-data - uglifier (= 3.2.0) + uglifier (>= 1.3.0) unicorn (~> 5.3.0) - web-console (~> 3.5.0) + web-console (>= 3.3.0) BUNDLED WITH - 1.16.0.pre.3 + 1.14.4 diff --git a/Rakefile b/Rakefile index a1e9443..87de0d3 100644 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,7 @@ # Add your own tasks in files placed in lib/tasks ending in .rake, # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. -require File.expand_path('../config/application', __FILE__) +require_relative 'config/application' Rails.application.load_tasks diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 3d6e182..1c09634 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -5,7 +5,7 @@ // or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path. // // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// compiled file. +// compiled file. JavaScript code in this file should be added after the last require_* statement. // // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details // about supported directives. @@ -17,7 +17,9 @@ //= require jquery_ujs //= require dataTables/jquery.dataTables //= require dataTables/bootstrap/3/jquery.dataTables.bootstrap -//= require turbolinks// +//= require jquery_ujs +//= require turbolinks +// // Required by Blacklight //= require blacklight/blacklight diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index af4188c..ef788a0 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -6,9 +6,9 @@ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. * * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any styles - * defined in the other CSS/SCSS files in this directory. It is generally better to create a new - * file per style scope. + * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS + * files in this directory. Styles in this file should be added after the last require_* statement. + * It is generally better to create a new file per style scope. * *= require_tree . *= require dataTables/bootstrap/3/jquery.dataTables.bootstrap @@ -26,4 +26,4 @@ li > div.row {background-color: #eee;} .form-group.time_span ul.listing {list-style-type: none; padding: 0; margin: 0; max-width: 530px} .form-group.multi_value ul.listing {list-style-type: none; padding: 0; margin: 0; max-width: 535px} .object_resource_visibility_after_embargo {visibility: hidden;} -.open_seadragon_widget {display: none; position: relative;} \ No newline at end of file +.open_seadragon_widget {display: none; position: relative;} diff --git a/app/assets/stylesheets/openseadragon.css b/app/assets/stylesheets/openseadragon.css index 329d04e..42b22a5 100644 --- a/app/assets/stylesheets/openseadragon.css +++ b/app/assets/stylesheets/openseadragon.css @@ -1,4 +1,4 @@ /* *= require openseadragon/openseadragon */ -picture {text-align: center;} \ No newline at end of file +picture {text-align: center;} diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb index 668b2f3..8188b5a 100644 --- a/app/controllers/catalog_controller.rb +++ b/app/controllers/catalog_controller.rb @@ -231,7 +231,7 @@ def self.modified_field config.add_search_field('based_near') do |field| field.label = "Location" - solr_name = solr_name("based_near", :stored_searchable) + solr_name = solr_name("based_near_label", :stored_searchable) field.solr_local_parameters = { qf: solr_name, pf: solr_name @@ -279,7 +279,7 @@ def self.modified_field end # disable the bookmark control from displaying in gallery view - # Sufia doesn't show any of the default controls on the list view, so + # Hyrax doesn't show any of the default controls on the list view, so # this method is not called in that context. def render_bookmarks_control? false diff --git a/app/controllers/hyrax/object_resources_controller.rb b/app/controllers/hyrax/object_resources_controller.rb index 1187f08..1f26f66 100644 --- a/app/controllers/hyrax/object_resources_controller.rb +++ b/app/controllers/hyrax/object_resources_controller.rb @@ -11,7 +11,10 @@ class ObjectResourcesController < ApplicationController helper Rails.application.routes.url_helpers - self.curation_concern_type = ObjectResource + self.curation_concern_type = ::ObjectResource + + # Use this line if you want to use a custom presenter + self.show_presenter = ::ObjectShowPresenter # Display the form the the user. def new @@ -51,10 +54,6 @@ def search_builder_class ::WorkSearchBuilder end - def show_presenter - ::ObjectShowPresenter - end - def add_breadcrumb_relation return unless action_name == 'edit' || action_name == 'show' @document = ::SolrDocument.find(params[:id]) diff --git a/app/models/collection.rb b/app/models/collection.rb index 8ce53a5..343e9aa 100644 --- a/app/models/collection.rb +++ b/app/models/collection.rb @@ -1,4 +1,4 @@ -# Generated by hyrax:models:install +# Generated by hyrax:models class Collection < ActiveFedora::Base include ::Hyrax::CollectionBehavior include ActiveModel::Validations diff --git a/app/models/object_resource.rb b/app/models/object_resource.rb index fea631e..1fd401d 100644 --- a/app/models/object_resource.rb +++ b/app/models/object_resource.rb @@ -3,11 +3,12 @@ class ObjectResource < ActiveFedora::Base include ::Hyrax::WorkBehavior include ::RightsOverrideBehavior - include ::CommonMetadata include NestedAttributes self.human_readable_type = 'Object' + self.indexer = ::WorkIndexer + # Change this to restrict which works can be added as a child. # self.valid_child_concerns = [] validates :title, presence: { message: 'Your work must have a title.' } @@ -45,8 +46,4 @@ def rights_override_change? return true if rights_override != file_sets.first.rights_override false end - - def self.indexer - ::WorkIndexer - end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8b06376..e14d4ee 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,14 +1,14 @@ - - MyApp - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> - <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> - <%= csrf_meta_tags %> - - + + MyApp + <%= csrf_meta_tags %> -<%= yield %> + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + - + + <%= yield %> + diff --git a/bin/rails b/bin/rails index 0739660..5badb2f 100755 --- a/bin/rails +++ b/bin/rails @@ -1,4 +1,9 @@ #!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end APP_PATH = File.expand_path('../config/application', __dir__) require_relative '../config/boot' require 'rails/commands' diff --git a/bin/rake b/bin/rake index 1724048..d87d5f5 100755 --- a/bin/rake +++ b/bin/rake @@ -1,4 +1,9 @@ #!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end require_relative '../config/boot' require 'rake' Rake.application.run diff --git a/bin/spring b/bin/spring index 9bc076b..fb2ec2e 100755 --- a/bin/spring +++ b/bin/spring @@ -8,7 +8,8 @@ unless defined?(Spring) require 'bundler' lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) - if spring = lockfile.specs.detect { |spec| spec.name == "spring" } + spring = lockfile.specs.detect { |spec| spec.name == "spring" } + if spring Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path gem 'spring', spring.version require 'spring/binstub' diff --git a/config.ru b/config.ru index bd83b25..f7ba0b5 100644 --- a/config.ru +++ b/config.ru @@ -1,4 +1,5 @@ # This file is used by Rack-based servers to start the application. -require ::File.expand_path('../config/environment', __FILE__) +require_relative 'config/environment' + run Rails.application diff --git a/config/blacklight.yml b/config/blacklight.yml index d0ec9f4..9ea3254 100644 --- a/config/blacklight.yml +++ b/config/blacklight.yml @@ -3,8 +3,7 @@ development: url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_DEVELOPMENT_PORT', 8983)}/solr/hydra-development" %> test: &test adapter: solr - url: http://localhost:<%= ENV['SOLR_TEST_PORT'] || 8985 %>/solr/hydra-test + url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:#{ENV.fetch('SOLR_TEST_PORT', 8985)}/solr/hydra-test" %> production: adapter: solr url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %> - diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index b5bf153..7cf5ec7 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -6,7 +6,7 @@ # confirmation, reset password and unlock tokens in the database. # Devise will use the `secret_key_base` as its `secret_key` # by default. You can change it below and use your own secret key. - # config.secret_key = '76c8e957f286ecbf2a22a00b51828bfe643bbcd34cf3b963d336d1ba21dbabd3a6d1f5a266d674f29e03f638e44a3a075ca58124c416ee13dac16ae89511ca62' + # config.secret_key = '1cb864c6813530e1509e084ed59fdaef69e212e7298c6ee940ac39c584fbd663ff59d4ab087afdf378a86f895a2fda475d3daced21e81f5290fddc206b0e766e' # ==> Mailer Configuration # Configure the e-mail address which will be shown in Devise::Mailer, @@ -123,9 +123,12 @@ config.stretches = Rails.env.test? ? 1 : 11 # Set up a pepper to generate the hashed password. - # config.pepper = 'ab83db3e6d44ea55db604176629fd54aabe2b785477f5d1b7deccbfe4fca9c26672e394b853a0456489af85b3eaa6a4c1814fecbc0c1ae2ba50053c682b2fb02' + # config.pepper = 'f31eed187b3acf8fc5e478c420b3165d188a57abb4ca90154c7b7de32706bec85eeb24d78bb8bc6f060576aa3bbe40c91f5e0fc1640c00475affa2f76c5e675a' - # Send a notification email when the user's password is changed + # Send a notification to the original email when the user's email is changed. + # config.send_email_changed_notification = false + + # Send a notification email when the user's password is changed. # config.send_password_change_notification = false # ==> Configuration for :confirmable diff --git a/config/initializers/hyrax.rb b/config/initializers/hyrax.rb index f86aa94..41f8dd0 100644 --- a/config/initializers/hyrax.rb +++ b/config/initializers/hyrax.rb @@ -1,4 +1,6 @@ Hyrax.config do |config| + # Injected via `rails g hyrax:work ObjectResource` + #config.register_curation_concern :object_resource # Register roles that are expected by your implementation. # @see Hyrax::RoleRegistry for additional details. # @note there are magical roles as defined in Hyrax::RoleRegistry::MAGIC_ROLES @@ -27,18 +29,27 @@ # How frequently should a file be fixity checked # config.max_days_between_fixity_checks = 7 + # Options to control the file uploader + # config.uploader = { + # limitConcurrentUploads: 6, + # maxNumberOfFiles: 100, + # maxFileSize: 500.megabytes + # } + # Enable displaying usage statistics in the UI - # Defaults to FALSE + # Defaults to false # Requires a Google Analytics id and OAuth2 keyfile. See README for more info - config.analytics = ENV.fetch('APPS_HORTON_ANALYTICS'){'false'} + # config.analytics = false - # Specify a Google Analytics tracking ID to gather usage statistics - config.google_analytics_id = ENV.fetch('APPS_HORTON_GOOGLE_ID'){'UA-99999999-1'} + # Google Analytics tracking ID to gather usage statistics + # config.google_analytics_id = 'UA-99999999-1' - # Specify a date you wish to start collecting Google Analytic statistics for. - config.analytic_start_date = DateTime.new(2014,9,10) + # Date you wish to start collecting Google Analytic statistics for + # Leaving it blank will set the start date to when ever the file was uploaded by + # NOTE: if you have always sent analytics to GA for downloads and page views leave this commented out + # config.analytic_start_date = DateTime.new(2014, 9, 10) - # Enables a link to the citations page for a generic_file. + # Enables a link to the citations page for a work # Default is false # config.citations = false @@ -84,6 +95,9 @@ # of Zotero-managed research items. # config.arkivo_api = false + # Stream realtime notifications to users in the browser + # config.realtime_notifications = true + # Location autocomplete uses geonames to search for named regions # Username for connecting to geonames # config.geonames_username = '' @@ -196,3 +210,4 @@ Qa::Authorities::Local.register_subauthority('languages', 'Qa::Authorities::Local::TableBasedAuthority') Qa::Authorities::Local.register_subauthority('genres', 'Qa::Authorities::Local::TableBasedAuthority') Qa::Authorities::Local.register_subauthority('country_codes', 'Qa::Authorities::Local::TableBasedAuthority') + diff --git a/config/initializers/mailboxer.rb b/config/initializers/mailboxer.rb index 48b77fa..bc34b24 100644 --- a/config/initializers/mailboxer.rb +++ b/config/initializers/mailboxer.rb @@ -9,9 +9,10 @@ #Configures the methods needed by mailboxer config.email_method = :mailboxer_email config.name_method = :name + config.notify_method = :notify #Configures if you use or not a search engine and which one you are using - #Supported engines: [:solr,:sphinx] + #Supported engines: [:solr,:sphinx,:pg_search] config.search_enabled = false config.search_engine = :solr diff --git a/config/initializers/new_framework_defaults.rb b/config/initializers/new_framework_defaults.rb index 0706caf..dd236b5 100644 --- a/config/initializers/new_framework_defaults.rb +++ b/config/initializers/new_framework_defaults.rb @@ -2,7 +2,9 @@ # # This file contains migration options to ease your Rails 5.0 upgrade. # -# Read the Rails 5.0 release notes for more info on each option. +# Read the Guide for Upgrading Ruby on Rails for more info on each option. + +Rails.application.config.action_controller.raise_on_unfiltered_parameters = true # Enable per-form CSRF tokens. Previous versions had false. Rails.application.config.action_controller.per_form_csrf_tokens = true diff --git a/config/initializers/redis_config.rb b/config/initializers/redis_config.rb index 8aad448..aad03ef 100644 --- a/config/initializers/redis_config.rb +++ b/config/initializers/redis_config.rb @@ -1,3 +1,3 @@ require 'redis' -config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access +config = YAML.safe_load(ERB.new(IO.read(Rails.root.join('config', 'redis.yml'))).result)[Rails.env].with_indifferent_access Redis.current = Redis.new(config.merge(thread_safe: true)) diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 194dcc5..7bd3bcd 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,3 +1,3 @@ # Be sure to restart your server when you modify this file. -Rails.application.config.session_store :cookie_store, key: '_hyrax_app_session' +Rails.application.config.session_store :cookie_store, key: '_my_app_session' diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index bd4c3eb..0b8f130 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -23,6 +23,8 @@ en: subject: "Reset password instructions" unlock_instructions: subject: "Unlock instructions" + email_changed: + subject: "Email Changed" password_change: subject: "Password Changed" omniauth_callbacks: diff --git a/config/locales/hyrax.de.yml b/config/locales/hyrax.de.yml new file mode 100644 index 0000000..74ec395 --- /dev/null +++ b/config/locales/hyrax.de.yml @@ -0,0 +1,56 @@ +--- +de: + blacklight: + search: + fields: + facet: + based_near_sim: Ort + creator_sim: Schöpfer + file_format_sim: Format + generic_type_sim: Art + keyword_sim: Stichwort + language_sim: Sprache + publisher_sim: Herausgeber + subject_sim: Fach + index: + based_near_tesim: Ort + contributor_tesim: Mitwirkender + creator_tesim: Schöpfer + date_created_tesim: Datum erstellt + date_modified_dtsi: Datum geändert + date_uploaded_dtsi: Datum hochgeladen + description_tesim: Beschreibung + file_format_tesim: Datei Format + identifier_tesim: Identifikator + keyword_tesim: Stichwort + language_tesim: Sprache + publisher_tesim: Herausgeber + rights_tesim: Rechte + subject_tesim: Fach + show: + based_near_tesim: Ort + contributor_tesim: Mitwirkender + creator_tesim: Schöpfer + date_created_tesim: Datum erstellt + date_modified_dtsi: Datum geändert + date_uploaded_dtsi: Datum hochgeladen + description_tesim: Beschreibung + file_format_tesim: Datei Format + identifier_tesim: Identifikator + keyword_tesim: Stichwort + language_tesim: Sprache + publisher_tesim: Herausgeber + rights_tesim: Rechte + subject_tesim: Fach + title_tesim: Titel + hyrax: + account_name: Meine Institution Konto-ID + directory: + suffix: "@ Example.org" + footer: + copyright_html: "Copyright © 2017 Samvera lizenziert unter der Apache Lizenz, Version 2.0" + service_html: Ein Dienst von Samvera . + institution_name: Institution + institution_name_full: Name des Instituts + product_name: Hyrax + product_twitter_handle: "@SamveraRepo" diff --git a/config/locales/hyrax.en.yml b/config/locales/hyrax.en.yml index 1249ad1..7fc3957 100644 --- a/config/locales/hyrax.en.yml +++ b/config/locales/hyrax.en.yml @@ -3,76 +3,60 @@ en: action: batch: new: "Batch Import" + blacklight: + search: + fields: + facet: + based_near_sim: Location + creator_sim: Creator + file_format_sim: Format + generic_type_sim: Type + keyword_sim: Keyword + language_sim: Language + publisher_sim: Publisher + subject_sim: Subject + index: + based_near_tesim: Location + contributor_tesim: Contributor + creator_tesim: Creator + date_created_tesim: Date Created + date_modified_dtsi: Date Modified + date_uploaded_dtsi: Date Uploaded + description_tesim: Description + file_format_tesim: File Format + identifier_tesim: Identifier + keyword_tesim: Keyword + language_tesim: Language + publisher_tesim: Publisher + rights_tesim: Rights + subject_tesim: Subject + show: + based_near_tesim: Location + contributor_tesim: Contributor + creator_tesim: Creator + date_created_tesim: Date Created + date_modified_dtsi: Date Modified + date_uploaded_dtsi: Date Uploaded + description_tesim: Description + file_format_tesim: File Format + identifier_tesim: Identifier + keyword_tesim: Keyword + language_tesim: Language + publisher_tesim: Publisher + rights_tesim: Rights + subject_tesim: Subject + title_tesim: Title hyrax: - product_name: "Hyrax" - product_twitter_handle: "@HydraSphere" - institution_name: "Campus" -# institution_name_full: "The Institution Name" - account_name: "My Institution Account Id" + product_name: "Hyrax" + product_twitter_handle: "@SamveraRepo" + institution_name: "Institution" + institution_name_full: "The Institution Name" + account_name: "My Institution Account Id" directory: - suffix: "@example.org" + suffix: "@example.org" footer: - copyright_html: "Copyright © 2016 Project Hydra Licensed under the Apache License, Version 2.0" - search: - form: - option: - my_works: - label_short: "My Objects" - label_long: "My Objects" - select_type: - name: "Object" - share_button: "Share Your Object" - homepage: - featured_works: - tab_label: 'Featured Objects' - title: 'Featured Objects' - no_works: 'No objects have been featured' - toolbar: - works: - menu: "Objects" - new: "New Object" - my: "My Objects" - batch: "Batch Create" - toolbar: - collections: - menu: "Collections" - new: "New Collection" - my: "My Collections" - controls: - faq: "FAQ" - search-tips: "Search Tips" - takedown: "Take Down Policy" - dashboard: - heading_actions: - create_work: "Create Object" - select_type_of_work: "Select type of object" - view_works: "View Objects" - create_work: "Create Object" - transfer_works_link: "Select objects to transfer" - no_transfer_requests: "You haven't received any object transfer requests" - no_transfers: "You haven't transferred any object" - stats: - works: "Objects created" - my: - works: "My Objects" - shares: "Objects Shared with Me" - facet_label: - works: "Filter your objects" - works: - new: - header: "Add New Object" - in_collections: This Object in Collections - in_this_work: Other Objects in this Object - in_other_works: This Object in Other Objects - after_create_html: "Your files are being processed by %{application_name} in the background. The metadata and access controls you specified are being applied. Files will be marked Private until this process is complete (shouldn't take too long, hang in there!). You may need to refresh this page to see these updates." - edit: - header: Edit Object - in_collections: This Object in Collections - in_this_work: Other Objects in this Object - in_other_works: This Object in Other Objects - additional_fields: "Additional fields" - progress: - header: "Save Object" + copyright_html: "Copyright © 2017 Samvera Licensed under the Apache License, Version 2.0" + service_html: A service of Samvera. visibility: suppress_discovery: class: "label-info" @@ -90,8 +74,18 @@ en: tabs: faq_page: FAQ Page takedown_page: Take Down Page - search_tips_page: Search Tips Page - simple_form: - labels: - defaults: - description: "Description" \ No newline at end of file + search_tips_page: Search Tips Page + controls: + faq: "FAQ" + search-tips: "Search Tips" + takedown: "Take Down Policy" + toolbar: + works: + menu: "Objects" + new: "New Object" + my: "My Objects" + batch: "Batch Create" + collections: + menu: "Collections" + new: "New Collection" + my: "My Collections" diff --git a/config/locales/hyrax.es.yml b/config/locales/hyrax.es.yml index 54aa835..70a3c60 100644 --- a/config/locales/hyrax.es.yml +++ b/config/locales/hyrax.es.yml @@ -1,12 +1,56 @@ +--- es: + blacklight: + search: + fields: + facet: + based_near_sim: Ubicación + creator_sim: Creador + file_format_sim: Formato + generic_type_sim: Tipo + keyword_sim: Palabra clave + language_sim: Idioma + publisher_sim: Editor + subject_sim: Tema + index: + based_near_tesim: Ubicación + contributor_tesim: Contribuidor + creator_tesim: Creador + date_created_tesim: Fecha de Creacion + date_modified_dtsi: Fecha Modificada + date_uploaded_dtsi: Fecha de Subida + description_tesim: Descripción + file_format_tesim: Formato de Archivo + identifier_tesim: Identificador + keyword_tesim: Palabra clave + language_tesim: Idioma + publisher_tesim: Editor + rights_tesim: Derechos + subject_tesim: Tema + show: + based_near_tesim: Ubicación + contributor_tesim: Contribuidor + creator_tesim: Creador + date_created_tesim: Fecha de Creacion + date_modified_dtsi: Fecha Modificada + date_uploaded_dtsi: Fecha de Subida + description_tesim: Descripción + file_format_tesim: Formato de Archivo + identifier_tesim: Identificador + keyword_tesim: Palabra clave + language_tesim: Idioma + publisher_tesim: Editor + rights_tesim: Derechos + subject_tesim: Tema + title_tesim: Título hyrax: - product_name: "Hyrax" - product_twitter_handle: "@HydraSphere" - institution_name: "institución" - institution_name_full: "El nombre de la institución" - account_name: "Mi identificador de cuenta institucional" + account_name: Mi identificador de cuenta institucional directory: - suffix: "@example.org" + suffix: "@example.org" footer: - copyright_html: "Copyright © 2017 Proyecto Hydra bajo licencia de Apache, Version 2.0" - service_html: Un servicio de Proyecto Hydra. + copyright_html: "Copyright © 2017 Samvera bajo licencia de Apache, Version 2.0" + service_html: Un servicio de Samvera/a>. + institution_name: institución + institution_name_full: El nombre de la institución + product_name: Hyrax + product_twitter_handle: "@SamveraRepo" diff --git a/config/locales/hyrax.fr.yml b/config/locales/hyrax.fr.yml new file mode 100644 index 0000000..6777579 --- /dev/null +++ b/config/locales/hyrax.fr.yml @@ -0,0 +1,56 @@ +--- +fr: + blacklight: + search: + fields: + facet: + based_near_sim: Emplacement + creator_sim: Créateur + file_format_sim: Format + generic_type_sim: Type + keyword_sim: Mot-clé + language_sim: La langue + publisher_sim: Éditeur + subject_sim: Assujettir + index: + based_near_tesim: Emplacement + contributor_tesim: Donateur + creator_tesim: Créateur + date_created_tesim: date créée + date_modified_dtsi: Date modifiée + date_uploaded_dtsi: Date de téléchargement + description_tesim: La description + file_format_tesim: Format de fichier + identifier_tesim: Identificateur + keyword_tesim: Mot-clé + language_tesim: La langue + publisher_tesim: Éditeur + rights_tesim: Droits + subject_tesim: Assujettir + show: + based_near_tesim: Emplacement + contributor_tesim: Donateur + creator_tesim: Créateur + date_created_tesim: date créée + date_modified_dtsi: Date modifiée + date_uploaded_dtsi: Date de téléchargement + description_tesim: La description + file_format_tesim: Format de fichier + identifier_tesim: Identificateur + keyword_tesim: Mot-clé + language_tesim: La langue + publisher_tesim: Éditeur + rights_tesim: Droits + subject_tesim: Assujettir + title_tesim: Titre + hyrax: + account_name: L'ID de compte de mon établissement + directory: + suffix: "@ Example.org" + footer: + copyright_html: "Copyright © 2017 Samvera Licence sous Licence Apache, Version 2.0" + service_html: Un service de Samvera . + institution_name: Institution + institution_name_full: Nom de l'établissement + product_name: Hyrax + product_twitter_handle: "@SamveraRepo" diff --git a/config/locales/hyrax.it.yml b/config/locales/hyrax.it.yml new file mode 100644 index 0000000..f4d3bcc --- /dev/null +++ b/config/locales/hyrax.it.yml @@ -0,0 +1,56 @@ +--- +it: + blacklight: + search: + fields: + facet: + based_near_sim: luogo + creator_sim: Creatore + file_format_sim: Formato + generic_type_sim: Tipo + keyword_sim: Parola chiave + language_sim: Lingua + publisher_sim: Editore + subject_sim: Soggetto + index: + based_near_tesim: luogo + contributor_tesim: Collaboratore + creator_tesim: Creatore + date_created_tesim: data di creazione + date_modified_dtsi: Data modificata + date_uploaded_dtsi: Data caricata + description_tesim: Descrizione + file_format_tesim: Formato del file + identifier_tesim: Identifier + keyword_tesim: Parola chiave + language_tesim: Lingua + publisher_tesim: Editore + rights_tesim: Diritti + subject_tesim: Soggetto + show: + based_near_tesim: luogo + contributor_tesim: Collaboratore + creator_tesim: Creatore + date_created_tesim: data di creazione + date_modified_dtsi: Data modificata + date_uploaded_dtsi: Data caricata + description_tesim: Descrizione + file_format_tesim: Formato del file + identifier_tesim: Identifier + keyword_tesim: Parola chiave + language_tesim: Lingua + publisher_tesim: Editore + rights_tesim: Diritti + subject_tesim: Soggetto + title_tesim: Titolo + hyrax: + account_name: ID del mio istituto dell'istituto + directory: + suffix: "@ example.org" + footer: + copyright_html: "Copyright © 2017 Samvera Licenza sotto la licenza Apache, versione 2.0" + service_html: Un servizio di Samvera . + institution_name: Istituzione + institution_name_full: Nome dell'Istituzione + product_name: Hyrax + product_twitter_handle: "@SamveraRepo" diff --git a/config/locales/hyrax.pt-BR.yml b/config/locales/hyrax.pt-BR.yml new file mode 100644 index 0000000..23b313a --- /dev/null +++ b/config/locales/hyrax.pt-BR.yml @@ -0,0 +1,56 @@ +--- +pt-BR: + blacklight: + search: + fields: + facet: + based_near_sim: Localização + creator_sim: O Criador + file_format_sim: Formato + generic_type_sim: Tipo + keyword_sim: Palavra-chave + language_sim: Língua + publisher_sim: Editor + subject_sim: Sujeito + index: + based_near_tesim: Localização + contributor_tesim: Contribuinte + creator_tesim: O Criador + date_created_tesim: Data Criada + date_modified_dtsi: Data modificada + date_uploaded_dtsi: Data carregada + description_tesim: Descrição + file_format_tesim: Formato de arquivo + identifier_tesim: Identificador + keyword_tesim: Palavra-chave + language_tesim: Língua + publisher_tesim: Editor + rights_tesim: Direitos + subject_tesim: Sujeito + show: + based_near_tesim: Localização + contributor_tesim: Contribuinte + creator_tesim: O Criador + date_created_tesim: Data Criada + date_modified_dtsi: Data modificada + date_uploaded_dtsi: Data carregada + description_tesim: Descrição + file_format_tesim: Formato de arquivo + identifier_tesim: Identificador + keyword_tesim: Palavra-chave + language_tesim: Língua + publisher_tesim: Editor + rights_tesim: Direitos + subject_tesim: Sujeito + title_tesim: Título + hyrax: + account_name: ID da conta da minha instituição + directory: + suffix: "@ Example.org" + footer: + copyright_html: "Copyright © 2017 Samvera Licenciado sob a Licença Apache, Versão 2.0" + service_html: Um serviço de Samvera . + institution_name: Instituição + institution_name_full: O Nome da Instituição + product_name: Hyrax + product_twitter_handle: "@SamveraRepo" diff --git a/config/locales/hyrax.zh.yml b/config/locales/hyrax.zh.yml new file mode 100644 index 0000000..56a1d1b --- /dev/null +++ b/config/locales/hyrax.zh.yml @@ -0,0 +1,56 @@ +--- +zh: + blacklight: + search: + fields: + facet: + based_near_sim: 位置 + creator_sim: 创造者 + file_format_sim: 文件格式 + generic_type_sim: 类型 + keyword_sim: 关键词 + language_sim: 语言 + publisher_sim: 出版者 + subject_sim: 学科 + index: + based_near_tesim: 位置 + contributor_tesim: 贡献者 + creator_tesim: 创造者 + date_created_tesim: 创建日期 + date_modified_dtsi: 修改日期 + date_uploaded_dtsi: 日期上传 + description_tesim: 描述 + file_format_tesim: 文件格式 + identifier_tesim: 识别码 + keyword_tesim: 关键词 + language_tesim: 语言 + publisher_tesim: 出版者 + rights_tesim: 权 + subject_tesim: 学科 + show: + based_near_tesim: 位置 + contributor_tesim: 贡献者 + creator_tesim: 创造者 + date_created_tesim: 创建日期 + date_modified_dtsi: 修改日期 + date_uploaded_dtsi: 日期上传 + description_tesim: 描述 + file_format_tesim: 文件格式 + identifier_tesim: 识别码 + keyword_tesim: 关键词 + language_tesim: 语言 + publisher_tesim: 出版者 + rights_tesim: 权 + subject_tesim: 学科 + title_tesim: 标题 + hyrax: + account_name: 我的机构帐户标识符 + directory: + suffix: "@example.org" + footer: + copyright_html: "版权所有 © 2017 Samvera 根据Apache许可证2.0版许可" + service_html: 的服务Samvera. + institution_name: 机构 + institution_name_full: 机构名称 + product_name: 蹄兔 + product_twitter_handle: "@SamveraRepo" diff --git a/config/workflows/mediated_deposit_workflow.json b/config/workflows/mediated_deposit_workflow.json index b1fab98..4ab7fad 100644 --- a/config/workflows/mediated_deposit_workflow.json +++ b/config/workflows/mediated_deposit_workflow.json @@ -32,7 +32,8 @@ } ], "methods": [ - "Hyrax::Workflow::DeactivateObject" + "Hyrax::Workflow::DeactivateObject", + "Hyrax::Workflow::GrantEditToDepositor" ] }, { "name": "approve", @@ -46,6 +47,8 @@ } ], "methods": [ + "Hyrax::Workflow::GrantReadToDepositor", + "Hyrax::Workflow::RevokeEditFromDepositor", "Hyrax::Workflow::ActivateObject" ] }, { diff --git a/db/migrate/20170223191746_remove_workflow_name_from_permission_templates.rb b/db/migrate/20170223191746_remove_workflow_name_from_permission_templates.rb deleted file mode 100644 index 234da7c..0000000 --- a/db/migrate/20170223191746_remove_workflow_name_from_permission_templates.rb +++ /dev/null @@ -1,5 +0,0 @@ -class RemoveWorkflowNameFromPermissionTemplates < ActiveRecord::Migration[5.0] - def change - remove_column :permission_templates, :workflow_name, :string - end -end diff --git a/db/migrate/20170223193040_add_workflow_ref_to_permission_templates.rb b/db/migrate/20170223193040_add_workflow_ref_to_permission_templates.rb deleted file mode 100644 index 4e0fa4a..0000000 --- a/db/migrate/20170223193040_add_workflow_ref_to_permission_templates.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddWorkflowRefToPermissionTemplates < ActiveRecord::Migration[5.0] - def change - add_reference :permission_templates, :workflow, foreign_key: true - end -end diff --git a/db/migrate/20170308175556_add_allows_access_grant_to_workflow.rb b/db/migrate/20170308175556_add_allows_access_grant_to_workflow.rb deleted file mode 100644 index 35eb24f..0000000 --- a/db/migrate/20170308175556_add_allows_access_grant_to_workflow.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddAllowsAccessGrantToWorkflow < ActiveRecord::Migration - def change - add_column :sipity_workflows, :allows_access_grant, :boolean - end -end diff --git a/db/migrate/20170110223602_create_searches.blacklight.rb b/db/migrate/20171009180419_create_searches.blacklight.rb similarity index 86% rename from db/migrate/20170110223602_create_searches.blacklight.rb rename to db/migrate/20171009180419_create_searches.blacklight.rb index 97bc5e2..391fe79 100644 --- a/db/migrate/20170110223602_create_searches.blacklight.rb +++ b/db/migrate/20171009180419_create_searches.blacklight.rb @@ -1,6 +1,6 @@ # This migration comes from blacklight (originally 20140202020201) # frozen_string_literal: true -class CreateSearches < ActiveRecord::Migration +class CreateSearches < ActiveRecord::Migration[4.2] def self.up create_table :searches do |t| t.binary :query_params diff --git a/db/migrate/20170110223603_create_bookmarks.blacklight.rb b/db/migrate/20171009180420_create_bookmarks.blacklight.rb similarity index 88% rename from db/migrate/20170110223603_create_bookmarks.blacklight.rb rename to db/migrate/20171009180420_create_bookmarks.blacklight.rb index 3050c72..85c8c4d 100644 --- a/db/migrate/20170110223603_create_bookmarks.blacklight.rb +++ b/db/migrate/20171009180420_create_bookmarks.blacklight.rb @@ -1,6 +1,6 @@ # This migration comes from blacklight (originally 20140202020202) # frozen_string_literal: true -class CreateBookmarks < ActiveRecord::Migration +class CreateBookmarks < ActiveRecord::Migration[4.2] def self.up create_table :bookmarks do |t| t.integer :user_id, index: true, null: false diff --git a/db/migrate/20170110223604_add_polymorphic_type_to_bookmarks.blacklight.rb b/db/migrate/20171009180421_add_polymorphic_type_to_bookmarks.blacklight.rb similarity index 83% rename from db/migrate/20170110223604_add_polymorphic_type_to_bookmarks.blacklight.rb rename to db/migrate/20171009180421_add_polymorphic_type_to_bookmarks.blacklight.rb index be9f730..3e873ed 100644 --- a/db/migrate/20170110223604_add_polymorphic_type_to_bookmarks.blacklight.rb +++ b/db/migrate/20171009180421_add_polymorphic_type_to_bookmarks.blacklight.rb @@ -1,6 +1,6 @@ # This migration comes from blacklight (originally 20140320000000) # frozen_string_literal: true -class AddPolymorphicTypeToBookmarks < ActiveRecord::Migration +class AddPolymorphicTypeToBookmarks < ActiveRecord::Migration[4.2] def change add_column(:bookmarks, :document_type, :string) unless Bookmark.connection.column_exists? :bookmarks, :document_type diff --git a/db/migrate/20170110223631_devise_create_users.rb b/db/migrate/20171009180437_devise_create_users.rb similarity index 100% rename from db/migrate/20170110223631_devise_create_users.rb rename to db/migrate/20171009180437_devise_create_users.rb diff --git a/db/migrate/20170110223637_add_devise_guests_to_users.rb b/db/migrate/20171009180442_add_devise_guests_to_users.rb similarity index 86% rename from db/migrate/20170110223637_add_devise_guests_to_users.rb rename to db/migrate/20171009180442_add_devise_guests_to_users.rb index 445a7d1..2380aaa 100644 --- a/db/migrate/20170110223637_add_devise_guests_to_users.rb +++ b/db/migrate/20171009180442_add_devise_guests_to_users.rb @@ -1,4 +1,4 @@ -class AddDeviseGuestsToUsers < ActiveRecord::Migration +class AddDeviseGuestsToUsers < ActiveRecord::Migration[5.0] def self.up change_table(:users) do |t| ## Database authenticatable @@ -12,4 +12,4 @@ def self.down # model already existed. Please edit below which fields you would like to remove in this migration. raise ActiveRecord::IrreversibleMigration end -end \ No newline at end of file +end diff --git a/db/migrate/20170110223715_create_version_committers.hyrax.rb b/db/migrate/20171009180520_create_version_committers.hyrax.rb similarity index 84% rename from db/migrate/20170110223715_create_version_committers.hyrax.rb rename to db/migrate/20171009180520_create_version_committers.hyrax.rb index a5fe392..b89330e 100644 --- a/db/migrate/20170110223715_create_version_committers.hyrax.rb +++ b/db/migrate/20171009180520_create_version_committers.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222152) -class CreateVersionCommitters < ActiveRecord::Migration +class CreateVersionCommitters < ActiveRecord::Migration[4.2] def self.up create_table :version_committers do |t| t.string :obj_id diff --git a/db/migrate/20170110223716_create_checksum_audit_logs.hyrax.rb b/db/migrate/20171009180521_create_checksum_audit_logs.hyrax.rb similarity index 90% rename from db/migrate/20170110223716_create_checksum_audit_logs.hyrax.rb rename to db/migrate/20171009180521_create_checksum_audit_logs.hyrax.rb index 4f92ab8..7eb88d4 100644 --- a/db/migrate/20170110223716_create_checksum_audit_logs.hyrax.rb +++ b/db/migrate/20171009180521_create_checksum_audit_logs.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222153) -class CreateChecksumAuditLogs < ActiveRecord::Migration +class CreateChecksumAuditLogs < ActiveRecord::Migration[4.2] def self.up create_table :checksum_audit_logs do |t| t.string :file_set_id diff --git a/db/migrate/20170110223717_create_single_use_links.hyrax.rb b/db/migrate/20171009180522_create_single_use_links.hyrax.rb similarity index 82% rename from db/migrate/20170110223717_create_single_use_links.hyrax.rb rename to db/migrate/20171009180522_create_single_use_links.hyrax.rb index 2020630..6894ae5 100644 --- a/db/migrate/20170110223717_create_single_use_links.hyrax.rb +++ b/db/migrate/20171009180522_create_single_use_links.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222154) -class CreateSingleUseLinks < ActiveRecord::Migration +class CreateSingleUseLinks < ActiveRecord::Migration[4.2] def change create_table :single_use_links do |t| t.string :downloadKey diff --git a/db/migrate/20170110223718_add_social_to_users.hyrax.rb b/db/migrate/20171009180523_add_social_to_users.hyrax.rb similarity index 88% rename from db/migrate/20170110223718_add_social_to_users.hyrax.rb rename to db/migrate/20171009180523_add_social_to_users.hyrax.rb index c3e2e00..22769b8 100644 --- a/db/migrate/20170110223718_add_social_to_users.hyrax.rb +++ b/db/migrate/20171009180523_add_social_to_users.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222156) -class AddSocialToUsers < ActiveRecord::Migration +class AddSocialToUsers < ActiveRecord::Migration[4.2] def self.up add_column :users, :facebook_handle, :string add_column :users, :twitter_handle, :string diff --git a/db/migrate/20170110223719_add_ldap_attrs_to_user.hyrax.rb b/db/migrate/20171009180524_add_ldap_attrs_to_user.hyrax.rb similarity index 94% rename from db/migrate/20170110223719_add_ldap_attrs_to_user.hyrax.rb rename to db/migrate/20171009180524_add_ldap_attrs_to_user.hyrax.rb index 5ff183e..edc0d30 100644 --- a/db/migrate/20170110223719_add_ldap_attrs_to_user.hyrax.rb +++ b/db/migrate/20171009180524_add_ldap_attrs_to_user.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222157) -class AddLdapAttrsToUser < ActiveRecord::Migration +class AddLdapAttrsToUser < ActiveRecord::Migration[4.2] def self.up add_column :users, :display_name, :string add_column :users, :address, :string diff --git a/db/migrate/20170110223720_add_avatars_to_users.hyrax.rb b/db/migrate/20171009180525_add_avatars_to_users.hyrax.rb similarity index 90% rename from db/migrate/20170110223720_add_avatars_to_users.hyrax.rb rename to db/migrate/20171009180525_add_avatars_to_users.hyrax.rb index 959955b..f3a4da7 100644 --- a/db/migrate/20170110223720_add_avatars_to_users.hyrax.rb +++ b/db/migrate/20171009180525_add_avatars_to_users.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222158) -class AddAvatarsToUsers < ActiveRecord::Migration +class AddAvatarsToUsers < ActiveRecord::Migration[4.2] def self.up add_column :users, "avatar_file_name", :string add_column :users, "avatar_content_type", :string diff --git a/db/migrate/20170110223721_create_trophies.hyrax.rb b/db/migrate/20171009180526_create_trophies.hyrax.rb similarity index 80% rename from db/migrate/20170110223721_create_trophies.hyrax.rb rename to db/migrate/20171009180526_create_trophies.hyrax.rb index e5c2c14..6dd73b8 100644 --- a/db/migrate/20170110223721_create_trophies.hyrax.rb +++ b/db/migrate/20171009180526_create_trophies.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222161) -class CreateTrophies < ActiveRecord::Migration +class CreateTrophies < ActiveRecord::Migration[4.2] def change create_table :trophies do |t| t.integer :user_id diff --git a/db/migrate/20170110223722_add_linkedin_to_users.hyrax.rb b/db/migrate/20171009180527_add_linkedin_to_users.hyrax.rb similarity index 70% rename from db/migrate/20170110223722_add_linkedin_to_users.hyrax.rb rename to db/migrate/20171009180527_add_linkedin_to_users.hyrax.rb index f63d51d..a5f5b96 100644 --- a/db/migrate/20170110223722_add_linkedin_to_users.hyrax.rb +++ b/db/migrate/20171009180527_add_linkedin_to_users.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222162) -class AddLinkedinToUsers < ActiveRecord::Migration +class AddLinkedinToUsers < ActiveRecord::Migration[4.2] def change add_column :users, :linkedin_handle, :string end diff --git a/db/migrate/20170110223723_create_tinymce_assets.hyrax.rb b/db/migrate/20171009180528_create_tinymce_assets.hyrax.rb similarity index 76% rename from db/migrate/20170110223723_create_tinymce_assets.hyrax.rb rename to db/migrate/20171009180528_create_tinymce_assets.hyrax.rb index 36b35d9..d9c9353 100644 --- a/db/migrate/20170110223723_create_tinymce_assets.hyrax.rb +++ b/db/migrate/20171009180528_create_tinymce_assets.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222163) -class CreateTinymceAssets < ActiveRecord::Migration +class CreateTinymceAssets < ActiveRecord::Migration[4.2] def change create_table :tinymce_assets do |t| t.string :file diff --git a/db/migrate/20170110223724_create_content_blocks.hyrax.rb b/db/migrate/20171009180529_create_content_blocks.hyrax.rb similarity index 81% rename from db/migrate/20170110223724_create_content_blocks.hyrax.rb rename to db/migrate/20171009180529_create_content_blocks.hyrax.rb index 83c6ef2..33d1619 100644 --- a/db/migrate/20170110223724_create_content_blocks.hyrax.rb +++ b/db/migrate/20171009180529_create_content_blocks.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222164) -class CreateContentBlocks < ActiveRecord::Migration +class CreateContentBlocks < ActiveRecord::Migration[4.2] def change create_table :content_blocks do |t| t.string :name diff --git a/db/migrate/20170110223725_create_featured_works.hyrax.rb b/db/migrate/20171009180530_create_featured_works.hyrax.rb similarity index 84% rename from db/migrate/20170110223725_create_featured_works.hyrax.rb rename to db/migrate/20171009180530_create_featured_works.hyrax.rb index 5a8ce19..8bd26c5 100644 --- a/db/migrate/20170110223725_create_featured_works.hyrax.rb +++ b/db/migrate/20171009180530_create_featured_works.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222165) -class CreateFeaturedWorks < ActiveRecord::Migration +class CreateFeaturedWorks < ActiveRecord::Migration[4.2] def change create_table :featured_works do |t| t.integer :order, default: 5 diff --git a/db/migrate/20170110223726_add_external_key_to_content_blocks.hyrax.rb b/db/migrate/20171009180531_add_external_key_to_content_blocks.hyrax.rb similarity index 72% rename from db/migrate/20170110223726_add_external_key_to_content_blocks.hyrax.rb rename to db/migrate/20171009180531_add_external_key_to_content_blocks.hyrax.rb index 188c5dd..7ade97d 100644 --- a/db/migrate/20170110223726_add_external_key_to_content_blocks.hyrax.rb +++ b/db/migrate/20171009180531_add_external_key_to_content_blocks.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222166) -class AddExternalKeyToContentBlocks < ActiveRecord::Migration +class AddExternalKeyToContentBlocks < ActiveRecord::Migration[4.2] def change add_column :content_blocks, :external_key, :string remove_index :content_blocks, :name diff --git a/db/migrate/20170110223727_create_proxy_deposit_rights.hyrax.rb b/db/migrate/20171009180532_create_proxy_deposit_rights.hyrax.rb similarity index 83% rename from db/migrate/20170110223727_create_proxy_deposit_rights.hyrax.rb rename to db/migrate/20171009180532_create_proxy_deposit_rights.hyrax.rb index a206e32..15188ff 100644 --- a/db/migrate/20170110223727_create_proxy_deposit_rights.hyrax.rb +++ b/db/migrate/20171009180532_create_proxy_deposit_rights.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222226) -class CreateProxyDepositRights < ActiveRecord::Migration +class CreateProxyDepositRights < ActiveRecord::Migration[4.2] def change create_table :proxy_deposit_rights do |t| t.references :grantor diff --git a/db/migrate/20170110223728_create_proxy_deposit_requests.hyrax.rb b/db/migrate/20171009180533_create_proxy_deposit_requests.hyrax.rb similarity index 90% rename from db/migrate/20170110223728_create_proxy_deposit_requests.hyrax.rb rename to db/migrate/20171009180533_create_proxy_deposit_requests.hyrax.rb index d8f4ab5..9ed16a0 100644 --- a/db/migrate/20170110223728_create_proxy_deposit_requests.hyrax.rb +++ b/db/migrate/20171009180533_create_proxy_deposit_requests.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222227) -class CreateProxyDepositRequests < ActiveRecord::Migration +class CreateProxyDepositRequests < ActiveRecord::Migration[4.2] def change create_table :proxy_deposit_requests do |t| t.string :generic_file_id, null: false diff --git a/db/migrate/20170110223729_create_file_view_stats.hyrax.rb b/db/migrate/20171009180534_create_file_view_stats.hyrax.rb similarity index 82% rename from db/migrate/20170110223729_create_file_view_stats.hyrax.rb rename to db/migrate/20171009180534_create_file_view_stats.hyrax.rb index 443a43f..4f85fc9 100644 --- a/db/migrate/20170110223729_create_file_view_stats.hyrax.rb +++ b/db/migrate/20171009180534_create_file_view_stats.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222228) -class CreateFileViewStats < ActiveRecord::Migration +class CreateFileViewStats < ActiveRecord::Migration[4.2] def change create_table :file_view_stats do |t| t.datetime :date diff --git a/db/migrate/20170110223730_create_file_download_stats.hyrax.rb b/db/migrate/20171009180535_create_file_download_stats.hyrax.rb similarity index 82% rename from db/migrate/20170110223730_create_file_download_stats.hyrax.rb rename to db/migrate/20171009180535_create_file_download_stats.hyrax.rb index fcbb4c0..05db23a 100644 --- a/db/migrate/20170110223730_create_file_download_stats.hyrax.rb +++ b/db/migrate/20171009180535_create_file_download_stats.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222229) -class CreateFileDownloadStats < ActiveRecord::Migration +class CreateFileDownloadStats < ActiveRecord::Migration[4.2] def change create_table :file_download_stats do |t| t.datetime :date diff --git a/db/migrate/20170110223731_add_orcid_to_users.hyrax.rb b/db/migrate/20171009180536_add_orcid_to_users.hyrax.rb similarity index 70% rename from db/migrate/20170110223731_add_orcid_to_users.hyrax.rb rename to db/migrate/20171009180536_add_orcid_to_users.hyrax.rb index 09758ae..cf9a987 100644 --- a/db/migrate/20170110223731_add_orcid_to_users.hyrax.rb +++ b/db/migrate/20171009180536_add_orcid_to_users.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222230) -class AddOrcidToUsers < ActiveRecord::Migration +class AddOrcidToUsers < ActiveRecord::Migration[4.2] def change add_column :users, :orcid, :string end diff --git a/db/migrate/20170110223732_create_user_stats.hyrax.rb b/db/migrate/20171009180537_create_user_stats.hyrax.rb similarity index 90% rename from db/migrate/20170110223732_create_user_stats.hyrax.rb rename to db/migrate/20171009180537_create_user_stats.hyrax.rb index 7dd18b6..ff2dd28 100644 --- a/db/migrate/20170110223732_create_user_stats.hyrax.rb +++ b/db/migrate/20171009180537_create_user_stats.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222231) -class CreateUserStats < ActiveRecord::Migration +class CreateUserStats < ActiveRecord::Migration[4.2] def change create_table :user_stats do |t| t.integer :user_id diff --git a/db/migrate/20170110223733_create_work_view_stats.hyrax.rb b/db/migrate/20171009180538_create_work_view_stats.hyrax.rb similarity index 83% rename from db/migrate/20170110223733_create_work_view_stats.hyrax.rb rename to db/migrate/20171009180538_create_work_view_stats.hyrax.rb index eae2574..bb4647c 100644 --- a/db/migrate/20170110223733_create_work_view_stats.hyrax.rb +++ b/db/migrate/20171009180538_create_work_view_stats.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222232) -class CreateWorkViewStats < ActiveRecord::Migration +class CreateWorkViewStats < ActiveRecord::Migration[4.2] def change create_table :work_view_stats do |t| t.datetime :date diff --git a/db/migrate/20170110223734_add_works_to_user_stats.hyrax.rb b/db/migrate/20171009180539_add_works_to_user_stats.hyrax.rb similarity index 87% rename from db/migrate/20170110223734_add_works_to_user_stats.hyrax.rb rename to db/migrate/20171009180539_add_works_to_user_stats.hyrax.rb index ceaddd2..793de9e 100644 --- a/db/migrate/20170110223734_add_works_to_user_stats.hyrax.rb +++ b/db/migrate/20171009180539_add_works_to_user_stats.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222233) -class AddWorksToUserStats < ActiveRecord::Migration +class AddWorksToUserStats < ActiveRecord::Migration[4.2] def self.up add_column :user_stats, :work_views, :integer add_column :work_view_stats, :user_id, :integer diff --git a/db/migrate/20170110223735_change_trophy_generic_file_id_to_work_id.hyrax.rb b/db/migrate/20171009180540_change_trophy_generic_file_id_to_work_id.hyrax.rb similarity index 96% rename from db/migrate/20170110223735_change_trophy_generic_file_id_to_work_id.hyrax.rb rename to db/migrate/20171009180540_change_trophy_generic_file_id_to_work_id.hyrax.rb index a4e6935..346c387 100644 --- a/db/migrate/20170110223735_change_trophy_generic_file_id_to_work_id.hyrax.rb +++ b/db/migrate/20171009180540_change_trophy_generic_file_id_to_work_id.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222236) -class ChangeTrophyGenericFileIdToWorkId < ActiveRecord::Migration +class ChangeTrophyGenericFileIdToWorkId < ActiveRecord::Migration[4.2] def change rename_column :trophies, :generic_file_id, :work_id end diff --git a/db/migrate/20170110223736_change_proxy_deposit_generic_file_id_to_work_id.hyrax.rb b/db/migrate/20171009180541_change_proxy_deposit_generic_file_id_to_work_id.hyrax.rb similarity index 94% rename from db/migrate/20170110223736_change_proxy_deposit_generic_file_id_to_work_id.hyrax.rb rename to db/migrate/20171009180541_change_proxy_deposit_generic_file_id_to_work_id.hyrax.rb index 63b062b..b2df46f 100644 --- a/db/migrate/20170110223736_change_proxy_deposit_generic_file_id_to_work_id.hyrax.rb +++ b/db/migrate/20171009180541_change_proxy_deposit_generic_file_id_to_work_id.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222237) -class ChangeProxyDepositGenericFileIdToWorkId < ActiveRecord::Migration +class ChangeProxyDepositGenericFileIdToWorkId < ActiveRecord::Migration[4.2] def change rename_column :proxy_deposit_requests, :generic_file_id, :work_id end diff --git a/db/migrate/20170110223737_change_audit_log_generic_file_id_to_file_set_id.hyrax.rb b/db/migrate/20171009180542_change_audit_log_generic_file_id_to_file_set_id.hyrax.rb similarity index 95% rename from db/migrate/20170110223737_change_audit_log_generic_file_id_to_file_set_id.hyrax.rb rename to db/migrate/20171009180542_change_audit_log_generic_file_id_to_file_set_id.hyrax.rb index d291e1a..980b647 100644 --- a/db/migrate/20170110223737_change_audit_log_generic_file_id_to_file_set_id.hyrax.rb +++ b/db/migrate/20171009180542_change_audit_log_generic_file_id_to_file_set_id.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222238) -class ChangeAuditLogGenericFileIdToFileSetId < ActiveRecord::Migration +class ChangeAuditLogGenericFileIdToFileSetId < ActiveRecord::Migration[4.2] def change rename_column :checksum_audit_logs, :generic_file_id, :file_set_id unless ChecksumAuditLog.column_names.include?('file_set_id') end diff --git a/db/migrate/20170110223738_change_proxy_deposit_request_generic_file_id_to_work_id.hyrax.rb b/db/migrate/20171009180543_change_proxy_deposit_request_generic_file_id_to_work_id.hyrax.rb similarity index 93% rename from db/migrate/20170110223738_change_proxy_deposit_request_generic_file_id_to_work_id.hyrax.rb rename to db/migrate/20171009180543_change_proxy_deposit_request_generic_file_id_to_work_id.hyrax.rb index aa439e9..3ff3ae7 100644 --- a/db/migrate/20170110223738_change_proxy_deposit_request_generic_file_id_to_work_id.hyrax.rb +++ b/db/migrate/20171009180543_change_proxy_deposit_request_generic_file_id_to_work_id.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160328222239) -class ChangeProxyDepositRequestGenericFileIdToWorkId < ActiveRecord::Migration +class ChangeProxyDepositRequestGenericFileIdToWorkId < ActiveRecord::Migration[4.2] def change rename_column :proxy_deposit_requests, :generic_file_id, :generic_id if ProxyDepositRequest.column_names.include?('generic_file_id') end diff --git a/db/migrate/20170110223739_create_uploaded_files.hyrax.rb b/db/migrate/20171009180544_create_uploaded_files.hyrax.rb similarity index 83% rename from db/migrate/20170110223739_create_uploaded_files.hyrax.rb rename to db/migrate/20171009180544_create_uploaded_files.hyrax.rb index 47de2e2..f9893b3 100644 --- a/db/migrate/20170110223739_create_uploaded_files.hyrax.rb +++ b/db/migrate/20171009180544_create_uploaded_files.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160401142419) -class CreateUploadedFiles < ActiveRecord::Migration +class CreateUploadedFiles < ActiveRecord::Migration[4.2] def change create_table :uploaded_files do |t| t.string :file diff --git a/db/migrate/20170110223740_create_features.hyrax.rb b/db/migrate/20171009180545_create_features.hyrax.rb similarity index 82% rename from db/migrate/20170110223740_create_features.hyrax.rb rename to db/migrate/20171009180545_create_features.hyrax.rb index bf8c731..ad2560f 100644 --- a/db/migrate/20170110223740_create_features.hyrax.rb +++ b/db/migrate/20171009180545_create_features.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160415212015) -class CreateFeatures < ActiveRecord::Migration +class CreateFeatures < ActiveRecord::Migration[4.2] def change create_table :hyrax_features do |t| t.string :key, null: false diff --git a/db/migrate/20170110223741_create_operations.hyrax.rb b/db/migrate/20171009180546_create_operations.hyrax.rb similarity index 92% rename from db/migrate/20170110223741_create_operations.hyrax.rb rename to db/migrate/20171009180546_create_operations.hyrax.rb index d7ea61b..847dd0d 100644 --- a/db/migrate/20170110223741_create_operations.hyrax.rb +++ b/db/migrate/20171009180546_create_operations.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160427155928) -class CreateOperations < ActiveRecord::Migration +class CreateOperations < ActiveRecord::Migration[4.2] def change create_table :curation_concerns_operations do |t| t.string :status diff --git a/db/migrate/20170110223742_change_featured_work_generic_file_id_to_work_id.hyrax.rb b/db/migrate/20171009180547_change_featured_work_generic_file_id_to_work_id.hyrax.rb similarity index 95% rename from db/migrate/20170110223742_change_featured_work_generic_file_id_to_work_id.hyrax.rb rename to db/migrate/20171009180547_change_featured_work_generic_file_id_to_work_id.hyrax.rb index d3956df..accd412 100644 --- a/db/migrate/20170110223742_change_featured_work_generic_file_id_to_work_id.hyrax.rb +++ b/db/migrate/20171009180547_change_featured_work_generic_file_id_to_work_id.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160510000007) -class ChangeFeaturedWorkGenericFileIdToWorkId < ActiveRecord::Migration +class ChangeFeaturedWorkGenericFileIdToWorkId < ActiveRecord::Migration[4.2] def change return unless column_exists?(:featured_works, :generic_file_id) rename_column :featured_works, :generic_file_id, :work_id diff --git a/db/migrate/20170110223743_add_arkivo_to_users.hyrax.rb b/db/migrate/20171009180548_add_arkivo_to_users.hyrax.rb similarity index 83% rename from db/migrate/20170110223743_add_arkivo_to_users.hyrax.rb rename to db/migrate/20171009180548_add_arkivo_to_users.hyrax.rb index d9fbbec..a9f2d88 100644 --- a/db/migrate/20170110223743_add_arkivo_to_users.hyrax.rb +++ b/db/migrate/20171009180548_add_arkivo_to_users.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160516190435) -class AddArkivoToUsers < ActiveRecord::Migration +class AddArkivoToUsers < ActiveRecord::Migration[4.2] def change add_column :users, :arkivo_token, :string add_column :users, :arkivo_subscription, :string diff --git a/db/migrate/20170110223744_create_sipity.hyrax.rb b/db/migrate/20171009180549_create_sipity.hyrax.rb similarity index 99% rename from db/migrate/20170110223744_create_sipity.hyrax.rb rename to db/migrate/20171009180549_create_sipity.hyrax.rb index b146eb3..2c8d4e0 100644 --- a/db/migrate/20170110223744_create_sipity.hyrax.rb +++ b/db/migrate/20171009180549_create_sipity.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20160919151348) -class CreateSipity < ActiveRecord::Migration +class CreateSipity < ActiveRecord::Migration[4.2] def change create_table "sipity_notification_recipients" do |t| t.integer "notification_id", null: false diff --git a/db/migrate/20170110223745_create_sipity_workflow_methods.hyrax.rb b/db/migrate/20171009180550_create_sipity_workflow_methods.hyrax.rb similarity index 85% rename from db/migrate/20170110223745_create_sipity_workflow_methods.hyrax.rb rename to db/migrate/20171009180550_create_sipity_workflow_methods.hyrax.rb index 7160df3..7dceb10 100644 --- a/db/migrate/20170110223745_create_sipity_workflow_methods.hyrax.rb +++ b/db/migrate/20171009180550_create_sipity_workflow_methods.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20161012182404) -class CreateSipityWorkflowMethods < ActiveRecord::Migration +class CreateSipityWorkflowMethods < ActiveRecord::Migration[4.2] def change create_table :sipity_workflow_methods do |t| t.string "service_name", null: false diff --git a/db/migrate/20170110223746_create_permission_template.hyrax.rb b/db/migrate/20171009180551_create_permission_template.hyrax.rb similarity index 74% rename from db/migrate/20170110223746_create_permission_template.hyrax.rb rename to db/migrate/20171009180551_create_permission_template.hyrax.rb index 026e5f0..a06ea04 100644 --- a/db/migrate/20170110223746_create_permission_template.hyrax.rb +++ b/db/migrate/20171009180551_create_permission_template.hyrax.rb @@ -1,10 +1,10 @@ # This migration comes from hyrax (originally 20161021175854) -class CreatePermissionTemplate < ActiveRecord::Migration +class CreatePermissionTemplate < ActiveRecord::Migration[4.2] def change create_table :permission_templates do |t| + t.belongs_to :workflow t.string :admin_set_id t.string :visibility - t.string :workflow_name t.timestamps end add_index :permission_templates, :admin_set_id diff --git a/db/migrate/20170110223747_create_permission_template_access.hyrax.rb b/db/migrate/20171009180552_create_permission_template_access.hyrax.rb similarity index 81% rename from db/migrate/20170110223747_create_permission_template_access.hyrax.rb rename to db/migrate/20171009180552_create_permission_template_access.hyrax.rb index 3a44bf5..7d85b73 100644 --- a/db/migrate/20170110223747_create_permission_template_access.hyrax.rb +++ b/db/migrate/20171009180552_create_permission_template_access.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20161021180154) -class CreatePermissionTemplateAccess < ActiveRecord::Migration +class CreatePermissionTemplateAccess < ActiveRecord::Migration[4.2] def change create_table :permission_template_accesses do |t| t.references :permission_template, foreign_key: true diff --git a/db/migrate/20170110223748_add_release_to_permission_templates.hyrax.rb b/db/migrate/20171009180553_add_release_to_permission_templates.hyrax.rb similarity index 75% rename from db/migrate/20170110223748_add_release_to_permission_templates.hyrax.rb rename to db/migrate/20171009180553_add_release_to_permission_templates.hyrax.rb index 90387f5..be722f9 100644 --- a/db/migrate/20170110223748_add_release_to_permission_templates.hyrax.rb +++ b/db/migrate/20171009180553_add_release_to_permission_templates.hyrax.rb @@ -1,5 +1,5 @@ # This migration comes from hyrax (originally 20161116222307) -class AddReleaseToPermissionTemplates < ActiveRecord::Migration +class AddReleaseToPermissionTemplates < ActiveRecord::Migration[4.2] def change add_column :permission_templates, :release_date, :date add_column :permission_templates, :release_period, :string diff --git a/db/migrate/20170131142607_add_permission_template_to_sipity_workflow.rb b/db/migrate/20171009180554_add_permission_template_to_sipity_workflow.hyrax.rb similarity index 93% rename from db/migrate/20170131142607_add_permission_template_to_sipity_workflow.rb rename to db/migrate/20171009180554_add_permission_template_to_sipity_workflow.hyrax.rb index 070b1a8..fea045a 100644 --- a/db/migrate/20170131142607_add_permission_template_to_sipity_workflow.rb +++ b/db/migrate/20171009180554_add_permission_template_to_sipity_workflow.hyrax.rb @@ -1,4 +1,5 @@ -class AddPermissionTemplateToSipityWorkflow < ActiveRecord::Migration +# This migration comes from hyrax (originally 20170131142607) +class AddPermissionTemplateToSipityWorkflow < ActiveRecord::Migration[4.2] def change add_column :sipity_workflows, :permission_template_id, :integer, index: true remove_index :sipity_workflows, :name diff --git a/db/migrate/20170307142607_tidy_up_because_of_bad_exception.rb b/db/migrate/20171009180555_tidy_up_because_of_bad_exception.hyrax.rb similarity index 62% rename from db/migrate/20170307142607_tidy_up_because_of_bad_exception.rb rename to db/migrate/20171009180555_tidy_up_because_of_bad_exception.hyrax.rb index ff7b76b..7c51ae6 100644 --- a/db/migrate/20170307142607_tidy_up_because_of_bad_exception.rb +++ b/db/migrate/20171009180555_tidy_up_because_of_bad_exception.hyrax.rb @@ -1,6 +1,7 @@ -class TidyUpBecauseOfBadException < ActiveRecord::Migration +# This migration comes from hyrax (originally 20170307142607) +class TidyUpBecauseOfBadException < ActiveRecord::Migration[4.2] def change - if Hyrax::PermissionTemplate.column_names.include?('workflow_id') + if column_exists?(Hyrax::PermissionTemplate.table_name, :workflow_id) Hyrax::PermissionTemplate.all.each do |permission_template| workflow_id = permission_template.workflow_id next unless workflow_id diff --git a/db/migrate/20171009180556_add_allows_access_grant_to_workflow.hyrax.rb b/db/migrate/20171009180556_add_allows_access_grant_to_workflow.hyrax.rb new file mode 100644 index 0000000..0f7c774 --- /dev/null +++ b/db/migrate/20171009180556_add_allows_access_grant_to_workflow.hyrax.rb @@ -0,0 +1,6 @@ +# This migration comes from hyrax (originally 20170308175556) +class AddAllowsAccessGrantToWorkflow < ActiveRecord::Migration[4.2] + def change + add_column :sipity_workflows, :allows_access_grant, :boolean + end +end diff --git a/db/migrate/20170504192714_change_checksum_audit_log.rb b/db/migrate/20171009180557_change_checksum_audit_log.hyrax.rb similarity index 89% rename from db/migrate/20170504192714_change_checksum_audit_log.rb rename to db/migrate/20171009180557_change_checksum_audit_log.hyrax.rb index cc81372..ed7467d 100644 --- a/db/migrate/20170504192714_change_checksum_audit_log.rb +++ b/db/migrate/20171009180557_change_checksum_audit_log.hyrax.rb @@ -1,3 +1,4 @@ +# This migration comes from hyrax (originally 20170504192714) class ChangeChecksumAuditLog < ActiveRecord::Migration[5.0] def change rename_column :checksum_audit_logs, :version, :checked_uri diff --git a/db/migrate/20170621201939_create_job_io_wrappers.rb b/db/migrate/20171009180558_create_job_io_wrappers.hyrax.rb similarity index 84% rename from db/migrate/20170621201939_create_job_io_wrappers.rb rename to db/migrate/20171009180558_create_job_io_wrappers.hyrax.rb index b8a0fa9..34c402d 100644 --- a/db/migrate/20170621201939_create_job_io_wrappers.rb +++ b/db/migrate/20171009180558_create_job_io_wrappers.hyrax.rb @@ -1,3 +1,4 @@ +# This migration comes from hyrax (originally 20170621201939) class CreateJobIoWrappers < ActiveRecord::Migration[5.0] def change create_table :job_io_wrappers do |t| diff --git a/db/migrate/20171009210710_add_preferred_locale_to_users.hyrax.rb b/db/migrate/20171009180559_add_preferred_locale_to_users.hyrax.rb similarity index 100% rename from db/migrate/20171009210710_add_preferred_locale_to_users.hyrax.rb rename to db/migrate/20171009180559_add_preferred_locale_to_users.hyrax.rb diff --git a/db/migrate/20170110223749_create_mailboxer.mailboxer_engine.rb b/db/migrate/20171009180560_create_mailboxer.mailboxer_engine.rb similarity index 93% rename from db/migrate/20170110223749_create_mailboxer.mailboxer_engine.rb rename to db/migrate/20171009180560_create_mailboxer.mailboxer_engine.rb index 99ed59b..d42e89f 100644 --- a/db/migrate/20170110223749_create_mailboxer.mailboxer_engine.rb +++ b/db/migrate/20171009180560_create_mailboxer.mailboxer_engine.rb @@ -1,5 +1,5 @@ # This migration comes from mailboxer_engine (originally 20110511145103) -class CreateMailboxer < ActiveRecord::Migration +class CreateMailboxer < ActiveRecord::Migration[4.2] def self.up #Tables #Conversations @@ -28,7 +28,7 @@ def self.up t.column :conversation_id, :integer t.column :draft, :boolean, :default => false t.string :notification_code, :default => nil - t.references :notified_object, :polymorphic => true + t.references :notified_object, :polymorphic => true, index: { name: 'mailboxer_notifications_notified_object' } t.column :attachment, :string t.column :updated_at, :datetime, :null => false t.column :created_at, :datetime, :null => false diff --git a/db/migrate/20170110223750_add_conversation_optout.mailboxer_engine.rb b/db/migrate/20171009180561_add_conversation_optout.mailboxer_engine.rb similarity index 90% rename from db/migrate/20170110223750_add_conversation_optout.mailboxer_engine.rb rename to db/migrate/20171009180561_add_conversation_optout.mailboxer_engine.rb index c4f4555..a9860bd 100644 --- a/db/migrate/20170110223750_add_conversation_optout.mailboxer_engine.rb +++ b/db/migrate/20171009180561_add_conversation_optout.mailboxer_engine.rb @@ -1,5 +1,5 @@ # This migration comes from mailboxer_engine (originally 20131206080416) -class AddConversationOptout < ActiveRecord::Migration +class AddConversationOptout < ActiveRecord::Migration[4.2] def self.up create_table :mailboxer_conversation_opt_outs do |t| t.references :unsubscriber, :polymorphic => true diff --git a/db/migrate/20170110223751_add_missing_indices.mailboxer_engine.rb b/db/migrate/20171009180562_add_missing_indices.mailboxer_engine.rb similarity index 94% rename from db/migrate/20170110223751_add_missing_indices.mailboxer_engine.rb rename to db/migrate/20171009180562_add_missing_indices.mailboxer_engine.rb index fde9671..608d7f6 100644 --- a/db/migrate/20170110223751_add_missing_indices.mailboxer_engine.rb +++ b/db/migrate/20171009180562_add_missing_indices.mailboxer_engine.rb @@ -1,5 +1,5 @@ # This migration comes from mailboxer_engine (originally 20131206080417) -class AddMissingIndices < ActiveRecord::Migration +class AddMissingIndices < ActiveRecord::Migration[4.2] def change # We'll explicitly specify its name, as the auto-generated name is too long and exceeds 63 # characters limitation. diff --git a/db/migrate/20170110223752_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb b/db/migrate/20171009180563_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb similarity index 95% rename from db/migrate/20170110223752_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb rename to db/migrate/20171009180563_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb index a820919..498d152 100644 --- a/db/migrate/20170110223752_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb +++ b/db/migrate/20171009180563_add_delivery_tracking_info_to_mailboxer_receipts.mailboxer_engine.rb @@ -1,5 +1,5 @@ # This migration comes from mailboxer_engine (originally 20151103080417) -class AddDeliveryTrackingInfoToMailboxerReceipts < ActiveRecord::Migration +class AddDeliveryTrackingInfoToMailboxerReceipts < ActiveRecord::Migration[4.2] def change add_column :mailboxer_receipts, :is_delivered, :boolean, default: false add_column :mailboxer_receipts, :delivery_method, :string diff --git a/db/migrate/20170110223753_create_qa_local_authorities.rb b/db/migrate/20171009180564_create_qa_local_authorities.rb similarity index 100% rename from db/migrate/20170110223753_create_qa_local_authorities.rb rename to db/migrate/20171009180564_create_qa_local_authorities.rb diff --git a/db/migrate/20170110223755_create_qa_local_authority_entries.rb b/db/migrate/20171009180565_create_qa_local_authority_entries.rb similarity index 73% rename from db/migrate/20170110223755_create_qa_local_authority_entries.rb rename to db/migrate/20171009180565_create_qa_local_authority_entries.rb index 43f3fe2..2c3b082 100644 --- a/db/migrate/20170110223755_create_qa_local_authority_entries.rb +++ b/db/migrate/20171009180565_create_qa_local_authority_entries.rb @@ -1,7 +1,7 @@ class CreateQaLocalAuthorityEntries < ActiveRecord::Migration[5.0] def change create_table :qa_local_authority_entries do |t| - t.references :local_authority, foreign_key: true + t.references :local_authority, foreign_key: { to_table: :qa_local_authorities }, index: true t.string :label t.string :uri diff --git a/db/migrate/20170110223828_create_minter_states.active_fedora_noid_engine.rb b/db/migrate/20171009180616_create_minter_states.active_fedora_noid_engine.rb similarity index 90% rename from db/migrate/20170110223828_create_minter_states.active_fedora_noid_engine.rb rename to db/migrate/20171009180616_create_minter_states.active_fedora_noid_engine.rb index e9c86b8..f175f69 100644 --- a/db/migrate/20170110223828_create_minter_states.active_fedora_noid_engine.rb +++ b/db/migrate/20171009180616_create_minter_states.active_fedora_noid_engine.rb @@ -1,6 +1,6 @@ # This migration comes from active_fedora_noid_engine (originally 20160610010003) # frozen_string_literal: true -class CreateMinterStates < ActiveRecord::Migration +class CreateMinterStates < ActiveRecord::Migration[4.2] def change create_table :minter_states do |t| t.string :namespace, null: false, default: 'default' diff --git a/db/migrate/20170110223829_rename_minter_state_random_to_rand.active_fedora_noid_engine.rb b/db/migrate/20171009180617_rename_minter_state_random_to_rand.active_fedora_noid_engine.rb similarity index 73% rename from db/migrate/20170110223829_rename_minter_state_random_to_rand.active_fedora_noid_engine.rb rename to db/migrate/20171009180617_rename_minter_state_random_to_rand.active_fedora_noid_engine.rb index 6a14eee..7d14cab 100644 --- a/db/migrate/20170110223829_rename_minter_state_random_to_rand.active_fedora_noid_engine.rb +++ b/db/migrate/20171009180617_rename_minter_state_random_to_rand.active_fedora_noid_engine.rb @@ -1,6 +1,6 @@ # This migration comes from active_fedora_noid_engine (originally 20161021203429) # frozen_string_literal: true -class RenameMinterStateRandomToRand < ActiveRecord::Migration +class RenameMinterStateRandomToRand < ActiveRecord::Migration[4.2] def change rename_column :minter_states, :random, :rand end diff --git a/db/migrate/20170808194346_add_uid_provider_to_users.rb b/db/migrate/20171115194346_add_uid_provider_to_users.rb similarity index 100% rename from db/migrate/20170808194346_add_uid_provider_to_users.rb rename to db/migrate/20171115194346_add_uid_provider_to_users.rb diff --git a/db/schema.rb b/db/schema.rb index aaf0209..9ff7210 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171009210710) do +ActiveRecord::Schema.define(version: 20171115194346) do create_table "bookmarks", force: :cascade do |t| t.integer "user_id", null: false @@ -150,6 +150,7 @@ t.datetime "expires" t.index ["conversation_id"], name: "index_mailboxer_notifications_on_conversation_id" t.index ["notified_object_id", "notified_object_type"], name: "index_mailboxer_notifications_on_notified_object_id_and_type" + t.index ["notified_object_type", "notified_object_id"], name: "mailboxer_notifications_notified_object" t.index ["sender_id", "sender_type"], name: "index_mailboxer_notifications_on_sender_id_and_sender_type" t.index ["type"], name: "index_mailboxer_notifications_on_type" end @@ -198,9 +199,7 @@ t.datetime "updated_at" t.date "release_date" t.string "release_period" - t.integer "workflow_id" t.index ["admin_set_id"], name: "index_permission_templates_on_admin_set_id", unique: true - t.index ["workflow_id"], name: "index_permission_templates_on_workflow_id" end create_table "proxy_deposit_requests", force: :cascade do |t| @@ -500,10 +499,10 @@ t.string "arkivo_subscription" t.binary "zotero_token" t.string "zotero_userid" + t.string "preferred_locale" t.string "uid" t.string "provider" t.string "full_name" - t.string "preferred_locale" t.index ["email"], name: "index_users_on_email", unique: true t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true end diff --git a/public/404.html b/public/404.html index b612547..2be3af2 100644 --- a/public/404.html +++ b/public/404.html @@ -4,7 +4,7 @@ The page you were looking for doesn't exist (404) - +
diff --git a/public/422.html b/public/422.html index a21f82b..c08eac0 100644 --- a/public/422.html +++ b/public/422.html @@ -4,7 +4,7 @@ The change you wanted was rejected (422) - +
diff --git a/public/500.html b/public/500.html index 061abc5..78a030a 100644 --- a/public/500.html +++ b/public/500.html @@ -4,7 +4,7 @@ We're sorry, but something went wrong (500) - +
diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png new file mode 100644 index 0000000..e69de29 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000..e69de29 diff --git a/public/robots.txt b/public/robots.txt index 9e2e871..3c9c7c0 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -3,5 +3,3 @@ # To ban all spiders from the entire site uncomment the next two lines: # User-agent: * # Disallow: / - -Sitemap: http://library.ucsd.edu/dc/sitemap.xml \ No newline at end of file diff --git a/solr/conf/schema.xml b/solr/conf/schema.xml index 62c895e..2549604 100644 --- a/solr/conf/schema.xml +++ b/solr/conf/schema.xml @@ -548,7 +548,7 @@ text - + - +